Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r8a75eb668795994f1dfd92ff5d33e9375937c12f -rc14addfb86127ccba5457249549a577af1de7c0f
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
@@ -434,24 +434,26 @@
 	<table id="authoringTable">
 		<tr>
 			<td id="templateContainerCell">
-				<div id="template-container-cell-dummy-placeholder"></div>
+				<div id="template-container-collapse">
+					<i class="fa fa-arrow-circle-o-left" onClick="javascript:MenuLib.toggleTemplateContainer()"></i>
+				</div>
 				<div id="template-container-panel-group" class="templateContainer scrollable panel-group" role="tablist" aria-multiselectable="true">
 				
 					<c:forTokens items="3,2,4,6,5" delims="," var="toolCategoryId">
-						 <div class="panel panel-default">
-						 	  <div class="panel-heading" role="tab" id="collapse-heading-tool-category-${toolCategoryId}"
-						 	  		data-toggle="collapse" href="#collapse-tool-category-${toolCategoryId}" 
-									aria-expanded="false" aria-controls="collapse-tool-category-${toolCategoryId}"
-									data-parent="#template-container-panel-group">
-						 	  		<span class="panel-title">
-										<fmt:message key="authoring.fla.tool.category.${toolCategoryId}" />
-						 	  		</span>
-						 	  </div>
-						 </div>
+						<div class="panel panel-default">
+					 	  <div class="panel-heading" role="tab" id="collapse-heading-tool-category-${toolCategoryId}"
+					 	  		data-toggle="collapse" href="#collapse-tool-category-${toolCategoryId}" 
+								aria-expanded="false" aria-controls="collapse-tool-category-${toolCategoryId}"
+								data-parent="#template-container-panel-group">
+					 	  		<span class="panel-title">
+									<fmt:message key="authoring.fla.tool.category.${toolCategoryId}" />
+					 	  		</span>
+					 	  </div>
+					  	</div>
 						 
-						   <div id="collapse-tool-category-${toolCategoryId}" class="panel-collapse collapse" 
-					       	    role="tabpanel" aria-labelledby="collapse-heading-tool-category-${toolCategoryId}">
-					       </div>
+					    <div id="collapse-tool-category-${toolCategoryId}" class="panel-collapse collapse" 
+				       	    role="tabpanel" aria-labelledby="collapse-heading-tool-category-${toolCategoryId}">
+				        </div>
 					</c:forTokens>
 						
 					<c:forEach var="tool" items="${tools}">
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -r4a05d1759c21483cf0abad459fc9713fc775c2e0 -rc14addfb86127ccba5457249549a577af1de7c0f
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 4a05d1759c21483cf0abad459fc9713fc775c2e0)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
@@ -456,13 +456,13 @@
   vertical-align: top;
 }
 
-td#templateContainerCell #template-container-cell-dummy-placeholder {
-  height: 22px;
+td#templateContainerCell #template-container-collapse {
+	padding-left: 5px;
 }
 
-td#templateContainerCell div.templateContainer {
-  display: none;
-  overflow: auto;
+td#templateContainerCell #template-container-collapse i.fa {
+	font-size: 20px;
+	cursor: pointer;
 }
 
 td#templateContainerCell div.template {
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r8a75eb668795994f1dfd92ff5d33e9375937c12f -rc14addfb86127ccba5457249549a577af1de7c0f
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
@@ -2886,11 +2886,11 @@
 		$('.templateContainer').height(windowHeight - 80);
 		$('#canvas').height(windowHeight - 75)
 		// width of window minus templates on the left; minimum is toolbar width so it does not collapse
-					.width(Math.max($('#toolbar').width() - 180, $(window).width() - 190));
+		// .width(Math.max($('#toolbar').width() - 200, $(window).width() - $('#templateContainerCell').width()));
 		
 		if (!width || !height) {
-			var width = 0,
-				height = 0;
+			width = 0;
+			height = 0;
 			$.each(layout.activities, function(){
 				// find new dimensions of paper
 				var activityBox = this.items.shape.getBBox();
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r54613e14332031bce49e424b8e0ebc3700a2ccd7 -rc14addfb86127ccba5457249549a577af1de7c0f
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 54613e14332031bce49e424b8e0ebc3700a2ccd7)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
@@ -222,6 +222,18 @@
 		}
 	},
 	
+	/**
+	 * Hide / show activity toolbar on the left
+	 */
+	toggleTemplateContainer : function(){
+		var templateContainerCell = $('#templateContainerCell');
+		templateContainerCell.animate({
+			'width': templateContainerCell.width() > 0 ? 0 : 200
+		}, function(){
+			templateContainerCell.find('#template-container-collapse i.fa').toggleClass('fa-arrow-circle-o-left fa-arrow-circle-o-right');
+			GeneralLib.resizePaper();
+		});
+	},
 	
 	/**
 	 * Mark an activity as ready for pasting.