Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re722194ffa7a6c79e7ffeb14354c70d9aed69ef7 -r8a75eb668795994f1dfd92ff5d33e9375937c12f
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e722194ffa7a6c79e7ffeb14354c70d9aed69ef7)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
@@ -630,6 +630,12 @@
 authoring.fla.liveedit.readonly.remove.parent.error = The activity can not be removed. Its parent activity is read-only.
 authoring.fla.liveedit.readonly.remove.child.error = The activity can not be removed. It has read-only child activities.
 authoring.fla.liveedit.readonly.remove.transition.error = The transition can not be removed. It is read-only.
+authoring.fla.tool.category.1 = Flow
+authoring.fla.tool.category.2 = Collaboration
+authoring.fla.tool.category.3 = Assessment
+authoring.fla.tool.category.4 = Content
+authoring.fla.tool.category.5 = Combined
+authoring.fla.tool.category.6 = Reflective
 ckeditor.math.math = Math
 ckeditor.math.functions = Functions
 ckeditor.math.greek = Greek
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r72d525026e011d4ac75686e07377a4242c3eb09f -r8a75eb668795994f1dfd92ff5d33e9375937c12f
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 72d525026e011d4ac75686e07377a4242c3eb09f)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
@@ -435,9 +435,26 @@
 		<tr>
 			<td id="templateContainerCell">
 				<div id="template-container-cell-dummy-placeholder"></div>
-				<div class="templateContainer scrollable">
+				<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 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}">
-						<div class="tooltemplate">
 						<div
                              name="tool${tool.toolDisplayName}"
 							 toolId="${tool.toolId}"
@@ -466,7 +483,6 @@
 								</div>
 							</div>
 						</div>
-						</div>
 					</c:forEach>
 				</div>
 			</td>
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -r72d525026e011d4ac75686e07377a4242c3eb09f -r8a75eb668795994f1dfd92ff5d33e9375937c12f
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 72d525026e011d4ac75686e07377a4242c3eb09f)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
@@ -141,9 +141,6 @@
 	width: 95%;
 }
 
-div#infoDialog .modal-content {
-}
-
 div#infoDialog .modal-header {
 	padding-top: 5px;
 	padding-bottom: 5px;
@@ -445,44 +442,79 @@
 	table-layout: fixed;
 	width: 100%;
 }
+  
+table#authoringTable .template-drag-helper{
+	width : 200px;
+	height: 70px;
+	border: thin black solid !important;
+	z-index : 1;
+	cursor  : move;
+}
 
 td#templateContainerCell {
-	width: 175px;
-	vertical-align: top;
+  width: 200px;
+  vertical-align: top;
 }
 
-
 td#templateContainerCell #template-container-cell-dummy-placeholder {
   height: 22px;
 }
 
-div.templateContainer {
-	display: none;
-	overflow: auto;
-	border: $border-thin-default;
-	border-radius: 3px;
+td#templateContainerCell div.templateContainer {
+  display: none;
+  overflow: auto;
 }
 
-div.template {
-	min-height: 45px;
-	border-bottom: $border-thin-default;
+td#templateContainerCell div.template {
+  min-height: 65px;
+  border-bottom: thin solid #cecdcd;
+  cursor: pointer;
+}
+  
+  
+td#templateContainerCell div.template:hover{
+	background-color: #eeeeee; 
+}
+
+td#templateContainerCell div.template .media {
+  margin-top: 0px;
+  padding: 12px 5px 5px 5px; 
+  font-size: larger;
+}
+
+td#templateContainerCell div.template .media img {
+  width: 50px;
+  height: 40px;
+}
+
+td#templateContainerCell .panel-heading {
 	cursor: pointer;
 }
 
-.tooltemplate :hover {
-	background-color:$gray-lighter;
+td#templateContainerCell #collapse-heading-tool-category-1 {
+	background-color: #caddfb;
 }
 
-.tooltemplate .media {
-	margin-top: 0px;
-	padding: 8px 0px 5px 5px;
+td#templateContainerCell #collapse-heading-tool-category-2 {
+	background-color: #ffffbb;
 }
 
-.tooltemplate .media img {
-	width: 30px;
-	height: 30px;
+td#templateContainerCell #collapse-heading-tool-category-3 {
+	background-color: rgba(45, 188, 233, 0.25);
 }
 
+td#templateContainerCell #collapse-heading-tool-category-4 {
+	background-color: rgb(255, 114, 172, 0.25);
+}
+
+td#templateContainerCell #collapse-heading-tool-category-5 {
+	background-color: #f0f8ff;
+}
+
+td#templateContainerCell #collapse-heading-tool-category-6 {
+	background-color: rgba(26, 217, 178, 0.25);
+}
+
 td#canvasContainerCell {
 	vertical-align: top;
 }
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r72d525026e011d4ac75686e07377a4242c3eb09f -r8a75eb668795994f1dfd92ff5d33e9375937c12f
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 72d525026e011d4ac75686e07377a4242c3eb09f)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 8a75eb668795994f1dfd92ff5d33e9375937c12f)
@@ -179,8 +179,10 @@
 	 * Draw boxes with Tool Activity templates in the panel on the left.
 	 */
 	initTemplates : function(){
+		var templateContainerCell = $('#templateContainerCell');
+		
 		// store some template data in JS structures
-		$('.template').each(function(){
+		$('.template', templateContainerCell).each(function(){
 			var learningLibraryID = +$(this).attr('learningLibraryId'),
 				learningLibraryTitle = $(this).attr('learningLibraryTitle'),
 				activityCategoryID = ActivityCategories[learningLibraryTitle],
@@ -215,29 +217,27 @@
 			// store the initial window height now as on iPad the iframe grows when templates are show,
 			// reporting incorrect window height to the first resizePaper() run
 			layout.initWindowHeight = $(window).height();
-			$('#templateContainerCell .templateContainer').show();
 			
-			$('.template').each(function(){
+			$('.template', templateContainerCell).each(function(){
+				var learningLibraryID = +$(this).attr('learningLibraryId'),
+					activityCategoryID = layout.toolMetadata[learningLibraryID].activityCategoryID;
+					
+				$('#collapse-tool-category-' + activityCategoryID, templateContainerCell).append(this);
+				
 				// allow dragging a template to canvas
 				$(this).draggable({
 					'containment' : '#authoringTable',
 				    'revert'      : 'invalid',
 				    'distance'    : 20,
 				    'scroll'      : false,
 				    'scope'       : 'template',
-				    'helper'      : function(event){
+				    'helper'      : function(){
 				    	// build a simple helper
-						return $(this).clone().css({
-							'width'   : '150px',
-							'border'  : 'thin black solid',
-							'z-index' : 1,
-							'cursor'  : 'move'
-						});
+						return $(this).clone().addClass('template-drag-helper');
 					}
 				});
 			});
 
-			
 			// allow dropping templates to canvas
 			canvas.droppable({
 				   'tolerance'   : 'touch',
@@ -282,6 +282,8 @@
 						ActivityLib.dropActivity(activity, eventX, eventY);
 				   }
 			});
+			
+			$('.templateContainer', templateContainerCell).show();
 		}
 	},