Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.6.2.34 -r1.6.2.35
--- lams_central/web/authoring/authoring.jsp	4 Nov 2016 20:12:51 -0000	1.6.2.34
+++ lams_central/web/authoring/authoring.jsp	4 Nov 2016 23:27:45 -0000	1.6.2.35
@@ -1,4 +1,6 @@
 <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
@@ -276,36 +278,40 @@
 			<i class="fa fa-plus"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.new" /></span>
 		</button>
-		
-		<div class="btn-group" role="group">
-		  <button id="openDropButton" class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-		  	<i class="fa fa-folder-open-o"></i> 
-		    <span><fmt:message key="authoring.fla.page.menu.open" /></span>
-		    <span class="caret"></span>
-		  </button>
-		  <ul class="dropdown-menu" aria-labelledby="openDropButton">
-			<li id="openButton" onClick="javascript:MenuLib.openLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.open" /></a></li>
-		    <li id="importSequenceButton" onClick="javascript:MenuLib.importLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.import" /></a></li>
-		    <li id="importPartSequenceButton" onClick="javascript:MenuLib.importPartLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.import.part" /></a></li>
-		  </ul>
+
+		<div class="btn-group">
+			<button type="button" class="btn btn-default" onClick="javascript:MenuLib.openLearningDesign()">
+				<i class="fa fa-folder-open-o"></i>
+				<span><fmt:message key="authoring.fla.page.menu.open" /></span>
+			</button>
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<span class="caret"></span>
+				<span class="sr-only">Toggle Dropdown</span>
+			</button>
+			<ul class="dropdown-menu">
+				<li id="importSequenceButton" onClick="javascript:MenuLib.importLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.import" /></a></li>
+				<li id="importPartSequenceButton" onClick="javascript:MenuLib.importPartLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.import.part" /></a></li>
+			</ul>
 		</div>
-		
-		<div class="btn-group" role="group">
-		  <button class="btn btn-default dropdown-toggle" type="button" id="saveDropButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-		  	<i class="fa fa-save"></i>
-		    <span><fmt:message key="authoring.fla.page.menu.save" /></span>
-		    <span class="caret"></span>
-		  </button>
-		  <ul class="dropdown-menu" aria-labelledby="saveDropButton">
-		    <li id="saveButton" onClick="javascript:MenuLib.saveLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.save" /></a></li>
-		    <li id="saveAsButton" onClick="javascript:MenuLib.saveLearningDesign(true)"><a href="#"><fmt:message key="authoring.fla.page.menu.saveas" /></a></li>
-		    <li role="separator" class="divider"></li>
-		    <li class="dropdown-header"><fmt:message key="authoring.fla.page.menu.export" /></li>
-		    <li id="exportLamsButton" onClick="javascript:MenuLib.exportLearningDesign(1)"><a href="#"><fmt:message key="authoring.fla.page.menu.export.lams" /></a></li>
-		    <li id="exportSvgButton"  onClick="javascript:MenuLib.exportSVG(true)"><a href="#"><fmt:message key="authoring.fla.page.menu.export.svg" /></a></li>
-		  </ul>
-		</div>
 
+		<div class="btn-group">
+			<button type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()">
+				<i class="fa fa-save"></i>
+				<span><fmt:message key="authoring.fla.page.menu.save" /></span>
+			</button>
+			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<span class="caret"></span>
+				<span class="sr-only">Toggle Dropdown</span>
+			</button>
+			<ul class="dropdown-menu">
+				<li id="saveAsButton" onClick="javascript:MenuLib.saveLearningDesign(true)"><a href="#"><fmt:message key="authoring.fla.page.menu.saveas" /></a></li>
+				<li role="separator" class="divider"></li>
+				<li class="dropdown-header"><fmt:message key="authoring.fla.page.menu.export" /></li>
+				<li id="exportLamsButton" onClick="javascript:MenuLib.exportLearningDesign(1)"><a href="#"><fmt:message key="authoring.fla.page.menu.export.lams" /></a></li>
+				<li id="exportSvgButton"  onClick="javascript:MenuLib.exportSVG(true)"><a href="#"><fmt:message key="authoring.fla.page.menu.export.svg" /></a></li>
+			</ul>
+		</div>
+		
 		<button id="cancelLiveEditButton" class="btn btn-default" onClick="javascript:GeneralLib.cancelLiveEdit()">
 			<i class="fa fa-ban"></i> 
 			<span><fmt:message key="authoring.fla.cancel.button" /></span>
@@ -376,6 +382,8 @@
 			<i class="fa fa-search-plus"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.preview" /></span>
 		</button>
+
+		<a id="helpButton" class="btn btn-xs btn-default pull-right" target="_blank" href="<%=Configuration.get(ConfigurationKeys.HELP_URL)%>/authoring"><i class="fa fa-question-circle text-primary"></i></a>
 	</div>
 	
 	<table id="authoringTable">
@@ -386,6 +394,7 @@
 				</select>
 				<div class="templateContainer">
 					<c:forEach var="tool" items="${tools}">
+						<div class="tooltemplate">
 						<div
 							 toolId="${tool.toolId}"
 							 learningLibraryId="${tool.learningLibraryId}"
@@ -407,6 +416,7 @@
 							 >
 							<div><c:out value="${tool.toolDisplayName}" /></div>
 						</div>
+						</div>
 					</c:forEach>
 				</div>
 			</td>
@@ -475,7 +485,7 @@
 			<tr>
 				<td id="ldStoreDialogButtonCell" colspan="2">
 					<div class="container-fluid">
-						<div id="ldStoreDialogLeftButtonContainer" class="btn-group" role="group">
+						<div id="ldStoreDialogLeftButtonContainer" class="buttonsbar">
 							<button id="ldStoreDialogNewFolderButton" class="btn btn-default">
 								<i class="fa fa-folder"></i> 
 								<span><fmt:message key="authoring.fla.new.folder.button" /></span>
@@ -507,26 +517,27 @@
 							<input type="text"/>
 						</div>
 						
-						<div id="ldStoreDialogRightButtonContainer" class="btn-group pull-right" role="group">
-							<button id="ldStoreDialogSaveButton" class="btn btn-default">
+						<div id="ldStoreDialogRightButtonContainer" class="action-buttons pull-right">
+
+							<button id="ldStoreDialogCancelButton" class="btn btn-default">
+								<i class="fa fa-ban"></i> 
+								<span><fmt:message key="authoring.fla.cancel.button" /></span>
+							</button>
+
+							<button id="ldStoreDialogSaveButton" class="btn btn-primary">
 								<i class="fa fa-save"></i> 
 								<span><fmt:message key="authoring.fla.save.button" /></span>
 							</button>
 							
-							<button id="ldStoreDialogOpenButton" class="btn btn-default">
+							<button id="ldStoreDialogOpenButton" class="btn btn-primary">
 								<i class="fa fa-folder-open-o"></i> 
 								<span><fmt:message key="authoring.fla.open.button" /></span>
 							</button>
 							
-							<button id="ldStoreDialogImportPartButton" class="btn btn-default">
+							<button id="ldStoreDialogImportPartButton" class="btn btn-primary">
 								<i class="fa fa-arrow-circle-o-down"></i> 
 								<span><fmt:message key="authoring.fla.import.button" /></span>
 							</button>
-							
-							<button id="ldStoreDialogCancelButton" class="btn btn-default">
-								<i class="fa fa-ban"></i> 
-								<span><fmt:message key="authoring.fla.cancel.button" /></span>
-							</button>
 						</div>
 					</div>
 				</td>
Index: lams_central/web/css/authoring.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v
diff -u -r1.30.2.14 -r1.30.2.15
--- lams_central/web/css/authoring.css	3 Nov 2016 16:04:03 -0000	1.30.2.14
+++ lams_central/web/css/authoring.css	4 Nov 2016 23:27:45 -0000	1.30.2.15
@@ -225,7 +225,8 @@
 
 div#ldStoreDialogContents #ldStoreDialogNameContainer input {
 	width: 300px;
-	margin-left: 10px;	
+	margin-left: 10px;
+	color: #000000;
 }
 
 div.branchMappingDialog .container-fluid {
@@ -332,7 +333,7 @@
 }
 
 td#templateContainerCell {
-	width: 150px;
+	width: 175px;
 	vertical-align: top;
 }
 
@@ -344,26 +345,32 @@
 div.templateContainer {
 	display: none;
 	overflow: auto;
-	border: black thin solid;
-	background-color: rgb(219, 230, 252);
+	border: 0.5px solid #a9a9a9;
+	border-radius: 3px;
+	// background-color: rgb(219, 230, 252);
 }
 
 div.template {
-	height: 40px;
-	border-bottom: black thin solid;
+	height: 45px;
+	border-bottom: 0.5px solid #a9a9a9;
 	cursor: pointer;
 }
 
+.tooltemplate {
+}
+
+.tooltemplate :hover {
+	background-color: #EDEDED;
+}
+
 div.template img {
-	margin: 5px 0 5px 5px;
+	margin: 8px 0 5px 5px;
 }
 
 div.template div {
 	float: right;
-	width: 89px;
-	padding-top: 14px;
-	font-size: 12px;
-	font-family: "Lucida Console", Monaco, monospace;
+	width: 130px;
+	padding-top: 12px;
 }
 
 td#canvasContainerCell {
@@ -372,13 +379,14 @@
 
 #ldDescriptionDiv {
 	z-index: 1099;
-	border-bottom: 1px solid black;
+	border-bottom: 1px solid #000000;
 }
 
 #ldDescriptionDiv #ldDescriptionTitleContainer {
 	padding: 2px 0 0 0;
 	text-align: center;
-	font-size: 12px;
+	font-size: 14px;
+	font-weight: bold;
 	cursor: pointer;
 }
 
@@ -422,4 +430,4 @@
 #canvas {
 	overflow: auto;
 	vertical-align: top;
-}
\ No newline at end of file
+}
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.51.2.45 -r1.51.2.46
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	30 Oct 2016 10:36:56 -0000	1.51.2.45
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	4 Nov 2016 23:27:45 -0000	1.51.2.46
@@ -176,8 +176,8 @@
 				// if a tool's name is too long and gets broken into two lines
 				// make some adjustments to layout
 				var toolName = $('div', this);
-				if (toolName.text().length > 12){
-					toolName.css('padding-top', '5px');
+				if (toolName.text().length > 17){
+					toolName.css('padding-top', '2px');
 				}
 			}
 		});
@@ -2749,4 +2749,4 @@
 			});
 		}
 	}
-};
\ No newline at end of file
+};