Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -rbcd97309f4ccc8497eec840aeeaa163ca9c9ef18 -r184d3b8b5d3dcb11d73a1a59574fe6f776a7812b
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision bcd97309f4ccc8497eec840aeeaa163ca9c9ef18)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 184d3b8b5d3dcb11d73a1a59574fe6f776a7812b)
@@ -299,7 +299,10 @@
 	</div>
 	
 	<div id="toolbar" class="buttons btn-group-sm">
-	
+		<button id="activitiesToolbarButton" class="btn btn-primary" onClick="javascript:MenuLib.toggleTemplateContainer()">
+			Activities
+		</button>
+		
 		<div class="btn-group btn-group-sm">
 			<button id="newButton" class="btn btn-default desktopButton" onClick="javascript:GeneralLib.newLearningDesign(false)">
 				<i class="fa fa-plus"></i> 
@@ -365,7 +368,7 @@
 			<i class="fa fa-long-arrow-right"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.transition" /></span>
 		</button>
-
+		<!-- 
 		<div class="btn-group btn-group-sm desktopButton" role="group">
 		  <button class="btn btn-default dropdown-toggle" type="button" id="optionalButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
 		  	<i class="fa fa-check-square-o"></i>
@@ -394,7 +397,8 @@
 			<i class="fa fa-group"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.group" /></span>
 		</button>
-		
+		 -->
+		 
 		<div class="btn-group btn-group-sm desktopButton" role="group">
 		  <button class="btn btn-default dropdown-toggle" type="button" id="annotateButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
 		  	<i class="fa fa-font"></i>
@@ -406,17 +410,17 @@
 		    <li id="annotateRegionButton" onClick="javascript:MenuLib.addAnnotationRegion()"><a href="#"><fmt:message key="authoring.fla.page.menu.annotate.region" /></a></li>
 		  </ul>
 		</div>
+			
+		<button id="arrangeButton" class="btn btn-default desktopButton" onClick="javascript:GeneralLib.arrangeActivities()">
+			<i class="fa fa-th"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.arrange" /></span>
+		</button>
 		
 		<button id="weightButton" class="btn btn-default desktopButton" onClick="javascript:MenuLib.openWeights()">
 			<i class="fa fa-balance-scale"></i> 
 			<span><fmt:message key="authoring.fla.weights.menu" /></span>
 		</button>	
 		
-		<button id="arrangeButton" class="btn btn-default desktopButton" onClick="javascript:GeneralLib.arrangeActivities()">
-			<i class="fa fa-th"></i> 
-			<span><fmt:message key="authoring.fla.page.menu.arrange" /></span>
-		</button>
-		
 		<button id="questionBankButton" class="btn btn-default desktopButton" onClick="javascript:MenuLib.openQuestionBank()">
 			<i class="fa fa-bank"></i> 
 			<span><fmt:message key="label.question.bank" /></span>
@@ -435,9 +439,6 @@
 		<tr>
 			<td id="templateContainerCell">
 				<div id="template-container-collapse">
-					<i id="template-container-collapse-button" class="fa fa-chevron-circle-left" 
-					   title="<fmt:message key='authoring.fla.tool.bar.expand' />"	
-					   onClick="javascript:MenuLib.toggleTemplateContainer()"></i>
 					<i id="template-categories-collapse-button" class="fa fa-chevron-circle-down"
 					   title="<fmt:message key='authoring.fla.tool.category.expand' />"	
 					   onClick="javascript:MenuLib.toggleExpandTemplateCategories()"></i>
@@ -481,12 +482,14 @@
 							 	style="display: none"
 							 </c:if>
 							 >
-							<div class="media">
-  								<div class="media-left img-${tool.learningLibraryId}">
-  									<img src="<lams:LAMSURL/>${tool.iconPath}" />
-  								</div>
-  								<div class="media-body media-middle tool-display-name">
-									<c:out value="${tool.toolDisplayName}" />
+							 <div>
+								<div class="media">
+	  								<div class="media-left img-${tool.learningLibraryId}">
+	  									<img src="<lams:LAMSURL/>${tool.iconPath}" />
+	  								</div>
+	  								<div class="media-body media-middle tool-display-name">
+										<c:out value="${tool.toolDisplayName}" />
+									</div>
 								</div>
 							</div>
 						</div>
@@ -495,11 +498,11 @@
 			</td>
 			<td id="canvasContainerCell">
 				<div id="ldDescriptionDiv">
-					<div id="ldDescriptionTitleContainer" title='<fmt:message key="authoring.fla.page.ld.title.desc" /> '
-						 onClick="javascript:MenuLib.toggleDescriptionDiv()">
+					<div id="ldDescriptionTitleContainer">
 						<span id="ldDescriptionFieldTitle"><fmt:message key="authoring.fla.page.ld.title" /></span>
 						<span id="ldDescriptionFieldModified"></span>
-						<span id="ldDescriptionHideTip">&#9660;</span>
+						<i id="ldDescriptionHideTip" class="fa fa-chevron-circle-down" title='<fmt:message key="authoring.fla.page.ld.title.desc" /> '
+						   onClick="javascript:MenuLib.toggleDescriptionDiv()"></i>
 					</div>
 					<div id="ldDescriptionDetails">
 						<div class="ldDescriptionLabel"><label for="ldDescriptionFieldDescription"><fmt:message key="authoring.fla.page.ld.description" /></label><p class="text-muted"><i class="text-primary fa fa-info-circle" aria-hidden="true"></i> <fmt:message key="authoring.fla.page.ld.description.placeholder" /></p></div>
Index: lams_central/web/css/_authoring_base.scss
===================================================================
diff -u -rcf80c24d2abd17fde353604001e96e3f93645f01 -r184d3b8b5d3dcb11d73a1a59574fe6f776a7812b
--- lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision cf80c24d2abd17fde353604001e96e3f93645f01)
+++ lams_central/web/css/_authoring_base.scss	(.../_authoring_base.scss)	(revision 184d3b8b5d3dcb11d73a1a59574fe6f776a7812b)
@@ -1,4 +1,9 @@
 /**** Dialog styles ****/
+
+body {
+	background: $canvas-dot-background;
+	
+}
 #loadingOverlay {
 	width: 99%;
 	height: 99%;
@@ -429,151 +434,191 @@
 }
 
 /**** Main authoring styles ****/
-
 div#toolbar {
-	padding: 3px;
+  display: flex;
+  justify-content: center;
+  padding-top: 15px;
+  padding-bottom: 15px;
 }
 
-#cancelLiveEditButton {
-	display: none;
+div#toolbar button {
+  box-shadow: 0px 8px 15px rgba(0, 0, 0, 0.1);
+  outline: none;  
 }
+div#toolbar > button, div#toolbar .btn-group {
+  margin-right: 5px;
+}
 
-table#authoringTable {
-	table-layout: fixed;
-	width: 100%;
+div#toolbar > button, div#toolbar > a, div#toolbar .btn-group button:first-child {
+  border-top-left-radius: 45px;
+  border-bottom-left-radius: 45px; }
+
+div#toolbar > button, div#toolbar > a, div#toolbar .btn-group button.dropdown-toggle:first-child, div#toolbar .btn-group button:nth-child(2) {
+  border-top-right-radius: 45px;
+  border-bottom-right-radius: 45px; }
+
+div#toolbar #activitiesToolbarButton {
+	margin-right: 30px;
 }
-  
 
+div#toolbar ul.dropdown-menu {
+	background-color: transparent;
+	border: none;
+	box-shadow: none;
+}
+
+div#toolbar ul.dropdown-menu li {
+	background-color: white;
+	border: thin solid #ccc;
+	border-radius: 45px;
+	margin-bottom: 10px;
+	outline: none;
+}
+div#toolbar ul.dropdown-menu li > a {
+	border-radius: 45px;	
+}
+
+#cancelLiveEditButton {
+  display: none; }
+
+table#authoringTable {
+  table-layout: fixed;
+  width: 100%; }
+
 table#authoringTable .template-drag-helper {
   width: 200px;
   height: 70px;
   border: thin black solid !important;
   background-color: white !important;
   z-index: 1;
-  cursor: move; 
-}
+  cursor: move; }
 
 td#templateContainerCell {
   width: 200px;
   vertical-align: top;
-  user-select: none;
-}
+  user-select: none; }
 
 td#templateContainerCell #template-container-collapse {
   padding: 1px 0 1px 5px;
-  border-bottom: thin solid #cecdcd;
-}
+ }
 
 td#templateContainerCell #template-container-collapse i.fa {
   color: #6f6e6e;
-  cursor: pointer;
-}
-   
+  cursor: pointer; }
+
 td#templateContainerCell #template-categories-collapse-button {
-	margin-left: 155px;
+	margin-left: 182px;
+	visibility: hidden;
 }
 
-td#templateContainerCell #template-container-panel-group {
-	overflow-x: hidden;
-	overflow-y: auto;
-	background: url("data:image/svg+xml,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20width%3D%2720%27%20height%3D%2720%27%3E%0D%0A%20%20%3Crect%20width%3D%2720%27%20height%3D%2720%27%20fill%3D%27%23fefefe%27%2F%3E%0D%0A%3Crect%20x%3D%2710%27%20y%3D%2710%27%20width%3D%271.5%27%20height%3D%271.5%27%20fill%3D%27%23b6b6b6%27%2F%3E%0D%0A%3C%2Fsvg%3E");
+td#templateContainerCell:hover #template-categories-collapse-button {
+	visibility: visible;
 }
 
-td#templateContainerCell #template-container-panel-group .panel {
-	border-top: none;
-}
-
-td#templateContainerCell div.template {
-  min-height: 65px;
-  background-color: white;
-  border-bottom: thin solid #cecdcd;
-  border-right: thin solid #cecdcd;
+td#templateContainerCell #template-container-panel-group {
+  overflow-x: hidden;
+  overflow-y: auto; }
+  
+td#templateContainerCell #template-container-panel-group .panel-heading {
   cursor: pointer;
-}
-
-td#templateContainerCell div.template .media {
-  margin-top: 0px;
-  padding: 12px 5px 5px 5px;
-  font-size: 16px; }
-
-td#templateContainerCell div.template .media img {
-  width: 50px;
-  height: 40px; }
-
-td#templateContainerCell .panel-heading {
-  cursor: pointer;
   background-color: white;
   font-size: 16px;
-  padding-bottom: 4px; }
+  padding-bottom: 4px;
+  border-radius: 30px;
+}
 
-td#templateContainerCell #collapse-heading-tool-category-1 {
-  border-bottom: 10px solid #caddfb; }
+td#templateContainerCell #template-container-panel-group > .panel {
+  border: none;
+  background-color: transparent;
+  box-shadow: none;
+}
   
-td#templateContainerCell #collapse-heading-tool-category-1 div.template:hover {
+td#templateContainerCell #template-container-panel-group > .panel:not(:first-child) {
+	margin-top: 10px;
+}
+
+td#templateContainerCell #collapse-heading-tool-category-1 {
+  border: 5px solid #caddfb; }
+
+td#templateContainerCell #collapse-heading-tool-category-1 div.template:hover > div {
   background-color: #caddfb; }
-  
+
 td#templateContainerCell #collapse-heading-tool-category-2 {
-  border-bottom: 10px solid #ffffbb; }
+  border: 5px solid #ffffbb; }
 
-td#templateContainerCell #collapse-tool-category-2 div.template:hover {
+td#templateContainerCell #collapse-tool-category-2 div.template:hover > div {
   background-color: #ffffbb; }
-  
+
 td#templateContainerCell #collapse-heading-tool-category-3 {
-  border-bottom: 10px solid rgba(45, 188, 233, 0.25); }
+  border: 5px solid rgba(45, 188, 233, 0.25); }
 
-td#templateContainerCell #collapse-tool-category-3 div.template:hover {
+td#templateContainerCell #collapse-tool-category-3 div.template:hover > div {
   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: 5px solid rgba(255, 114, 172, 0.25); }
 
-td#templateContainerCell #collapse-tool-category-4 div.template:hover {
+td#templateContainerCell #collapse-tool-category-4 div.template:hover > div {
   background-color: rgba(255, 114, 172, 0.25); }
-  
+
 td#templateContainerCell #collapse-heading-tool-category-5 {
-  border-bottom: 10px solid #f0f8ff; }
+  border: 5px solid #f0f8ff; }
 
-td#templateContainerCell #collapse-tool-category-5 div.template:hover {
+td#templateContainerCell #collapse-tool-category-5 div.template:hover > div {
   background-color: #f0f8ff; }
-  
+
 td#templateContainerCell #collapse-heading-tool-category-6 {
-  border-bottom: 10px solid rgba(26, 217, 178, 0.25); }
+  border: 5px solid rgba(26, 217, 178, 0.25); }
 
-td#templateContainerCell #collapse-tool-category-6 div.template:hover {
+td#templateContainerCell #collapse-tool-category-6 div.template:hover > div {
   background-color: rgba(26, 217, 178, 0.25); }
   
+td#templateContainerCell div.template > div {
+	height: 100%;
+	border-radius: 15px;
+	border: thin solid #cecdcd;
+}
 
+td#templateContainerCell div.template {
+  height: 65px;
+  margin-top: 10px;
+  cursor: pointer;
+  background-color: white;	
+}
+
+td#templateContainerCell div.template .media {
+  margin-top: 0px;
+  padding: 12px 5px 5px 5px;
+  font-size: 16px; }
+
+td#templateContainerCell div.template .media img {
+  width: 50px;
+  height: 40px; }
+  
 td#canvasContainerCell {
 	vertical-align: top;
 }
 
 #ldDescriptionDiv {
 	z-index: 1099;
-	border-bottom: $border-thin-default;
 }
 
 #ldDescriptionDiv #ldDescriptionTitleContainer {
-	padding: 2px 0 0 0;
-	text-align: center;
-	font-size: 14px;
-	font-weight: bold;
-	cursor: pointer;
-}
+  padding: 2px 0 0 0;
+  text-align: center;
+  font-size: 14px;
+  font-weight: bold; }
 
 #ldDescriptionDiv #ldDescriptionHideTip {
-	float: right;
-	margin-right: 10px;
-}
+  margin-left: 30px;
+  color: #6f6e6e;
+  cursor: pointer; }
 
 #ldDescriptionDiv #ldDescriptionDetails {
-	padding: 0 0 5px 10px;
-	display: none;
-}
+  padding: 0 0 5px 10px;
+  background-color: white;
+  display: none; }
 
-#ldDescriptionDiv .ldDescriptionLabel {
-	font-size: 12px;
-}
-
 #ldDescriptionDiv #ldDescriptionEditorContainer {
 	margin: 0px 15px 15px 0;
 }
@@ -601,7 +646,6 @@
 #canvas {
 	overflow: auto;
 	vertical-align: top;
-    background: $canvas-dot-background;
 	user-select: none;	
 }
 
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r1a0c05dd0bcc660b51742c96e0f7d671104cbf8a -r184d3b8b5d3dcb11d73a1a59574fe6f776a7812b
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 1a0c05dd0bcc660b51742c96e0f7d671104cbf8a)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 184d3b8b5d3dcb11d73a1a59574fe6f776a7812b)
@@ -583,8 +583,8 @@
 	 * Expands/collapses description field.
 	 */
 	toggleDescriptionDiv: function() {
+		$('#ldDescriptionHideTip').toggleClass('fa-chevron-circle-down fa-chevron-circle-up')
 		$('#ldDescriptionDetails').slideToggle(function(){
-			$('#ldDescriptionHideTip').text($(this).is(':visible') ? '▲' : '▼');
 			$('.templateContainer').height($('#ldDescriptionDiv').height() + $('#canvas').height() - 10);
 		});
 	},
@@ -607,15 +607,15 @@
 			isExpanded = templateContainerCell.width();
 
 		if (isExpanded) {
-			$('#template-container-collapse #template-categories-collapse-button', templateContainerCell).hide();
+			$('#template-container-collapse #template-categories-collapse-button', templateContainerCell).css('visibility', 'hidden');
 		}
 
 		templateContainerCell.animate({
 			'width': isExpanded > 0 ? 0 : 200
 		}, function(){
 			$('#template-container-collapse #template-container-collapse-button', templateContainerCell).toggleClass('fa-chevron-circle-left fa-chevron-circle-right');
 			if (!isExpanded) {
-				$('#template-container-collapse #template-categories-collapse-button', templateContainerCell).show();
+				$('#template-container-collapse #template-categories-collapse-button', templateContainerCell).css('visibility', '');
 			}
 			GeneralLib.resizePaper();
 		});