Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r481d8af8e0dfa898a103943c6088b753f36e6e36 -ra2844b7929c3d01d170ec34fc150216700d8a7ea
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 481d8af8e0dfa898a103943c6088b753f36e6e36)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision a2844b7929c3d01d170ec34fc150216700d8a7ea)
@@ -45,8 +45,6 @@
 			LABEL_NAME_INVALID_CHARACTERS = '<fmt:message key="error.lessonname.invalid.characters" />';
 				
 		$(document).ready(function(){
-			$('#tabs').tabs();
-			
 			initLessonTab();
 			initClassTab();
 			initAdvancedTab();
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r1fd9b1e192318928a8507b7693d661147a3fea07 -ra2844b7929c3d01d170ec34fc150216700d8a7ea
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1fd9b1e192318928a8507b7693d661147a3fea07)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision a2844b7929c3d01d170ec34fc150216700d8a7ea)
@@ -9,11 +9,12 @@
 <lams:head>
 	<title><fmt:message key="authoring.fla.page.title" /></title>
 	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/yui/treeview.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/yui/folders.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen">
-
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/defaultHTML_learner.css" type="text/css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/authoring.css" type="text/css" media="screen" />
+	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.dialogextend.js"></script>
@@ -22,12 +23,14 @@
 	<!-- Fix for iPad
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.ui.touch-punch.js"></script>
 	-->
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>	
+
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/yahoo-dom-event.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/animation-min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/json-min.js" ></script> 
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/treeview-min.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringGeneral.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringActivity.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringDecoration.js"></script>
@@ -295,104 +298,113 @@
 		<img src="<lams:LAMSURL/>images/ajax-loader-big.gif" />
 	</div>
 	
-	<div id="toolbar" class="ui-corner-all">
-		<div id="newButton" class="ui-button" onClick="javascript:GeneralLib.newLearningDesign(false)">
-			<fmt:message key="authoring.fla.page.menu.new" />
+	<div id="toolbar" class="btn-group" role="toolbar">
+	
+		<button id="newButton" class="btn btn-default" onClick="javascript:GeneralLib.newLearningDesign(false)">
+			<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>
-		<div>
-			<div class="split-ui-button">
-				<div id="openButton" onClick="javascript:MenuLib.openLearningDesign()">
-					<span><fmt:message key="authoring.fla.page.menu.open" /></span>
-				</div>
-				<div id="openDropButton">&nbsp;</div>
-			</div>
-			<ul>
-				<li id="importSequenceButton" onClick="javascript:MenuLib.importLearningDesign()"><fmt:message key="authoring.fla.page.menu.import" /></li>
-				<li id="importPartSequenceButton" onClick="javascript:MenuLib.importPartLearningDesign()"><fmt:message key="authoring.fla.page.menu.import.part" /></li>
-			</ul>
+		
+		<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" class="exportSequenceButton" onClick="javascript:MenuLib.exportLearningDesign(1)"><a href="#"><fmt:message key="authoring.fla.page.menu.export.lams" /></a></li>
+		    <li id="exportPngButton"  class="exportImageButton"    onClick="javascript:MenuLib.exportPNG(true)"><a href="#"><fmt:message key="authoring.fla.page.menu.export.png" /></a></li>
+		    <li id="exportSvgButton"  class="exportImageButton"    onClick="javascript:MenuLib.exportSVG(true))"><a href="#"><fmt:message key="authoring.fla.page.menu.export.svg" /></a></li>
+		  </ul>
 		</div>
-		<div>
-			<div class="split-ui-button">
-				<div id="saveButton" onClick="javascript:MenuLib.saveLearningDesign()">
-					<span><fmt:message key="authoring.fla.page.menu.save" /></span>
-				</div>
-				<div id="saveDropButton">&nbsp;</div>
-			</div>
-			<ul>
-				<li id="saveAsButton" onClick="javascript:MenuLib.saveLearningDesign(true)"><fmt:message key="authoring.fla.page.menu.saveas" /></li>
-				<li id="exportButton"><fmt:message key="authoring.fla.page.menu.export" /><span class="ui-icon ui-menu-icon ui-icon-carat-1-e"></span>
-					<ul>
-						<li id="exportLamsButton" class="exportSequenceButton"
-							title="Standard LAMS ZIP format"
-							onClick="javascript:MenuLib.exportLearningDesign(1)"><fmt:message key="authoring.fla.page.menu.export.lams" /></li>
-						<li id="exportPngButton" class="exportImageButton" onClick="javascript:MenuLib.exportPNG(true)"><fmt:message key="authoring.fla.page.menu.export.png" /></li>
-						<li id="exportSvgButton" class="exportImageButton" onClick="javascript:MenuLib.exportSVG(true)"><fmt:message key="authoring.fla.page.menu.export.svg" /></li>
-					</ul>
-				</li>
-			</ul>
+		
+		<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>
+		</button>
+		
+		<button id="copyButton" class="btn btn-default" onClick="javascript:MenuLib.copyActivity()">
+			<i class="fa fa-copy"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.copy" /></span>
+		</button>
+		
+		<button id="pasteButton" class="btn btn-default" onClick="javascript:MenuLib.pasteActivity()">
+			<i class="fa fa-paste"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.paste" /></span>
+		</button>
+		
+		<button id="transitionButton" class="btn btn-default" onClick="javascript:MenuLib.addTransition()">
+			<i class="fa fa-long-arrow-right"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.transition" /></span>
+		</button>
+
+		<div class="btn-group" 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>
+		    <span><fmt:message key="authoring.fla.page.menu.optional" /></span>
+		    <span class="caret"></span>
+		  </button>
+		  <ul class="dropdown-menu" aria-labelledby="optionalButton">
+		    <li id="optionalActivityButton" onClick="javascript:MenuLib.addOptionalActivity()"><a href="#"><fmt:message key="authoring.fla.page.menu.optional.activity" /></a></li>
+		    <li id="floatingActivityButton" onClick="javascript:MenuLib.addFloatingActivity()"><a href="#"><fmt:message key="authoring.fla.page.menu.optional.support" /></a></li>
+		  </ul>
 		</div>
-		<div id="cancelLiveEditButton" class="ui-button" onClick="javascript:GeneralLib.cancelLiveEdit()">
-			<fmt:message key="authoring.fla.cancel.button" />
+
+		<div class="btn-group" role="group">
+		  <button class="btn btn-default dropdown-toggle" type="button" id="flowButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+		  	<i class="fa fa-map"></i>
+		    <span><fmt:message key="authoring.fla.page.menu.flow" /></span>
+		    <span class="caret"></span>
+		  </button>
+		  <ul class="dropdown-menu" aria-labelledby="flowButton">
+		    <li id="gateButton" onClick="javascript:MenuLib.addGate()"><a href="#"><fmt:message key="authoring.fla.page.menu.flow.gate" /></a></li>
+		    <li id="branchingButton" onClick="javascript:MenuLib.addBranching()"><a href="#"><fmt:message key="authoring.fla.page.menu.flow.branch" /></a></li>
+		  </ul>
 		</div>
-		<div id="copyButton" class="ui-button" onClick="javascript:MenuLib.copyActivity()">
-			<fmt:message key="authoring.fla.page.menu.copy" />
+		
+		<button id="groupButton" class="btn btn-default" onClick="javascript:MenuLib.addGrouping()">
+			<i class="fa fa-group"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.group" /></span>
+		</button>
+		
+		<div class="btn-group" 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>
+		    <span><fmt:message key="authoring.fla.page.menu.annotate" /></span>
+		    <span class="caret"></span>
+		  </button>
+		  <ul class="dropdown-menu" aria-labelledby="annotateButton">
+		    <li id="annotateLabelButton" onClick="javascript:MenuLib.addAnnotationLabel()"><a href="#"><fmt:message key="authoring.fla.page.menu.annotate.label" /></a></li>
+		    <li id="annotateRegionButton" onClick="javascript:MenuLib.addAnnotationRegion()"><a href="#"><fmt:message key="authoring.fla.page.menu.annotate.region" /></a></li>
+		  </ul>
 		</div>
-		<div id="pasteButton" class="ui-button" onClick="javascript:MenuLib.pasteActivity()">
-			<fmt:message key="authoring.fla.page.menu.paste" />
-		</div>
-		<div id="transitionButton" class="ui-button" onClick="javascript:MenuLib.addTransition()">
-			<fmt:message key="authoring.fla.page.menu.transition" />
-		</div>
-		<div>
-			<div id="optionalButton" class="split-ui-button">
-				<div>
-					<span><fmt:message key="authoring.fla.page.menu.optional" /></span>
-				</div>
-				<div id="optionalDropButton">&nbsp;</div>
-			</div>
-			<ul>
-				<li id="optionalActivityButton" onClick="javascript:MenuLib.addOptionalActivity()"><fmt:message key="authoring.fla.page.menu.optional.activity" /></li>
-				<li id="floatingActivityButton" onClick="javascript:MenuLib.addFloatingActivity()"><fmt:message key="authoring.fla.page.menu.optional.support" /></li>
-			</ul>
-		</div>
-		<div>
-			<div id="flowButton" class="split-ui-button">
-				<div>
-					<span><fmt:message key="authoring.fla.page.menu.flow" /></span>
-				</div>
-				<div id="flowDropButton">&nbsp;</div>
-			</div>
-			<ul>
-				<li id="gateButton" onClick="javascript:MenuLib.addGate()"><fmt:message key="authoring.fla.page.menu.flow.gate" /></li>
-				<li id="branchingButton" onClick="javascript:MenuLib.addBranching()"><fmt:message key="authoring.fla.page.menu.flow.branch" /></li>
-			</ul>
-		</div>
-		<div id="groupButton" class="ui-button" onClick="javascript:MenuLib.addGrouping()">
-			<fmt:message key="authoring.fla.page.menu.group" />
-		</div>
-		<div>
-			<div id="annotateButton" class="split-ui-button">
-				<div>
-					<span><fmt:message key="authoring.fla.page.menu.annotate" /></span>
-				</div>
-				<div id="annotateDropButton">&nbsp;</div>
-			</div>
-			<ul>
-				<li id="annotateLabelButton" onClick="javascript:MenuLib.addAnnotationLabel()"><fmt:message key="authoring.fla.page.menu.annotate.label" /></li>
-				<li id="annotateRegionButton" onClick="javascript:MenuLib.addAnnotationRegion()"><fmt:message key="authoring.fla.page.menu.annotate.region" /></li>
-			</ul>
-		</div>
-		<div id="arrangeButton" class="ui-button" onClick="javascript:GeneralLib.arrangeActivities()">
-			<fmt:message key="authoring.fla.page.menu.arrange" />
-		</div>
-		<div id="previewButton" class="ui-button" onClick="javascript:MenuLib.openPreview()">
-			<fmt:message key="authoring.fla.page.menu.preview" />
-		</div>
-		<!-- 
-		<div id="zoomButton" class="ui-button" onClick="javascript:MenuLib.zoom()">
-			Zoom out
-		</div>
- 		-->
+				
+		<button id="arrangeButton" class="btn btn-default" onClick="javascript:GeneralLib.arrangeActivities()">
+			<i class="fa fa-th"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.arrange" /></span>
+		</button>
+				
+		<button id="previewButton" class="btn btn-default" onClick="javascript:MenuLib.openPreview()">
+			<i class="fa fa-search-plus"></i> 
+			<span><fmt:message key="authoring.fla.page.menu.preview" /></span>
+		</button>
 	</div>
 	
 	<table id="authoringTable">
@@ -492,8 +504,17 @@
 			</tr>
 		</table>
 		<%-- This will be moved to dialog's button pane using JS --%>
-		<div id="ldStoreDialogNameContainer" class="ldStoreDialogSaveOnly">
-			<span><fmt:message key="authoring.fla.page.dialog.ld.title" /></span><input id="ldStoreDialogNameField" class="defaultFocus" type="text"/>
+
+		<hr class="separator" />
+		<div class="container-fluid">
+			<div id="ldStoreDialogNameContainer" class="ldStoreDialogSaveOnly">
+				<span><fmt:message key="authoring.fla.page.dialog.ld.title" /></span><input id="ldStoreDialogNameField" class="defaultFocus" type="text"/>
+			</div>
+			<div class="pull-left">
+				<button id="addButton" class="btn btn-primary" href="#" onClick="javascript:addLesson()"><i class="fa fa-plus"></i> 
+					<fmt:message key="button.add.now" />
+				</button>
+			</div>
 		</div>
 	</div>
 	
Index: lams_central/web/css/authoring.css
===================================================================
diff -u -rb75c055c6e1fbc3f8522de9376363afb19539679 -ra2844b7929c3d01d170ec34fc150216700d8a7ea
--- lams_central/web/css/authoring.css	(.../authoring.css)	(revision b75c055c6e1fbc3f8522de9376363afb19539679)
+++ lams_central/web/css/authoring.css	(.../authoring.css)	(revision a2844b7929c3d01d170ec34fc150216700d8a7ea)
@@ -12,15 +12,6 @@
 
 
 /**** Dialog styles ****/
-.ui-dialog {
-	font-size: 12px !important;
-}
-
-/* For jQuery Dialogextend */
-.ui-dialog .ui-dialog-titlebar-buttonpane a {
-	margin-right: 3px;
-}
-
 #loadingOverlay {
 	width: 99%;
 	height: 99%;
@@ -34,8 +25,34 @@
 	margin-top: 35%;
 }
 
-div.dialogContainer, .ldChoiceDependentCanvasElement, 
-.dialog-no-title .ui-dialog-titlebar {
+.dialogContainer {
+	-webkit-overflow-scrolling: touch !important;
+}
+
+.dialogContainer .modal-body {
+	height : 100%;
+	max-height: calc(100% - 60px);
+	padding: 0;
+}
+
+.dialogContainer button {
+	cursor: pointer;
+}
+
+.dialogContainer button:focus {
+	outline: none;
+}
+
+.dialogContainer button .fa {
+  font-size: 16px;
+  margin-left: 10px;
+}
+
+.dialogContainer .ui-draggable .modal-header {
+	cursor: move;
+}
+
+div.dialogContainer, .ldChoiceDependentCanvasElement {
 	display: none;
 }
 
@@ -294,56 +311,23 @@
 
 div#toolbar {
 	padding: 3px;
-	width: 1035px;
-	height: 27px;
 }
 
-div#toolbar > div {
-	float: left;
-	height: 30px;
-	margin-right: 10px;
+#cancelLiveEditButton {
+	display: none;
 }
 
-div#toolbar .ui-button, div#toolbar .split-ui-button {
-	height: 24px;
-	font-size: 11px;
+#groupingButton span {
+	background: url('../images/icons/group.png') no-repeat 3px 3px;
+	padding-left: 25px;
 }
 
-div#toolbar .split-ui-button + ul, div#toolbar .split-ui-button + ul ul {
-	font-size: 11px;
-	font-weight: bold;
-	list-style: none;
-	color: #2E6E9E;
-	z-index: 1100;
-}
 
-div#toolbar .split-ui-button + ul li {
-	padding: 3px 5px;
-	cursor: pointer;
-}
-
-div#toolbar .split-ui-button + ul li:hover {
-	background-color: #dfeffc;
-}
-
-div#toolbar .split-ui-button + ul ul {
-	white-space: nowrap;
-}
-
 table#authoringTable {
 	table-layout: fixed;
 	width: 100%;
 }
 
-#groupingButton span {
-	background: url('../images/icons/group.png') no-repeat 3px 3px;
-	padding-left: 25px;
-}
-
-#cancelLiveEditButton {
-	display: none;
-}
-
 td#templateContainerCell {
 	width: 150px;
 	vertical-align: top;
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320 -ra2844b7929c3d01d170ec34fc150216700d8a7ea
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision a2844b7929c3d01d170ec34fc150216700d8a7ea)
@@ -1337,19 +1337,18 @@
 		
 		if (activity.authorURL) {
 			showDialog("dialogActivity" + activity.toolContentID, {
-				'height' : 800,
+				'height' : Math.max(200, $(window).height() - 60),
 				'width' : 1024,
+				'draggable' : false,
 				'title' : activity.title + ' ' + LABELS.ACTIVITY_DIALOG_TITLE_SUFFIX,
 				'beforeClose' : function(event){
 					// ask the user if he really wants to exit before saving his work
 					var iframe = $('iframe', this);
 					// if X button was clicked, currentTarget is set
 					// if it is not the last Re-Edit/Close page, doCancel() exists
-					if (event.currentTarget && iframe[0].contentWindow.doCancel) {
+					if (iframe[0].contentWindow.doCancel) {
 						iframe[0].contentWindow.doCancel();
 						return false;
-					} else {
-						iframe.attr('src', null);
 					}
 				},
 				'open' : function() {
@@ -1358,11 +1357,14 @@
 					$('iframe', dialog).attr('src', activity.authorURL).load(function(){
 						// override the close function so it works with the dialog, not window
 						this.contentWindow.closeWindow = function(){
-							dialog.dialog('close');
+							// detach the 'beforeClose' handler above, attach the standard one and close the dialog
+							dialog.off('hide.bs.modal').on('hide.bs.modal', function(){
+								$('iframe', this).attr('src', null);
+							}).modal('hide');
 						}
 					});
 				}
-			}, true);
+			}, false);
 			
 			GeneralLib.setModified(true);
 		}
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r1fd9b1e192318928a8507b7693d661147a3fea07 -ra2844b7929c3d01d170ec34fc150216700d8a7ea
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 1fd9b1e192318928a8507b7693d661147a3fea07)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision a2844b7929c3d01d170ec34fc150216700d8a7ea)
@@ -177,7 +177,7 @@
 				// make some adjustments to layout
 				var toolName = $('div', this);
 				if (toolName.text().length > 12){
-					toolName.css('padding-top', '8px');
+					toolName.css('padding-top', '5px');
 				}
 			}
 		});