Index: lams_tool_lamc/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Arrow.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Comments.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf7fc2ea4f07c842e1c377410f60054411f9aaaf5 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f7fc2ea4f07c842e1c377410f60054411f9aaaf5)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -12,25 +12,38 @@
 <div class="row no-gutter">
 	<div class="col-xs-12">
 		<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_lamc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/TSTable.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rac6c077d83ef253fa3f07a515edc49077317029a -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ac6c077d83ef253fa3f07a515edc49077317029a)
+++ lams_tool_lamc/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_lamc/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/TabBodyArea.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/TabBodys.tag	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r7329c82c5388fbb86b6a0a2b27a71151ee8f116e -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 7329c82c5388fbb86b6a0a2b27a71151ee8f116e)
+++ lams_tool_lamc/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_tool_lamc/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -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_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,75 +1,63 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<p>
-	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" onclick="clickSelectLeaderToolOuputHandler();"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="useSelectLeaderToolOuput">
-		<fmt:message key="label.use.select.leader.tool.output" />
+	<html:checkbox property="useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" onclick="clickSelectLeaderToolOuputHandler();"/>
+	<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
-</p>
+</div>
 
 
-<p class="small-space-top">
-	<html:checkbox property="prefixAnswersWithLetters" value="1" styleId="prefixAnswersWithLetters"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="prefixAnswersWithLetters">
-		<fmt:message key="label.prefix.sequential.letters.for.each.answer" />
+	<html:checkbox property="prefixAnswersWithLetters" value="1" styleId="prefixAnswersWithLetters"/>
+	<fmt:message key="label.prefix.sequential.letters.for.each.answer" />
 	</label>
-</p>
+</div>
 
 
-<p class="small-space-top">
-	<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="questionsSequenced">
-		<fmt:message key="radiobox.onepq" />
+	<html:checkbox property="questionsSequenced" value="1" styleId="questionsSequenced"/>
+	<fmt:message key="radiobox.onepq" />
 	</label>
-</p>
+</div>
 
 
-<p class="small-space-top">
-	<html:checkbox property="showMarks" value="1" styleId="showMarks"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="showMarks">
-		<fmt:message key="label.showMarks" />
+	<html:checkbox property="showMarks" value="1" styleId="showMarks"/>
+	<fmt:message key="label.showMarks" />
 	</label>
-</p>
+</div>
 
 
-<p class="small-space-top">
-	<html:checkbox property="randomize" value="1" styleId="randomize"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="randomize">
-		<fmt:message key="label.randomize" />
+	<html:checkbox property="randomize" value="1" styleId="randomize"/>
+	<fmt:message key="label.randomize" />
 	</label>
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:checkbox property="displayAnswers" value="1" styleId="displayAnswers"
-		styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="displayAnswers">
-		<fmt:message key="label.displayAnswers" />
+	<html:checkbox property="displayAnswers" value="1" styleId="displayAnswers"/>
+	<fmt:message key="label.displayAnswers" />
 	</label>
-</p>
+</div>
 
 
-<p>
-	<html:checkbox property="retries" value="1" styleId="retries"
-		onclick="javascript:updatePass(this); submitMethod('updateMarksList');" styleClass="noBorder">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="retries">
-		<fmt:message key="radiobox.retries" />		
+	<html:checkbox property="retries" value="1" styleId="retries"
+		onclick="javascript:updatePass(this); submitMethod('updateMarksList');"/>
+	<fmt:message key="radiobox.retries" />		
 	</label>
-</p>
+</div>
 
-<p>
-	<select name="passmark">
+<div class="form-inline loffset20">
+	<div class="form-group">
+	<select name="passmark"  class="form-control input-sm">
 		<c:forEach var="passmarkEntry"
 			items="${mcGeneralAuthoringDTO.passMarksMap}">
 			<c:set var="SELECTED_PASS" scope="request" value="" />
@@ -85,19 +73,18 @@
 		</c:forEach>
 	</select>
 	<fmt:message key="radiobox.passmark" />
+	</div>
+</div>
 
-</p>
-
-<p>
-	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect">
-	</html:checkbox>
+<div class="checkbox">
 	<label for="reflect">
-		<fmt:message key="label.reflect" />
+	<html:checkbox property="reflect" value="1" styleClass="noBorder" styleId="reflect"/>
+	<fmt:message key="label.reflect" />
 	</label>
-</p>
-<p>
-	<html:textarea cols="30" rows="3" property="reflectionSubject" styleId="reflectInstructions"></html:textarea>
-</p>
+</div>
+<div class="form-group">
+<html:textarea property="reflectionSubject" styleId="reflectInstructions"  styleClass="form-control" rows="3"/>
+</div>
 
 <script type="text/javascript">
 <!--
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -7,24 +7,12 @@
 <%@ page import="java.util.Set" %>
 <%@ page import="org.lamsfoundation.lams.tool.mc.McAppConstants"%>
 
-    <% 
-		Set tabs = new LinkedHashSet();
-		tabs.add("label.basic");
-		tabs.add("label.advanced");
-		pageContext.setAttribute("tabs", tabs);
-	%>
-
 <lams:html>		
 	<lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	
-	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
-
 	<%@ include file="/common/header.jsp"%>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-	
+ 	
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
 	<script language="JavaScript" type="text/JavaScript">
 
@@ -86,42 +74,43 @@
 </lams:head>
 <body onLoad="init();" class="stripes">
 
-<div id="page">
-	<h1>  <fmt:message key="label.authoring.mc"/> </h1>
-	
-	<div id="header">		
-		<lams:Tabs collection="${tabs}" useKey="true" control="true" />					
-	</div>
-
-	<div id="content">	
-		<html:form  action="/authoring?validate=false" styleId="authoringForm" enctype="multipart/form-data" method="POST" target="_self">
-			<html:hidden property="dispatch" value="submitAllContent"/>
-			<html:hidden property="toolContentID"/>
-			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="httpSessionID"/>						
-			<html:hidden property="contentFolderID"/>												
-			<html:hidden property="totalMarks"/>
-			<input type="hidden" name="mode" value="${mode}">
+	<html:form  action="/authoring?validate=false" styleId="authoringForm" enctype="multipart/form-data" method="POST" target="_self">
+		<html:hidden property="dispatch" value="submitAllContent"/>
+		<html:hidden property="toolContentID"/>
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="httpSessionID"/>						
+		<html:hidden property="contentFolderID"/>												
+		<html:hidden property="totalMarks"/>
+		<input type="hidden" name="mode" value="${mode}">
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 			
-			<%@ include file="/common/messages.jsp"%>
-			   
-			<lams:help toolSignature="<%= McAppConstants.MY_SIGNATURE %>" module="authoring"/>
-				
-			<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
-			<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
 
-			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		 <lams:Tabs control="true" title="${title}" helpToolSignature="<%= McAppConstants.MY_SIGNATURE %>" helpModule="authoring">
+                    <lams:Tab id="1" key="label.basic" />
+                    <lams:Tab id="2" key="label.advanced" />
+            </lams:Tabs>   
 			
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
-				cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
-				contentFolderID="${formBean.contentFolderID}" accessMode="${mode}" defineLater="${mode=='teacher'}"/>
-		
-		</html:form>
-	</div>
+			<lams:TabBodyArea>
+				<%@ include file="/common/messages.jsp"%>
+              
+                <!--  Set up tabs  -->
+                <lams:TabBodys>
+					<lams:TabBody id="1" titleKey="label.basic" page="BasicContent.jsp"/>
+ 					<lams:TabBody id="2" titleKey="label.advanced" page="AdvancedContent.jsp" />
+                </lams:TabBodys>
 
-	<div id="footer"></div>
+				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
+					cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" 
+					contentFolderID="${formBean.contentFolderID}" accessMode="${mode}" defineLater="${mode=='teacher'}"/>
+			</lams:TabBodyArea>
+					
+		<div id="footer"></div>
 
-</div>
-
+	</lams:Page>
+	
+	</html:form>
+	
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -38,8 +38,8 @@
 		    	height = document.documentElement.clientHeight;
 		    	// alert("using clientHeight");
 		    }
-			// alert("doc height "+height);
-		    height -= document.getElementById('TB_iframeContent').offsetTop + 60;
+		 	// alert("doc height "+height);
+		    height -= document.getElementById('TB_iframeContent').offsetTop + 260;
 		    document.getElementById('TB_iframeContent').style.height = height +"px";
 	
 			TB_HEIGHT = height + 28;
@@ -70,46 +70,35 @@
     	frame.src = '<html:rewrite page="/authoring.do?dispatch=exportQTI&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}" />'
     			+ '&title=' + title;
     }
-
+ 
 </script>
 
 <html:hidden property="questionIndex" />
-<table cellpadding="0">
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.title.col"></fmt:message>
-			</div>
-			<html:text property="title" style="width: 99%;"></html:text>
-		</td>
-	</tr>
 
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.instructions.col"></fmt:message>
-			</div>
-			<lams:CKEditor id="instructions"
-				value="${mcGeneralAuthoringDTO.activityInstructions}"
-				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
-</table>
+<div class="form-group">
+    <label for="title"><fmt:message key="label.authoring.title.col"/></label>
+    <html:text property="title" styleClass="form-control"></html:text>
+</div>
+<div class="form-group">
+    <label for="instructions"><fmt:message key="label.authoring.instructions.col" /></label>
+    <lams:CKEditor id="instructions" value="${mcGeneralAuthoringDTO.activityInstructions}" contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"></lams:CKEditor>
+</div>
 
+
 <div id="resourceListArea">
 	<%@ include file="/authoring/itemlist.jsp"%>
 </div>
-
+  
 <p>
-	<a href="<html:rewrite page="/authoring.do"/>?dispatch=newQuestionBox&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&KeepThis=true&TB_iframe=true&height=640&width=950&modal=true"
-		class="button-add-item thickbox"> 
-		<fmt:message key="label.save.question" /> 
+	<a href="<html:rewrite page="/authoring.do"/>?dispatch=newQuestionBox&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&KeepThis=true&TB_iframe=true&height=540&width=950&modal=true"
+		class="btn btn-default btn-sm thickbox"> 
+		<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.save.question" /> 
 	</a>
 	
-	<a href="#" onClick="javascript:importQTI()" style="margin-left: 40px">
+	<a href="#" onClick="javascript:importQTI()" class="btn btn-default btn-sm">
 		<fmt:message key="label.authoring.import.qti" />
 	</a>
-	<a href="#" onClick="javascript:exportQTI()" style="margin-left: 40px">
+	<a href="#" onClick="javascript:exportQTI()" class="btn btn-default btn-sm">
 		<fmt:message key="label.authoring.export.qti" />
 	</a>
 </p>
Index: lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	(.../candidateAnswersAddList.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -7,61 +7,54 @@
 				${candidateIndex}
 			</c:when>
 			<c:otherwise>
-				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				${formBean.candidateIndex}
 			</c:otherwise>
 		</c:choose>
 	</c:set>
 	
 	<input type="hidden" name="candidateIndex" value="${candidateIndex}"/>
 	
-	<div class="field-name space-top">
-		<fmt:message key="label.answers"></fmt:message>
-	</div>
-	
 	<%@ include file="/common/messages.jsp"%>
 
-	<table id="caTable">
+	<table id="caTable" class="table table-condensed table-no-border">
 	
 		<c:set var="caCount" scope="request" value="${fn:length(newQuestionDTO.listCandidateAnswersDTO)}"/>
 		<c:set var="listCandidateAnswersDTO" scope="request" value="${newQuestionDTO.listCandidateAnswersDTO}"/>	
 		<c:set var="caIndex" scope="request" value="0"/>
 
 		<tr>
-			<td width="10px">
-			</td>
-	
-			<td>
-			</td>
-	
-			<td width="60px" class="align-center">
+			<th colspan="2">
+				<fmt:message key="label.answers"></fmt:message>
+			</th>
+			
+			<th class="text-center">
 				<fmt:message key="label.isCorrect" />
-			</td>
+			</th>
 	
-			<td width="40px">
-			</td>
+			<th>
+			</th>
 	
-			<td width="20px">
-			</td>
+			<th>
+			</th>
 		</tr>
 		    
 	 	<c:forEach items="${listCandidateAnswersDTO}" var="currentCandidateDTO" varStatus="status">
 		   		<c:set var="caIndex" scope="request" value="${caIndex +1}"/>
 		   	
 				<tr>
-					<td>
+					<td width="10px">
 						<input type="hidden" name="caUid${caIndex}" value="${currentCandidateDTO.uid}">
 						<c:out value="${caIndex}" />  
 					</td>		
 				
-					<td>
+					<td width="90%">
 						<lams:CKEditor id="ca${caIndex}" 
 							value="${currentCandidateDTO.candidateAnswer}"
 							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
 						</lams:CKEditor>
 					</td>		
 					
-					<td class="align-center">
+					<td width="60px" class="text-center">
 						<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
 							<c:set var="SELECTED_ANSWER" scope="request" value="" />
 							<c:set var="ISCORRECT" scope="request" value="Incorrect" />
@@ -71,47 +64,29 @@
 								<c:set var="ISCORRECT" scope="request" value="Correct" />
 							</c:if>
 	
-							<input type="radio" name="correct" value="<c:out value="${caIndex}"/>" <c:out value="${SELECTED_ANSWER}"/> >  
+							<input type="radio" name="correct" class="form-control" value="<c:out value="${caIndex}"/>" ${SELECTED_ANSWER} >  
 	
 						</c:forEach>
 					</td>		
 					
-					<td>
+					<td width="5%">
 				 		<c:if test="${caCount != 1}"> 		
 				 		
-							<c:if test="${caIndex == 1}">
-								<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateDown'/>"
-									onclick="javascript:submitModifyAddedCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateDown');">
-								<img src="<c:out value="${tool}"/>images/up_disabled.gif"
-									border="0">
+							<c:if test="${caIndex != 1}">
+								<lams:Arrow state="up" title="<fmt:message key='label.tip.moveCandidateUp'/>" 
+									onclick="javascript:submitModifyAddedCandidate('${caIndex}', 'moveAddedCandidateUp');"/>
 							</c:if>
-	
-							<c:if test="${caIndex == caCount}">
-								<img src="<c:out value="${tool}"/>images/down_disabled.gif"
-									border="0">
-								<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateUp'/>"
-									onclick="javascript:submitModifyAddedCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateUp');">
+
+							<c:if test="${caIndex != caCount}">
+								<lams:Arrow state="down" title="<fmt:message key='label.tip.moveCandidateDown'/>" 
+									onclick="javascript:submitModifyAddedCandidate('${caIndex}', 'moveAddedCandidateDown');"/>
 							</c:if>
-	
-							<c:if test="${(caIndex != 1)  && (caIndex != caCount)}">
-								<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateDown'/>"
-									onclick="javascript:submitModifyAddedCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateDown');">
-	
-								<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateUp'/>"
-									onclick="javascript:submitModifyAddedCandidate('<c:out value="${caIndex}"/>', 'moveAddedCandidateUp');">
-							</c:if>							
 						
 						</c:if> 			
 					</td>
-					
-					<td>				
-						<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
-							title="<fmt:message key='label.tip.removeCandidate'/>"
-							onclick="removeAddedCandidate(${caIndex});">
+
+					<td  class="text-center"  width="5%"><i class="fa fa-times"	title="<fmt:message key='label.tip.removeCandidate'/>" 
+						onclick="removeAddedCandidate(${caIndex});"></i>
 					</td>
 			
 				</tr>
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -7,7 +7,6 @@
 			${candidateIndex}
 		</c:when>
 		<c:otherwise>
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 			${formBean.candidateIndex}
 		</c:otherwise>
 	</c:choose>
@@ -18,7 +17,6 @@
 			${questionIndex}
 		</c:when>
 		<c:otherwise>
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 			${formBean.questionIndex}
 		</c:otherwise>
 	</c:choose>
@@ -27,26 +25,20 @@
 <input type="hidden" name="candidateIndex" value="${candidateIndex}"/>
 <input type="hidden" name="questionIndex" value="${questionIndex}"/>
 
-<div class="field-name space-top">
-	<fmt:message key="label.answers"></fmt:message>
-</div>
-
 <%@ include file="/common/messages.jsp"%>
 
-<table id="caTable">
+<table id="caTable" class="table table-condensed table-no-border">
 
-	<c:set var="queIndex" scope="request" value="0" />
+	<c:set var="queIndex" value="0" />
 	
 	<tr>
-		<td width="10px">
-		</td>
-
-		<td>
-		</td>
-
-		<td width="60px" class="align-center">
+		<th colspan="2">
+			<fmt:message key="label.answers"></fmt:message>
+		</th>
+			
+		<th class="text-center">
 			<fmt:message key="label.isCorrect" />
-		</td>
+		</th>
 
 		<td width="40px">
 		</td>
@@ -56,83 +48,67 @@
 	</tr>
 	
 	<c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
-		<c:set var="queIndex" scope="request" value="${queIndex +1}" />
-		<c:set var="caCount" scope="request" value="${fn:length(currentDTO.listCandidateAnswersDTO)}" />
+		<c:set var="queIndex" value="${queIndex +1}" />
+		<c:set var="caCount" value="${fn:length(currentDTO.listCandidateAnswersDTO)}" />
 
 		<c:if test="${currentEditableQuestionIndex == queIndex}">
 
-			<c:set var="listCandidateAnswersDTO" scope="request" value="${currentDTO.listCandidateAnswersDTO}" />
+			<c:set var="listCandidateAnswersDTO" value="${currentDTO.listCandidateAnswersDTO}" />
 
-			<c:set var="caIndex" scope="request" value="0" />
+			<c:set var="caIndex" value="0" />
 
 			<c:forEach items="${listCandidateAnswersDTO}" var="currentCandidateDTO" varStatus="status">
-				<c:set var="caIndex" scope="request" value="${caIndex +1}" />
+				<c:set var="caIndex" value="${caIndex +1}" />
 
 				<tr>
-					<td>
+					<td width="10px">
 						<input type="hidden" name="caUid${caIndex}" value="${currentCandidateDTO.uid}">
 						<c:out value="${caIndex}" />
 					</td>
 
-					<td>
+					<td width="90%">
 						<lams:CKEditor id="ca${caIndex}" 
 							value="${currentCandidateDTO.candidateAnswer}"
 							contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
 						</lams:CKEditor>
 					</td>
 
-					<td class="align-center">
+					<td width="60px" class="text-center">
 
 						<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
-							<c:set var="SELECTED_ANSWER" scope="request" value="" />
-							<c:set var="ISCORRECT" scope="request" value="Incorrect" />
+							<c:set var="SELECTED_ANSWER" value="" />
+							<c:set var="ISCORRECT" value="Incorrect" />
 								
 							<c:if test="${correctEntry.value == currentCandidateDTO.correct}">
-								<c:set var="SELECTED_ANSWER" scope="request" value="CHECKED" />
-								<c:set var="ISCORRECT" scope="request" value="Correct" />
+								<c:set var="SELECTED_ANSWER" value="CHECKED" />
+								<c:set var="ISCORRECT" value="Correct" />
 							</c:if>
 
-							<input type="radio" name="correct" value="<c:out value="${caIndex}"/>" <c:out value="${SELECTED_ANSWER}"/> >  
+							<input type="radio" name="correct" value="<c:out value="${caIndex}"/>" ${SELECTED_ANSWER} >  
 
 						</c:forEach>
 					</td>
 
-					<td>
-						<c:if test="${caCount != 1}">
-
-							<c:if test="${caIndex == 1}">
-								<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateDown'/>"
-									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateDown');">
-								<img src="<c:out value="${tool}"/>images/up_disabled.gif"
-									border="0">
+					<td width="5%">
+				 		<c:if test="${caCount != 1}"> 		
+				 		
+							<c:if test="${caIndex != 1}">
+								<lams:Arrow state="up" title="<fmt:message key='label.tip.moveCandidateUp'/>" 
+									onclick="javascript:submitModifyAuthoringCandidate(${queIndex}, ${caIndex}, 'moveCandidateUp');"/>
 							</c:if>
 
-							<c:if test="${caIndex == caCount}">
-								<img src="<c:out value="${tool}"/>images/down_disabled.gif"
-									border="0">
-								<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateUp'/>"
-									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateUp');">
+							<c:if test="${caIndex != caCount}">
+								<lams:Arrow state="down" title="<fmt:message key='label.tip.moveCandidateDown'/>" 
+									onclick="javascript:submitModifyAuthoringCandidate(${queIndex}, ${caIndex}, 'moveCandidateDown');"/>
 							</c:if>
-
-							<c:if test="${(caIndex != 1)  && (caIndex != caCount)}">
-								<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateDown'/>"
-									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateDown');">
-
-								<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-									title="<fmt:message key='label.tip.moveCandidateUp'/>"
-									onclick="javascript:submitModifyAuthoringCandidate('<c:out value="${queIndex}"/>', '<c:out value="${caIndex}"/>', 'moveCandidateUp');">
-							</c:if>
-						</c:if>
+						
+						</c:if> 			
 					</td>
 
-					<td>
-						<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
-							title="<fmt:message key='label.tip.removeCandidate'/>"
-							onclick="removeCandidate(${queIndex}, ${caIndex});">
+					<td  class="text-center"  width="5%"><i class="fa fa-times"	title="<fmt:message key='label.tip.removeCandidate'/>" 
+						onclick="removeCandidate(${queIndex}, ${caIndex});"></i>
 					</td>
+
 				</tr>
 			</c:forEach>
 
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -5,9 +5,7 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		<link href="<html:rewrite page='/includes/css/addItem.css'/>" rel="stylesheet" type="text/css">
 
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 
 		<script language="JavaScript" type="text/JavaScript">
@@ -149,77 +147,72 @@
 		</script>
 	</lams:head>
 
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >
-		<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
+<body class="stripes" onload="parent.resizeIframe();">
 
-			<html:hidden property="dispatch" value="saveSingleQuestion" />
-			<html:hidden property="currentField"/>
-			<html:hidden property="toolContentID" />
-			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="httpSessionID" />
-			<html:hidden property="contentFolderID" />
-			<html:hidden property="editableQuestionIndex" />
-			<html:hidden property="editQuestionBoxRequest" value="true" />
-			<html:hidden property="totalMarks" />
+	<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 
-			<div class="field-name space-top">
-				<fmt:message key="label.edit.question"></fmt:message>
-			</div>
+		<html:hidden property="dispatch" value="saveSingleQuestion" />
+		<html:hidden property="currentField"/>
+		<html:hidden property="toolContentID" />
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="contentFolderID" />
+		<html:hidden property="editableQuestionIndex" />
+		<html:hidden property="editQuestionBoxRequest" value="true" />
+		<html:hidden property="totalMarks" />
 
-			<lams:CKEditor id="newQuestion"
-				value="${mcGeneralAuthoringDTO.editableQuestionText}"
-				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"
-                width="100%">
-			</lams:CKEditor>
+		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-			<%@ include file="/authoring/candidateAnswersList.jsp"%>
+		<c:set var="title"><fmt:message key="label.edit.question"/></c:set>
+		<lams:Page title="${title}" type="learner">
 
-			<div class="space-bottom small-space-top">
-				<div class="right-buttons">
-					<html:button property="newCandidate" onclick="javascript:submitMethod('newCandidateBox');"
-						styleClass="button">
-						<fmt:message key="label.add.candidates" />
-					</html:button>
-				</div>
+			<div class="form-group">
+				<lams:CKEditor id="newQuestion"
+					value="${mcGeneralAuthoringDTO.editableQuestionText}"
+					contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
+				</lams:CKEditor>
+			</div>
 
-				<div id="questions-worth">
-					<fmt:message key="label.questions.worth"></fmt:message>
-					<select name="mark">
-						<c:forEach var="markEntry"
-							items="${mcGeneralAuthoringDTO.marksMap}">
-							<c:set var="SELECTED_MARK" scope="request" value="" />
-							<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
-								<c:set var="SELECTED_MARK" scope="request" value="SELECTED" />
-							</c:if>
-	
-							<option value="<c:out value="${markEntry.value}"/>"
-								<c:out value="${SELECTED_MARK}"/>>
-								<c:out value="${markEntry.value}" />
-							</option>
+			<%@ include file="/authoring/candidateAnswersList.jsp"%>
+
+			<div class="form-group">
+				<html:button property="newAddedCandidate" onclick="javascript:submitMethod('newAddedCandidateBox');" styleClass="btn btn-default btn-sm">
+					<fmt:message key="label.add.candidates" />
+				</html:button>
+			</div>
+			
+			<div id="questions-worth" class="form-group">
+				<fmt:message key="label.questions.worth"/>&nbsp;
+				<select name="mark" class="control-sm">
+					<c:forEach var="markEntry"
+						items="${mcGeneralAuthoringDTO.marksMap}">
+						<c:set var="SELECTED_MARK" value="" />
+						<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
+							<c:set var="SELECTED_MARK" value="SELECTED" />
+						</c:if>
+		
+						<option value="<c:out value="${markEntry.value}"/>"	${SELECTED_MARK}>
+							<c:out value="${markEntry.value}" />
+						</option>
 						</c:forEach>
-					</select>
-					<fmt:message key="label.marks"></fmt:message>
-				</div>
+				</select>
+				&nbsp;<fmt:message key="label.marks"></fmt:message>
 			</div>
 
-			<div class="field-name">
-				<fmt:message key="label.feedback"></fmt:message>
-			</div>
-			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
-
 			<lams:ImgButtonWrapper>
 				<a href="#" onclick="addItem();"
-					onmousedown="self.focus();" class="button-add-item"> 
-					<fmt:message key="label.add.new.question" />
+					onmousedown="self.focus();" class="btn btn-default btn-sm"> 
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" />
 				</a>
 	
-				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left"> 
+				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm"> 
 					<fmt:message key="label.cancel" />
 				</a>
 			</lams:ImgButtonWrapper>
 
-		</html:form>
-		</div>
-	</body>
+		</lams:Page>
+
+	</html:form>
+		
+</body>
 </lams:html>
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,30 +1,31 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 <div id="itemList">
-	<h2 class="spacer-left">
+
+	<div class="panel panel-default add-file">
+	<div class="panel-heading panel-title">
 		<fmt:message key="label.questions" />
-	</h2>
-	<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="resourceListArea_Busy" />
-	</h2>
+		<i class="fa fa-spinner" style="display: none" id="resourceListArea_Busy"></i>
+	</div>
 
 	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<table id="itemTable" class="alternative-color" cellspacing="0">
+	<table id="itemTable" class="table table-striped table-condensed">
 		<c:set var="queIndex" scope="request" value="0" />
 
 		<tr>
+			<c:if test="${totalQuestionCount > 0}">
 			<th>
-
+				<fmt:message key="label.questions" />
 			</th>
 
-			<th width="70px" class="align-center">
-				<c:if test="${totalQuestionCount > 0}">
-					<fmt:message key="label.question.marks" />
-				</c:if>
+			<th class="text-center">
+				<fmt:message key="label.question.marks" />
 			</th>
 
 			<th colspan="3">
 				&nbsp;
 			</th>
+			</c:if>
 		</tr>
 
 		<c:forEach items="${listQuestionContentDTO}" var="currentDTO"
@@ -39,64 +40,50 @@
 			<tr>
 				<td>
 					<div style="overflow: auto;">
-						<strong> <fmt:message key="label.question" />: </strong>
 						<c:out value="${question}" escapeXml="false" />
 					</div>					
 				</td>
 
 
-				<td class="align-center">
+				<td width="70px" class="text-center">
 					<c:out value="${mark}" />
 				</td>
 
-				<td width="40px">
+				<td class="arrows" style="width:5%">
+					<!-- Don't display up icon if first line -->
 					<c:if test="${totalQuestionCount != 1}">
-						<c:if test="${queIndex == 1}">
-							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-								title="<fmt:message key='label.tip.moveQuestionDown'/>"
-								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
-							<img src="<c:out value="${tool}"/>images/up_disabled.gif"
-								border="0">
-						</c:if>
-
-						<c:if test="${queIndex == totalQuestionCount}">
-							<img src="<c:out value="${tool}"/>images/down_disabled.gif"
-								border="0">
-							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-								title="<fmt:message key='label.tip.moveQuestionUp'/>"
-								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');">
-						</c:if>
-
-						<c:if
-							test="${(queIndex != 1)  && (queIndex != totalQuestionCount)}">
-							<img src="<c:out value="${tool}"/>images/down.gif" border="0"
-								title="<fmt:message key='label.tip.moveQuestionDown'/>"
-								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');" />
-							<img src="<c:out value="${tool}"/>images/up.gif" border="0"
-								title="<fmt:message key='label.tip.moveQuestionUp'/>"
-								onclick="javascript:submitModifyAuthoringQuestion('<c:out value="${queIndex}"/>','moveQuestionUp');" />
-						</c:if>
-
+						<!-- Don't display up icon if first line -->
+						<c:if test="${queIndex != 1}">
+							<c:set var="tip"><fmt:message key='label.tip.moveQuestionUp'/></c:set>
+ 		 					<lams:Arrow state="up" title="${tip} ${queIndex}" 
+		 						onclick="javascript:submitModifyAuthoringQuestion(${queIndex},'moveQuestionUp');"/>
+ 		 				</c:if>
+						<!-- Don't display down icon if last line -->
+						<c:if test="${queIndex != totalQuestionCount}">
+							<c:set var="tip"><fmt:message key='label.tip.moveQuestionDown'/></c:set>
+	 						<lams:Arrow state="down" title="${tip} ${queIndex}"  
+								onclick="javascript:submitModifyAuthoringQuestion(${queIndex},'moveQuestionDown');"/>
+	 	 				</c:if>
 					</c:if>
 				</td>
 
-				<td width="20px">
+				<td align="center" style="width:5%">
 					<c:set var="editItemUrl" >
 						<html:rewrite page="/authoring.do"/>?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&KeepThis=true&TB_iframe=true&height=540&width=950&modal=true
 					</c:set>
 					<a href="${editItemUrl}" class="thickbox"> 
-						<img src="${tool}images/edit.gif" border="0" title="<fmt:message key='label.tip.editQuestion'/>">
+						<i class="fa fa-pencil" title="<fmt:message key='label.tip.editQuestion'/>"></i>
 					</a>
 				</td>
 
-				<td width="20px" align="center">
-					<img src="<c:out value="${tool}"/>images/delete.gif" border="0"
-						title="<fmt:message key='label.tip.deleteQuestion'/>"
-						onclick="removeQuestion(${queIndex});">
+				<td  align="center" style="width:5%">
+					<i class="fa fa-times"	title="<fmt:message key="label.tip.deleteQuestion" />" 	onclick="removeQuestion(${queIndex});"></i>
 				</td>
+
 			</tr>
 		</c:forEach>
 
 	</table>
+	</div>
 </div>
 
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -5,9 +5,7 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		<link href="<html:rewrite page='/includes/css/addItem.css'/>" rel="stylesheet" type="text/css">
 		
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 
 		<script language="JavaScript" type="text/JavaScript">
@@ -145,71 +143,69 @@
 		</script>
 	</lams:head>
 
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >
-		<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
-			<html:hidden property="dispatch" value="addSingleQuestion" />
-			<html:hidden property="currentField" />			
-			<html:hidden property="toolContentID" />
-			<html:hidden property="currentTab" styleId="currentTab" />
-			<html:hidden property="httpSessionID" />
-			<html:hidden property="contentFolderID" />
-			<html:hidden property="editQuestionBoxRequest" value="false" />
-			<html:hidden property="totalMarks" />
+<body class="stripes" onload="parent.resizeIframe();">
 
-			<div class="field-name space-top">
-				<fmt:message key="label.add.new.question"></fmt:message>
-			</div>
+	<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
+		<html:hidden property="dispatch" value="addSingleQuestion" />
+		<html:hidden property="currentField" />			
+		<html:hidden property="toolContentID" />
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="httpSessionID" />
+		<html:hidden property="contentFolderID" />
+		<html:hidden property="editQuestionBoxRequest" value="false" />
+		<html:hidden property="totalMarks" />
+
+		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+
+		<c:set var="title"><fmt:message key="label.add.new.question"/></c:set>
+	 	<lams:Page title="${title}" type="learner">
+		
 			<lams:CKEditor id="newQuestion"
 				value="${mcGeneralAuthoringDTO.editableQuestionText}"
-				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}"
-				width="100%">
+				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
 			</lams:CKEditor>
-
+			
 			<%@ include file="/authoring/candidateAnswersAddList.jsp"%>
 
-			<div class="space-bottom small-space-top">
-				<div class="right-buttons">
-					<html:button property="newAddedCandidate"
-						onclick="javascript:submitMethod('newAddedCandidateBox');"
-						styleClass="button">
-						<fmt:message key="label.add.candidates" />
-					</html:button>
-				</div>
-				<div id="questions-worth">
-					<fmt:message key="label.questions.worth"></fmt:message>
-					<select name="mark">
-						<c:forEach var="markEntry" items="${mcGeneralAuthoringDTO.marksMap}">
-							<c:set var="SELECTED_MARK" scope="request" value="" />
-							<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
-								<c:set var="SELECTED_MARK" scope="request" value="SELECTED" />
-							</c:if>
-	
-							<option value="<c:out value="${markEntry.value}"/>" <c:out value="${SELECTED_MARK}"/>>
-								<c:out value="${markEntry.value}" />
-							</option>
-						</c:forEach>
-					</select>
-					<fmt:message key="label.marks"></fmt:message>
-				</div>
+			<div class="form-group">
+				<a href="#" onclick="javascript:submitMethod('newAddedCandidateBox');" class="btn btn-default btn-sm"> 
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.candidates" />
+				</a>
 			</div>
+			
+			<div id="questions-worth" class="form-group">
+				<fmt:message key="label.questions.worth"></fmt:message>&nbsp;
+				<select name="mark" class="control-sm">
+					<c:forEach var="markEntry" items="${mcGeneralAuthoringDTO.marksMap}">
+						<c:set var="SELECTED_MARK" value="" />
+						<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
+							<c:set var="SELECTED_MARK" value="SELECTED" />
+						</c:if>
 
-			<div class="field-name">
-				<fmt:message key="label.feedback"></fmt:message>
+						<option value="<c:out value="${markEntry.value}"/>" ${SELECTED_MARK}>
+							<c:out value="${markEntry.value}" />
+						</option>
+					</c:forEach>
+				</select>
+				&nbsp;<fmt:message key="label.marks"></fmt:message>
 			</div>
-			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
+
+			<div class="form-group">
+				<label for="feedback"><fmt:message key="label.feedback"></fmt:message></label>
+				<html:textarea property="feedback" rows="3" cols="70" styleClass="form-control"></html:textarea>
+			</div>
 			
-			<lams:ImgButtonWrapper>
-					<a href="#" onclick="addItem();" onmousedown="self.focus();" class="button-add-item"> 
-						<fmt:message key="label.add.new.question" />
-					</a>
-	
-					<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left"> 
-						<fmt:message key="label.cancel" />
-					</a>
-			</lams:ImgButtonWrapper>
+			<a href="#" onclick="addItem();" onmousedown="self.focus();" class="btn btn-default btn-sm"> 
+				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" />
+			</a>
 
-		</html:form>
-		</div>
-	</body>
+			<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm"> 
+				<fmt:message key="label.cancel" />
+			</a>
+
+		</lams:Page>
+
+	</html:form>
+
+</body>
 </lams:html>
Index: lams_tool_lamc/web/common/header.jsp
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/common/header.jsp	(.../header.jsp)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_lamc/web/common/header.jsp	(.../header.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -7,10 +7,15 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 
-<lams:css style="main"/>
+<lams:css/>
+<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 
 <!-- ********************  javascript ********************** -->
 <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/thickbox.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.form.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_lamc/web/common/messages.jsp
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/common/messages.jsp	(.../messages.jsp)	(revision 8522cd628329e0031e21b48f2750b1fd9b1842a6)
+++ lams_tool_lamc/web/common/messages.jsp	(.../messages.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,20 +1,21 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
     <div class="error" id="errorMessages">
-        <html:messages id="error">
-            &nbsp&nbsp <html:img page="/images/iconWarning.gif" 
-               styleClass="icon"/>
-            &nbsp&nbsp <c:out value="${error}" escapeXml="false"/><br/>
-        </html:messages>
-    </div>
+       	<lams:Alert id="errorMessages" type="danger" close="false">
+	        <html:messages id="error">
+            	<c:out value="${error}" escapeXml="false"/><br/>
+ 	       </html:messages>
+        </lams:Alert>
+   </div>
 </logic:messagesPresent>
 
 <%-- Success Messages --%>
 <logic:messagesPresent message="true">
     <div class="message" id="successMessages">
-        <html:messages id="message" message="true">
-            &nbsp&nbsp <html:img page="/images/iconInformation.gif" styleClass="icon"/>
-            &nbsp&nbsp <c:out value="${message}" escapeXml="false"/><br/>
-        </html:messages>
+       	<lams:Alert id="errorMessages" type="info" close="false">
+	        <html:messages id="message" message="true">
+            	<c:out value="${message}" escapeXml="false"/><br/>
+    	    </html:messages>
+	    </lams:Alert>
     </div>
 </logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_lamc/web/common/monitoringheader.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/common/monitoringheader.jsp	(revision 0)
+++ lams_tool_lamc/web/common/monitoringheader.jsp	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -0,0 +1,25 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
+
+<lams:css/>
+<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+
+<!-- ********************  javascript ********************** -->
+<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.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_lamc/web/images/delete.gif
===================================================================
diff -u -r985b09431975de79bdae1f64b1ea7d305bc8fcf3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/dot.jpg
===================================================================
diff -u -rec67da05f1b2d2c701aa19df56b0637234b93eb3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/down.gif
===================================================================
diff -u -r985b09431975de79bdae1f64b1ea7d305bc8fcf3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/down_disabled.gif
===================================================================
diff -u -r50bd839478dc878c34c6b3ead13abe9027c4930c -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/edit.gif
===================================================================
diff -u -r985b09431975de79bdae1f64b1ea7d305bc8fcf3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/error.jpg
===================================================================
diff -u -r985b09431975de79bdae1f64b1ea7d305bc8fcf3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/green_arrow_down_right.gif
===================================================================
diff -u -r6ce3706b391e6c79a50eb0180c14e2ee4535fff5 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/iconInformation.gif
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/iconWarning.gif
===================================================================
diff -u -r8522cd628329e0031e21b48f2750b1fd9b1842a6 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/success.gif
===================================================================
diff -u -r985b09431975de79bdae1f64b1ea7d305bc8fcf3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/up.gif
===================================================================
diff -u -r985b09431975de79bdae1f64b1ea7d305bc8fcf3 -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Index: lams_tool_lamc/web/images/up_disabled.gif
===================================================================
diff -u -r50bd839478dc878c34c6b3ead13abe9027c4930c -r00937d78dacc0993260d5ed7b39e4376e432cf45
Binary files differ
Fisheye: Tag 00937d78dacc0993260d5ed7b39e4376e432cf45 refers to a dead (removed) revision in file `lams_tool_lamc/web/includes/css/addItem.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -3,85 +3,43 @@
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
 <html:hidden property="questionIndex"/>
-<table cellpadding="0">
-
+<table class="table table-condensed">
 	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.title.col"></fmt:message>
-			</div>
-			<c:out value="${mcGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
-		</td>
+		<td width="10%" ><fmt:message key="label.authoring.title.col"></fmt:message></td>
+		<td><c:out value="${mcGeneralAuthoringDTO.activityTitle}" escapeXml="false"/></td>
 	</tr>		
 
 	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.instructions.col"></fmt:message>
-			</div>
-			<c:out value="${mcGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
-		</td>
+		<td width="10%" ><fmt:message key="label.authoring.instructions.col"></fmt:message></td>
+		<td><c:out value="${mcGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/></td>
 	</tr>
-	
-	<tr>
-		<td colspan="2">
-			<div id="resourceListArea">
-				
-				<div id="itemList">
-					<h2><fmt:message key="label.questions" />
-					<img src="${ctxPath}/includes/images/indicator.gif" style="display:none" id="resourceListArea_Busy" /></h2>
-					
-					<table id="itemTable" class="align-left" style="width:650px" >
-					    <c:set var="queIndex" scope="request" value="0"/>
-					    
-					    <c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
-							<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-							<c:set var="question" scope="request" value="${currentDTO.question}"/>
-							<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
-							<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
-						
-							<tr>
-								<td width="10%" class="align-right">
-										<strong> <fmt:message key="label.question" />: </strong>
-								</td>
-						
-								<td width="60%" class="align-left">
-									<div style="overflow: auto;">				
-										<c:out value="${question}" escapeXml="false"/> 
-									</div>											
-								</td>		
-						
-						
-								<td width="10%" class="align-right">
-								</td>
-						       	
-								<td width="10%" class="align-right">
-						
-								</td>
-						
-								<td width="10%" class="align-right">
-						
-								</td>
-							</tr>
-						</c:forEach>
-					
-					</table>
-				</div>								
-			</div>
-		</td>
-	</tr>
 
-	<tr>
-		<td colspan=2 class="align-right">
-			<c:url  var="authoringUrl" value="/authoringStarter.do">
-				<c:param name="toolContentID" value="${formBean.toolContentID}" />
-				<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
-				<c:param name="mode" value="teacher" />
-			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
-				<fmt:message key="label.edit"/>
-			</html:link>				 		  					
+	<c:set var="queIndex" scope="request" value="0"/>
+		
+	<c:forEach items="${listQuestionContentDTO}" var="currentDTO" varStatus="status">
+		<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+		<c:set var="question" scope="request" value="${currentDTO.question}"/>
+		<c:set var="feedback" scope="request" value="${currentDTO.feedback}"/>
+		<c:set var="displayOrder" scope="request" value="${currentDTO.displayOrder}"/>	
+		
+		<tr>
+			<td width="10%">
+				<fmt:message key="label.question" />:
 		</td>
-	</tr>
-</table>		
 		
+		<td>
+			<c:out value="${question}" escapeXml="false"/> 
+			</td>		
+		</tr>
+	</c:forEach>
+		
+</table>
+
+<c:url  var="authoringUrl" value="/authoringStarter.do">
+	<c:param name="toolContentID" value="${formBean.toolContentID}" />
+	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
+	<c:param name="mode" value="teacher" />
+</c:url>
+<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default">
+	<fmt:message key="label.edit"/>
+</html:link>				 		  					
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -20,45 +20,19 @@
 
 <body class="stripes">
 	
-	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
-	<div id="content">
-		
-		<h1>
-			<fmt:message key="label.view.reflection"/>
-		</h1>
+<c:set var="title"><fmt:message key="label.view.reflection"/></c:set>
+<lams:Page title="${title}" type="learner">
 
-		<table>
-			<tr>
-				<td>
-					<h2>
-						<c:out value="${mcGeneralLearnerFlowDTO.userName}" escapeXml="true"/>
-					</h2>
-				</td>
-			</tr>
-				
-			<tr>
-				<td>
-					<p>
-						<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>
-					</p>
-				</td>
-			</tr>
-		</table>
+	<h4><c:out value="${mcGeneralLearnerFlowDTO.userName}" escapeXml="true"/></h4>
 
-		<table cellpadding="0">
-			<tr>
-				<td>
-					<a href="javascript:window.close();" class="button">
-						<fmt:message key="label.close"/>
-					</a>
-				</td>
-			</tr>
-		</table>
+	<p><lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/></p>
+
+	<a href="javascript:window.close();" class="btn btn-default">
+		<fmt:message key="label.close"/>
+	</a>
 		
-	</div>
-	</html:form>	
-	
 	<div id="footer"></div>
 
+</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -7,24 +7,12 @@
 <%@ page import="java.util.Set" %>
 <%@ page import="org.lamsfoundation.lams.tool.mc.McAppConstants"%>
 
-    <% 
-		Set tabs = new LinkedHashSet();
-		tabs.add("label.summary");
-		tabs.add("label.editActivity");
-		tabs.add("label.stats");
-		pageContext.setAttribute("tabs", tabs);
-	%>
-
 <lams:html>
 <lams:head>
 
 	<title><fmt:message key="label.monitoring"/></title>
 	
-	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
-
-	<%@ include file="/common/header.jsp"%>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
+	<%@ include file="/common/monitoringheader.jsp"%>
 	<script type="text/javascript">
 	
         function init(){
@@ -72,33 +60,36 @@
 </lams:head>
 <body onLoad="init();" class="stripes">
 
-	<div id="page">
-		<h1> <fmt:message key="label.monitoring"/> </h1>
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Page title="${title}" type="navbar">
 
-		<div id="header">
-			<lams:Tabs collection="${tabs}" useKey="true" control="true"/>
-		</div>	
+	<lams:Tabs title="${title}" control="true" helpToolSignature="<%= McAppConstants.MY_SIGNATURE %>" helpModule="monitoring">
+		<lams:Tab id="1" key="label.summary" />
+		<lams:Tab id="2" key="label.editActivity" />
+		<lams:Tab id="3" key="label.stats" />
+	</lams:Tabs>
+
+    <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self" styleId="monitoringForm">		
+		<html:hidden property="dispatch"/>
+		<html:hidden property="toolContentID"/>
+		<html:hidden property="httpSessionID"/>
+		<html:hidden property="currentTab" styleId="currentTab" />
+		<html:hidden property="contentFolderID"/>
+		<html:hidden property="responseId"/>
 	
-		<div id="content">						
-		    <html:form  action="/monitoring?validate=false" enctype="multipart/form-data" method="POST" target="_self" styleId="monitoringForm">		
-				<html:hidden property="dispatch"/>
-				<html:hidden property="toolContentID"/>
-				<html:hidden property="httpSessionID"/>
-				<html:hidden property="currentTab" styleId="currentTab" />
-				<html:hidden property="contentFolderID"/>
-				<html:hidden property="responseId"/>
-			
-				<lams:help toolSignature="<%= McAppConstants.MY_SIGNATURE %>" module="monitoring"/>
-			
+		<lams:TabBodyArea>
+			<lams:TabBodys>
 				<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp"/>
 				<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
 				<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
-			</html:form>
-		</div>	
-	
-		<div id="footer"></div>
+			</lams:TabBodys>
+		</lams:TabBodyArea>
 
-	</div>
+	</html:form>
 	
+	<div id="footer" />
+	
+</lams:Page>
+
 </body>
 </lams:html>
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,40 +1,45 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:if test="${notebookEntriesExist == 'true' }"> 			
-	<table class="alternative-color">
-						
-		<tr>			
-			<th colspan=2 class="align-left">
-				<b>  <fmt:message key="label.reflection"/>  </b> 
-			</th>
-		</tr>		
-						
-		<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
-			<c:set var="userName" scope="request" value="${currentDto.userName}"/>
-			<c:set var="userId" scope="request" value="${currentDto.userId}"/>
-			<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
-			<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
+<c:if test="${notebookEntriesExist == 'true' }"> 		
+
+<div class="panel-group" id="accordionReflection" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default" >
+        <div class="panel-heading collapsable-icon-left" id="headingReflection">
+        	<span class="panel-title">
+	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseReflection" aria-expanded="false" aria-controls="collapseReflection" >
+          	<fmt:message key="label.reflection"/>
+        	</a>
+      		</span>
+        </div>
+
+        <div id="collapseReflection" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingReflection">
+			<table class="table table-striped table-condensed">
+			<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
+				<c:set var="userName" scope="request" value="${currentDto.userName}"/>
+				<c:set var="userId" scope="request" value="${currentDto.userId}"/>
+				<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
+				<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
+				<tr>			
+					<td>
+						<c:url value="monitoring.do" var="openNotebook">
+							<c:param name="dispatch" value="openNotebook" />
+							<c:param name="uid" value="${reflectionUid}" />
+							<c:param name="userId" value="${userId}" />
+							<c:param name="userName" value="${fn:escapeXml(userName)}" />
+							<c:param name="sessionId" value="${sessionId}" />													
+							<c:param name="contentFolderID" value="${McMonitoringForm.contentFolderID}" />																								
+						</c:url>
 			
-			<tr>			
-				<td valign=top class="align-left">
-					<c:out value="${userName}" escapeXml="true"/> 
-				</td>
+						<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}');" styleClass="btn btn-default btn-sm">
+							<fmt:message key="label.view" />
+						</html:link>
+						&nbsp;<c:out value="${userName}" escapeXml="true"/> 
+					</td>
+				</tr>	
+			</c:forEach>		
+			</table>
+		</div>
+	</div>
+</div>
 	
-				<td valign=top class="align-right">
-					<c:url value="monitoring.do" var="openNotebook">
-						<c:param name="dispatch" value="openNotebook" />
-						<c:param name="uid" value="${reflectionUid}" />
-						<c:param name="userId" value="${userId}" />
-						<c:param name="userName" value="${fn:escapeXml(userName)}" />
-						<c:param name="sessionId" value="${sessionId}" />													
-						<c:param name="contentFolderID" value="${McMonitoringForm.contentFolderID}" />																								
-					</c:url>
-		
-					<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}');" styleClass="button">
-						<fmt:message key="label.view" />
-					</html:link>
-				</td>
-			</tr>	
-		</c:forEach>		
-	</table>
 </c:if> 															
Index: lams_tool_lamc/web/monitoring/Stats.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -3,7 +3,7 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-<table class="alternative-color">
+<table class="table table-condensed">
 	<tr> 
 		<th>
 			<b> <fmt:message key="count.total.user" /> </b>
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -rbcca58d5b7597693db2f6d01764f29a9145876a7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision bcca58d5b7597693db2f6d01764f29a9145876a7)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,8 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
-<c:set var="isShrinkToFit" value="${(145 + fn:length(assessment.questions)*80) < 630}"/>
 
-<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css"/>
 <style media="screen,projection" type="text/css">
@@ -26,13 +25,7 @@
 		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
 	};	
 </script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 <script type="text/javascript">
 	$(document).ready(function(){
 		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
@@ -41,13 +34,13 @@
 				datatype: "json",
 				url: "<c:url value='/monitoring.do'/>?dispatch=getPagedUsers&toolSessionID=${sessionDto.sessionId}",
 				height: 'auto',
-				width: 630,
-				shrinkToFit: ${isShrinkToFit},
+				autowidth: true,
+				shrinkToFit: true,
 				pager: 'pager-${sessionDto.sessionId}',
 				rowList:[10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
-			   	caption: "${sessionDto.sessionName}",
+			   	/* caption: "${sessionDto.sessionName}", */
 			   	colNames:[
 						'userUid',
 						"<fmt:message key="label.monitoring.summary.user.name" />",
@@ -90,7 +83,7 @@
 				//hiddengrid:true,
 				height: 110,
 				autowidth: true,
-				shrinkToFit: false,
+				shrinkToFit: true,
 				caption: "<fmt:message key="label.monitoring.summary.learner.summary" />",
 			   	colNames:['#',
 						'userAttemptUid',
@@ -167,69 +160,88 @@
 
 </script>
 
-<h1>
-	<c:out value="${mcGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
-</h1>
+<div class="panel">
+	<h4>
+	    <c:out value="${mcGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${mcGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
+	</div>
+	
+	<c:if test="${useSelectLeaderToolOuput}">
+		<lams:Alert type="info" id="use-leader" close="false">
+			<fmt:message key="label.info.use.select.leader.outputs" />
+		</lams:Alert>
+	</c:if>
+	
+	<c:if test="${(mcGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="error.noLearnerActivity"/>
+		</lams:Alert>
+	</c:if>
+	
+	<!--For release marks feature-->
+	<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
+	<div id="message-area"></div>
 
-<div class="instructions space-top">
-	<c:out value="${mcGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
 </div>
+
 <%@ include file="parts/advanceQuestions.jsp"%>
 
-<c:if test="${useSelectLeaderToolOuput}">
-	<div class="info space-top">
-		<fmt:message key="label.info.use.select.leader.outputs" />
-	</div>
-	<br>
-</c:if>
 
-<c:if test="${(mcGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
-	<c:if test="${notebookEntriesExist != 'true' }"> 			
-		<table align="center">
-			<tr> 
-				<td NOWRAP valign=top align=center> 
-					<b>  <fmt:message key="error.noLearnerActivity"/> </b>
-				</td> 
-			<tr>
-		</table>
-	</c:if>
-</c:if>
-			
 <c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
-	<br/>
-	<h2 style="font-size: 15px; margin-left: 30px;">    
+	<html:link href="#" onclick="javascript:submitMonitoringMethod('downloadMarks');" styleClass="btn btn-default btn-xs pull-right">
+		<fmt:message key="label.monitoring.downloadMarks.button" />
+	</html:link>
+
+	<h4>    
 		<fmt:message key="label.studentMarks"/>
-	</h2>
+	</h4>
 
 	<div id="masterDetailArea">
 		<%@ include file="masterDetailLoadUp.jsp"%>
 	</div>
-		
+
+	<c:if test="${isGroupedActivity}">
+	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+	</c:if>
+	
 	<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
-			
-		<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
-			<c:if test="${isGroupedActivity}">
-				<div style="padding-bottom: 5px; font-size: small;">
-					<B><fmt:message key="group.label" /></B> ${sessionDto.sessionName}
-				</div>
-			</c:if>
+
+		<c:if test="${isGroupedActivity}">
+			<div class="panel panel-default" >
+	        <div class="panel-heading" id="heading${sessionDto.sessionId}">
+    	    	<span class="panel-title collapsable-icon-left">
+        		<a role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionId}" 
+					aria-expanded="false" aria-controls="collapse${sessionDto.sessionId}" >
+				<fmt:message key="group.label" />&nbsp;${sessionDto.sessionName}</a>
+				</span>
+        	</div>
+        
+	        <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading${sessionDto.sessionId}">
+		</c:if>
 					
 			<table id="group${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
 			<div id="pager-${sessionDto.sessionId}" class="scroll"></div>
 			
 			<div style="margin-top: 10px; width:99%;">
 				<table id="userSummary${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
 			</div>
-		</div>
-				
+			
+		<c:if test="${isGroupedActivity}">
+			</div> <!-- end collapse area  -->
+			</div> <!-- end collapse panel  -->
+		</c:if>
+		${ !isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+		
 	</c:forEach>
 
+	<c:if test="${isGroupedActivity}">
+	</div>
+	</c:if>
+
 	<jsp:include page="/monitoring/Reflections.jsp" />
 				
-	<html:link href="#" onclick="javascript:submitMonitoringMethod('downloadMarks');" styleClass="button float-right">
-		<fmt:message key="label.monitoring.downloadMarks.button" />
-	</html:link>
-	<br><br>			
 </c:if>
 
 <c:if test="${noSessionsNotebookEntriesExist == 'true'}"> 							
Index: lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,15 +1,7 @@
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<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">
-
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+             
+<table class="table table-striped table-condensed">
 	<tr>
 		<td>
 			<fmt:message key="label.use.select.leader.tool.output" />
@@ -163,25 +155,23 @@
 			</tr>
 		</c:when>
 	</c:choose>
+
+	<tr>
+		<td colspan="2">
+		<c:choose>
+			<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'true'}">
+				<fmt:message key="label.monitoring.yesDisplayAnswers"/>
+			</c:when>
+			<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false'}">
+				<fmt:message key="label.monitoring.noDisplayAnswers1"/><br/>
+				<quote>
+					<fmt:message key="label.monitoring.noDisplayAnswers2"/>
+					<input onclick="javascript:submitChangeDisplayAnswers(this.value, 'displayAnswers');" name="displayAnswers" class="btn btn-default btn-xs" value="<fmt:message key='button.monitoring.noDisplayAnswers'/>" type="button">	
+				</quote>
+			</c:when>
+		</c:choose>
+		</td>
+	</tr>
 </table>
 
-<c:choose>
-	<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'true'}">
-		<p>
-			<fmt:message key="label.monitoring.yesDisplayAnswers"/>
-		</p>
-	</c:when>
-	<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false'}">
-		<p>
-			<fmt:message key="label.monitoring.noDisplayAnswers1"/>
-			<br>
-			
-			<quote>
-				<fmt:message key="label.monitoring.noDisplayAnswers2"/>
-				<input onclick="javascript:submitChangeDisplayAnswers(this.value, 'displayAnswers');" class="button" name="displayAnswers" class="button" value="<fmt:message key='button.monitoring.noDisplayAnswers'/>" type="button">	
-			</quote>
-		</p>
-	</c:when>
-</c:choose>
-
-</div>
+</lams:AdvancedAccordian>
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp
===================================================================
diff -u -r1a02559e19419af9991eaeb9363f809355b39bc7 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp	(.../advanceQuestions.jsp)	(revision 1a02559e19419af9991eaeb9363f809355b39bc7)
+++ lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp	(.../advanceQuestions.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,51 +1,49 @@
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon3" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advanced-questions'), document.getElementById('treeIcon3'), '<lams:LAMSURL/>');" />
+ <div class="panel panel-default" >
+	<div class="panel-heading" id="heading-advanced-questions">
+		<span class="panel-title collapsable-icon-left">
+			<a class=collapsed role="button" data-toggle="collapse" href="#advanced-questions" 
+				aria-expanded="true" aria-controls="advanced-questions" >
+			<fmt:message key="label.Questions" /></a>
+		</span>
+     </div>
+     <div id="advanced-questions" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading-advanced-questions">
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advanced-questions'), document.getElementById('treeIcon3'),'<lams:LAMSURL/>');" >
-		<fmt:message key="label.Questions" />
-	</a>
-</h1>
+		<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
+			<table class="table table-condensed table-striped">
+				<c:forEach var="question" items="${content.mcQueContents}" varStatus="i">
+	
+					<tr>			
+						<td><b>  <fmt:message key="label.question.only"/>&nbsp;${i.index + 1}:</b> (<fmt:message key="label.mark"/>&nbsp;<c:out value="${question.mark}"/>)<br/>
+							<c:out value="${question.question}" escapeXml="false"/>						
+						</td>
+					</tr>
+							
+					<tr>					
+						<td>  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+							<table class="table table-condensed" style="margin-bottom:0px">
+								<c:forEach var="option" items="${question.mcOptionsContents}">
+									<tr>			
+										<td>
+											<c:if test="${option.correctOption}"> 		
+												(<fmt:message key="label.correct"/>)
+											</c:if>	
+											<c:out value="${option.mcQueOptionText}" escapeXml="false"/> 
+										</td>	
+									</tr>
+								</c:forEach>		  	
+							</table>
+						</td>  
+					</tr>			
+	
+				</c:forEach>		  	
+	
+			  	<tr>
+			  	 	<td class="text-left"> <b> 
+			  	 		<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
+			  	 	</td>
+			  	</tr>
+			</table>
+		</c:if>
 
-<div class="monitoring-advanced" id="advanced-questions" style="display:none">
-
-	<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
-		<table class="forms">
-			<c:forEach var="question" items="${content.mcQueContents}" varStatus="i">
-
-				<tr>			
-					<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> ${i.index + 1}:</b>
-						<c:out value="${question.question}" escapeXml="false"/> &nbsp (<fmt:message key="label.mark"/> <c:out value="${question.mark}"/> )
-					</td>
-				</tr>
-						
-				<tr>					
-					<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-						<table class="align-left">
-							<c:forEach var="option" items="${question.mcOptionsContents}">
-								<tr>			
-									<td NOWRAP valign=top class="align-left">
-										&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-										<c:out value="${option.mcQueOptionText}" escapeXml="false"/> 
-												
-										<c:if test="${option.correctOption}"> 		
-											&nbsp (<fmt:message key="label.correct"/>)
-										</c:if>																		
-									</td>	
-								</tr>
-							</c:forEach>		  	
-						</table>
-					</td>  
-				</tr>			
-
-			</c:forEach>		  	
-
-		  	<tr>
-		  	 	<td NOWRAP valign=top class="align-left"> <b> 
-		  	 		<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
-		  	 	</td>
-		  	</tr>
-		</table>
-	</c:if>
-
-</div>
-		
\ No newline at end of file
+	</div>
+</div>		
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/parts/dateRestriction.jsp
===================================================================
diff -u -r3f7d82f8f5d0c6881eb83f9ce8c36720e9756649 -r00937d78dacc0993260d5ed7b39e4376e432cf45
--- lams_tool_lamc/web/monitoring/parts/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 3f7d82f8f5d0c6881eb83f9ce8c36720e9756649)
+++ lams_tool_lamc/web/monitoring/parts/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
@@ -1,43 +1,29 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+<c:set var="ddTitle"><fmt:message key="monitor.summary.date.restriction" /></c:set>
+<lams:RestrictedUsageAccordian title="${ddTitle}">
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.date.restriction" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
-
-	<p>
-		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
-	</p	>
+	<p><fmt:message key="monitor.summary.when.date.restriction.is.set" /></p>
 		
 	<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
-		<input type="text" name="datetime" id="datetime" value=""/>
-				
-		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+		<div class="form-group">
+		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
+		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
+		</label>							
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.set.restriction" />
 		</html:link>
+		</div>
 	</div>
 
 	<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
+		<label><fmt:message key="monitor.summary.after.date" /></span>
 		<span id="dateInfo">
 		</span>
-				
-		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+		</label>
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.unset.restriction" />
 		</html:link>
 	</div>
 
-</div>
\ No newline at end of file
+</lams:RestrictedUsageAccordian>