Index: lams_tool_scribe/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,53 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Advanced Settings in Montoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Arrow.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,35 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%-- state = up: up arrow;  state = down: down arrow --%>
+<%@ attribute name="state" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+
+<c:choose>
+	<c:when test="${not empty title}">
+		<c:set var="fullTitle">title="${title}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullTitle" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty onclick}">
+		<c:set var="fullOnclick">onclick="${onclick}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullOnclick" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+	</c:when>
+	<c:otherwise>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+	</c:otherwise>
+</c:choose>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -122,12 +122,12 @@
     	window.close();
     }  				
 </script>	
-<p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+<div id="saveCancelButtons" >
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
-</p>
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+</div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,349 @@
+<% 
+ /**
+  * AuthoringRatingCriteria.tag
+  *	Author: Andrey Balan
+  *	Description: Creates list of rating criterias for authoring page
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
+<%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
+<%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="upLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="downLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="maximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMinimumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="noMaximumLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="jsWarningLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowCommentsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty hasRatingLimits}">
+	<c:set var="hasRatingLimits" value="false" scope="request"/>
+</c:if>
+<c:if test="${not empty formContentPrefix}">
+	<c:set var="formContentPrefix" value="${formContentPrefix}."/>
+</c:if>
+<c:if test="${empty headerLabel}">
+	<c:set var="headerLabel" value="label.rating.criterias" scope="request"/>
+</c:if>
+<c:if test="${empty addLabel}">
+	<c:set var="addLabel" value="label.add.criteria" scope="request"/>
+</c:if>
+<c:if test="${empty deleteLabel}">
+	<c:set var="deleteLabel" value="label.delete" scope="request"/>
+</c:if>
+<c:if test="${empty upLabel}">
+	<c:set var="upLabel" value="label.move.up" scope="request"/>
+</c:if>
+<c:if test="${empty downLabel}">
+	<c:set var="downLabel" value="label.move.down" scope="request"/>
+</c:if>
+<c:if test="${empty minimumLabel}">
+	<c:set var="minimumLabel" value="label.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty maximumLabel}">
+	<c:set var="maximumLabel" value="label.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty noMinimumLabel}">
+	<c:set var="noMinimumLabel" value="label.no.minimum" scope="request"/>
+</c:if>
+<c:if test="${empty noMaximumLabel}">
+	<c:set var="noMaximumLabel" value="label.no.maximum" scope="request"/>
+</c:if>
+<c:if test="${empty jsWarningLabel}">
+	<c:set var="jsWarningLabel" value="js.warning.max.min.limit" scope="request"/>
+</c:if>
+<c:if test="${empty allowCommentsLabel}">
+	<c:set var="allowCommentsLabel" value="label.allow.comments" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.minimum.number.words" scope="request"/>
+</c:if>
+
+<!-- calculate whether isCommentsAllowed is true -->
+<c:set var="isCommentsEnabled" value="false"/>
+<c:set var="commentsMinWordsLimit" value="0"/>
+<c:forEach var="criteria" items="${criterias}" varStatus="status">
+	<c:if test="${criteria.commentsEnabled}">
+		<c:set var="isCommentsEnabled" value="true"/>
+		<c:set var="commentsMinWordsLimit" value="${criteria.commentsMinWordsLimit}"/>
+	</c:if>
+</c:forEach>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+$(document).ready(function() { 
+	
+	// find max orderId
+	<c:set var="maxOrderId" value="0"/>
+	<c:forEach var="criteria" items="${criterias}" varStatus="status">
+		<c:if test="${criteria.orderId > maxOrderId}">
+			<c:set var="maxOrderId" value="${criteria.orderId}"/>
+		</c:if>
+	</c:forEach>
+	var maxOrderId = ${maxOrderId};
+	
+	function addCriteria() {
+		//increase maxOrderId by 1
+		maxOrderId++;
+		$("#criteria-max-order-id").val(maxOrderId);
+		
+		jQuery('<tr/>').append(jQuery('<td/>', {
+			'class': 'criteria-info',
+		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="" class="form-control">'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '40px',
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+		    		
+		})).append(jQuery('<td/>', {
+			width: '20px',
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+		})).appendTo('#criterias-table');
+		
+		reactivateArrows();
+	}
+	<c:if test="${empty criterias}">
+		addCriteria(); 
+		addCriteria();
+	</c:if>
+	reactivateArrows();
+	
+	function reactivateArrows() {
+		$('#criterias-table tr').each(function() {
+
+		    $this = $(this); // cache $(this)
+		    
+		    if ($this.is(':first-child')) {
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
+		    } else {
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
+		    }
+		    
+		    if ($this.is(':last-child')) {
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
+		    } else {
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
+		    }
+		});
+	}
+	
+	//upCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var prevRow = currentRow.prev();
+		var prevCriteriaTd = $( ".criteria-info", prevRow);
+		var prevOrderId = $( "input[name^='criteriaOrderId']", prevCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(prevOrderId.val());
+		prevOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(prevRow);
+		prevCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 } );
+	 
+	//downCriteria
+	 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
+		var currentRow = $(this).closest('tr');
+		var currentCriteriaTd = $( ".criteria-info", currentRow);
+		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
+		//var textEl1 = $( "input[id^='criteria-title-']", currentRow);
+		var nextRow = currentRow.next();
+		var nextCriteriaTd = $( ".criteria-info", nextRow);
+		var nextOrderId = $( "input[name^='criteriaOrderId']", nextCriteriaTd);
+		//var textEl2 = $( "input[id^='criteria-title-']", currentRow);
+		
+		//swap orderIds
+		var temp = currentOrderId.val();
+		currentOrderId.val(nextOrderId.val());
+		nextOrderId.val(temp);
+		
+		//swap elements
+		currentCriteriaTd.detach().prependTo(nextRow);
+		nextCriteriaTd.detach().prependTo(currentRow);
+		
+		reactivateArrows();
+	 });
+	 
+	 //deleteCriteria
+	 $( "body" ).on( "click", ".fa-times", function() {
+		var currentRow = $(this).closest('tr');
+		currentRow.remove();
+		
+		reactivateArrows();
+	});
+	 
+	 //addCriteria
+	 $( "body" ).on( "click", "#add-criteria", function() {
+		 addCriteria();
+	});
+	 
+ 	//spinner
+ 	var minimumWordsSpinner = $("#comments-min-words-limit").spinner({ 
+ 		min: 0,
+ 		disabled: ${!isCommentsEnabled}
+ 	});
+ 	$("#enable-comments").click(function() {
+ 		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+ 			minimumWordsSpinner.spinner( "enable" );
+ 			$("#comments-min-words-limit-label").removeClass("gray-color");
+ 		} else {
+ 			minimumWordsSpinner.spinner( "disable" );
+ 			$("#comments-min-words-limit-label").addClass("gray-color");
+ 		}
+     });
+	 
+})
+
+	//check minimum is not bigger than maximum
+	function validateRatingLimits(isMinimum) {
+		var minRateDropDown = document.getElementById("minimum-rates");
+		var minLimit = parseInt(minRateDropDown.options[minRateDropDown.selectedIndex].value);
+		var maxRateDropDown = document.getElementById("maximum-rates");
+		var maxLimit = parseInt(maxRateDropDown.options[maxRateDropDown.selectedIndex].value);
+
+		if ((minLimit > maxLimit) && !(maxLimit == 0)) {
+			if (isMinimum) {
+				minRateDropDown.selectedIndex = maxRateDropDown.selectedIndex;
+			} else {
+				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
+			}
+
+			alert('<fmt:message key="js.warning.max.min.limit"/>');
+		}
+	}
+</script>
+
+<div class="rating-criteria-tag" style="${styleId}">
+
+	<div class="panel panel-default voffset5">
+		<div class="panel-heading panel-title">
+			<label><fmt:message key="${headerLabel}" /></label>
+		</div>
+	
+		<div class="form-group roffset10 loffset10">
+			<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+			<table class="table table-condensed table-no-border" id="criterias-table">
+		
+				<c:forEach var="criteria" items="${criterias}" varStatus="status">
+					<c:if test="${!criteria.commentsEnabled}">
+						<tr>
+							
+							<td class="criteria-info">
+								<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+								<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}" class="form-control">
+							</td>
+							
+							<td width="40px">
+								<div class="arrow-up" title="<fmt:message key="${upLabel}"/>"></div>
+								<div class="arrow-down" title="<fmt:message key="${downLabel}"/>"></div>
+							</td>
+			                
+							<td width="20px">
+								<i class="fa fa-times" title="<fmt:message key="${deleteLabel}" />"></i>
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>
+			</table>
+	
+			<div style="height: 25px; margin-top: -10px;">
+				<a href="#nogo" class="btn btn-default btn-xs pull-right" id="add-criteria">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+				</a>
+			</div>
+	
+			<c:if test="${hasRatingLimits}">
+				<div>
+					<label for="minimum-rates">
+						<fmt:message key="${minimumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				
+					<label for="maximum-rates">
+						<fmt:message key="${maximumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</html:option>
+						<html:option value="1">1</html:option>
+						<html:option value="2">2</html:option>
+						<html:option value="3">3</html:option>
+						<html:option value="4">4</html:option>
+						<html:option value="5">5</html:option>
+						<html:option value="6">6</html:option>
+						<html:option value="7">7</html:option>
+						<html:option value="8">8</html:option>
+						<html:option value="9">9</html:option>
+						<html:option value="10">10</html:option>
+					</html:select>
+				</div>
+			</c:if>
+	
+			<div class="checkbox">
+				<label for="enable-comments">
+					<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
+						<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
+					/>
+					<fmt:message key="${allowCommentsLabel}" />
+				</label>
+			</div>
+	
+			<div>
+				<label for="comments-min-words-limit" id="comments-min-words-limit-label"
+					<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
+				>
+					<fmt:message key="${minNumberWordsLabel}" >
+						<fmt:param> </fmt:param>
+					</fmt:message>
+				</label>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_scribe/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Comments.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,47 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%@ attribute name="toolSessionId" required="true" rtexprvalue="true"%>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true"%>
+<%@ attribute name="height" required="false" rtexprvalue="true"%>
+<%@ attribute name="width" required="false" rtexprvalue="true"%>
+<%@ attribute name="mode" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeAndDislike" required="false" rtexprvalue="true"%>
+<%@ attribute name="readOnly" required="false" rtexprvalue="true"%>
+<%@ attribute name="pageSize" required="false" rtexprvalue="true"%>
+<%@ attribute name="sortBy" required="false" rtexprvalue="true"%>
+
+
+<c:if test="${empty width}">
+	<c:set var="width" value="100%" />
+</c:if>
+
+<c:if test="${empty height}">
+	<c:set var="height" value="auto" />
+</c:if>
+
+<c:set var="modeStr" value=""/>
+<c:if test="${!empty mode}">
+	<c:set var="modeStr">&mode=${mode}</c:set>
+</c:if>
+
+<c:if test="${empty likeAndDislike}">
+	<c:set var="likeAndDislike" value="false" />
+</c:if>
+
+<c:if test="${empty readOnly}">
+	<c:set var="readOnly" value="false" />
+</c:if>
+
+<c:if test="${empty sortBy}">
+	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
+</c:if>
+
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
+<script>
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
+</script>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/CommentsAuthor.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,51 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+<%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
+<%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty allowCommentsVariableName}">
+	<c:set var="allowCommentsVariableName" value="allowComments" />
+</c:if>
+<c:if test="${empty allowCommentLabelKey}">
+	<c:set var="allowCommentLabelKey" value="advanced.allow.comments" />
+</c:if>
+<c:if test="${empty likeDislikeVariableName}">
+	<c:set var="likeDislikeVariableName" value="commentsLikeAndDislike" />
+</c:if>
+<c:if test="${empty likeOnlyCommentLabelKey}">
+	<c:set var="likeOnlyCommentLabelKey" value="advanced.comments.like.only" />
+</c:if>
+<c:if test="${empty likeDislikeLabelKey}">
+	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
+</c:if>
+
+<div class="checkbox">
+	<label>
+	<html:checkbox property="${allowCommentsVariableName}" value="1"
+		styleId="${allowCommentsVariableName}">
+	</html:checkbox>
+	<fmt:message key="${allowCommentLabelKey}"/>
+	</label>
+</div>
+<div class="loffset20" id="likedislike">
+		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+</div>
+
+<script>
+jQuery( document ).ready(function( $ ) {
+	if (! $("#${allowCommentsVariableName}").is(':checked')) {
+		$("#likedislike").hide();
+	}
+	$("#${allowCommentsVariableName}").click(function() {
+		$("#likedislike").toggle('slow');
+	});
+});
+</script>
+
+
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd0f5cf0a1ac77fb71d6337ae72bd505e82042d14 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d0f5cf0a1ac77fb71d6337ae72bd505e82042d14)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -7,28 +7,43 @@
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
 <%@ attribute name="headingContent" required="false" rtexprvalue="true"%>
 
+
+
 <div class="row no-gutter">
 	<div class="col-xs-12">
-		<div class="container" id="${idName}">
+		<div class="container" id="content">
+		
+		<c:choose>
+		<c:when test='${type == "navbar"}'>
+			<jsp:doBody />
+		</c:when> 
+		<c:otherwise>
 			<div class="panel panel-default panel-${type}-page">
-				<div class="panel-heading">
-					<c:if test="${not empty title}">
+				<c:if test="${not empty title}">
+					<div class="panel-heading">
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
 								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
 							</c:if>
 						</div>
-					</c:if>
-					<c:if test="${not empty headingContent}">
-						<c:out value="${headingContent}" escapeXml="true" />
-					</c:if>
-				</div>
+						<c:if test="${not empty headingContent}">
+							<c:out value="${headingContent}" escapeXml="true" />
+						</c:if>
+					</div>
+				</c:if>
 				<div class="panel-body panel-${type}-body">
 					<jsp:doBody />
 				</div>
 			</div>
+		</c:otherwise>
+		</c:choose>
+			
 		</div>
 		<!-- End content container -->
 	</div>
 </div>
+
+
+		
+			
Index: lams_tool_scribe/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,194 @@
+<% 
+ /**
+  * Rating.tag
+  *	Author: Andrey Balan
+  *	Description: Shows rating stars widget
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%@ attribute name="itemRatingDto" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.ItemRatingDTO" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="disabled" required="false" rtexprvalue="true" %>
+<%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %>
+<%@ attribute name="maxRates" required="false" rtexprvalue="true" %>
+<%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %>
+<%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
+<%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty disabled}">
+	<c:set var="disabled" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty isItemAuthoredByUser}">
+	<c:set var="isItemAuthoredByUser" value="false" scope="request"/>
+</c:if>
+<c:if test="${empty maxRates}">
+	<c:set var="maxRates" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty countRatedItems}">
+	<c:set var="countRatedItems" value="0" scope="request"/>
+</c:if>
+<c:if test="${empty yourRatingLabel}">
+	<c:set var="yourRatingLabel" value="label.your.rating" scope="request"/>
+</c:if>
+<c:if test="${empty averageRatingLabel}">
+	<c:set var="averageRatingLabel" value="label.average.rating" scope="request"/>
+</c:if>
+<c:if test="${empty minNumberWordsLabel}">
+	<c:set var="minNumberWordsLabel" value="label.comment.minimum.number.words" scope="request"/>
+</c:if>
+<c:if test="${empty showComments}">
+	<c:set var="showComments" value="true" scope="request"/>
+</c:if>
+<c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
+
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
+<%--Rating stars area---------------------------------------%>
+
+<div class="extra-controls-inner">
+<div class="rating-stars-holder text-center center-block">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
+		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
+		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
+	
+		<c:choose>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingStarsClass" value="rating-stars"/>
+			</c:otherwise>
+		</c:choose>
+			
+		<strong>
+			${criteriaDto.ratingCriteria.title}
+		</strong>
+			
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser || not isCriteriaNotRatedByUser}'>
+				<c:set var="ratingDataAverage" value="${criteriaDto.averageRating}"/>
+			</c:when>
+			<c:otherwise>
+				<c:set var="ratingDataAverage" value="0"/>
+			</c:otherwise>
+		</c:choose>
+		
+		<div class="${ratingStarsClass} rating-stars-new" data-average="${ratingDataAverage}" data-id="${objectId}">
+		</div>
+			
+		<c:choose>
+			<c:when test="${isItemAuthoredByUser}">
+				<div class="rating-stars-caption">
+					<fmt:message key="${averageRatingLabel}" >
+						<fmt:param>
+							<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+						</fmt:param>
+						<fmt:param>
+							${criteriaDto.numberOfVotes}
+						</fmt:param>
+					</fmt:message>
+				</div>
+			</c:when>
+				
+			<c:otherwise>
+				<div class="rating-stars-caption" id="rating-stars-caption-${objectId}"
+					<c:if test="${isCriteriaNotRatedByUser}">style="visibility: hidden;"</c:if>
+				>
+					<fmt:message key="${yourRatingLabel}" >
+						<fmt:param>
+							<span id="user-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.userRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>			
+						<fmt:param>
+							<span id="average-rating-${objectId}">
+								<fmt:formatNumber value="${criteriaDto.averageRating}" type="number" maxFractionDigits="1" />
+							</span>
+						</fmt:param>
+						<fmt:param>
+							<span id="number-of-votes-${objectId}">${criteriaDto.numberOfVotes}</span>
+						</fmt:param>
+					</fmt:message>
+				</div>
+				
+			</c:otherwise>
+		</c:choose>
+			
+	</c:forEach>
+
+</div>
+
+</div>
+
+<%--Comments area---------------------------------------%>
+<c:if test="${isCommentsEnabled}">
+	<div id="comments-area-${itemRatingDto.itemId}">
+	
+		<c:choose>
+			<c:when test='${isItemAuthoredByUser}'>
+				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+					<div class="rating-comment">
+						<c:out value="${comment.comment}" escapeXml="false" />
+					</div>
+				</c:forEach>
+			</c:when>
+			
+			<c:when test='${not empty commentLeftByUser}'>
+				<div class="rating-comment">
+					<c:out value="${commentLeftByUser.comment}" escapeXml="false" />
+				</div>
+			</c:when>
+			
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
+				<div id="add-comment-area-${itemRatingDto.itemId}">
+			
+					<!-- Comment min words limit -->
+					<c:if test="${itemRatingDto.commentsMinWordsLimit ne 0}">
+					
+						<lams:Alert type="info" id="comment-limit-${itemRatingDto.itemId}" close="false">
+							<fmt:message key="${minNumberWordsLabel}">
+								: <fmt:param value="${itemRatingDto.commentsMinWordsLimit}"/>
+							</fmt:message>
+						</lams:Alert>
+					</c:if>		
+				
+					<div class="no-gutter">
+						<div class="col-xs-12 col-sm-11 ">
+						<textarea name="comment" rows="2" id="comment-textarea-${itemRatingDto.itemId}" onfocus="if(this.value==this.defaultValue)this.value='';" 
+								onblur="if(this.value=='')this.value=this.defaultValue;" 
+								class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>
+						</div>
+						<div class="button add-comment add-comment-new col-xs-12 col-sm-1 " data-item-id="${itemRatingDto.itemId}" data-comment-criteria-id="${itemRatingDto.commentsCriteriaId}">
+						</div>
+					</div>		
+				</div>			
+			</c:when>
+		</c:choose>
+			
+	</div>	
+</c:if>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,54 @@
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * AdvancedAccordian.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates the show/hide entry for the Restricted Usage Settings in Monitoring.
+	 * Wiki: 
+	 */
+%>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
+          	${title}
+        	</a>
+      		</span>
+        </div>
+
+
+		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
+		<jsp:doBody />
+		</div>
+	</div>
+</div>
+		
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/TSTable.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,53 @@
+<%-- Tablesorter Table and Pager --%>
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
+<%@ attribute name="dataId" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="test" required="false" rtexprvalue="true"%>
+
+<c:if test="${empty tableClass}">
+	<c:set var="tableClass" value="tablesorter" />
+</c:if>
+
+<c:if test="${empty pagerClass}">
+	<c:set var="pagerClass" value="ts-pager" />
+</c:if>
+
+<c:if test="${empty dataId}">
+	<c:set var="dataId" value="" />
+</c:if>
+
+<table class="${tableClass}" ${dataId}>
+	<thead>
+		<tr>
+			<jsp:doBody />
+		</tr>
+	</thead>
+	<tfoot>
+		<tr>
+	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
+	        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
+	        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+	        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+	        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
+	        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
+	        <select class="pagesize" title="Select page size">
+	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
+	      		<option selected="selected" value="10">10</option>
+	      		<option value="20">20</option>
+	      		<option value="30">30</option>
+	      		<option value="40">40</option>
+	      		<option value="50">50</option>
+	      		<option value="100">100</option>
+	        </select>
+	      </th>
+	    </tr>
+	</tfoot>
+	<tbody>
+	</tbody>
+</table>
+
+	
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rac6c077d83ef253fa3f07a515edc49077317029a -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ac6c077d83ef253fa3f07a515edc49077317029a)
+++ lams_tool_scribe/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,85 +1,89 @@
-<%
-	 /****************************************************************
-	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	 * =============================================================
-	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
-	 * 
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License version 2.0
-	 * as published by the Free Software Foundation.
-	 * 
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 * 
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
-
-	/**
-	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
-	 * Wiki: 
-	 */
-%>
-<%@ tag body-content="empty"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="value" required="false" rtexprvalue="true"%>
-<%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<%-- Check if  bundle is set --%>
-<c:if test="${not empty bundle}">
-	<fmt:setBundle basename="${bundle}"/>
-</c:if>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
-<c:set var="tabTitle" value="${value}" />
-
-<%--
-	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	this is handy if the page needs different logic on initialisation and user switching tabs
---%>
-
-<c:if test="${methodCall == null}">
-	<c:choose>
-		<c:when test="${dControl}">
-			<c:set var="methodCall" value="doSelectTab" />
-		</c:when>
-		<c:otherwise>
-			<c:set var="methodCall" value="selectTab" />
-		</c:otherwise>
-	</c:choose>
-</c:if>
-
-<c:if test="${key != null && value == null}">
-	<c:set var="tabTitle">
-		<fmt:message key="${key}" />
-	</c:set>
-</c:if>
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
+	 * Wiki: 
+	 */
+%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
+--%>
+
+<c:if test="${methodCall == null}">
+	<c:choose>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
+	</c:choose>
+</c:if>
+
+<c:if test="${key != null && value == null}">
+	<c:set var="tabTitle">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_tool_scribe/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_scribe/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,52 +1,44 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabBody.tag
- *	Author: Mitchell Seaton
- *	Description: Creates the body container for a tab element
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="page" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-
-</div>
-<!-- end tab content -->
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
+
+%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
+
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_scribe/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/TabBodyArea.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,39 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodyArea.tag
+ *	Author: Fiona Malikoff
+ *	Description: Creates the panel body area for a nav bar screen
+ * Wiki: 
+ */
+
+%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<div class="panel-body panel-monitor-body">
+	 <jsp:doBody />
+</div>
+
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/TabBodys.tag	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -0,0 +1,37 @@
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBodys.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a tabbody list from nested TabBody tags.
+ * Wiki: 
+ */
+
+		%>
+<%@ tag body-content="scriptless"%>
+
+<!-- tab body holder table -->
+<div class="tab-content">
+	<jsp:doBody />
+</div>
Index: lams_tool_scribe/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
+++ lams_tool_scribe/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,59 +1,59 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabName Tag
- *	Author: Mitchell Seaton
- *	Description: Shortens name that are too long to fit inside a tab
- */
-
-		%>
-<%@ tag body-content="scriptless" %>
-
-<%@ attribute name="url" required="true" rtexprvalue="true"%>
-<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-function" prefix="fn"%>
-
-<c:set var="limit">12</c:set>
-<c:set var="fullname"><jsp:doBody/></c:set>
-<c:set var="titleValue" value=""/>
-
-<c:choose>
-	<c:when test="${fn:length(fullname) > limit}">
-			<c:set var="titleValue" value="${fullname}"/>
-			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="tabname" value="${fullname}"/>
-	</c:otherwise>
-</c:choose>
-
-<c:if test="${highlight eq true}">
-	<c:set var="classVar" value="tab-link-highlight" />
-</c:if>
-
-<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
-	<c:out value="${tabname}" escapeXml="false"/>	
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabName Tag
+ *	Author: Mitchell Seaton
+ *	Description: Shortens name that are too long to fit inside a tab
+ */
+
+		%>
+<%@ tag body-content="scriptless" %>
+
+<%@ attribute name="url" required="true" rtexprvalue="true"%>
+<%@ attribute name="highlight" required="false" rtexprvalue="true" %>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+
+<c:set var="limit">12</c:set>
+<c:set var="fullname"><jsp:doBody/></c:set>
+<c:set var="titleValue" value=""/>
+
+<c:choose>
+	<c:when test="${fn:length(fullname) > limit}">
+			<c:set var="titleValue" value="${fullname}"/>
+			<c:set var="tabname" value="${fn:substring(fullname, 0, limit-2)}..."/>
+	</c:when>
+	<c:otherwise>
+		<c:set var="tabname" value="${fullname}"/>
+	</c:otherwise>
+</c:choose>
+
+<c:if test="${highlight eq true}">
+	<c:set var="classVar" value="tab-link-highlight" />
+</c:if>
+
+<a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
+	<c:out value="${tabname}" escapeXml="false"/>	
 </a>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_scribe/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,69 +1,92 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
-<%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<c:set var="dControl" value="false" scope="request" />
-<c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request" />
-</c:if>
-
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
-
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-</div>
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Tabs.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
+ */
+
+%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
+<c:set var="dControl" value="false" scope="request" />
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request" />
+</c:if>
+
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
+
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
+</div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -41,7 +41,9 @@
 	<lams:WebAppURL />
 </c:set>
 
-<lams:css style="main"/>
+<lams:css/>
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r276c03eb13322c40ee4c9cc63d0e34d8c371c68a -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 276c03eb13322c40ee4c9cc63d0e34d8c371c68a)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,18 +408,34 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>   	
+   	</tag-file>   
    	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file>    		
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -438,8 +454,24 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
@@ -481,5 +513,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_scribe/web/layouts/tabLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_scribe/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -6,13 +6,6 @@
 <lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes" onload="init();">
-		<div id="page">
-			<tiles:useAttribute name="pageTitleKey" />
-			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-			<h1>
-				<fmt:message key="${pTitleKey}" />
-			</h1>
-			<tiles:insert attribute="body" />
-		</div>
+		<tiles:insert attribute="body" />
 	</body>
 </lams:html>
Index: lams_tool_scribe/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r0edacde89fb315c54ed60643a06ef7d3e7b5bb89 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 0edacde89fb315c54ed60643a06ef7d3e7b5bb89)
+++ lams_tool_scribe/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -2,45 +2,41 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<p class="small-space-top">
-	<html:checkbox property="showAggregatedReports" value="1"
-		styleClass="noBorder" styleId="showAggregatedReports"></html:checkbox>
-
+<div class="checkbox">
 	<label for="showAggregatedReports">
-		<fmt:message key="advanced.showAggregatedReports" />
+	<html:checkbox property="showAggregatedReports" value="1" styleId="showAggregatedReports"></html:checkbox>
+	<fmt:message key="advanced.showAggregatedReports" />
 	</label>
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:checkbox property="reflectOnActivity" value="1"
-		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-
+<div class="checkbox">
 	<label for="reflectOnActivity">
-		<fmt:message key="advanced.reflectOnActivity" />
+	<html:checkbox property="reflectOnActivity" value="1" styleId="reflectOnActivity"></html:checkbox>
+	<fmt:message key="advanced.reflectOnActivity" />
 	</label>
 </p>
 <p>
-	<html:textarea property="reflectInstructions" cols="30" rows="3" styleId="reflectInstructions"/>
+	<html:textarea property="reflectInstructions" rows="3" styleId="reflectInstructions" styleClass="form-control"/>
 </p>
 
-<h2>
+<h4>
 	<fmt:message key="advanced.selectScribe" />
-</h2>
+</h4>
 
-<p>
-	<html:radio property="autoSelectScribe" value="true" styleId="autoSelectScribe1" styleClass="noBorder">
+<div class="form-group">
+	<html:radio property="autoSelectScribe" value="true" styleId="autoSelectScribe1">
 	</html:radio>
 	<label for="autoSelectScribe1">
 		<fmt:message key="advanced.firstLearner" />
 	</label>
-</p>
-<p>
-	<html:radio property="autoSelectScribe" value="false" styleId="autoSelectScribe2" styleClass="noBorder">
+</div>
+<div class="form-group">
+	<html:radio property="autoSelectScribe" value="false" styleId="autoSelectScribe2">
 	</html:radio>
 	<label for="autoSelectScribe2">
 		<fmt:message key="advanced.selectInMonitor" />
 	</label>
-</p>
+</div>
 
 <script type="text/javascript">
 <!--
Index: lams_tool_scribe/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_scribe/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -11,50 +11,49 @@
 		<c:set var="defineLater" value="yes" />
 	</c:if>
 
-	<div id="header">
-		<lams:Tabs control="true">
-			<lams:Tab id="1" key="button.basic" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:Tab id="2" key="button.advanced" />
-			</c:if>
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+				<lams:Tab id="1" key="button.basic" />
+				<c:if test="${sessionMap.mode == 'author'}">
+					<lams:Tab id="2" key="button.advanced" />
+				</c:if>
 		</lams:Tabs>
-	</div>
-	<!--closes header-->
 
-	<div id="content">
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="dispatch" value="updateContent" />
+		<html:hidden property="sessionMapID" />
 
-		<div>
-			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="dispatch" value="updateContent" />
-			<html:hidden property="sessionMapID" />
-		</div>
+		
+        <lams:TabBodyArea>
+			<div id="message" style="text-align: center;">
+				<logic:messagesPresent>
+					<lams:Alert id="errorMessages" type="danger" close="false">
+					        <html:messages id="error">
+					            <c:out value="${error}" escapeXml="false"/><br/>
+					        </html:messages>
+					</lams:Alert>
+				</logic:messagesPresent>			
+			</div>
+	
+			<%-- Page tabs --%>
+			<lams:TabBodys>
+				<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+				<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+			</lams:TabBodys>
 
-		<div id="message" style="text-align: center;">
-			<logic:messagesPresent>
-				<p class="warning">
-				        <html:messages id="error">
-				            <c:out value="${error}" escapeXml="false"/><br/>
-				        </html:messages>
-				</p>
-			</logic:messagesPresent>			
-		</div>
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do" toolSignature="lascrb11"
+				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+				toolContentID="${sessionMap.toolContentID}"
+				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				customiseSessionID="${sessionMap.sessionID}"
+				contentFolderID="${sessionMap.contentFolderID}" />
+		</lams:TabBodyArea>
 
-		<lams:help toolSignature="<%=ScribeConstants.TOOL_SIGNATURE%>" module="authoring" />
+		<div id="footer"></div>
 
-		<%-- Page tabs --%>
-		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-		<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+	</lams:Page>
 
-		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do" toolSignature="lascrb11"
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-			toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
-			customiseSessionID="${sessionMap.sessionID}"
-			contentFolderID="${sessionMap.contentFolderID}" />
-
-	</div>
-	<!--closes content-->
 </html:form>
-
-<div id="footer"></div>
Index: lams_tool_scribe/web/pages/authoring/basic.jsp
===================================================================
diff -u -rfb9d13eb115f5281b03ab1624ec10a22ba3b81b7 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision fb9d13eb115f5281b03ab1624ec10a22ba3b81b7)
+++ lams_tool_scribe/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -2,84 +2,55 @@
 
 <script type="text/javascript">
 
-	/**
-	 * Launches the popup window for the instruction files
-	 */
 	function showMessage(url) {
-		var area=document.getElementById("iframeArea");
-		if(area != null){
-			area.style.width="685px";
-			area.src=url;
-			area.style.display="block";
-		}
-		document.getElementById("saveCancelButtons").style.visibility="hidden";
-		location.hash = "iframeArea";		
+		$("#iframeArea").load(url, function() {
+			$(this).show();
+			$("#saveCancelButtons").hide();
+		});
 	}
 	function hideMessage(){
-		var area=document.getElementById("iframeArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		
-		document.getElementById("saveCancelButtons").style.visibility="visible";
+		$("#iframeArea").hide();
+		$("#saveCancelButtons").show();
 	}
+	function runUrl(url) {
+		$("#iframeArea").load(url, function() {
+			$(this).show();
+		});
+	}
+	
 </script>
 
 
 <c:set var="formBean"
-	value="<%=request
-									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
 <!-- ========== Basic Tab ========== -->
+<div class="form-group">
+    <label for="title"><fmt:message key="label.authoring.basic.title"/></label>
+    <html:text property="title" styleClass="form-control"/>
+</div>
 
-
-<table cellpadding="0">
-
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.title"></fmt:message>
-			</div>
-			<html:text property="title" style="width: 99%;"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
-			</div>
-			<lams:CKEditor id="instructions" value="${formBean.instructions}"
+<div class="form-group">
+    <label for=instructions><fmt:message key="label.authoring.basic.instructions"/></label>
+	<lams:CKEditor id="instructions" value="${formBean.instructions}"
 				contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
+</div>
 
-
-</table>
-
-<h2 class="spacer-left">
+<h4 class="spacer-left">
 	<fmt:message key="label.authoring.basic.heading" />
-</h2>
+</h4>
 
 <div id="itemListArea">
 	<%@ include file="parts/headingList.jsp"%>
 </div>
 
-<p class="small-space-bottom">
 <a 
 	href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${formBean.sessionMapID}"/>');"
-	class="button-add-item"> <fmt:message
-		key="label.authoring.basic.heading.add" /> </a>
+	class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.heading.add" /> </a>
 </p>
 
-<iframe
-	onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+370+'px'"
-	id="iframeArea" name="iframeArea"
-	style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-	scrolling="no">
-</iframe>
+<div id="iframeArea" name="iframeArea" class="voffset10"></div>
 
Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -2,71 +2,60 @@
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 
 <script type="text/javascript"> 
-	$(function() {
-		//change size of an iframe on ckeditor's autogrow 
-		CKEDITOR.instances.heading.on("instanceReady", function(e) {
-		    e.editor.on('resize', function(reEvent){
-		    	var iframe = window.parent.document.getElementById("iframeArea");
-		    	iframe.style.height = eval(iframe.contentWindow.document.body.scrollHeight) + 'px';
-		    });
-		});
-	});
-
-	function callHideMessage() {
-		try {
-			if (window.parent && window.parent.hideMessage) {
-				window.parent.hideMessage();
-			} else if (window.top && window.top.hideMessage) {
-				window.top.hideMessage();
+	function submitHeading(){
+		for (var i in CKEDITOR.instances) {
+       		CKEDITOR.instances[i].updateElement();
+   		}
+			
+		// after submit, it direct to itemlist.jsp, 
+		// then refresh "basic tab" resource list and close this window.
+	    $.ajax({ // create an AJAX call...
+			data: $("#headingForm").serialize(), 
+	       	type: $("#headingForm").attr('method'),
+			url: $("#headingForm").attr('action'),
+			success: function(data) {
+	           $('#itemListArea').html(data);
 			}
-		} catch(err) {
-			// mute cross-domain iframe access errors
-		}
+	    });
+	    
 	}
 </script>
 
-<table>
-	<tr>
-		<td>
-			<html:form action="/authoring" styleId="authoringForm" method="post">
+<html:form action="/authoring" styleId="headingForm" method="post">
 
-				<html:hidden property="dispatch" value="addOrUpdateHeading" />
-				<html:hidden property="sessionMapID" />
-				<html:hidden property="headingIndex" />
+	<html:hidden property="dispatch" value="addOrUpdateHeading" />
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="headingIndex" />
 
-				<c:set var="formBean"
-					value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-				<c:set var="sessionMap"
-					value="${sessionScope[formBean.sessionMapID]}" />
+	<c:set var="formBean"
+		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	<c:set var="sessionMap"
+		value="${sessionScope[formBean.sessionMapID]}" />
 
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.heading.add"></fmt:message>
-				</h2>
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.heading.add" />
+		</div>
+		
+		<div class="panel-body">
 
-				<c:set var="headingText" value="" />
-				<c:if test="${not empty formBean.headingIndex}">
-					<c:set var="headingText">
-				${sessionMap.headings[formBean.headingIndex].headingText}
-			</c:set>
-				</c:if>
+			<c:set var="headingText" value="" />
+			<c:if test="${not empty formBean.headingIndex}">
+				<c:set var="headingText">${sessionMap.headings[formBean.headingIndex].headingText}</c:set>
+			</c:if>
+		
+			<lams:CKEditor id="heading" value="${headingText}" contentFolderID="${sessionMap.contentFolderID}"/>
+		
+			<div class="voffset5">
+				<a href="#" onclick="submitHeading()" class="btn btn-default btn-sm">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.submit" /> </a>
 
-				<lams:CKEditor id="heading" value="${headingText}"
-					contentFolderID="${sessionMap.contentFolderID}" width="99%"/>
-
-				<div class="small-space-top">
-
-					<html:submit styleClass="button" titleKey="basic.title">
-						<fmt:message key="button.submit" />
-					</html:submit>
-
-					<html:button property="Cancel" styleClass="button"
-						onclick="javascript:callHideMessage()">
-						<fmt:message key="button.cancel" />
-					</html:button>
-			</html:form>
-
+				<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.cancel" /> </a>
 			</div>
-		</td>
-	</tr>
-</table>
+		</div>
+	</div>
+	
+</html:form>
 
+
Index: lams_tool_scribe/web/pages/authoring/headingResponse.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -6,22 +6,10 @@
 		<%@ include file="parts/headingList.jsp"%>
 	</div>
 
-	<script type="text/javascript">
-		var win = null;
-		try {
-			if (window.parent && window.parent.hideMessage) {
-				win = window.parent;
-			} else if (window.top && window.top.hideMessage) {
-				win = window.top;
-			}
-		} catch(err) {
-			// mute cross-domain iframe access errors
-		}
-		if (win) {
-			win.hideMessage();
-			var obj = win.document.getElementById('itemListArea');
-			obj.innerHTML= document.getElementById("itemList").innerHTML;
-		}
+	<script lang="javascript">
+		hideMessage();
+		var obj = document.getElementById('itemListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
 	</script>
 
 </div>
Index: lams_tool_scribe/web/pages/authoring/parts/headingList.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/authoring/parts/headingList.jsp	(.../headingList.jsp)	(revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_tool_scribe/web/pages/authoring/parts/headingList.jsp	(.../headingList.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -2,12 +2,11 @@
 
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<table class="alternative-color" cellspacing="0">
+<table class="table table-condensed table-striped" >
 	<c:if test="${empty sessionMap.headings}">
 		<tr>
 			<td>
 				<fmt:message key="message.noHeadings" />
-				<%--	TODO should we ever reach this state ??--%>
 			<td>
 		</tr>
 	</c:if>
@@ -21,62 +20,44 @@
 				</div>
 			</td>
 
-			<td width="10%">
-				<c:choose>
-					<c:when test="${index ne 0}">
-						<c:set var="moveUpURL">
-							<html:rewrite
-								page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=up" />
-						</c:set>
-						<img src="${tool}images/up.gif"
-							title="<fmt:message key="link.moveUp"/>"
-							onclick="showMessage('${moveUpURL}')"></img>
-					</c:when>
-					<c:otherwise>
-						<img src="${tool}images/up_disabled.gif"
-							title="<fmt:message key="link.moveUp"/>"></img>
-					</c:otherwise>
-				</c:choose>
+ 			<td class="arrows" style="width:5%">
+				<c:if test="${index ne 0}">
+					<c:set var="moveUpURL">
+						<html:rewrite
+							page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=up" />
+					</c:set>
+					<lams:Arrow state="up" title="<fmt:message key='link.moveUp'/>" 
+	 						onclick="runUrl('${moveUpURL}')"/>
+				</c:if>
 
-				<c:choose>
-					<c:when test="${index ne fn:length(sessionMap.headings)-1}">
-						<c:set var="moveDownURL">
-							<html:rewrite
-								page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=down" />
-						</c:set>
-						<img src="${tool}images/down.gif"
-							title="<fmt:message key="link.moveDown"/>"
-							onclick="showMessage('${moveDownURL}')"></img>
-					</c:when>
-					<c:otherwise>
-						<img src="${tool}images/down_disabled.gif"
-							title="<fmt:message key="link.moveDown"/>"></img>
-					</c:otherwise>
-				</c:choose>
+				<c:if test="${index ne fn:length(sessionMap.headings)-1}">
+					<c:set var="moveDownURL">
+						<html:rewrite
+							page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=down" />
+					</c:set>
+					<lams:Arrow state="down" title="<fmt:message key='link.moveDown'/>"  
+								onclick="runUrl('${moveDownURL}')"/>
+				</c:if>
 			</td>
 
-			<td>
+			<td class="text-center" style="width:3%">
 				<c:set var="editURL">
 					<html:rewrite
 						page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}" />
 				</c:set>
-				<img src="${tool}images/edit.gif"
-					title="<fmt:message key="link.edit"/>"
-					onclick="showMessage('${editURL}')"></img>
+				<i class="fa fa-pencil" title="<fmt:message key='link.edit'/>" onclick="showMessage('${editURL}')"></i>
 			</td>
 
-			<td>
+			<td class="text-center"  style="width:3%">
 				<c:set var="deleteURL">
 					<html:rewrite
 						page="/authoring.do?dispatch=deleteHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}" />
 				</c:set>
-				<img src="${tool}images/delete.gif"
-					title="<fmt:message key="link.delete"/>"
-					onclick="showMessage('${deleteURL}')"></img>
-
-				<c:set var="index" value="${index + 1}" />
-			</td>
+				<i class="fa fa-times"	title="<fmt:message key="link.delete"/>" onclick="runUrl('${deleteURL}')"></img>
+			</td> 
 		</tr>
+		
+		<c:set var="index" value="${index + 1}" />
 	</c:forEach>
 
 </table>
Index: lams_tool_scribe/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -rabc6f25b4f548215dc7d18bf316adbe21fe296a6 -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision abc6f25b4f548215dc7d18bf316adbe21fe296a6)
+++ lams_tool_scribe/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -2,7 +2,13 @@
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-<table cellspacing="0">
+<c:if test="${dto.contentInUse}">
+	<lams:Alert type="info" id="content-in-use" close="false">
+		<fmt:message key="message.contentInUseSet" /> 
+	</lams:Alert>
+</c:if>	
+
+<table class="table table-condensed">
 	<tbody>
 		<tr>
 			<td class="field-name" style="width: 30%;">
@@ -23,22 +29,15 @@
 	</tbody>
 </table>
 
-<c:choose>
-	<c:when test="${not dto.contentInUse}">
-		<c:url value="/authoring.do" var="authoringUrl">
-			<c:param name="toolContentID" value="${dto.toolContentID}" />
-			<c:param name="mode" value="teacher" />
-			<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
-		</c:url>
-		<html:link href="${fn:escapeXml(authoringUrl)}"
-			styleClass="button right-buttons" target="_blank">
-			<fmt:message key="button.editActivity" />
-		</html:link>
-	</c:when>
-	<c:otherwise>
-		<div class="warning">
-			<fmt:message key="message.contentInUseSet" /> 
-		</div>
-	</c:otherwise>
-</c:choose>
+<c:if test="${not dto.contentInUse}">
+	<c:url value="/authoring.do" var="authoringUrl">
+		<c:param name="toolContentID" value="${dto.toolContentID}" />
+		<c:param name="mode" value="teacher" />
+		<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
+	</c:url>
+	<html:link href="${fn:escapeXml(authoringUrl)}"
+		styleClass="btn btn-default" target="_blank">
+		<fmt:message key="button.editActivity" />
+	</html:link>
+</c:if>
 
Index: lams_tool_scribe/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_scribe/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,20 +1,21 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.scribe.util.ScribeConstants"%>
 
-<div id="header">
-	<lams:Tabs>
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Page title="${title}" type="navbar">
+	<lams:Tabs title="${title}" control="true" helpToolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
 		<lams:Tab id="1" key="button.summary" />
 		<lams:Tab id="2" key="button.editActivity" />
 		<lams:Tab id="3" key="button.statistics" />
 	</lams:Tabs>
-</div>
 
-<div id="content">
-	<lams:help toolSignature="<%= ScribeConstants.TOOL_SIGNATURE %>" module="monitoring"/>
+	<lams:TabBodyArea>
+		<lams:TabBodys>
+			<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
+			<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+			<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+		</lams:TabBodys>
+	</lams:TabBodyArea>
 
-	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
-</div>
-
-<div id="footer"></div>
+	<div id="footer"></div>
+</lams:Page>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 2c5b4d48beb07aaf5f39402b8ed8efc5f04033cd)
+++ lams_tool_scribe/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,17 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<table>
-	<tr>
-		<td>
-			<h2>
-				<c:out value="${scribeUserDTO.firstName} ${scribeUserDTO.lastName}" escapeXml="true"/>
-			</h2>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<p><lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/></p>
-		</td>
-	</tr>
-</table>
+<h4>
+	<c:out value="${scribeUserDTO.firstName} ${scribeUserDTO.lastName}" escapeXml="true"/>
+</h4>
+<p><lams:out value="${scribeUserDTO.notebookEntry}" escapeHtml="true"/></p>
 
Index: lams_tool_scribe/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf)
+++ lams_tool_scribe/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -1,31 +1,31 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-<table cellspacing="0" class="alternative-color">
-	<tr>
-		<th class="first">
-			<fmt:message key="heading.sessionName" />	
-		</th>
-		
-		<th align="center">
-			<fmt:message key="heading.totalLearners" />
-		</th>
-		
-		<th align="center">
-			<fmt:message key="heading.numberOfVotes" />
-		</th>
-	</tr>
-	<c:forEach var="session" items="${dto.sessionDTOs}">
+<c:forEach var="session" items="${dto.sessionDTOs}">
+
+<c:if test="${isGroupedActivity}">
+	<div class="panel panel-default" >
+       <div class="panel-heading" id="stats${session.sessionID}">
+  	    	<span class="panel-title">
+			${session.sessionName}</a>
+			</span>
+      	</div>
+</c:if>
+
+	<table class="table table-condensed">
 		<tr>
-			<td align="left">
-				${session.sessionName}
-			</td>
-			<td align="center">
-				${session.numberOfLearners}			
-			</td>
-			<td align="center">
-				${session.numberOfVotes}
-			</td>
+			<td><strong> <fmt:message key="heading.totalLearners" /> </strong></td>
+			<td>${session.numberOfLearners}	</td>
 		</tr>
-	</c:forEach>
-</table>
+		<tr>
+			<td><strong> <fmt:message key="heading.numberOfVotes" /> </strong></td>
+			<td>${session.numberOfVotes}</td>
+		</tr>
+	</table>
+
+<c:if test="${isGroupedActivity}">
+	</div>
+</c:if>
+
+</c:forEach>
+
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf -r9732fd6b134b021525bf6be0e8cad758e6beae05
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1da8dadde28e6b4b1f248175bb9f3c22ffeeb9cf)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 9732fd6b134b021525bf6be0e8cad758e6beae05)
@@ -13,104 +13,132 @@
 	}
 </script>
 
-<h1>
-	<c:out value="${monitoringDTO.title}" escapeXml="true"/>
-</h1>
+<html:form action="/monitoring">
+	<html:hidden property="toolContentID" value="${dto.toolContentID}" />
+	<html:hidden property="contentFolderID" />
+	<p>
+		<html:submit styleClass="btn btn-default pull-right">
+			<fmt:message key="button.refresh" />
+		</html:submit>
+	</p>
+</html:form>
 
-<div class="instructions space-top">
-	<c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
+
+<div class="panel">
+	<h4>
+	    <c:out value="${monitoringDTO.title}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${monitoringDTO.instructions}" escapeXml="false"/>
+	</div>
 </div>
 
-<br/>
-<c:forEach var="session" items="${dto.sessionDTOs}">
-	
+
+<c:if test="${isGroupedActivity}">
+	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+</c:if>
+
+<c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
+
+	<c:set var="subpanelHeadingClass"></c:set>
+		
 	<c:if test="${isGroupedActivity}">
-		<h2>
-			${session.sessionName}
-		</h2>
+		<c:set var="subpanelHeadingClass">panel-heading-sm</c:set>
+		<div class="panel panel-default" >
+        <div class="panel-heading" id="heading${session.sessionID}">
+   	    	<span class="panel-title collapsable-icon-left">
+       		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.sessionID}" 
+				aria-expanded="false" aria-controls="collapse${session.sessionID}" >
+			${session.sessionName}</a>
+			</span>
+       	</div>
+       
+        <div id="collapse${session.sessionID}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${session.sessionID}">
+		<div class="loffset5 voffset10 roffset5" >
 	</c:if>
 
-	<c:choose>
-		<c:when test="${not empty session.userDTOs and (not dto.autoSelectScribe or session.appointedScribe != null)}">
-			<html:form action="/monitoring">
+	<div class="loffset5">
+		<c:choose>
+			<c:when test="${not empty session.userDTOs and (not dto.autoSelectScribe or session.appointedScribe != null)}">
+				<html:form action="/monitoring">
+		
+					<html:hidden property="toolSessionID" value="${session.sessionID}" />
+					<html:hidden property="dispatch" value="appointScribe" />
+					<html:hidden property="contentFolderID" />
+					<html:hidden property="currentTab" styleId="currentTab" />
+		
+					<div class="form-group form-inline">
+						<fmt:message key="heading.selectScribe" />
+						<html:select property="appointedScribeUID" styleClass="form-control input-sm loffset5">
+							<c:forEach var="user" items="${session.userDTOs}">
+								<html:option value="${user.uid}">
+									${user.firstName} ${user.lastName}
+								</html:option>
+							</c:forEach>
+						</html:select>
+						<html:submit styleClass="btn btn-default btn-sm loffset5">
+							<fmt:message key="button.select" />
+						</html:submit>
+					</div>	
+				</html:form>
+			</c:when>
+		
+			<c:otherwise>
+				<p>
+					<fmt:message key="message.noLearners" />
+				</p>
+			</c:otherwise>
+		</c:choose>
 	
-				<html:hidden property="toolSessionID" value="${session.sessionID}" />
-				<html:hidden property="dispatch" value="appointScribe" />
-				<html:hidden property="contentFolderID" />
-				<html:hidden property="currentTab" styleId="currentTab" />
-	
-				<fmt:message key="heading.selectScribe" />
-	
-				<html:select property="appointedScribeUID" style="min-width: 150px;">
-					<c:forEach var="user" items="${session.userDTOs}">
-						<html:option value="${user.uid}">
-							${user.firstName} ${user.lastName}
-						</html:option>
-					</c:forEach>
-				</html:select>
-	
-				<html:submit styleClass="button">
-					<fmt:message key="button.select" />
-				</html:submit>
-	
-			</html:form>
-			<br>
-		</c:when>
-	
-		<c:otherwise>
-			<p>
-				<fmt:message key="message.noLearners" />
-			</p>
-		</c:otherwise>
-	</c:choose>
-
+		<c:if test="${session.appointedScribe != null}">
+			<strong>
+				<fmt:message key="heading.appointedScribe" />: <c:out value="${session.appointedScribe}" escapeXml="true"/>
+			</strong>
+		</c:if>
+	</div>
+		
 	<c:if test="${session.appointedScribe != null}">
-		<b>
-			<fmt:message key="heading.appointedScribe" />: <c:out value="${session.appointedScribe}" escapeXml="true"/>
-		</b>
-
 		<c:set var="scribeSessionDTO" value="${session}" scope="request"/>
 
-		<div class="field-name">
-			<fmt:message key="heading.report" />
+		<div class="panel panel-default voffset10" style="margin-bottom:5px" >
+        <div class="panel-heading ${subpanelHeadingClass}"><span class="panel-title"><fmt:message key="heading.report" /></span></div>
+        <div class="panel-body">
+			<c:forEach var="report" items="${session.reportDTOs}">
+				<p>
+					<c:out value="${report.headingDTO.headingText}" escapeXml="false" />
+				</p>
+				<p>
+					<lams:out value="${report.entryText}" escapeHtml="true"/>
+				</p>
+				<hr />
+			</c:forEach>
+	
+			<%@include file="/pages/parts/voteDisplay.jsp"%>
+	
+			<c:if test="${session.forceComplete eq false}">
+				<html:form action="monitoring" onsubmit="return confirmForceComplete();">
+					<html:hidden property="dispatch" value="forceCompleteActivity" />
+					<html:hidden property="toolSessionID" value="${session.sessionID}" />
+					<html:hidden property="contentFolderID" />
+					<html:submit styleClass="btn btn-default btn-sm">
+						<fmt:message key="button.forceComplete" />
+					</html:submit>
+				</html:form>
+			</c:if>
 		</div>
-		<hr />
-		<c:forEach var="report" items="${session.reportDTOs}">
-			<p>
-				<c:out value="${report.headingDTO.headingText}" escapeXml="false" />
-			</p>
-			<p>
-				<lams:out value="${report.entryText}" escapeHtml="true"/>
-			</p>
-			<hr />
-		</c:forEach>
-
-		<%@include file="/pages/parts/voteDisplay.jsp"%>
-
-		<c:if test="${session.forceComplete eq false}">
-			<html:form action="monitoring" onsubmit="return confirmForceComplete();">
-				<html:hidden property="dispatch" value="forceCompleteActivity" />
-				<html:hidden property="toolSessionID" value="${session.sessionID}" />
-				<html:hidden property="contentFolderID" />
-				<html:submit styleClass="button">
-					<fmt:message key="button.forceComplete" />
-				</html:submit>
-			</html:form>
-		</c:if>
-
+		</div>
 	</c:if>
 
 	<c:if test="${dto.reflectOnActivity}">
-		<div class="field-name">
-			<fmt:message key="heading.reflections" />
-		</div>
-		<table class="alternative-color" cellspacing="0">
+		<div class="panel panel-default voffset10" style="margin-bottom:5px" >
+        <div class="panel-heading  ${subpanelHeadingClass}"><span class="panel-title"><fmt:message key="heading.reflections" /></span></div>
+		<table class="table table-condensed table-striped">
 			<tr>
-				<th class="first">
+				<th>
 					<fmt:message>heading.learner</fmt:message>
 				</th>
 
-				<th class="first">
+				<th>
 					<c:choose>
 						<c:when test="${dto.reflectOnActivity}">
 							<fmt:message key="heading.reflection" />
@@ -144,33 +172,27 @@
 				</tr>
 			</c:forEach>
 		</table>
+		</div>
 	</c:if>
 
 
+	<c:if test="${isGroupedActivity}">
+		</div>
+		</div> <!-- end collapse area  -->
+		</div> <!-- end collapse panel  -->
+	</c:if>
+	${ !isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+	
 </c:forEach>
 
-<html:form action="/monitoring">
-	<html:hidden property="toolContentID" value="${dto.toolContentID}" />
-	<html:hidden property="contentFolderID" />
-	<p>
-		<html:submit styleClass="button right-buttons">
-			<fmt:message key="button.refresh" />
-		</html:submit>
-	</p>
-</html:form>
+<c:if test="${isGroupedActivity}">
+</div>
+</c:if>
 
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+<table class="table table-striped table-condensed">	
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">	
-
 	<tr>
 		<td>
 			<fmt:message key="advanced.showAggregatedReports" />
@@ -235,4 +257,4 @@
 		</c:when>
 	</c:choose>
 </table>
-</div>
+</lams:AdvancedAccordian>