Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rc14addfb86127ccba5457249549a577af1de7c0f -rcf6d008d6b7287b647a0d79855cf248840c47769
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision cf6d008d6b7287b647a0d79855cf248840c47769)
@@ -480,7 +480,7 @@
   								<div class="media-left img-${tool.learningLibraryId}">
   									<img src="<lams:LAMSURL/>${tool.iconPath}" />
   								</div>
-  								<div class="media-body media-middle" id="toolDisplayName">
+  								<div class="media-body media-middle tool-display-name">
 									<c:out value="${tool.toolDisplayName}" />
 								</div>
 							</div>
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -rc14addfb86127ccba5457249549a577af1de7c0f -rcf6d008d6b7287b647a0d79855cf248840c47769
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision cf6d008d6b7287b647a0d79855cf248840c47769)
@@ -443,12 +443,14 @@
 	width: 100%;
 }
   
-table#authoringTable .template-drag-helper{
-	width : 200px;
-	height: 70px;
-	border: thin black solid !important;
-	z-index : 1;
-	cursor  : move;
+
+table#authoringTable .template-drag-helper {
+  width: 200px;
+  height: 70px;
+  border: thin black solid !important;
+  background-color: white !important;
+  z-index: 1;
+  cursor: move; 
 }
 
 td#templateContainerCell {
@@ -464,59 +466,68 @@
 	font-size: 20px;
 	cursor: pointer;
 }
+ 
+td#templateContainerCell #template-container-panel-group {
+	overflow-x: hidden;
+	overflow-y: auto;
+}
 
 td#templateContainerCell div.template {
   min-height: 65px;
   border-bottom: thin solid #cecdcd;
-  cursor: pointer;
-}
-  
-  
-td#templateContainerCell div.template:hover{
-	background-color: #eeeeee; 
-}
+  cursor: pointer; }
 
 td#templateContainerCell div.template .media {
   margin-top: 0px;
-  padding: 12px 5px 5px 5px; 
-  font-size: 16px; 
-}
+  padding: 12px 5px 5px 5px;
+  font-size: 16px; }
 
 td#templateContainerCell div.template .media img {
   width: 50px;
-  height: 40px;
-}
+  height: 40px; }
 
 td#templateContainerCell .panel-heading {
   cursor: pointer;
   background-color: white;
   font-size: 16px;
-}
+  padding-bottom: 4px; }
 
 td#templateContainerCell #collapse-heading-tool-category-1 {
-  border-bottom: 5px solid #caddfb;
-}
-
+  border-bottom: 10px solid #caddfb; }
+  
+td#templateContainerCell #collapse-heading-tool-category-1 div.template:hover {
+  background-color: #caddfb; }
+  
 td#templateContainerCell #collapse-heading-tool-category-2 {
- border-bottom: 10px solid #ffffbb;
-}
+  border-bottom: 10px solid #ffffbb; }
 
+td#templateContainerCell #collapse-tool-category-2 div.template:hover {
+  background-color: #ffffbb; }
+  
 td#templateContainerCell #collapse-heading-tool-category-3 {
-  border-bottom: 10px solid rgba(45, 188, 233, 0.25);
-}
+  border-bottom: 10px solid rgba(45, 188, 233, 0.25); }
 
+td#templateContainerCell #collapse-tool-category-3 div.template:hover {
+  background-color: rgba(45, 188, 233, 0.25); }
+  
 td#templateContainerCell #collapse-heading-tool-category-4 {
-  border-bottom: 10px solid rgba(255, 114, 172, 0.25);
-}
+  border-bottom: 10px solid rgba(255, 114, 172, 0.25); }
 
+td#templateContainerCell #collapse-tool-category-4 div.template:hover {
+  background-color: rgba(255, 114, 172, 0.25); }
+  
 td#templateContainerCell #collapse-heading-tool-category-5 {
-  border-bottom: 10px solid #f0f8ff;
-}
+  border-bottom: 10px solid #f0f8ff; }
 
+td#templateContainerCell #collapse-tool-category-5 div.template:hover {
+  background-color: #f0f8ff; }
+  
 td#templateContainerCell #collapse-heading-tool-category-6 {
-  border-bottom: 10px solid rgba(26, 217, 178, 0.25);
-}
+  border-bottom: 10px solid rgba(26, 217, 178, 0.25); }
 
+td#templateContainerCell #collapse-tool-category-6 div.template:hover {
+  background-color: rgba(26, 217, 178, 0.25); }
+  
 
 td#canvasContainerCell {
 	vertical-align: top;
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -rc14addfb86127ccba5457249549a577af1de7c0f -rcf6d008d6b7287b647a0d79855cf248840c47769
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision c14addfb86127ccba5457249549a577af1de7c0f)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision cf6d008d6b7287b647a0d79855cf248840c47769)
@@ -252,7 +252,7 @@
 							activityCategoryID = layout.toolMetadata[learningLibraryID].activityCategoryID,
 					    	x = draggable.offset.left  + canvas.scrollLeft() - canvas.offset().left,
 					    	y = draggable.offset.top   + canvas.scrollTop()  - canvas.offset().top,
-					    	label = $('#toolDisplayName', draggable.draggable).text().trim(),
+					    	label = $('.tool-display-name', draggable.draggable).text().trim(),
 					    	activity = null,
 					    	translatedEvent = GeneralLib.translateEventOnCanvas(event),
 							eventX = translatedEvent[0],
@@ -264,7 +264,7 @@
 					    	layout.toolMetadata[learningLibraryID].parallelChildActivityDefs.each(function(){
 					    		var childLearningLibraryID = +$(this).attr('learningLibraryId'),
 					    			childToolID = +$(this).attr('toolId'),
-					    			toolLabel = $('#toolDisplayName', this).text().trim(),
+					    			toolLabel = $('.tool-display-name', this).text().trim(),
 					    			childActivity = new ActivityDefs.ToolActivity(null, null, null,
 					    					childToolID, childLearningLibraryID, null, x, y, toolLabel);