Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
diff -u -re05eabde125abc5f2847a169592b3b5e6bd60091 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision e05eabde125abc5f2847a169592b3b5e6bd60091)
+++ lams_central/web/css/defaultHTML_learner.css	(.../defaultHTML_learner.css)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -40,6 +40,9 @@
 .voffset10 {
   margin-top: 10px;
 }
+.voffset20 {
+  margin-top: 20px;
+}
 .roffset2 {
   margin-right: 2px;
 }
@@ -61,6 +64,9 @@
 .loffset20 {
   margin-left: 20px;
 }
+.clear-both {
+	clear: both;
+}
 /* Comments/Forum classes */
 .msg .panel-heading {
   padding: 3px;
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -2,8 +2,6 @@
 #language code: en 
 #locale code: AU 
 
-
- 
 #=================== labels for Assessment =================# 
 
 appName  =Assessment Tool
Index: lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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,'replace')}">
+	<c:set var="toolbarSet">${toolbarSet}Replace</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_assessment/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Comments.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,37 +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
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</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
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/Rating.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/TSTable.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -24,8 +24,8 @@
 
 	/**
 	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
 	 * Wiki: 
 	 */
 %>
@@ -54,6 +54,9 @@
 <%--
 	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}">
@@ -73,13 +76,14 @@
 	</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>
+<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_assessment/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -28,25 +28,17 @@
  * 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>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
 
-</div>
-<!-- end tab content -->
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_assessment/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/TabBodyArea.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/TabBodys.tag	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -23,47 +23,70 @@
 
 /**
  * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
  */
 
-		%>
-<%@ 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"%>
+<%@ 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>
 
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
 
-<!-- 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>
+ 	<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_assessment/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_assessment/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r3a3e8d8da9a68a70d1e8c9d718346960d5d115a1 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -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,16 +408,32 @@
        <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>
+       <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>
@@ -438,11 +454,23 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>  
+   	</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>
@@ -485,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_assessment/web/common/header.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/common/header.jsp	(.../header.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/common/header.jsp	(.../header.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -9,6 +9,7 @@
 
  <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentcommon.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>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentcommon.js'/>"></script>
Index: lams_tool_assessment/web/common/messages.jsp
===================================================================
diff -u -r3900618a37feede0762b63edea137223d4f19721 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/common/messages.jsp	(.../messages.jsp)	(revision 3900618a37feede0762b63edea137223d4f19721)
+++ lams_tool_assessment/web/common/messages.jsp	(.../messages.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,17 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-	<lams:Alert id="error" close="false" type="danger">
+	 <lams:Alert id="errorMessages" type="danger" close="false">
 		<html:messages id="error">
-			<c:out value="${error}" escapeXml="false" />
+			<c:out value="${error}" escapeXml="false"/><br/>
 		</html:messages>
 	</lams:Alert>
-</logic:messagesPresent>
-
-<%-- Success Messages --%>
-<logic:messagesPresent message="true">
-	<lams:Alert id="message" close="false" type="info">
-		<html:messages id="message" message="true">
-			<c:out value="${message}" escapeXml="false" />
-		</html:messages>
-	</lams:Alert>
 </logic:messagesPresent>
\ No newline at end of file
Index: lams_tool_assessment/web/common/tabbedheader.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_assessment/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -3,14 +3,15 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
- 	<!-- ********************  CSS ********************** -->
-	<link href="<html:rewrite page='/includes/css/assessment.css'/>" rel="stylesheet" type="text/css">
-	<lams:css style="main"/>
+ <!-- ********************  CSS ********************** -->
+<lams:css/>
+<link href="<html:rewrite page='/includes/css/assessment.css'/>" rel="stylesheet" type="text/css">
 
+<!-- ********************  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/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentcommon.js'/>"></script> 
 
- 	<!-- ********************  javascript ********************** -->
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentcommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
-
 	
Index: lams_tool_assessment/web/includes/css/addQuestion.css
===================================================================
diff -u -r724afbcc75966e8132c8793ccbd17121491e2cc2 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/includes/css/addQuestion.css	(.../addQuestion.css)	(revision 724afbcc75966e8132c8793ccbd17121491e2cc2)
+++ lams_tool_assessment/web/includes/css/addQuestion.css	(.../addQuestion.css)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,36 +1,35 @@
+div.error {
+	display:none;
+}
 label.error { 
-	color: red; font-weight: bold; font-style: italic; margin-left: 0px;
+	color: red; 
+	font-weight: bold; 
+	margin-left: 0px;
 	display: inline-block;
 }
 em { 
-	font-weight: bold; padding-right: 1em; vertical-align: top; 
+	font-weight: bold; 
+	padding-right: 1em; 
+	vertical-align: top; 
 }
 #content {
-	width: 91%; margin-bottom: 10px;
+	width: 91%; 
+	margin-bottom: 10px;
 }
 table.alternative-color td {
 	padding-left: 0;
 }
-input[type=text].shortInputText {
+.short-input-text {
 	width:10%;
 }
-input[type=text] {
-	width:98%;
-}
-textarea {
-	width:98%;
-}
 
-.word-limit-label {
-	margin-right: 7px;
-}
-
 #max-words-limit-checkbox, #min-words-limit-checkbox {
 	vertical-align: sub;
 }
 
 .fake-validation-input {
 	visibility: hidden;
-	height: 0px;
-	padding: 0 !important;
+	height: 0;
+	width: 0;
+	float: right !important;
 }
\ No newline at end of file
Index: lams_tool_assessment/web/includes/css/assessment.css
===================================================================
diff -u -rdbc7ce0bc9f424c489eea4f884879f052dd867f2 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision dbc7ce0bc9f424c489eea4f884879f052dd867f2)
+++ lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,17 +1,3 @@
-.field-name input[type=checkbox] {
-	vertical-align: bottom;
-	margin-right: 4px;
-	border: none;
-}
-
-.field-name a {
-	color: #0087e5;
-}
-
-.field-name img {
-	margin-left: -4px;
-}
-
 #overall-feedback {
 	margin-left: 23px; 
 	margin-top: 10px;
@@ -64,7 +50,7 @@
 	width:100%;
 }
 
-div.error, div.message {
+div.message {
     background-color: #FFE4C4;
     border: 1px solid #000;
     color: #000000;
@@ -76,11 +62,6 @@
     vertical-align: bottom;
 }
 
-/* use a different color for the errors */
-div.error {
-	border: 2px solid red;
-}
-
 img.validationWarning, div.errors img.icon, div.messages img.icon {
     border: 0;
     width: 14px;
@@ -153,7 +134,7 @@
 	color: red;
 }
 
-#warning-answers-required, #warning-words-limit, #warning-mark-hedging-wrong-total, .hidden {
+#warning-answers-required, #warning-words-limit, #warning-mark-hedging-wrong-total, .initially-hidden {
 	display: none;
 }
 
@@ -167,3 +148,12 @@
 .button-disabled {
 	opacity:.2;
 }
+
+table.table-row-spacing {
+	width:100%; 
+	border-spacing: 4px; 
+	border-collapse: separate;
+}
+.comments {
+	font-size: small; font-style: italic; margin-top: -8px;
+}
Index: lams_tool_assessment/web/includes/javascript/assessmentcommon.js
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/includes/javascript/assessmentcommon.js	(.../assessmentcommon.js)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/includes/javascript/assessmentcommon.js	(.../assessmentcommon.js)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,21 +1,9 @@
-function showBusy(targetDiv){
-	if($(targetDiv+"_Busy") != null){
-		Element.show(targetDiv+"_Busy");
-	}
-}
-
-function hideBusy(targetDiv){
-	if($(targetDiv+"_Busy") != null){
-		Element.hide(targetDiv+"_Busy");
-	}				
-}
-
 // toggles whether to display advanced options
 function toggleVisibility(divId) {
 	var divToHide = $("#" + divId);
 	
 	//change img's src
-	var img = $(divToHide).prev().children().first();
+	var img = $(divToHide).parent().children().first();
 	var oldSrc = img.attr("src");
 	var newSrc = (oldSrc.indexOf("/images/tree_closed.gif") > -1) ? 
 			oldSrc.replace("/images/tree_closed.gif", "/images/tree_open.gif") : 
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r71da0e76045dd5ab9dd29b50944ced6395554359 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 71da0e76045dd5ab9dd29b50944ced6395554359)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -37,26 +37,25 @@
 		<c:if test="${formBean.assessment.passingMark > 0}">$("#attemptsAllowed").prop("disabled", true);</c:if>
 		<c:if test="${formBean.assessment.useSelectLeaderToolOuput}">$("#display-summary").prop("disabled", true);</c:if>
 	});
-
 </script>
 
 <!-- Advance Tab Content -->
-<p>
-	<html:checkbox property="assessment.useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput" styleClass="noBorder"/>
+<div class="checkbox">
 	<label for="useSelectLeaderToolOuput">
+		<html:checkbox property="assessment.useSelectLeaderToolOuput" value="1" styleId="useSelectLeaderToolOuput"/>
 		<fmt:message key="label.use.select.leader.tool.output" />
 	</label>
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:text property="assessment.timeLimit" size="3" styleId="timeLimit"></html:text>
+<div class="form-inline form-group">
+	<html:text property="assessment.timeLimit" size="3" styleId="timeLimit" styleClass="form-control input-sm"/>
 	<label for="timeLimit">
-		<fmt:message key="label.authoring.advance.time.limit" />
+		&nbsp;<fmt:message key="label.authoring.advance.time.limit" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:select property="assessment.questionsPerPage">
+<div class="form-inline form-group">
+	<html:select property="assessment.questionsPerPage" styleClass="form-control input-sm">
 		<html:option value="0"><fmt:message key="label.authoring.advance.all.in.one.page" /></html:option>
 		<html:option value="10">10</html:option>
 		<html:option value="9">9</html:option>
@@ -69,146 +68,153 @@
 		<html:option value="2">2</html:option>
 		<html:option value="1">1</html:option>
 	</html:select>
-	<fmt:message key="label.authoring.advance.questions.per.page" />
-</p>
+	<label for="assessment.questionsPerPage">
+		&nbsp;<fmt:message key="label.authoring.advance.questions.per.page" />
+	</label>
+</div>
 
-<p>
-	<html:checkbox property="assessment.shuffled" styleClass="noBorder" styleId="shuffled"/>
+<div class="checkbox">
 	<label for="shuffled">
+		<html:checkbox property="assessment.shuffled" styleId="shuffled"/>
 		<fmt:message key="label.authoring.advance.shuffle.questions" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="assessment.numbered" styleClass="noBorder" styleId="questions-numbering"/>
+<div class="checkbox">
 	<label for="questions-numbering">
+		<html:checkbox property="assessment.numbered" styleId="questions-numbering"/>
 		<fmt:message key="label.authoring.advance.numbered.questions" />
 	</label>
-</p>
+</div>
 
-<p>
-	<label>
-		<fmt:message key="label.authoring.advance.choose.restriction" />
-	</label>
-	<br><br>
+<fmt:message key="label.authoring.advance.choose.restriction" />
 	
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	<input type="radio" name="isAttemptsChosen" value="${true}" id="attemptsAllowedRadio"
-		<c:if test="${formBean.assessment.passingMark == 0}">checked="checked"</c:if> 
-	/>
-	<fmt:message key="label.authoring.advance.attempts.allowed" />
-	<html:select property="assessment.attemptsAllowed" styleId="attemptsAllowed" >
-		<html:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></html:option>
-		<html:option value="6">6</html:option>
-		<html:option value="5">5</html:option>
-		<html:option value="4">4</html:option>
-		<html:option value="3">3</html:option>
-		<html:option value="2">2</html:option>
-		<html:option value="1">1</html:option>
-	</html:select>
-	<br><br>
+<div class="loffset20">
+	<div class="radio form-inline">
+		<label for="attemptsAllowedRadio">
+			<input type="radio" name="isAttemptsChosen" value="${true}" id="attemptsAllowedRadio"
+					<c:if test="${formBean.assessment.passingMark == 0}">checked="checked"</c:if> />
+					
+			<fmt:message key="label.authoring.advance.attempts.allowed" />&nbsp;
+			
+			<html:select property="assessment.attemptsAllowed" styleId="attemptsAllowed" styleClass="form-control input-sm">
+				<html:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></html:option>
+				<html:option value="6">6</html:option>
+				<html:option value="5">5</html:option>
+				<html:option value="4">4</html:option>
+				<html:option value="3">3</html:option>
+				<html:option value="2">2</html:option>
+				<html:option value="1">1</html:option>
+			</html:select>
+		</label>
+	</div>
+
+	<div class="radio form-inline">
+		<label for="passingMarkRadio">
+			<input type="radio" name="isAttemptsChosen" value="${false}" id="passingMarkRadio"	
+					<c:if test="${formBean.assessment.passingMark > 0}">checked="checked"</c:if> />
+					
+			<fmt:message key="label.authoring.advance.passing.mark" />&nbsp;
+			
+			<html:select property="assessment.passingMark" styleId="passingMark" styleClass="form-control input-sm"/>
+		</label>
+	</div>
 	
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	<input type="radio" name="isAttemptsChosen" value="${false}" id="passingMarkRadio"	
-		<c:if test="${formBean.assessment.passingMark > 0}">checked="checked"</c:if> 
-	/>
-	<fmt:message key="label.authoring.advance.passing.mark" />
-	<html:select property="assessment.passingMark" styleId="passingMark" >
-	</html:select>
-	
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:checkbox property="assessment.displaySummary" styleClass="noBorder" styleId="display-summary"/>
+<div class="checkbox">
 	<label for="display-summary">
+		<html:checkbox property="assessment.displaySummary" styleId="display-summary"/>
 		<fmt:message key="label.authoring.advance.display.summary" />
 	</label>
-	
-	<div id="display-summary-area" style="padding-left: 50px; <c:if test="${!formBean.assessment.displaySummary}">display:none;</c:if>">
-	
-		<html:checkbox property="assessment.allowQuestionFeedback" styleClass="noBorder" styleId="allowQuestionFeedback"/>
+</div>
+
+<div id="display-summary-area" class="loffset20" 
+		<c:if test="${!formBean.assessment.displaySummary}">style="display:none;"</c:if>>
+
+	<div class="checkbox">
 		<label for="allowQuestionFeedback">
+			<html:checkbox property="assessment.allowQuestionFeedback" styleId="allowQuestionFeedback"/>
 			<fmt:message key="label.authoring.advance.allow.students.question.feedback" />
 		</label>
-		<br><br>
-		
-		<html:checkbox property="assessment.allowRightAnswersAfterQuestion" styleClass="noBorder" styleId="allowRightAnswersAfterQuestion"/>
+	</div>
+
+	<div class="checkbox">
 		<label for="allowRightAnswersAfterQuestion">
+			<html:checkbox property="assessment.allowRightAnswersAfterQuestion" styleId="allowRightAnswersAfterQuestion"/>
 			<fmt:message key="label.authoring.advance.allow.students.right.answers" />
 		</label>
-		<br><br>
-	
-		<html:checkbox property="assessment.allowWrongAnswersAfterQuestion" styleClass="noBorder" styleId="allowWrongAnswersAfterQuestion"/>
+	</div>
+
+	<div class="checkbox">
 		<label for="allowWrongAnswersAfterQuestion">
+			<html:checkbox property="assessment.allowWrongAnswersAfterQuestion" styleId="allowWrongAnswersAfterQuestion"/>
 			<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
 		</label>
-		<br><br>
-		
-		<html:checkbox property="assessment.allowHistoryResponses" styleClass="noBorder" styleId="allowHistoryResponsesAfterAttempt"/>
+	</div>
+
+	<div class="checkbox">
 		<label for="allowHistoryResponsesAfterAttempt">
+			<html:checkbox property="assessment.allowHistoryResponses" styleId="allowHistoryResponsesAfterAttempt"/>
 			<fmt:message key="label.authoring.advance.allow.students.history.responses" />
 		</label>
-	
 	</div>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="assessment.allowOverallFeedbackAfterQuestion" styleClass="noBorder" styleId="allowOverallFeedbackAfterQuestion"/>
+<div class="checkbox">
 	<label for="allowOverallFeedbackAfterQuestion">
+		<html:checkbox property="assessment.allowOverallFeedbackAfterQuestion" styleId="allowOverallFeedbackAfterQuestion"/>
 		<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="assessment.allowGradesAfterAttempt" styleClass="noBorder" styleId="allowGradesAfterAttempt"/>
+<div class="checkbox">
 	<label for="allowGradesAfterAttempt">
+		<html:checkbox property="assessment.allowGradesAfterAttempt" styleId="allowGradesAfterAttempt"/>
 		<fmt:message key="label.authoring.advance.allow.students.grades" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="assessment.notifyTeachersOnAttemptCompletion" styleClass="noBorder" styleId="notifyTeachersOnAttemptCompletion"/>
+<div class="checkbox">
 	<label for="notifyTeachersOnAttemptCompletion">
+		<html:checkbox property="assessment.notifyTeachersOnAttemptCompletion" styleId="notifyTeachersOnAttemptCompletion"/>
 		<fmt:message key="label.authoring.advanced.notify.on.attempt.completion" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="assessment.reflectOnActivity" styleClass="noBorder" styleId="reflectOnActivity"/>
+<div class="checkbox">
 	<label for="reflectOnActivity">
+		<html:checkbox property="assessment.reflectOnActivity" styleId="reflectOnActivity"/>
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:textarea property="assessment.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
-</p>
+<div class="form-group">
+	<html:textarea property="assessment.reflectInstructions" rows="3" styleId="reflectInstructions" styleClass="form-control"/>
+</div>
 
 <!-- Overall feedback -->
 <input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
+<%@ include file="/pages/authoring/parts/questionlist.jsp"%>
 <p>
-	<iframe 
-		id="advancedInputArea" name="advancedInputArea"
-		style="width:650px;height:100%;border:0px;display:block;" frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${formBean.sessionMapID}">
+	<iframe id="advancedInputArea" name="advancedInputArea" style="width:650px;height:100%;border:0px;display:block;" 
+			frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${formBean.sessionMapID}">
 	</iframe>
 </p>
 
 <script type="text/javascript">
-	<!--
 	//automatically turn on refect option if there are text input in refect instruction area
-		var ra = document.getElementById("reflectInstructions");
-		var rao = document.getElementById("reflectOnActivity");
-		function turnOnRefect(){
-			if(isEmpty(ra.value)){
+	var ra = document.getElementById("reflectInstructions");
+	var rao = document.getElementById("reflectOnActivity");
+	function turnOnRefect(){
+		if(isEmpty(ra.value)){
 			//turn off	
-				rao.checked = false;
-			}else{
+			rao.checked = false;
+		}else{
 			//turn on
-				rao.checked = true;		
-			}
+			rao.checked = true;		
 		}
+	}
 	
-		ra.onkeyup=turnOnRefect;
-	//-->
+	ra.onkeyup=turnOnRefect;
 </script>
-
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.assessment.AssessmentConstants"%>
 
@@ -9,11 +8,9 @@
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 	 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
-	
 	<script>
-        function init(){
+        function init() {
             var tag = document.getElementById("currentTab");
 	    	if(tag.value != "")
 	    		selectTab(tag.value);
@@ -39,57 +36,48 @@
     </script>
 </lams:head>
 <body class="stripes" onLoad="init()">
-<div id="page">
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
-<div id="header">
-		<lams:Tabs useKey="true" control="true">
-			<lams:Tab id="1" key="label.authoring.heading.basic" />
-			<lams:Tab id="2" key="label.authoring.heading.advance" />
-		</lams:Tabs>
-</div>
-	<!-- start tabs -->
-<div id="content">
-	<!-- end tab buttons -->
-		
-	<%@ include file="/common/messages.jsp"%>
-
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data" onsubmit="return serializeOverallFeedbackForm();">
+	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data"
+			onsubmit="return serializeOverallFeedbackForm();">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="assessment.contentId" />
-		<html:hidden property="mode" value="${mode}"/>
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-
-		<lams:help toolSignature="<%= AssessmentConstants.TOOL_SIGNATURE %>" module="authoring"/>
-
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
-
-			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-			<!-- end of content (Advanced) -->
-
-			<!-- Button Row -->
-			<%--  Default value 
-				cancelButtonLabelKey="label.authoring.cancel.button"
-				saveButtonLabelKey="label.authoring.save.button"
-				cancelConfirmMsgKey="authoring.msg.cancel.save"
-				accessMode="author"
-			--%>
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>" 
-				toolContentID="${formBean.assessment.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
-				customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}" />
+	
+		<c:set var="title"><fmt:message key="label.author.title" /></c:set>
+		<lams:Page title="${title}" type="navbar">
+		
+			<html:hidden property="assessment.contentId" />
+			<html:hidden property="mode" value="${mode}"/>
+			<html:hidden property="sessionMapID" />
+			<html:hidden property="contentFolderID" />
+			<html:hidden property="currentTab" styleId="currentTab" />
+	
+			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= AssessmentConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+				<lams:Tab id="1" key="label.authoring.heading.basic" />
+				<lams:Tab id="2" key="label.authoring.heading.advance" />
+			</lams:Tabs>	
+		
+		 	<lams:TabBodyArea>
+		 		<%@ include file="/common/messages.jsp"%>
+		 		
+				<!--  Set up tabs  -->
+		 		<lams:TabBodys>
+   					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+ 					<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+  				</lams:TabBodys>
+		
+				<!-- Button Row -->
+				<div id="saveCancelButtons">
+					<lams:AuthoringButton formID="authoringForm"
+						clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
+						toolContentID="${formBean.assessment.contentId}"
+						accessMode="author"
+						contentFolderID="${formBean.contentFolderID}" />
+				</div>
+			</lams:TabBodyArea>
+	
+			<div id="footer"></div>
+	
+		<!-- end page div -->
+		</lams:Page>
+	
 	</html:form>
-
-</div>
-
-<div id="footer"></div>
-<!-- end page div -->
-</div>
-
 </body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rdb599324881fb550c8645c904483d48ffe9f237d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision db599324881fb550c8645c904483d48ffe9f237d)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -176,36 +176,30 @@
 </script>
 
 <!-- Basic Tab Content -->
-<table>
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.title"></fmt:message>
-			</div>
-			<html:text property="assessment.title" style="width: 99%;"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
-			</div>
-			<lams:CKEditor id="assessment.instructions" value="${formBean.assessment.instructions}"
-				contentFolderID="${formBean.contentFolderID}">
-			</lams:CKEditor>
-		</td>
-	</tr>
+<div class="form-group">
+    <label for="assessment.title">
+    	<fmt:message key="label.authoring.basic.title"/>
+    </label>
+    <html:text property="assessment.title" styleClass="form-control"/>
+</div>
 
-</table>
+<div class="form-group">
+    <label for="assessment.instructions">
+    	<fmt:message key="label.authoring.basic.instruction"/>
+    </label>
+	<lams:CKEditor id="assessment.instructions" value="${formBean.assessment.instructions}"
+			contentFolderID="${formBean.contentFolderID}" height="400">
+	</lams:CKEditor>
+</div>
 
 <div id="questionListArea">
 	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 	<%@ include file="/pages/authoring/parts/questionlist.jsp"%>
 </div>
 
 <!-- Dropdown menu for choosing a question type -->
-<p>
-	<select id="questionType" style="float: left">
+<div class="form-inline form-group">
+	<select id="questionType" class="form-control input-sm">
 		<option selected="selected"><fmt:message key="label.authoring.basic.type.multiple.choice" /></option>
 		<option><fmt:message key="label.authoring.basic.type.matching.pairs" /></option>
 		<option><fmt:message key="label.authoring.basic.type.short.answer" /></option>
@@ -216,30 +210,31 @@
 		<option><fmt:message key="label.authoring.basic.type.mark.hedging" /></option>
 	</select>
 	
-	<a onclick="createNewQuestionInitHref();return false;" href="" class="button-add-item space-left thickbox" id="newQuestionInitHref">  
+	<a onclick="createNewQuestionInitHref();return false;" href="" class="btn btn-default btn-sm button-add-item thickbox" id="newQuestionInitHref">  
 		<fmt:message key="label.authoring.basic.add.question.to.pool" />
 	</a>
 	
 	<c:set var="importInitUrl" >
 		<c:url value='/authoring/importInit.do'/>?sessionMapID=${sessionMapID}&KeepThis=true&TB_iframe=true&height=240&width=650
 	</c:set>
-	<a href="${importInitUrl}" class="button space-right thickbox" id="importButton" style="float: right;">  
+	<a href="${importInitUrl}" class="btn btn-default btn-xs pull-right loffset5 thickbox" id="importButton">  
 		<fmt:message key="label.authoring.basic.import.questions" />
 	</a>
 	
-	<a onclick="javascript:exportQuestions();" class="button space-right" id="exportButton" style="float: right;">  
+	<a onclick="javascript:exportQuestions();" class="btn btn-default btn-xs pull-right" id="exportButton">  
 		<fmt:message key="label.authoring.basic.export.questions" />
 	</a>
 	
-	<a href="#" onClick="javascript:exportQTI()" style="float: right; margin-right: 50px">
-		<fmt:message key="label.authoring.basic.export.qti" />
-	</a>
-	
-	<a href="#" onClick="javascript:importQTI()" style="float: right; margin-right: 30px">
+	<br>
+	<a href="#nogo" onClick="javascript:importQTI()" class="btn btn-default btn-xs pull-right loffset5">
 		<fmt:message key="label.authoring.basic.import.qti" /> 
 	</a>
-</p>
-<br>
+	<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default btn-xs pull-right">
+		<fmt:message key="label.authoring.basic.export.qti" />
+	</a>
 
+</div>
+<br><br>
+
 <!-- For exporting QTI packages -->
 <iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
Index: lams_tool_assessment/web/pages/authoring/importQuestions.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_assessment/web/pages/authoring/importQuestions.jsp	(.../importQuestions.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -3,72 +3,72 @@
 
 <!DOCTYPE html>
 <lams:html>
-	<lams:head>
-		<title><fmt:message key="authoring.title.import" /></title>
-		<!-- ********************  CSS ********************** -->
-		<lams: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 type="text/javascript">
-			function closeWin(){
-				window.close();
-			}
+<lams:head>
+	<title><fmt:message key="authoring.title.import" /></title>
+	<%@ include file="/common/header.jsp"%>
+
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+	<script type="text/javascript">
+		function closeWin() {
+			window.close();
+		}
 			
-			function verifyAndSubmit() {
-				if (document.getElementById("UPLOAD_FILE").value.length == 0)	{
-					var msg = "<fmt:message key="button.select.importfile"/>";
-					alert(msg);
-					return (false);
-				} else {
-	    	    	var options = { 
-		    	    	target:  parent.jQuery('#questionListArea'), 
-		    		   	success: afterRatingSubmit  // post-submit callback
-		    		}; 				
+		function verifyAndSubmit() {
+			if (document.getElementById("UPLOAD_FILE").value.length == 0) {
+				var msg = "<fmt:message key="button.select.importfile"/>";
+				alert(msg);
+				return (false);
+			} else {
+    	    	var options = { 
+	    	    	target:  parent.jQuery('#questionListArea'), 
+	    		   	success: afterRatingSubmit  // post-submit callback
+	    		}; 				
 		    		    				
-		    		$('#importForm').ajaxSubmit(options);
-				}
+	    		$('#importForm').ajaxSubmit(options);
 			}
-			// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox();
-    			self.parent.tb_remove();
-    		}  
+		}
+		// post-submit callback 
+   		function afterRatingSubmit(responseText, statusText) { 
+   			self.parent.refreshThickbox();
+   			self.parent.tb_remove();
+   		}  
 			
-		</script>
-	</lams:head>
+	</script>
+</lams:head>
 
-	<body class="stripes">
-			<div id="content">
-			<h1>
-				<fmt:message key="authoring.title.import" />
-			</h1>
+<body class="stripes">
 
-				<h2>
-					<fmt:message key="title.import.instruction" />
-				</h2>
-				<p>
-					&nbsp;
-				</p>
-				<p>
-					<fmt:message key="msg.import.file.format"/>
-				</p>
-				<form action="<c:url value="/authoring/importQuestions.do"/>?sessionMapID=${sessionMapID}" method="post" enctype="multipart/form-data" id="importForm">
-					<p>
-						<fmt:message key="label.import.file" />
-						<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
-						<a href="javascript:;" class="button" onclick="verifyAndSubmit();"><span class="import"><fmt:message key="button.import" /></span></a>
-					</p>
-				</form>
-
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title">
+				<fmt:message key="authoring.title.import" />
 			</div>
-			<!--closes content-->
+		</div>
+			
+		<div class="panel-body">
+				
+			<p>
+				<fmt:message key="msg.import.file.format"/>
+			</p>
+				
+			<form action="<c:url value="/authoring/importQuestions.do"/>?sessionMapID=${sessionMapID}" method="post" enctype="multipart/form-data" id="importForm">	
+				<div class="form-group">
+				    <label for="UPLOAD_FILE">
+				    	<fmt:message key="label.import.file" />
+				    </label>
+					<input type="file" name="UPLOAD_FILE" id="UPLOAD_FILE"/>
+				</div>
+						
+				<a href="#nogo" class="btn btn-primary pull-right" onclick="javascript:verifyAndSubmit();">
+					<fmt:message key="button.import" />
+				</a>
+			</form>
 
+		</div>
+		<!--closes content-->
 
-			<div id="footer">
-			</div>
-			<!--closes footer-->
-
-
+		<div id="footer">
+		</div>
+		<!--closes footer-->
 	</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,20 +1,16 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+
 <lams:html>
-	<lams:head>
-		<link href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" rel="stylesheet" type="text/css" >
-		<%@ include file="/common/header.jsp"%>
-		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script>
-	    
+<lams:head>
+	<link href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" rel="stylesheet" type="text/css">
+	<%@ include file="/common/header.jsp"%>
+	<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
+
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+    <script>
 			$(document).ready(function(){
 		    	$("#assessmentQuestionForm").validate({
 		    		rules: {
@@ -45,6 +41,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
@@ -103,112 +100,116 @@
     		function afterRatingSubmit(responseText, statusText)  { 
     			self.parent.refreshThickbox();
     			self.parent.tb_remove();
-    		}    
-  		</script>
+    		}
+  	</script>
 		
-	</lams:head>
+</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.essay" />
+		</div>
+			
+		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
-		    </div>			
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
+		    </div>
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<html:hidden property="sessionMapID" />
 				<html:hidden property="questionType" value="6"/>
 				<html:hidden property="questionIndex" />
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.type.essay" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title" />
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText"/>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="allowRichEditor" styleId="allow-rich-editor"/>
+				<div class="checkbox">
 					<label for="allow-rich-editor">
+						<html:checkbox property="allowRichEditor" styleId="allow-rich-editor"/>
 						<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top" >
-					<input type="checkbox" id="max-words-limit-checkbox" name="noname"
-						<c:if test="${formBean.maxWordsLimit != 0}">checked="checked"</c:if>
-					/>
-					<label for="max-words-limit-checkbox" class="word-limit-label">
-						<fmt:message key="label.maximum.number.words" />
-					</label>
-					<html:text property="maxWordsLimit" styleId="max-words-limit"/>
+				<div class="checkbox">
+				    <label for="max-words-limit-checkbox">
+						<input type="checkbox" id="max-words-limit-checkbox" name="noname"
+								<c:if test="${formBean.maxWordsLimit != 0}">checked="checked"</c:if>/>
+				    	<fmt:message key="label.maximum.number.words" />
+				    </label>
+				    <html:text property="maxWordsLimit" styleId="max-words-limit"/>
 				</div>
 				
-				<div class="field-name space-top" >
-					<input type="checkbox" id="min-words-limit-checkbox" name="noname"
-						<c:if test="${formBean.minWordsLimit != 0}">checked="checked"</c:if>
-					/>
-					<label for="min-words-limit-checkbox" class="word-limit-label">
-						<fmt:message key="label.minimum.number.words" />
-					</label>
-					<html:text property="minWordsLimit" styleId="min-words-limit"/>
+				<div class="checkbox">
+				    <label for="min-words-limit-checkbox">
+						<input type="checkbox" id="min-words-limit-checkbox" name="noname"
+								<c:if test="${formBean.minWordsLimit != 0}">checked="checked"</c:if>/>
+				    	<fmt:message key="label.minimum.number.words" />
+				    </label>
+				    <html:text property="minWordsLimit" styleId="min-words-limit"/>
 				</div>
 					
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden form-group">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}" />
+					</div>
 				</div>
-				
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}">
-					</lams:CKEditor>
-				</div>
 
 			</html:form>
-
-			<br><br>
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.essay.add.essay" /> 
+			
+			<div class="voffset10 pull-right">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.essay.add.essay" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,27 +1,24 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="8"	scope="request" />
+
 <lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="8"	scope="request" />
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+	<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
 
-		<script type="text/javascript">
-			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-		</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script>
-			$(document).ready(function(){
+	<script type="text/javascript">
+		var questionType = ${questionType};
+		var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
+	   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
+   	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
+   	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+    <script>
+		$(document).ready(function(){
 				
 		    	$("#assessmentQuestionForm").validate({
 		    		rules: {
@@ -61,6 +58,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -86,17 +84,22 @@
     			self.parent.refreshThickbox()
     			self.parent.tb_remove();
     		}    
-  		</script>
+ 	</script>
 		
-	</lams:head>
-	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+</lams:head>
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.multiple.choice" />
+		</div>
+			
+		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
-		    </div>			
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
+		    </div>		
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
@@ -108,125 +111,126 @@
 				<html:hidden property="feedbackOnCorrect" styleId="feedbackOnCorrect"/>
 				<html:hidden property="feedbackOnPartiallyCorrect" styleId="feedbackOnPartiallyCorrect"/>
 				<html:hidden property="feedbackOnIncorrect" styleId="feedbackOnIncorrect"/>
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.type.multiple.choice" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title" />
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}" >
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText" />
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}"> 
-					</lams:CKEditor>
-				</div>
 	
-				<div class="field-name space-top" >
-					<html:checkbox property="shuffle" styleId="shuffle"/>
+				<div class="checkbox">
 					<label for="shuffle">
+						<html:checkbox property="shuffle" styleId="shuffle"/>
 						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="hedgingJustificationEnabled" styleId="ask-for-justification"/>
-					<label for="ask-for-justification">
+				<div class="checkbox">
+					<label for="hedging-justification">
+						<html:checkbox property="hedgingJustificationEnabled" styleId="hedging-justification"/>
 						<fmt:message key="label.ask.for.hedging.justification" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<h5 class="voffset20">
 					<fmt:message key="label.authoring.basic.answer.options" />
-				</div>
+				</h5>
 				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
-			<form id="optionForm" name="optionForm">
+			<form id="optionForm" name="optionForm" class="form-group">
 				<%@ include file="optionlist.jsp"%>
-				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
+				
+				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
 					<fmt:message key="label.authoring.choice.add.option" /> 
 				</a>
 			</form>
 			
 			<!-- Overall feedback -->
-			<div class="field-name " style="margin-top: 60px;">
+			<div class="form-group">
 				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
 
 				<a href="javascript:toggleVisibility('overall-feedback');" >
 					<fmt:message key="label.authoring.choice.overall.feedback" />
 				</a>
-			</div>
-			<div id="overall-feedback" class="hidden">
-				<div class="field-name" >
-					<fmt:message key="label.authoring.choice.feedback.on.correct" />
-				</div>
-				<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
+				<div id="overall-feedback" class="initially-hidden">
+					<div class="form-group">
+						<label for="feedbackOnCorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.correct" />
+						</label>
+						<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<label for="feedbackOnPartiallyCorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
+						</label>
+						<lams:CKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${formBean.feedbackOnPartiallyCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<label for="feedbackOnIncorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
+						</label>
+						<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<lams:CKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${formBean.feedbackOnPartiallyCorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
-				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
-				</div>
-				<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 			</div>
-			<br><br>
-			
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.choice.add.multiple.choice" /> 
+
+			<div class="voffset10 pull-right">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.choice.add.multiple.choice" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,27 +1,24 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="2"	scope="request" />
+
 <lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="2"	scope="request" />
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+	<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
 
-		<script type="text/javascript">
-			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-		</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script>
-			$(document).ready(function(){
+	<script type="text/javascript">
+		var questionType = ${questionType};
+		var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
+	   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
+   	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
+   	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+    <script>
+		$(document).ready(function(){
 				
 		    	$("#assessmentQuestionForm").validate({
 		    		rules: {
@@ -67,6 +64,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
 		    			$("#optionList").val($("#optionForm").serialize(true));
 		    			$("#question").val(CKEDITOR.instances.question.getData());
@@ -80,23 +78,30 @@
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
 		  		});
-			});
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
-  		</script>
+		});
+   		// post-submit callback 
+   		function afterRatingSubmit(responseText, statusText)  { 
+   			self.parent.refreshThickbox()
+   			self.parent.tb_remove();
+   		}    
+	</script>
 		
-	</lams:head>
+</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.matching.pairs" />
+		</div>
+			
+		<div class="panel-body">
+		
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
-		    </div>			
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
+		    </div>		
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
@@ -109,94 +114,96 @@
 				<html:hidden property="feedbackOnPartiallyCorrect" />
 				<html:hidden property="feedbackOnIncorrect" />
 				<html:hidden property="questionIndex" />
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.type.matching.pairs" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title"/>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText" />
-					
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.penalty.factor" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="penaltyFactor" styleClass="shortInputText" />
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>	
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}">
-					</lams:CKEditor>
-				</div>			
 	
-				<div class="field-name space-top" >
-					<html:checkbox property="shuffle" styleId="shuffle"/>
+				<div class="checkbox">
 					<label for="shuffle">
+						<html:checkbox property="shuffle" styleId="shuffle"/>
 						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
 					</label>
 				</div>
 				
-				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
-				<div class="field-name space-top">
+				<h5 class="voffset20">
 					<fmt:message key="label.authoring.matching.pairs.matching.pairs" />
-				</div>				
+				</h5>
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				<label for="hasOptionFilled" class="error" style="display: none;"></label>
 			</html:form>
 			
 			<!-- Options -->
 			<form id="optionForm" name="optionForm">
 				<%@ include file="optionlist.jsp"%>
-				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
+				
+				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
 					<fmt:message key="label.authoring.matching.pairs.add.matching.pair" /> 
 				</a>
 			</form>
-			
-			<br><br><br>
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.matching.pairs.add.matching.pairs" /> 
+
+			<div class="voffset10 pull-right clear-both">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.matching.pairs.add.matching.pairs" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,27 +1,24 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="1"	scope="request" />
+
 <lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="1"	scope="request" />
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+	<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
 
-		<script type="text/javascript">
-			var questionType = ${questionType};
-			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
-		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
-    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
-    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
-		</script>
-		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
-  	    <script>
-			$(document).ready(function(){
+	<script type="text/javascript">
+		var questionType = ${questionType};
+		var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
+	   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
+   	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
+   	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
+	</script>
+	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+    <script>
+		$(document).ready(function(){
 				
 		    	$("#assessmentQuestionForm").validate({
 		    		rules: {
@@ -81,6 +78,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -103,23 +101,28 @@
 					$("#incorrect-answer-nullifies-mark-area").toggle(eval($(this).val()));
 				}).trigger("change");
 
-			});
-    		// post-submit callback 
-    		function afterRatingSubmit(responseText, statusText)  { 
-    			self.parent.refreshThickbox()
-    			self.parent.tb_remove();
-    		}    
-  		</script>
-		
-	</lams:head>
-	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+		});
+   		// post-submit callback 
+   		function afterRatingSubmit(responseText, statusText)  { 
+   			self.parent.refreshThickbox()
+   			self.parent.tb_remove();
+   		}    
+	</script>
+</lams:head>
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.multiple.choice" />
+		</div>
+			
+		<div class="panel-body">
+			
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
-		    </div>			
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
+		    </div>
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
@@ -131,140 +134,145 @@
 				<html:hidden property="feedbackOnCorrect" styleId="feedbackOnCorrect"/>
 				<html:hidden property="feedbackOnPartiallyCorrect" styleId="feedbackOnPartiallyCorrect"/>
 				<html:hidden property="feedbackOnIncorrect" styleId="feedbackOnIncorrect"/>
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.type.multiple.choice" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title" />
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}" >
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText" />
-					
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.penalty.factor" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="penaltyFactor" styleClass="shortInputText" />
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"	contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}"> 
-					</lams:CKEditor>
+				
+				<div class="form-inline form-group">
+					<label for="multipleAnswersAllowed">
+						<fmt:message key="label.authoring.choice.one.multiple.answers" />
+					</label>
+					<html:select property="multipleAnswersAllowed" styleId="multipleAnswersAllowed" styleClass="form-control input-sm">
+						<html:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></html:option>
+						<html:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></html:option>
+					</html:select>
 				</div>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.choice.one.multiple.answers" />
-				</div>
-				<html:select property="multipleAnswersAllowed" styleId="multipleAnswersAllowed">
-					<html:option value="false"><fmt:message key="label.authoring.choice.one.answer" /></html:option>
-					<html:option value="true"><fmt:message key="label.authoring.choice.multiple.answers" /></html:option>
-				</html:select>
 				
-				<div class="field-name space-top" id="incorrect-answer-nullifies-mark-area">
-					<html:checkbox property="incorrectAnswerNullifiesMark" styleId="incorrect-answer-nullifies-mark"/>
-					<label for="incorrect-answer-nullifies-mark">
+				<div class="checkbox" id="incorrect-answer-nullifies-mark-area">
+					<label for="incorrectAnswerNullifiesMark">
+						<html:checkbox property="incorrectAnswerNullifiesMark" styleId="incorrectAnswerNullifiesMark"/>
 						<fmt:message key="label.incorrect.answer.nullifies.mark" />
 					</label>
-				</div>				
+				</div>		
 	
-				<div class="field-name space-top" >
-					<html:checkbox property="shuffle" styleId="shuffle"/>
+				<div class="checkbox">
 					<label for="shuffle">
+						<html:checkbox property="shuffle" styleId="shuffle"/>
 						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<h5 class="voffset20">
 					<fmt:message key="label.authoring.basic.answer.options" />
-				</div>
+				</h5>
 				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 			</html:form>
 			
-			<!-- Options -->
-			<form id="optionForm" name="optionForm">
+			<!-- Options -->			
+			<form id="optionForm" name="optionForm" class="form-group">
 				<%@ include file="optionlist.jsp"%>
-				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
+				
+				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
 					<fmt:message key="label.authoring.choice.add.option" /> 
 				</a>
 			</form>
 			
 			<!-- Overall feedback -->
-			<div class="field-name " style="margin-top: 60px;">
+			<div class="form-group">
 				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
 
 				<a href="javascript:toggleVisibility('overall-feedback');" >
 					<fmt:message key="label.authoring.choice.overall.feedback" />
 				</a>
-			</div>
-			<div id="overall-feedback" class="hidden">
-				<div class="field-name" >
-					<fmt:message key="label.authoring.choice.feedback.on.correct" />
-				</div>
-				<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
+				<div id="overall-feedback" class="initially-hidden">
+				<div class="form-group">
+						<label for="feedbackOnCorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.correct" />
+						</label>
+						<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<label for="feedbackOnPartiallyCorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
+						</label>
+						<lams:CKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${formBean.feedbackOnPartiallyCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<label for="feedbackOnIncorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
+						</label>
+						<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<lams:CKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${formBean.feedbackOnPartiallyCorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
-				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
-				</div>
-				<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 			</div>
-			<br><br>
-			
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.choice.add.multiple.choice" /> 
+
+			<div class="voffset10 pull-right">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.choice.add.multiple.choice" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>			
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>		
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="4"	scope="request" />
+		
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="4"	scope="request" />
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
@@ -29,13 +27,16 @@
     		}
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
 			$(document).ready(function(){
-				var optionValidator = $("#optionForm").validate();				
-				var unitValidator = $("#unitForm").validate();
+				var optionValidator = $("#optionForm").validate({
+					errorClass: "alert-danger"
+				});				
+				var unitValidator = $("#unitForm").validate({
+					errorClass: "alert-danger"
+				});
 				
 		    	$("#assessmentQuestionForm").validate({
 		    		rules: {
@@ -131,6 +132,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -156,12 +158,19 @@
 		
 	</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.numerical.question" />
+		</div>
+			
+		<div class="panel-body">
+		
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
 		    </div>
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
@@ -171,60 +180,62 @@
 				<input type="hidden" name="optionList" id="optionList" />
 				<input type="hidden" name="unitList" id="unitList" />
 				<html:hidden property="questionIndex" />
-				<html:hidden property="contentFolderID" styleId="contentFolderID"/>				
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.numerical.question" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<html:hidden property="contentFolderID" styleId="contentFolderID"/>
+
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title"/>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText"/>
-					
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.penalty.factor" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}">
-					</lams:CKEditor>
-				</div>
 				
-				<div class="field-name space-top">
+				<h5 class="voffset20">
 					<fmt:message key="label.authoring.numerical.answers" />
-				</div>
+				</h5>
 				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 				<input type="text" name="allAcceptedErrorsPositive" id="allAcceptedErrorsPositive" class="fake-validation-input">
@@ -233,38 +244,39 @@
 			<!-- Options -->
 			<form id="optionForm" name="optionForm">
 				<%@ include file="optionlist.jsp"%>
-				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
-					<fmt:message key="label.authoring.numerical.add.answer" /> 
+				
+				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+					<fmt:message key="label.authoring.numerical.add.answer" />  
 				</a>
 			</form>
 			
 			<!-- Units -->
-			<div class="field-name" style="margin-top: 50px;">
+			<h5 class="voffset20">
 				<fmt:message key="label.authoring.numerical.units" />
-			</div>			
+			</h5>			
 			<form id="unitForm" name="unitForm">
 				<%@ include file="unitlist.jsp"%>
-				<a href="javascript:;" onclick="addUnit();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
-					<fmt:message key="label.authoring.numerical.add.unit" /> 
+				
+				<a href="#nogo" onclick="javascript:addUnit();" class="btn btn-xs btn-default button-add-item pull-right">
+					<fmt:message key="label.authoring.numerical.add.unit" />  
 				</a>
 			</form>
-			
-			<br><br><br>
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.numerical.add.numerical" /> 
+
+			<div class="voffset10 pull-right clear-both">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.numerical.add.numerical" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>			
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="7"	scope="request" />
+
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="7"	scope="request" />
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
@@ -17,7 +15,6 @@
     	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
@@ -67,6 +64,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -91,15 +89,21 @@
     		}    
   		</script>
 		
-	</lams:head>
-	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+</lams:head>
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.ordering" />
+		</div>
+			
+		<div class="panel-body">
+		
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
-		    </div>			
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
+		    </div>		
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
@@ -110,110 +114,113 @@
 				<html:hidden property="contentFolderID" styleId="contentFolderID"/>
 				<html:hidden property="feedbackOnCorrect" styleId="feedbackOnCorrect"/>
 				<html:hidden property="feedbackOnIncorrect" styleId="feedbackOnIncorrect"/>
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.type.ordering" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title"/>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText"/>
-					
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.penalty.factor" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/> 
+					</div>
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}"> 
-					</lams:CKEditor>
-				</div>
 				
-				<div class="field-name space-top">
+				<h5 class="voffset20">
 					<fmt:message key="label.authoring.basic.answer.options" />
-				</div>
+				</h5>
 				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
-			<form id="optionForm" name="optionForm">
+			<form id="optionForm" name="optionForm" class="form-group">
 				<%@ include file="optionlist.jsp"%>
-				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
-					<fmt:message key="label.authoring.choice.add.option" /> 
+				
+				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+					<fmt:message key="label.authoring.choice.add.option" />  
 				</a>
 			</form>
 						
 			<!-- Overall feedback -->
-			<div class="field-name " style="margin-top: 60px;">
+			<div class="form-group">
 				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
 
 				<a href="javascript:toggleVisibility('overall-feedback');" >
 					<fmt:message key="label.authoring.choice.overall.feedback" />
 				</a>
-			</div>
-			<div id="overall-feedback" class="hidden">
-				<div class="field-name" >
-					<fmt:message key="label.authoring.choice.feedback.on.correct" />
-				</div>
-				<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
+				<div id="overall-feedback" class="initially-hidden">
+					<div class="form-group">
+						<label for="feedbackOnCorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.correct" />
+						</label>
+						<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
+					
+					<div class="form-group">
+						<label for="feedbackOnIncorrectOutsideForm">
+							<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
+						</label>
+						<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 			</div>
-			<br><br>
-			
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.ordering.add.ordering" /> 
+
+			<div class="voffset10 pull-right">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.ordering.add.ordering" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>			
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="3"	scope="request" />
+
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="3"	scope="request" />
 
 		<script type="text/javascript">
 			var questionType = ${questionType};
@@ -17,7 +15,6 @@
     	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
 		</script>
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
@@ -76,6 +73,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();     			    
 		    			$("#optionList").val($("#optionForm").serialize(true));
@@ -98,114 +96,122 @@
     		}    
   		</script>
 		
-	</lams:head>
+</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.basic.type.short.answer" />
+		</div>
+
+		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
-		    </div>			
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
+		    </div>
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<html:hidden property="sessionMapID" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<input type="hidden" name="optionList" id="optionList" />
 				<html:hidden property="questionIndex" />
-				<html:hidden property="contentFolderID" styleId="contentFolderID"/>				
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.basic.type.short.answer" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<html:hidden property="contentFolderID" styleId="contentFolderID"/>
+				
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title"/>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText"/>
-					
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.penalty.factor" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}">
-					</lams:CKEditor>
+				
+				<div class="form-inline form-group">
+					<label for="caseSensitive">
+						<fmt:message key="label.authoring.short.answer.case.sensitivity" />
+					</label>
+					<html:select property="caseSensitive" styleClass="form-control input-sm">
+						<html:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></html:option>
+						<html:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></html:option>
+					</html:select>
 				</div>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.short.answer.case.sensitivity" />
-				</div>
-				<html:select property="caseSensitive">
-					<html:option value="false"><fmt:message key="label.authoring.short.answer.no.case.unimportant" /></html:option>
-					<html:option value="true"><fmt:message key="label.authoring.short.answer.yes.case.must.match" /></html:option>
-				</html:select>
 				
-				<br><br>
-				
-				<div class="field-name space-top">
+				<h5 class="voffset20">
 					<fmt:message key="label.authoring.short.answer.answers" />
-				</div>
+				</h5>
 				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
 				<input type="text" name="hasOneHundredGrade" id="hasOneHundredGrade" class="fake-validation-input">
 			</html:form>
 			
 			<!-- Options -->
 			<form id="optionForm" name="optionForm">
 				<%@ include file="optionlist.jsp"%>
-				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
-					<fmt:message key="label.authoring.short.answer.add.answer" /> 
+				
+				<a href="#nogo" onclick="javascript:addOption();" class="btn btn-xs btn-default button-add-item pull-right">
+					<fmt:message key="label.authoring.short.answer.add.answer" />  
 				</a>
 			</form>
-			
-			<br><br><br>
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.short.answer.add.short.answer" /> 
+
+			<div class="voffset10 pull-right clear-both">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.short.answer.add.short.answer" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>			
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,15 +1,12 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="questionType" value="5"	scope="request" />
+		
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
-		
-		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-		<c:set var="questionType" value="5"	scope="request" />
 
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
   	    <script>
@@ -52,6 +49,7 @@
 		    		      }
 		    		},
 		    		debug: true,
+		    		errorClass: "alert alert-danger",
      			    submitHandler: function(form) {
 		    			$("#question").val(CKEDITOR.instances.question.getData());
 		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
@@ -74,110 +72,121 @@
     		}    
   		</script>
 		
-	</lams:head>
-	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >	
+</lams:head>
+<body onload="parent.resizeIframe();">
+	<div class="panel panel-default add-file">
+		<div class="panel-heading panel-title">
+			<fmt:message key="label.authoring.true.false.question" />
+		</div>
+			
+		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
-		    <div class="error" style="display:none;">
-		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
-		      	<span></span>.<br clear="all"/>
+		    <div class="error">
+		    	<lams:Alert id="errorMessages" type="danger" close="false" >
+					<span></span>
+				</lams:Alert>	
 		    </div>
 			
 			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
 				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<html:hidden property="sessionMapID" />
 				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 				<html:hidden property="questionIndex" />
-	
-				<h2 class="no-space-left">
-					<fmt:message key="label.authoring.true.false.question" />
-				</h2>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.name" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+
+				<div class="form-group">
+				    <label for="title">
+				    	<fmt:message key="label.authoring.basic.question.name"/>
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="title" styleId="title" styleClass="form-control" tabindex="1"/>
 				</div>
-				<html:text property="title"/>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.question.text" />
+			
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.basic.question.text" />
+					</label>
+		            	
+					<lams:CKEditor id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}" />
 				</div>
-				<lams:CKEditor id="question" value="${formBean.question}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.default.question.grade" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				<div class="form-group">
+				    <label for="defaultGrade">
+				    	<fmt:message key="label.authoring.basic.default.question.grade" />
+				    	<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="defaultGrade" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="defaultGrade" styleClass="shortInputText"/>
-					
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.basic.penalty.factor" />
-					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				
+				<div class="form-group">
+				    <label for="penaltyFactor">
+				    	<fmt:message key="label.authoring.basic.penalty.factor" />
+						<img src="${ctxPath}/includes/images/req.gif" title="Required field" alt="Required field"/>
+				    </label>
+				    <html:text property="penaltyFactor" styleClass="form-control short-input-text input-sm"/>
 				</div>
-				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
-				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" styleId="answer-required"/>
+				<div class="checkbox">
 					<label for="answer-required">
+						<html:checkbox property="answerRequired" styleId="answer-required"/>
 						<fmt:message key="label.authoring.answer.required" />
 					</label>
 				</div>
 				
-				<div class="field-name space-top">
+				<div class="form-group">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
 
 					<a href="javascript:toggleVisibility('general-feedback');" >
 						<fmt:message key="label.authoring.basic.general.feedback" />
 					</a>
+					
+					<div id="general-feedback" class="initially-hidden">
+						<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}"/>
+					</div>
 				</div>
-				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}">
-					</lams:CKEditor>
+				
+				<div class="form-inline form-group">
+					<label for="correctAnswer">
+						<fmt:message key="label.authoring.true.false.correct.answer" />
+					</label>
+					<html:select property="correctAnswer" styleClass="form-control input-sm">
+						<html:option value="false"><fmt:message key="label.authoring.true.false.false" /></html:option>
+						<html:option value="true"><fmt:message key="label.authoring.true.false.true" /></html:option>
+					</html:select>
 				</div>
-	
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.true.false.correct.answer" />
-				</div>
-				<html:select property="correctAnswer">
-					<html:option value="false"><fmt:message key="label.authoring.true.false.false" /></html:option>
-					<html:option value="true"><fmt:message key="label.authoring.true.false.true" /></html:option>
-				</html:select>
 				
-				<div class="field-name space-top" >
-					<fmt:message key="label.authoring.true.false.feedback.on.true" />
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.true.false.feedback.on.true" />
+					</label>
+		            	
+					<lams:CKEditor id="feedbackOnCorrect" value="${formBean.feedbackOnCorrect}" contentFolderID="${formBean.contentFolderID}"/>
 				</div>
-				<lams:CKEditor id="feedbackOnCorrect" value="${formBean.feedbackOnCorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>
 				
-				<div class="field-name space-top">
-					<fmt:message key="label.authoring.true.false.feedback.on.false" />
+				<div class="form-group">
+					<label for="question">
+						<fmt:message key="label.authoring.true.false.feedback.on.false" />
+					</label>
+		            	
+					<lams:CKEditor id="feedbackOnIncorrect" value="${formBean.feedbackOnIncorrect}" contentFolderID="${formBean.contentFolderID}"/>
 				</div>
-				<lams:CKEditor id="feedbackOnIncorrect" value="${formBean.feedbackOnIncorrect}"
-					contentFolderID="${formBean.contentFolderID}">
-				</lams:CKEditor>				
+				
 			</html:form>
-			
-			<br><br>
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
-					<fmt:message key="label.authoring.true.false.add.true.false" /> 
+
+			<div class="voffset10 pull-right">
+				<a href="#nogo" onclick="javascript:$('#assessmentQuestionForm').submit();" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.true.false.add.true.false" />
 				</a>
-				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
-					<fmt:message key="label.cancel" /> 
+				<a href="#nogo" onclick="javascript:self.parent.tb_remove();" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" />
 				</a>
-			</lams:ImgButtonWrapper>
+			</div>			
 
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>	
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp
===================================================================
diff -u -r4a324be1ed4ba67cf41b33034a0be86e4e6b8e95 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp	(.../gradeselector.jsp)	(revision 4a324be1ed4ba67cf41b33034a0be86e4e6b8e95)
+++ lams_tool_assessment/web/pages/authoring/parts/gradeselector.jsp	(.../gradeselector.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,43 +1,43 @@
-				<html:select property="optionGrade${status.index}" value="${option.grade}">
-					<html:option value="1.0">100 %</html:option>
-					<html:option value="0.9">90 %</html:option>
-					<html:option value="0.83333">83.333 %</html:option>
-					<html:option value="0.8">80 %</html:option>
-					<html:option value="0.75">75%</html:option>
-					<html:option value="0.7">70 %</html:option>
-					<html:option value="0.66666">66.666 %</html:option>
-					<html:option value="0.6">60 %</html:option>
-					<html:option value="0.5">50 %</html:option>
-					<html:option value="0.4">40 %</html:option>
-					<html:option value="0.33333">33.333 %</html:option>
-					<html:option value="0.3">30 %</html:option>
-					<html:option value="0.25">25 %</html:option>
-					<html:option value="0.2">20 %</html:option>
-					<html:option value="0.16666">16.666 %</html:option>
-					<html:option value="0.142857">14.2857 %</html:option>
-					<html:option value="0.125">12.5 %</html:option>
-					<html:option value="0.11111">11.111 %</html:option>
-					<html:option value="0.1">10 %</html:option>
-					<html:option value="0.05">5 %</html:option>
-					<html:option value="0.0"><fmt:message key="label.authoring.basic.none" /></html:option>
-					<html:option value="-0.05">-5 %</html:option>	
-					<html:option value="-0.1">-10 %</html:option>
-					<html:option value="-0.11111">-11.111 %</html:option>
-					<html:option value="-0.125">-12.5 %</html:option>
-					<html:option value="-0.142857">-14.2857 %</html:option>
-					<html:option value="-0.16666">-16.666 %</html:option>
-					<html:option value="-0.2">-20 %</html:option>
-					<html:option value="-0.25">-25 %</html:option>
-					<html:option value="-0.3">-30 %</html:option>	
-					<html:option value="-0.33333">-33.333 %</html:option>
-					<html:option value="-0.4">-40 %</html:option>
-					<html:option value="-0.5">-50 %</html:option>
-					<html:option value="-0.6">-60 %</html:option>
-					<html:option value="-0.66666">-66.666 %</html:option>
-					<html:option value="-0.7">-70 %</html:option>
-					<html:option value="-0.75">-75 %</html:option>	
-					<html:option value="-0.8">-80 %</html:option>
-					<html:option value="-0.83333">-83.333 %</html:option>
-					<html:option value="-0.9">-90 %</html:option>
-					<html:option value="-1.0">-100 %</html:option>
-				</html:select>
+<html:select property="optionGrade${status.index}" value="${option.grade}" styleClass="form-control input-sm short-input-text">
+	<html:option value="1.0">100 %</html:option>
+	<html:option value="0.9">90 %</html:option>
+	<html:option value="0.83333">83.333 %</html:option>
+	<html:option value="0.8">80 %</html:option>
+	<html:option value="0.75">75%</html:option>
+	<html:option value="0.7">70 %</html:option>
+	<html:option value="0.66666">66.666 %</html:option>
+	<html:option value="0.6">60 %</html:option>
+	<html:option value="0.5">50 %</html:option>
+	<html:option value="0.4">40 %</html:option>
+	<html:option value="0.33333">33.333 %</html:option>
+	<html:option value="0.3">30 %</html:option>
+	<html:option value="0.25">25 %</html:option>
+	<html:option value="0.2">20 %</html:option>
+	<html:option value="0.16666">16.666 %</html:option>
+	<html:option value="0.142857">14.2857 %</html:option>
+	<html:option value="0.125">12.5 %</html:option>
+	<html:option value="0.11111">11.111 %</html:option>
+	<html:option value="0.1">10 %</html:option>
+	<html:option value="0.05">5 %</html:option>
+	<html:option value="0.0"><fmt:message key="label.authoring.basic.none" /></html:option>
+	<html:option value="-0.05">-5 %</html:option>	
+	<html:option value="-0.1">-10 %</html:option>
+	<html:option value="-0.11111">-11.111 %</html:option>
+	<html:option value="-0.125">-12.5 %</html:option>
+	<html:option value="-0.142857">-14.2857 %</html:option>
+	<html:option value="-0.16666">-16.666 %</html:option>
+	<html:option value="-0.2">-20 %</html:option>
+	<html:option value="-0.25">-25 %</html:option>
+	<html:option value="-0.3">-30 %</html:option>	
+	<html:option value="-0.33333">-33.333 %</html:option>
+	<html:option value="-0.4">-40 %</html:option>
+	<html:option value="-0.5">-50 %</html:option>
+	<html:option value="-0.6">-60 %</html:option>
+	<html:option value="-0.66666">-66.666 %</html:option>
+	<html:option value="-0.7">-70 %</html:option>
+	<html:option value="-0.75">-75 %</html:option>	
+	<html:option value="-0.8">-80 %</html:option>
+	<html:option value="-0.83333">-83.333 %</html:option>
+	<html:option value="-0.9">-90 %</html:option>
+	<html:option value="-1.0">-100 %</html:option>
+</html:select>
Index: lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp
===================================================================
diff -u -r4d14e04ecb649047c874d2c9189a20a86212159d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision 4d14e04ecb649047c874d2c9189a20a86212159d)
+++ lams_tool_assessment/web/pages/authoring/parts/matchingpairoption.jsp	(.../matchingpairoption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,31 +1,16 @@
-<table>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">		
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.question"></fmt:message>
-				${status.index+1}
-			</span>
-		</td>
-	</tr>
-	<tr>			
-		<td style="padding-left:10px; border-bottom:0px; background:none;">
-			<lams:CKEditor id="optionQuestion${status.index}" value="${option.question}"
-				contentFolderID="${contentFolderID}">
-			</lams:CKEditor>				
-		</td>									
-	</tr>						
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-			</span>
-		</td>
-	</tr>
-	<tr>			
-		<td style="padding-left:10px; border-bottom:0px; background:none;" width="612px">	
-			<input type="text" name="optionString${status.index}"
-				id="optionString${status.index}" value="${option.optionString}">
-		</td>									
-	</tr>
-</table>
\ No newline at end of file
+<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+
+<div class="form-group">
+	<label for="optionQuestion${status.index}">
+		<fmt:message key="label.authoring.basic.option.question"/> ${status.index+1}
+	</label>
+		            	
+	<lams:CKEditor id="optionQuestion${status.index}" value="${option.question}" contentFolderID="${contentFolderID}"/>
+</div>
+
+<div class="form-group">
+    <label for="optionFeedback${status.index}">
+    	<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
+    </label>
+    <input type="text" name="optionString${status.index}" value="${option.optionString}" id="optionString${status.index}" class="form-control">
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp
===================================================================
diff -u -r4d14e04ecb649047c874d2c9189a20a86212159d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision 4d14e04ecb649047c874d2c9189a20a86212159d)
+++ lams_tool_assessment/web/pages/authoring/parts/numericaloption.jsp	(.../numericaloption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,52 +1,52 @@
-<table>
+<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+
+<table class="table-row-spacing">
 	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;" width="70px;">
-			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-				${status.index+1}
-			</span>
+		<td style="width: 120px;">
+			<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
 		</td>
-		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<input type="text" name="optionFloat${status.index}"
-				id="optionFloat${status.index}" value="${option.optionFloat}" class="number shortInputText" title="<fmt:message key='label.authoring.choice.enter.float'/>">
-		</td>									
+		<td>
+			<div class="form-inline">    	
+				<input type="text" name="optionFloat${status.index}" value="${option.optionFloat}" 
+						id="optionFloat${status.index}" class="number form-control short-input-text input-sm" 
+						title="<fmt:message key='label.authoring.choice.enter.float'/>">
+			</div>
+		</td>
 	</tr>
-	
+
 	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.accepted.error"></fmt:message>
-			</span>
+		<td>
+			<fmt:message key="label.authoring.basic.option.accepted.error"></fmt:message>
 		</td>
-		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<input type="text" name="optionAcceptedError${status.index}"
-				id="optionAcceptedError${status.index}" value="${option.acceptedError}" class="number shortInputText" title="<fmt:message key='label.authoring.choice.enter.float'/>">
-		</td>									
-	</tr>	
-	
+		<td>
+			<div class="form-inline">	
+				<input type="text" name="optionAcceptedError${status.index}" value="${option.acceptedError}"
+						id="optionAcceptedError${status.index}" class="number form-control short-input-text input-sm" 
+						title="<fmt:message key='label.authoring.choice.enter.float'/>">
+			</div>
+		</td>
+	</tr>
+
 	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
-			</span>
+		<td>
+			<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
 		</td>
-		<td style="padding-left:10px; border-bottom:0px; background:none;">
-			<%@ include file="gradeselector.jsp"%>
+		<td>
+			<div class="form-inline">
+				<%@ include file="gradeselector.jsp"%>
+			</div>
 		</td>
 	</tr>
+
 	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:top; background:none;" colspan="2">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
-			</span>
+		<td colspan="2">
+			<div class="form-group">
+				<label for="optionFeedback${status.index}">
+					<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
+				</label>
+					            	
+				<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
+			</div>
 		</td>
 	</tr>
-	<tr>		
-		<td style="padding-left:10px; border-bottom:0px; background:none;" colspan="2">
-			<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}"
-				contentFolderID="${contentFolderID}">
-			</lams:CKEditor>		
-		</td>
-	</tr>	
 </table>
Index: lams_tool_assessment/web/pages/authoring/parts/option.jsp
===================================================================
diff -u -r4d14e04ecb649047c874d2c9189a20a86212159d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision 4d14e04ecb649047c874d2c9189a20a86212159d)
+++ lams_tool_assessment/web/pages/authoring/parts/option.jsp	(.../option.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,41 +1,27 @@
-<table>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-				${status.index+1}
-			</span>
-		</td>
-	</tr>
-	<tr>		
-		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<lams:CKEditor id="optionString${status.index}" value="${option.optionString}"
-				contentFolderID="${contentFolderID}" >
-			</lams:CKEditor>					
-		</td>									
-	</tr>
-	
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
-			</span>
-			<span class="space-left">
-				<%@ include file="gradeselector.jsp"%>
-			</span>
-		</td>
-	</tr>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:top; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
-			</span>
-		</td>
-	</tr>
-	<tr>		
-		<td style="padding-left:10px; padding-right:0px; border-bottom:0px; background:none;" width="622px">
-			<lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}"/>
-		</td>
-	</tr>	
-</table>
+<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+
+<div class="form-group">			
+	<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+</div>
+
+<div class="form-group">
+	<label for="optionString${status.index}">
+		<fmt:message key="label.authoring.basic.question.text" />
+	</label>
+		            	
+	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}" />
+</div>
+
+<div class="form-group">
+	<label>
+		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+	</label>
+	<%@ include file="gradeselector.jsp"%>
+</div>
+
+<div class="form-group">
+    <label for="optionFeedback${status.index}">
+    	<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
+    </label>
+    <lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}" styleClass="form-control"/>
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(.../optionhedgingmark.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,43 +1,33 @@
-<table>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-				${status.index+1}
-			</span>
-		</td>
-	</tr>
-	
-	<tr>		
-		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<lams:CKEditor id="optionString${status.index}" value="${option.optionString}"
-				contentFolderID="${contentFolderID}" >
-			</lams:CKEditor>					
-		</td>									
-	</tr>
+<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
 
-	<tr>
-		<td style="border-bottom:0px; vertical-align:top; background:none;" class="right-buttons">
-			<input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" <c:if test="${option.correct}">checked="checked"</c:if> >
-								
-			<span class="field-name">
-				<fmt:message key="label.option.correct" />
-			</span>
-		</td>
-	</tr>
+<div class="form-group">
+	<label for="optionString${status.index}">
+		<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+	</label>
+	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}" />
+</div>
 
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:top; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
-			</span>
-		</td>
-	</tr>
-	
-	<tr>		
-		<td style="padding-left:10px; padding-right:0px; border-bottom:0px; background:none;" width="622px">
-			<lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}"/>
-		</td>
-	</tr>
-</table>
+<div class="radio">
+	<label for="option-correct">
+		<input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" id="option-correct"
+				<c:if test="${option.correct}">checked="checked"</c:if> >
+					
+		<fmt:message key="label.option.correct" />
+	</label>
+</div>
+
+<div class="form-group form-inline">
+	<label for="optionGrade${status.index}">
+		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+	</label>
+	<%@ include file="gradeselector.jsp"%>
+</div>
+
+<div class="form-group">
+    <label for="optionFeedback${status.index}">
+    	<fmt:message key="label.authoring.basic.option.feedback"/>
+    </label>
+    
+    <lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}" styleClass="form-control"/>
+</div>
+
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -3,10 +3,10 @@
 	<input type="hidden" name="optionCount" id="optionCount" value="${fn:length(optionList)}">
 	<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 	
-	<table class="alternative-color" cellspacing="0">
+	<table class="table table-condensed table-striped">
 		<c:forEach var="option" items="${optionList}" varStatus="status">
 			<tr>
-				<td style="padding-left:10px; padding-top:15px; padding-bottom:15px;">
+				<td>
 					<c:choose>
 						<c:when test="${questionType == 1}">
 							<%@ include file="option.jsp"%>
@@ -28,37 +28,24 @@
 						</c:when>
 					</c:choose>	
 				</td>
-					
-				<td width="20px" style="padding-left:10px; vertical-align:middle; text-align: center;">
+				
+				<td class="arrows">
+					<!-- Don't display up icon if first line -->
 					<c:if test="${not status.first}">
-						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.basic.up"/>"
-							onclick="upOption(${status.index})">
-						<c:if test="${status.last}">
-							<img
-								src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.basic.down"/>">
-						</c:if>
-					</c:if>
-	
+		 				<lams:Arrow state="up" title="<fmt:message key='label.authoring.basic.up'/>" 
+		 						onclick="javascript:upOption(${status.index})"/>
+		 			</c:if>
+					<!-- Don't display down icon if last line -->
 					<c:if test="${not status.last}">
-						<c:if test="${status.first}">
-							<img
-								src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.basic.up"/>">
-						</c:if>
-	
-						<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.basic.down"/>"
-							onclick="downOption(${status.index})">
-					</c:if>
+						<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.down'/>" 
+								onclick="javascript:downOption(${status.index})"/>
+		 			</c:if>
+				</td>			
+
+				<td width="30px">
+					<i class="fa fa-times" title="<fmt:message key="label.authoring.basic.delete" />"
+						onclick="javascript:removeOption(${status.index})"></i>
 				</td>
-	                
-				<td width="20px" style="padding-left:10px; vertical-align:middle; text-align: center;">
-					<img src="<html:rewrite page='/includes/images/cross.gif'/>"
-						title="<fmt:message key="label.authoring.basic.delete" />"
-						onclick="removeOption(${status.index})" />
-				</td>
 			</tr>
 		</c:forEach>
 	</table>
Index: lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp
===================================================================
diff -u -r4d14e04ecb649047c874d2c9189a20a86212159d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision 4d14e04ecb649047c874d2c9189a20a86212159d)
+++ lams_tool_assessment/web/pages/authoring/parts/orderingoption.jsp	(.../orderingoption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,18 +1,9 @@
-<table>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-				${status.index+1}
-			</span>
-		</td>
-	</tr>
-	<tr>		
-		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<lams:CKEditor id="optionString${status.index}" value="${option.optionString}"
-				contentFolderID="${contentFolderID}">
-			</lams:CKEditor>					
-		</td>									
-	</tr>
-</table>
+<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+
+<div class="form-group">
+	<label for="optionString${status.index}">
+		<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+	</label>
+		            	
+	<lams:CKEditor id="optionString${status.index}" value="${option.optionString}" contentFolderID="${contentFolderID}"/>
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp	(.../overallfeedbacklist.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp	(.../overallfeedbacklist.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,95 +1,80 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+
 <lams:html>
-	<lams:head>
-		<%@ include file="/common/header.jsp"%>
-		<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-		<lams:css style="main" />
-		<script lang="javascript">
-			var overallFeedbackTargetDiv = "overallFeedbackArea";
-			function addOverallFeedback(){
-				var addOverallFeedbackUrl = "<c:url value='/authoring/newOverallFeedback.do'/>";
-			    var param = Form.serialize("overallFeedbackForm");
-			    overallFeedbackLoading();
-			    var myAjax = new Ajax.Updater(
-			    		overallFeedbackTargetDiv,
-			    		addOverallFeedbackUrl,
-				    	{
-				    		method:'post',
-				    		parameters:param,
-				    		onComplete:overallFeedbackComplete,
-				    		evalScripts:true 
-				    	}
-			    );
-			}
-			function overallFeedbackLoading(){
-				showBusy(overallFeedbackTargetDiv);
-			}
-			function overallFeedbackComplete(){
-				hideBusy(overallFeedbackTargetDiv);
-			}
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+	<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
+	<c:set var="overallFeedbackListSize" value="${fn:length(overallFeedbackList)}" />
+	
+	<script lang="javascript">
+		var overallFeedbackTargetDiv = "overallFeedbackArea";
+		function addOverallFeedback() {
+			$("#" + overallFeedbackTargetDiv).load(
+				"<c:url value='/authoring/newOverallFeedback.do'/>?" + $("#overallFeedbackForm").serialize(true)
+			);
+		}
+	</script>
+</lams:head>
+<body class="tabpart">
 
-		</script>		
-	</lams:head>
-	<body class="tabpart">
-
-<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
-<c:set var="overallFeedbackListSize" value="${fn:length(overallFeedbackList)}" />
 <div id="overallFeedbackArea">
 	<form id="overallFeedbackForm">
 		<input type="hidden" name="overallFeedbackCount" id="overallFeedbackCount" value="${overallFeedbackListSize}">
 
-		<div class="field-name space-top">
+		<h5>
 			<fmt:message key="label.authoring.advance.overall.feedback" />
-			<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="overallFeedbackArea_Busy" />			
-		</div>
+			<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none;" id="overallFeedbackArea_Busy" />			
+		</h5>
 
-		<table class="alternative-color" cellspacing="0">
+		<table class="table table-condensed">
 			<tr>
-				<td style="padding-left:0px; border-bottom:0px; text-align:right; background:none;">
+				<td style="text-align:right;">
 					<fmt:message key="label.authoring.advance.grade.boundary"></fmt:message>
 				</td>
-				<td style="padding-left:5px; border-bottom:0px; background:none;">
+				<td>
 					<input type="hidden" name="overallFeedbackGradeBoundary0" id="overallFeedbackGradeBoundary0" value="100">	
 					100%
 				</td>									
-			</tr>		
+			</tr>
+				
 			<c:forEach var="overallFeedback" items="${overallFeedbackList}" varStatus="status">
 				<c:if test="${status.index != 0}">
 					<tr id="overallFeedback${status.index}">
-						<td style="padding-left:0px; border-bottom:0px; vertical-align:middle; text-align:right; background:none;">
+						<td style="  text-align:right; ">
 							<fmt:message key="label.authoring.advance.grade.boundary"></fmt:message>
 						</td>
-						<td style="padding-left:5px; border-bottom:0px; background:none;">	
-							<input type="text" name="overallFeedbackGradeBoundary${status.index}"
-								id="overallFeedbackGradeBoundary${status.index}" size="5" value="${overallFeedback.gradeBoundary}">%
+						<td>	
+							<input type="text" name="overallFeedbackGradeBoundary${status.index}" size="5" value="${overallFeedback.gradeBoundary}"
+								id="overallFeedbackGradeBoundary${status.index}" class="form-control form-control-inline">
+							&nbsp;%
 						</td>									
 					</tr>			
 				</c:if>
 
 				<tr>
-					<td style="padding-left:0px; border-bottom:0px; vertical-align:middle; text-align:right; background:none;">
+					<td style="text-align:right;">
 						<fmt:message key="label.authoring.advance.feedback"></fmt:message>
 					</td>
-					<td style="padding-left:5px; border-bottom:0px; background:none;">
+					<td>
 						<input type="hidden" name="overallFeedbackSequenceId${status.index}" id="overallFeedbackSequenceId${status.index}" value="${overallFeedback.sequenceId}">									
-						<input type="text" name="overallFeedbackFeedback${status.index}"
+						<input type="text" name="overallFeedbackFeedback${status.index}" class="form-control"
 							id="overallFeedbackFeedback${status.index}" size="57" value="${overallFeedback.feedback}">
-					</td>									
+					</td>
 				</tr>				
 			</c:forEach>
+			
 			<tr>
-				<td style="padding-left:0px; border-bottom:0px; vertical-align:middle; text-align:right; background:none;">
+				<td style="text-align:right;">
 					<fmt:message key="label.authoring.advance.grade.boundary"></fmt:message>
 				</td>
-				<td style="padding-left:5px; border-bottom:0px; background:none;">	
+				<td>	
 					0%
 				</td>									
 			</tr>
 		</table>
 		
-		<a href="javascript:;" onclick="addOverallFeedback();" class="button-add-item right-buttons" style="margin-right: 120px;">
+		<a href="javascript:;" onclick="addOverallFeedback();" class="btn btn-default btn-sm button-add-item pull-right">
 			<fmt:message key="label.authoring.advance.add.feedback.field" /> 
 		</a>
 		
@@ -105,9 +90,8 @@
 	if (!obj) {
 		obj = window.top.document.getElementById('advancedInputArea');
 	}
-	obj.style.height = eval(155 + ${overallFeedbackListSize}*72) + 'px';
+	obj.style.height = eval(125 + ${overallFeedbackListSize}*90) + 'px';
 </script>	
 	
-	</body>
+</body>
 </lams:html>
-
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -6,54 +6,58 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="availableQuestions" value="${sessionMap.availableQuestions}" />
 
-<div>
-	<h2 class="spacer-left">
+<div class="panel panel-default voffset5">
+	<div class="panel-heading panel-title">
 		<fmt:message key="label.authoring.basic.question.list.title" />
 		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="referencesArea_Busy" />
-	</h2>
+	</div>
 
-	<table class="alternative-color" id="referencesTable" cellspacing="0">
+	<table class="table table-condensed" id="referencesTable">
 		<tr>
-			<th width="20%"><fmt:message key="label.authoring.basic.list.header.type" /></th>
-			<th width="40%"><fmt:message key="label.authoring.basic.list.header.question" /></th>
-			<th colspan="3"><fmt:message key="label.authoring.basic.list.header.mark" /></th>
+			<th width="20%">
+				<fmt:message key="label.authoring.basic.list.header.type" />
+			</th>
+			<th width="40%">
+				<fmt:message key="label.authoring.basic.list.header.question" />
+			</th>
+			<th colspan="3">
+				<fmt:message key="label.authoring.basic.list.header.mark" />
+			</th>
 		</tr>	
 
 		<c:forEach var="questionReference" items="${sessionMap.questionReferences}" varStatus="status">
 			<c:set var="question" value="${questionReference.question}" />
 			<tr>
 				<td>
-					<span class="field-name">
-						<c:choose>
-							<c:when test="${questionReference.randomQuestion}">
-								<fmt:message key="label.authoring.basic.type.random.question" />
-							</c:when>
-							<c:when test="${question.type == 1}">
-								<fmt:message key="label.authoring.basic.type.multiple.choice" />
-							</c:when>
-							<c:when test="${question.type == 2}">
-								<fmt:message key="label.authoring.basic.type.matching.pairs" />
-							</c:when>
-							<c:when test="${question.type == 3}">
-								<fmt:message key="label.authoring.basic.type.short.answer" />
-							</c:when>
-							<c:when test="${question.type == 4}">
-								<fmt:message key="label.authoring.basic.type.numerical" />
-							</c:when>
-							<c:when test="${question.type == 5}">
-								<fmt:message key="label.authoring.basic.type.true.false" />
-							</c:when>
-							<c:when test="${question.type == 6}">
-								<fmt:message key="label.authoring.basic.type.essay" />
-							</c:when>
-							<c:when test="${question.type == 7}">
-								<fmt:message key="label.authoring.basic.type.ordering" />
-							</c:when>
-							<c:when test="${question.type == 8}">
-								<fmt:message key="label.authoring.basic.type.mark.hedging" />
-							</c:when>
-						</c:choose>
-					</span>
+					<c:choose>
+						<c:when test="${questionReference.randomQuestion}">
+							<fmt:message key="label.authoring.basic.type.random.question" />
+						</c:when>
+						<c:when test="${question.type == 1}">
+							<fmt:message key="label.authoring.basic.type.multiple.choice" />
+						</c:when>
+						<c:when test="${question.type == 2}">
+							<fmt:message key="label.authoring.basic.type.matching.pairs" />
+						</c:when>
+						<c:when test="${question.type == 3}">
+							<fmt:message key="label.authoring.basic.type.short.answer" />
+						</c:when>
+						<c:when test="${question.type == 4}">
+							<fmt:message key="label.authoring.basic.type.numerical" />
+						</c:when>
+						<c:when test="${question.type == 5}">
+							<fmt:message key="label.authoring.basic.type.true.false" />
+						</c:when>
+						<c:when test="${question.type == 6}">
+							<fmt:message key="label.authoring.basic.type.essay" />
+						</c:when>
+						<c:when test="${question.type == 7}">
+							<fmt:message key="label.authoring.basic.type.ordering" />
+						</c:when>
+						<c:when test="${question.type == 8}">
+							<fmt:message key="label.authoring.basic.type.mark.hedging" />
+						</c:when>
+					</c:choose>
 				</td>
 
 				<td>
@@ -68,128 +72,118 @@
 				</td>
 				
 				<td>
-					<input name="grade${questionReference.sequenceId}" id="grade${questionReference.sequenceId}" value="${questionReference.defaultGrade}">
+					<input name="grade${questionReference.sequenceId}" value="${questionReference.defaultGrade}"
+						id="grade${questionReference.sequenceId}" class="form-control input-sm" style="width: 50%;">
 				</td>
 				
-				<td width="40px" style="vertical-align:middle;">
+				<td class="arrows">
+					<!-- Don't display up icon if first line -->
 					<c:if test="${not status.first}">
-						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.basic.up"/>"
-							onclick="upQuestionReference(${status.index})">
-						<c:if test="${status.last}">
-							<img
-								src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.basic.down"/>">
-						</c:if>
-					</c:if>
-
+		 				<lams:Arrow state="up" title="<fmt:message key='label.authoring.basic.up'/>" onclick="javascript:upQuestionReference(${status.index})"/>
+		 			</c:if>
+					<!-- Don't display down icon if last line -->
 					<c:if test="${not status.last}">
-						<c:if test="${status.first}">
-							<img
-								src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.basic.up"/>">
-						</c:if>
+						<lams:Arrow state="down" title="<fmt:message key='label.authoring.basic.down'/>" onclick="javascript:downQuestionReference(${status.index})"/>
+		 			</c:if>
+				</td>			
 
-						<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.basic.down"/>"
-							onclick="downQuestionReference(${status.index})">
-					</c:if>
+				<td width="30px">
+					<i class="fa fa-times" title="<fmt:message key="label.authoring.basic.delete" />"
+						onclick="javascript:deleteQuestionReference(${status.index})"></i>
 				</td>
-                
-				<td width="20px" style="vertical-align:middle;">
-					<img src="${tool}includes/images/cross.gif"
-						title="<fmt:message key="label.authoring.basic.delete" />"
-						onclick="deleteQuestionReference(${status.index})" />
-				</td>
 			</tr>
 		</c:forEach>
 	</table>
+</div>
 	
+<!-- Dropdown menu for choosing a question from question bank -->
+<c:if test="${fn:length(sessionMap.questionReferences) < fn:length(sessionMap.questionList)}">
+	<div class="form-inline form-group">
 	
-	<!-- Dropdown menu for choosing a question from question bank -->
-	<c:if test="${fn:length(sessionMap.questionReferences) < fn:length(sessionMap.questionList)}">
-		<p>
-			<select id="questionSelect" style="float: left">
-				<c:if test="${fn:length(availableQuestions) > 1}">
-					<option value="-1" selected="selected"><fmt:message key="label.authoring.basic.select.random.question" /></option>
-				</c:if>
+		<select id="questionSelect" class="form-control input-sm roffset5">
+			<c:if test="${fn:length(availableQuestions) > 1}">
+				<option value="-1" selected="selected">
+					<fmt:message key="label.authoring.basic.select.random.question" />
+				</option>
+			</c:if>
 				
-				<c:forEach var="question" items="${availableQuestions}" varStatus="status">
-					<option value="${question.sequenceId}"><c:out value="${question.title}" escapeXml="true"/></option>
-				</c:forEach>
-			</select>
+			<c:forEach var="question" items="${availableQuestions}" varStatus="status">
+				<option value="${question.sequenceId}">
+					<c:out value="${question.title}" escapeXml="true"/>
+				</option>
+			</c:forEach>
+		</select>
 			
-			<a onclick="addQuestionReference();return false;" href="" class="button-add-item space-left" id="newQuestionInitHref2">  
-				<fmt:message key="label.authoring.basic.add.question.to.list" />
-			</a>
-		</p>
-	</c:if>
-</div>
-<br>
+		<a onclick="addQuestionReference();return false;" href="#nogo" class="btn btn-sm btn-default button-add-item" id="newQuestionInitHref2">  
+			<fmt:message key="label.authoring.basic.add.question.to.list" />
+		</a>
+	</div>
+</c:if>
 
-<div>
-	<h2 class="spacer-left">
+<div class="panel panel-default voffset20">
+	<div class="panel-heading panel-title">
 		<fmt:message key="label.authoring.basic.question.bank.title" />
 		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="assessmentListArea_Busy" />
-	</h2>
+	</div>
 
-	<table class="alternative-color" id="questionTable" cellspacing="0">
+	<table class="table table-condensed" id="questionTable">
 		<tr>
-			<th width="20%"><fmt:message key="label.authoring.basic.list.header.type" /></th>
-			<th colspan="3"><fmt:message key="label.authoring.basic.list.header.question" /></th>
+			<th width="20%">
+				<fmt:message key="label.authoring.basic.list.header.type" />
+			</th>
+			<th colspan="3">
+				<fmt:message key="label.authoring.basic.list.header.question" />
+			</th>
 		</tr>	
 	
 		<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
 			<tr>
 				<td>
-					<span class="field-name">
-						<c:choose>
-							<c:when test="${question.type == 1}">
-								<fmt:message key="label.authoring.basic.type.multiple.choice" />
-							</c:when>
-							<c:when test="${question.type == 2}">
-								<fmt:message key="label.authoring.basic.type.matching.pairs" />
-							</c:when>
-							<c:when test="${question.type == 3}">
-								<fmt:message key="label.authoring.basic.type.short.answer" />
-							</c:when>
-							<c:when test="${question.type == 4}">
-								<fmt:message key="label.authoring.basic.type.numerical" />
-							</c:when>
-							<c:when test="${question.type == 5}">
-								<fmt:message key="label.authoring.basic.type.true.false" />
-							</c:when>
-							<c:when test="${question.type == 6}">
-								<fmt:message key="label.authoring.basic.type.essay" />
-							</c:when>
-							<c:when test="${question.type == 7}">
-								<fmt:message key="label.authoring.basic.type.ordering" />
-							</c:when>
-							<c:when test="${question.type == 8}">
-								<fmt:message key="label.authoring.basic.type.mark.hedging" />
-							</c:when>
-						</c:choose>
-					</span>
+					<c:choose>
+						<c:when test="${question.type == 1}">
+							<fmt:message key="label.authoring.basic.type.multiple.choice" />
+						</c:when>
+						<c:when test="${question.type == 2}">
+							<fmt:message key="label.authoring.basic.type.matching.pairs" />
+						</c:when>
+						<c:when test="${question.type == 3}">
+							<fmt:message key="label.authoring.basic.type.short.answer" />
+						</c:when>
+						<c:when test="${question.type == 4}">
+							<fmt:message key="label.authoring.basic.type.numerical" />
+						</c:when>
+						<c:when test="${question.type == 5}">
+							<fmt:message key="label.authoring.basic.type.true.false" />
+						</c:when>
+						<c:when test="${question.type == 6}">
+							<fmt:message key="label.authoring.basic.type.essay" />
+						</c:when>
+						<c:when test="${question.type == 7}">
+							<fmt:message key="label.authoring.basic.type.ordering" />
+						</c:when>
+						<c:when test="${question.type == 8}">
+							<fmt:message key="label.authoring.basic.type.mark.hedging" />
+						</c:when>
+					</c:choose>
 				</td>
 
 				<td>
 					<c:out value="${question.title}" escapeXml="true" />
 				</td>
 				
-				<td width="20px" style="vertical-align:middle;">
+				<td width="30px">
 					<c:set var="editQuestionUrl" >
 						<c:url value='/authoring/editQuestion.do'/>?sessionMapID=${sessionMapID}&questionIndex=${status.index}&KeepThis=true&TB_iframe=true&height=540&width=850&modal=true
-					</c:set>		
+					</c:set>
+					
 					<a href="${editQuestionUrl}" class="thickbox" style="margin-left: 20px;"> 
-						<img src="<html:rewrite page='/includes/images/edit.gif'/>" 
-							title="<fmt:message key="label.authoring.basic.edit" />" style="border-style: none;"/>
-					</a>				
-                </td>
+						<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.edit" />"></i>
+					</a>
+				</td>
                 
-				<td width="20px" style="vertical-align:middle;">
-					<img src="${tool}includes/images/cross.gif"
-						title="<fmt:message key="label.authoring.basic.delete" />"
-						onclick="deleteQuestion(${status.index})" />
+               	<td width="30px">
+					<i class="fa fa-times" title="<fmt:message key="label.authoring.basic.delete" />"
+						onclick="javascript:deleteQuestion(${status.index})"></i>
 				</td>
 			</tr>
 		</c:forEach>
Index: lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp
===================================================================
diff -u -rf0c2b8f197da1cd58d9df772e6f0ef072d656602 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision f0c2b8f197da1cd58d9df772e6f0ef072d656602)
+++ lams_tool_assessment/web/pages/authoring/parts/shortansweroption.jsp	(.../shortansweroption.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,41 +1,23 @@
-<table>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
-				${status.index+1}
-			</span>
-		</td>
-	</tr>
-	<tr>		
-		<td style="padding-left:10px; border-bottom:0px; background:none;">	
-			<input type="text" name="optionString${status.index}" value="<c:out value='${option.optionString}' />"/>
-		</td>									
-	</tr>
-	
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
-			</span>
-			<span class="space-left">
-				<%@ include file="gradeselector.jsp"%>
-			</span>
-		</td>
-	</tr>
-	<tr>
-		<td style="padding-left:10px; border-bottom:0px; vertical-align:top; background:none;">
-			<span class="field-name">
-				<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
-			</span>
-		</td>
-	</tr>
-	<tr>		
-		<td style="padding-left:10px; padding-right:0px; border-bottom:0px; background:none;">
-			<lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}"
-				contentFolderID="${contentFolderID}">
-			</lams:CKEditor>		
-		</td>
-	</tr>	
-</table>
+<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+
+<div class="form-group">
+	<label for="optionString${status.index}">
+		<fmt:message key="label.authoring.basic.option.answer"/> ${status.index+1}
+	</label>
+	<input type="text" name="optionString${status.index}" value="<c:out value='${option.optionString}' />" class="form-control input-sm"/>
+</div>
+
+<div class="form-group">
+	<label>
+		<fmt:message key="label.authoring.basic.option.grade"></fmt:message>
+	</label>
+	<%@ include file="gradeselector.jsp"%>
+</div>
+
+<div class="form-group">
+    <label for="optionFeedback${status.index}">
+    	<fmt:message key="label.authoring.basic.option.feedback"/>
+    </label>
+    
+    <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}"/>
+</div>
Index: lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp
===================================================================
diff -u -r4d14e04ecb649047c874d2c9189a20a86212159d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp	(.../unitlist.jsp)	(revision 4d14e04ecb649047c874d2c9189a20a86212159d)
+++ lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp	(.../unitlist.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -3,43 +3,41 @@
 	<input type="hidden" name="unitCount" id="unitCount" value="${fn:length(unitList)}">
 	<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
 	
-	<table class="alternative-color" cellspacing="0">
+	<table class="table">
 		<c:forEach var="unit" items="${unitList}" varStatus="status">
 			<tr>
-				<td width="3px" style="vertical-align:middle;">
+				<td width="10px" style="vertical-align:middle;">
 					${status.index+1}
-				</td>			
+				</td>
 				<td>
-					<table>
+					<table class="table-row-spacing">
 						<tr>
-							<td style="padding-left:0px; border-bottom:0px; vertical-align:middle; background:none;" width="50 px">
-								<span class="field-name">
-									<fmt:message key="label.authoring.basic.unit.unit"></fmt:message>
-								</span>
+							<td width="80px">
+								<fmt:message key="label.authoring.basic.unit.unit"/>
 							</td>
-							<td style="padding-left:0px; border-bottom:0px; background:none;">	
-								<input type="hidden" name="unitSequenceId${status.index}" id="unitSequenceId${status.index}" value="${unit.sequenceId}">									
-								<input type="text" name="unitUnit${status.index}"
-									id="unitUnit${status.index}" value="${unit.unit}">
+							<td>	
+								<input type="hidden" name="unitSequenceId${status.index}" value="${unit.sequenceId}" 
+										id="unitSequenceId${status.index}">						
+								<input type="text" name="unitUnit${status.index}" value="${unit.unit}"
+										id="unitUnit${status.index}" class="number form-control input-sm">
 							</td>									
 						</tr>
 						<tr>
-							<td style="padding-left:0px; border-bottom:0px; vertical-align:middle; background:none;">
-								<span class="field-name">
-									<fmt:message key="label.authoring.basic.unit.multiplier"></fmt:message>
-								</span>
+							<td>
+								<fmt:message key="label.authoring.basic.unit.multiplier"/>
 							</td>
-							<td style="padding-left:0px; border-bottom:0px; background:none;">	
-							<c:choose>
-								<c:when test="${status.index == 0}">
-									<input type="hidden" name="unitMultiplier0" id="unitMultiplier0" value="${unit.multiplier}">
-									${unit.multiplier}
-								</c:when>
-								<c:otherwise>
-									<input type="text" name="unitMultiplier${status.index}"
-										id="unitMultiplier${status.index}" value="${unit.multiplier}" class="number shortInputText" title="<fmt:message key='label.authoring.choice.enter.float'/>">
-								</c:otherwise>
-							</c:choose>							
+							<td>	
+								<c:choose>
+									<c:when test="${status.index == 0}">
+										<input type="hidden" name="unitMultiplier0" id="unitMultiplier0" value="${unit.multiplier}">
+										${unit.multiplier}
+									</c:when>
+									<c:otherwise>
+										<input type="text" name="unitMultiplier${status.index}" value="${unit.multiplier}"
+												id="unitMultiplier${status.index}" class="number form-control short-input-text input-sm" 
+												title="<fmt:message key='label.authoring.choice.enter.float'/>">
+									</c:otherwise>
+								</c:choose>							
 							</td>									
 						</tr>	
 					</table>
Index: lams_tool_assessment/web/pages/authoring/start.jsp
===================================================================
diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2)
+++ lams_tool_assessment/web/pages/authoring/start.jsp	(.../start.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp" %>
+
 <html>
 	<body class="stripes">
 		<html:form action="/authoring/init.do?mode=${mode}" method="post" styleId="startForm">
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r3a3e8d8da9a68a70d1e8c9d718346960d5d115a1 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 3a3e8d8da9a68a70d1e8c9d718346960d5d115a1)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -5,7 +5,7 @@
 				<input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" />						
 							
 				<div class="panel panel-default" id="question-area-${status.index}">
-					<div class="field-name panel-heading">
+					<div class="panel-heading">
 						<c:if test="${assessment.numbered}">
 							<span class="question-numbers">
 								${status.index + sessionMap.questionNumberingOffset}.
Index: lams_tool_assessment/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r67f97f2d822958f924c8756ce825c04635c72069 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 67f97f2d822958f924c8756ce825c04635c72069)
+++ lams_tool_assessment/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -2,7 +2,7 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="assessment" value="${sessionMap.assessment}"/>
 
-<table cellpadding="0">
+<table class="table table-condensed">
 	<tr>
 		<td width="10%">
 			<fmt:message key="label.authoring.basic.title" />:
@@ -27,7 +27,7 @@
 				<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 				<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 			</c:url>
-			<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="button">
+			<html:link href="#nogo" onclick="javascript:launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
 				<fmt:message key="label.monitoring.edit.activity.edit" />
 			</html:link>
 		</td>
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,16 +1,13 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.assessment.AssessmentConstants"%>
 
-<c:set var="lams"><lams:LAMSURL /></c:set>
-
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/tabbedheader.jsp" %>
-		<link href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet" type="text/css" >
+		<link href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet" type="text/css" >
 		<link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css" >
-		<link href="${lams}css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
+		<link href="${lams}css/thickbox.css" rel="stylesheet" rel="stylesheet" type="text/css">
 		<link href="${lams}css/jquery.jqGrid.css" rel="stylesheet" type="text/css"/>
 		<style media="screen,projection" type="text/css">
 			.ui-jqgrid tr.jqgrow td {
@@ -19,67 +16,54 @@
 			    vertical-align:text-top;
 			    padding-top:2px;
 			}
-			
-			.session-container {
-				padding-left: 30px;
-				width:99%; 
-			}
-			.session-header {
-				padding-bottom: 5px;
-				font-size: small;
-			}
-			div[id^="gbox_userSummary"] {
-				margin-top: 5px;
-			}
 		</style>
- 
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+
+		<script>
+			// pass settings to monitorToolSummaryAdvanced.js
+			var submissionDeadlineSettings = {
+				lams: '<lams:LAMSURL />',
+				submissionDeadline: '${submissionDeadline}',
+				setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+				toolContentID: '${param.toolContentID}',
+				messageNotification: '<fmt:message key="monitor.summary.notification" />',
+				messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
+				messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+			};
+		</script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.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/thickbox.js"></script>
-	 	
-		<script>
-			var initialTabId = "${initialTabId}";
-	
-			function init(){
-				if (initialTabId) {
-					selectTab(initialTabId);
-				} else {
-					selectTab(1);
-				}
-		    }     
-		        
+		<script>        
 		    function doSelectTab(tabId) {
 			   	// end optional tab controller stuff
 			   	selectTab(tabId);
 		    } 
 		</script>	  
 	</lams:head>
 	
-	<body class="stripes" onLoad="init()">
-		<div id="page">
-			<h1>
-				<fmt:message key="label.monitoring.heading" />
-			</h1>
-			<div id="header">
-				<lams:Tabs>
-					<lams:Tab id="1" key="monitoring.tab.summary" />
-					<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
-					<lams:Tab id="3" key="monitoring.tab.statistics" />
-				</lams:Tabs>
-			</div>
-			<div id="content">
-					<lams:help toolSignature="<%= AssessmentConstants.TOOL_SIGNATURE %>" module="monitoring"/>
-			
+	<body class="stripes">		
+		<c:set var="title"><fmt:message key="label.author.title" /></c:set>
+	 	<lams:Page type="navbar" title="${title}"> 
+	
+			<lams:Tabs control="true" title="${title}" helpToolSignature="<%= AssessmentConstants.TOOL_SIGNATURE %>" helpModule="monitoring" refreshOnClickAction="javascript:location.reload();">
+				<lams:Tab id="1" key="monitoring.tab.summary"/>
+				<lams:Tab id="2" key="monitoring.tab.edit.activity"/>
+				<lams:Tab id="3" key="monitoring.tab.statistics"/>
+			</lams:Tabs>
+	
+	  		<lams:TabBodyArea>
+				<lams:TabBodys>
 					<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
 					<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
 					<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
-			</div>
+				</lams:TabBodys> 
+			</lams:TabBodyArea> 
+	
 			<div id="footer"></div>
-		
-		</div>
+		</lams:Page>
 	</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u -r20946003bc95595d01d3d330f582e81e178af97d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 20946003bc95595d01d3d330f582e81e178af97d)
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,254 +1,248 @@
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+<%@ include file="/common/taglibs.jsp"%>
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">     
+	<table class="table table-striped table-condensed">
 
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-
-	<tr>
-		<td>
-			<fmt:message key="label.use.select.leader.tool.output" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.use.select.leader.tool.output" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.useSelectLeaderToolOuput}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.useSelectLeaderToolOuput}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.time.limit" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.time.limit" />
+			</td>
+			
+			<td>
+				<c:out value="${assessment.questionsPerPage}" escapeXml="true"/>
+			</td>
+		</tr>
 		
-		<td>
-			<c:out value="${assessment.questionsPerPage}" escapeXml="true"/>
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.shuffle.questions" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.shuffle.questions" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.shuffled}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.shuffled}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.numbered.questions" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.numbered.questions" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.numbered}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.numbered}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.attempts.allowed" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.attempts.allowed" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.attemptsAllowed == 0}">
+						<fmt:message key="label.authoring.advance.unlimited" />
+					</c:when>
+					<c:otherwise>
+						<c:out value="${assessment.attemptsAllowed}" escapeXml="true"/>
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.attemptsAllowed == 0}">
-					<fmt:message key="label.authoring.advance.unlimited" />
-				</c:when>
-				<c:otherwise>
-					<c:out value="${assessment.attemptsAllowed}" escapeXml="true"/>
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.passing.mark" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.passing.mark" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.passingMark == 0}">
+						-
+					</c:when>
+					<c:otherwise>
+						<c:out value="${assessment.passingMark}" escapeXml="true"/>
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.passingMark == 0}">
-					-
-				</c:when>
-				<c:otherwise>
-					<c:out value="${assessment.passingMark}" escapeXml="true"/>
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.students.overall.feedback" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowOverallFeedbackAfterQuestion}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.allowOverallFeedbackAfterQuestion}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.students.question.feedback" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.students.question.feedback" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowQuestionFeedback}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.allowQuestionFeedback}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.students.right.answers" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.students.right.answers" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowRightAnswersAfterQuestion}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowWrongAnswersAfterQuestion}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>	
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.students.grades" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowGradesAfterAttempt}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advance.allow.students.history.responses" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.allowHistoryResponses}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="label.authoring.advanced.notify.on.attempt.completion" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.notifyTeachersOnAttemptCompletion}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.allowRightAnswersAfterQuestion}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.students.wrong.answers" />
-		</td>
+		<tr>
+			<td>
+				<fmt:message key="monitor.summary.td.addNotebook" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${assessment.reflectOnActivity}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.allowWrongAnswersAfterQuestion}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>	
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.students.grades" />
-		</td>
+		<c:choose>
+			<c:when test="${assessment.reflectOnActivity}">
+				<tr>
+					<td>
+						<fmt:message key="monitor.summary.td.notebookInstructions" />
+					</td>
+					<td>
+						<lams:out value="${assessment.reflectInstructions}" escapeHtml="true"/>
+					</td>
+				</tr>
+			</c:when>
+		</c:choose>
 		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.allowGradesAfterAttempt}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.allow.students.history.responses" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.allowHistoryResponses}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advanced.notify.on.attempt.completion" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.notifyTeachersOnAttemptCompletion}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${assessment.reflectOnActivity}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${assessment.reflectOnActivity}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					<lams:out value="${assessment.reflectInstructions}" escapeHtml="true"/>
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-	
-</table>
-</div>
+	</table>
+</lams:AdvancedAccordian>
Index: lams_tool_assessment/web/pages/monitoring/parts/dateRestriction.jsp
===================================================================
diff -u -r9727106bb7f305a094b00c9a0b29a09dee57990b -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 9727106bb7f305a094b00c9a0b29a09dee57990b)
+++ lams_tool_assessment/web/pages/monitoring/parts/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,43 +1,36 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<h1>
-	<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; ">
-
 	<div>
 		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
 	</div>
 		
 	<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">
-			<fmt:message key="monitor.summary.set.restriction" />
-		</html:link>
+		<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-sm btn-default loffset5">
+				<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>
+			<span><fmt:message key="monitor.summary.after.date" /></span>
+			
+			<span id="dateInfo">
+			</span>
+		</label>
 		
-		<span id="dateInfo">
-		</span>
-				
-		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="btn btn-sm btn-default loffset5">
 			<fmt:message key="monitor.summary.unset.restriction" />
 		</html:link>
 	</div>
 
-</div>
\ No newline at end of file
+</lams:RestrictedUsageAccordian>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -r45466cdcb65a2b45fa8e24d23a40b986d902cede -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 45466cdcb65a2b45fa8e24d23a40b986d902cede)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,31 +1,30 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <script type="text/javascript">
-	<!--
 	function masterDetailLoadUp(){
-			jQuery("#userSummary${assessmentResult.sessionId}").clearGridData().setGridParam({scrollOffset: 18});
- 	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
-	       		<c:set var="question" value="${questionResult.assessmentQuestion}"/>
-	       		<c:set var="title">
-	       			<c:out value="${questionResult.assessmentQuestion.titleEscaped}" escapeXml="true"/>
-	       		</c:set>	
- 	        	var responseStr = "";
- 	       		<%@ include file="userresponse.jsp"%>
+		jQuery("#userSummary${assessmentResult.sessionId}").clearGridData().setGridParam({scrollOffset: 18});
+
+ 	    <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
+	       	<c:set var="question" value="${questionResult.assessmentQuestion}"/>
+	       	<c:set var="title">
+	       		<c:out value="${questionResult.assessmentQuestion.titleEscaped}" escapeXml="true"/>
+	       	</c:set>	
+ 	        var responseStr = "";
+ 	       	<%@ include file="userresponse.jsp"%>
  	       		
- 	       		var table = jQuery("#userSummary${assessmentResult.sessionId}");
- 	     		table.addRowData(${i.index + 1}, {
- 	   	     		id:"${i.index + 1}",
- 	   	   			questionResultUid:"${questionResult.uid}",
- 	   	   			title:"${fn:escapeXml(title)}",
- 	   	   			response:responseStr,
- 	   	   			grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
- 	   	   	    });
+ 	       	var table = jQuery("#userSummary${assessmentResult.sessionId}");
+ 	     	table.addRowData(${i.index + 1}, {
+ 	   	    	id:"${i.index + 1}",
+ 	   	   		questionResultUid:"${questionResult.uid}",
+ 	   	   		title:"${fn:escapeXml(title)}",
+ 	   	   		response:responseStr,
+ 	   	   		grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
+ 	   	   	});
 
- 	 	     	// set maxGrade attribute to cell DOM element
- 	 	     	table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" :  ${questionResult.maxMark}});
-	        </c:forEach>
+ 	 	    // set maxGrade attribute to cell DOM element
+ 	 	    table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" :  ${questionResult.maxMark}});
+		</c:forEach>
 	};	  	   	  
 	masterDetailLoadUp();
-	-->	
 </script>
    	  
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,5 +1,4 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -10,8 +9,8 @@
 		<c:set var="assessment" value="${sessionMap.assessment}"/>
 		<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 		
-		<link type="text/css" href="<lams:LAMSURL />css/jquery-ui-redmond-theme.css" rel="stylesheet">
-		<link type="text/css" href="<lams:LAMSURL />css/jquery.jqGrid.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.jqGrid.css" rel="stylesheet" />
 		<style media="screen,projection" type="text/css">
 			.ui-jqgrid tr.jqgrow td {
 			    white-space: normal !important;
@@ -21,9 +20,8 @@
 			}
 		</style>
 		
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.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>
   	    	var isEdited = false;
   	    	var previousCellValue = "";
@@ -118,6 +116,7 @@
 	  		            });
 	  		        }
 	  			});
+	  			setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 	  		});  	    	
 	  		
     		function refreshSummaryPage()  { 
@@ -128,22 +127,23 @@
         		}
     		}
   		</script>
-		
-		
 	</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >
-		
-			<h1>
+<body class="stripes" onload="parent.resizeIframe();">
+
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title">
 				<fmt:message key="label.monitoring.question.summary.history.responses" />
-			</h1>
-			<br><br>		
+			</div>
+		</div>
+			
+		<div class="panel-body">
 			<%@ include file="/common/messages.jsp"%>
 			
-			<table class="forum">
+			<table class="table table-condensed table-striped">
 				<tr>
-					<th style="width: 180px; border-left: none; padding-top:0px; " >
+					<th style="width: 180px;" >
 						<fmt:message key="label.monitoring.question.summary.title" />
 					</th>
 					<td >
@@ -152,7 +152,7 @@
 				</tr>
 				
 				<tr>
-					<th style="width: 180px;" >
+					<th>
 						<fmt:message key="label.monitoring.question.summary.question" />
 					</th>
 					<td>
@@ -162,7 +162,7 @@
 				
 				<c:if test="${questionSummary.question.type == 1}">
 					<tr>
-						<th style="width: 180px;" >
+						<th>
 							<fmt:message key="label.incorrect.answer.nullifies.mark" />
 						</th>
 						<td>
@@ -172,7 +172,7 @@
 				</c:if>
 					
 				<tr>
-					<th style="width: 180px;" >
+					<th>
 						<fmt:message key="label.monitoring.question.summary.default.mark" />
 					</th>
 					<td>
@@ -181,39 +181,32 @@
 				</tr>
 					
 				<tr>
-					<th style="width: 180px;" >
+					<th>
 						<fmt:message key="label.monitoring.question.summary.penalty" />
 					</th>
 					<td>
 						<c:out value="${questionSummary.question.penaltyFactor}" escapeXml="true"/>
 					</td>
 				</tr>			
 			</table>
-			<br><br>
 			
 			<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
-				<div style="padding-left: 0px; padding-bottom: 30px; width:99%;">
-					<div style="font-size: small; padding-bottom: 5px;">
-						<fmt:message key="label.monitoring.question.summary.group" /> ${sessionDto.sessionName}
-					</div>
-					
-					<table id="session${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0" ></table>
-					<div id="pager${sessionDto.sessionId}" class="scroll"></div>
+				<div class="voffset20">
+					<table id="session${sessionDto.sessionId}"></table>
+					<div id="pager${sessionDto.sessionId}"></div>
 				</div>	
 			</c:forEach>
+			
+			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm button-add-item voffset10 pull-right">
+				<fmt:message key="label.monitoring.question.summary.ok" /> 
+			</a>
 
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="refreshSummaryPage();" class="button space-left" style="float:right; margin-right:10px; padding-top:5px;">
-					<fmt:message key="label.monitoring.question.summary.ok" /> 
-				</a>
-			</lams:ImgButtonWrapper>
-
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+	</div>
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp
===================================================================
diff -u -rd463d658f6f48849655e46334170839f8b502712 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp	(.../reflections.jsp)	(revision d463d658f6f48849655e46334170839f8b502712)
+++ lams_tool_assessment/web/pages/monitoring/parts/reflections.jsp	(.../reflections.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,23 +1,27 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<br>
-<table class="alternative-color" id="reflections">
-						
-	<tr>
-		<th>
-			<fmt:message key="label.export.reflection"/>
-		</th>
-	</tr>
+<div class="panel-group" id="reflections" 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.export.reflection"/>
+	        	</a>
+      		</span>
+        </div>
 
-	<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
-		<tr>
-			<td valign=top class="align-left">
-				<b><c:out value="${reflectDTO.fullName}" escapeXml="true"/> - <lams:Date value="${reflectDTO.date}"/></b>
-				<br>
-				<lams:out value="${reflectDTO.reflect}" escapeHtml="true"/>
-
-			</td>
-		</tr>
-	</c:forEach>
-
-</table>
+        <div id="collapseReflection" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingReflection">
+			<table class="table table-striped table-condensed">
+				<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
+					<tr>
+						<td>
+							<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
+							<br>
+							<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+						</td>
+					</tr>
+				</c:forEach>
+			</table>
+		</div>
+	</div>
+</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -0,0 +1,30 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div id="accordion-tool-output" class="panel-group voffset20" role="tablist" aria-multiselectable="true"> 
+    <div class="panel panel-default">
+        <div class="panel-heading collapsable-icon-left" id="heading-tool-output">
+        	<span class="panel-title">
+		    	<a class="collapsed" role="button" data-toggle="collapse" href="#tool-output" aria-expanded="true" aria-controls="tool-output">
+	          		<fmt:message key="label.tool.output" />
+	          	</a>
+      		</span>
+        </div>
+
+		<div aria-expanded="false" id="tool-output" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="heading-tool-output">
+		
+			<select name="activityEvaluation" id="activity-evaluation" autocomplete="off">
+				<option value="dummy"></option>
+				
+				<c:forEach var="toolOutputDefinition" items="${sessionMap.toolOutputDefinitions}" varStatus="firstGroup">
+				
+					<option value="${toolOutputDefinition}"
+							<c:if test="${toolOutputDefinition == sessionMap.activityEvaluation}">selected="selected"</c:if>>
+						<fmt:message key="output.desc.${toolOutputDefinition}" />
+					</option>
+					
+				</c:forEach>
+			</select>
+
+		</div>
+	</div>
+</div>
Index: lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
===================================================================
diff -u -rdb599324881fb550c8645c904483d48ffe9f237d -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision db599324881fb550c8645c904483d48ffe9f237d)
+++ lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,92 +1,92 @@
 <%@ include file="/common/taglibs.jsp"%>					
 					
-					<c:choose>
-						<c:when test="${question.type == 1}">
-							<c:forEach var="option" items="${question.options}">
-								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
-									<c:if test="${optionAnswer.answerBoolean && (optionAnswer.optionUid == option.uid)}">
-										responseStr += "${option.optionStringEscaped}";
-									</c:if>
-								</c:forEach>					
-							</c:forEach>						
-						</c:when>
+<c:choose>
+	<c:when test="${question.type == 1}">
+		<c:forEach var="option" items="${question.options}">
+			<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+				<c:if test="${optionAnswer.answerBoolean && (optionAnswer.optionUid == option.uid)}">
+					responseStr += "${option.optionStringEscaped}";
+				</c:if>
+			</c:forEach>					
+		</c:forEach>						
+	</c:when>
 						
-						<c:when test="${question.type == 2}">
-							<c:forEach var="option" items="${question.options}">
-								responseStr +='<div>';
-									responseStr +='<div style="float: left;">';
-										responseStr +="${option.questionEscaped}";
-									responseStr +='</div>';
-									responseStr +='<div style=" float: right; width: 50%;">';
-										responseStr +=' - '; 
-										<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
-											<c:if test="${option.uid == optionAnswer.optionUid}">
-												<c:forEach var="questionOption2" items="${question.options}">
-													<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
-														responseStr +="${questionOption2.optionStringEscaped}";
-													</c:if>
-												</c:forEach>
-											</c:if>
-										</c:forEach>										
-									responseStr +='</div>';
-								responseStr +='</div>';
-								responseStr +='<br>';
-							</c:forEach>
-						</c:when>
+	<c:when test="${question.type == 2}">
+		<c:forEach var="option" items="${question.options}">
+			responseStr +='<div>';
+			responseStr +=	'<div style="float: left;">';
+			responseStr +=		"${option.questionEscaped}";
+			responseStr +=	'</div>';
+			responseStr +=	'<div style=" float: right; width: 50%;">';
+			responseStr +=		' - '; 
+			<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+				<c:if test="${option.uid == optionAnswer.optionUid}">
+					<c:forEach var="questionOption2" items="${question.options}">
+						<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
+							responseStr +="${questionOption2.optionStringEscaped}";
+						</c:if>
+					</c:forEach>
+				</c:if>
+			</c:forEach>										
+			responseStr +=	'</div>';
+			responseStr +='</div>';
+			responseStr +='<br>';
+		</c:forEach>
+	</c:when>
 						
-						<c:when test="${question.type == 3}">
-							responseStr +="${fn:escapeXml(questionResult.answerStringEscaped)}";
-						</c:when>
+	<c:when test="${question.type == 3}">
+		responseStr +="${fn:escapeXml(questionResult.answerStringEscaped)}";
+	</c:when>
 						
-						<c:when test="${question.type == 4}">
-							responseStr +="${questionResult.answerStringEscaped}";
-						</c:when>
+	<c:when test="${question.type == 4}">
+		responseStr +="${questionResult.answerStringEscaped}";
+	</c:when>
 						
-						<c:when test="${question.type == 5}">
-							<c:if test="${questionResult.answerString != null}">			
-								responseStr +="${questionResult.answerBoolean}";
-							</c:if>
-						</c:when>
+	<c:when test="${question.type == 5}">
+		<c:if test="${questionResult.answerString != null}">			
+			responseStr +="${questionResult.answerBoolean}";
+		</c:if>
+	</c:when>
 						
-						<c:when test="${question.type == 6}">
-							responseStr +="${questionResult.answerStringEscaped}";
-						</c:when>
+	<c:when test="${question.type == 6}">
+		responseStr +="${questionResult.answerStringEscaped}";
+	</c:when>
 						
-						<c:when test="${question.type == 7}">
-							<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
-								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
-									<c:if test="${optionAnswer.answerInt == j}">		
-										<c:forEach var="option" items="${question.options}">
-											<c:if test="${optionAnswer.optionUid == option.uid}">
-												responseStr +="${option.optionStringEscaped}";
-											</c:if>
-										</c:forEach>
-									</c:if>								
-								</c:forEach>
-							</c:forEach>
-						</c:when>
+	<c:when test="${question.type == 7}">
+		<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
+			<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+				<c:if test="${optionAnswer.answerInt == j}">		
+					<c:forEach var="option" items="${question.options}">
+						<c:if test="${optionAnswer.optionUid == option.uid}">
+							responseStr +="${option.optionStringEscaped}";
+						</c:if>
+					</c:forEach>
+				</c:if>								
+			</c:forEach>
+		</c:forEach>
+	</c:when>
 						
-						<c:when test="${question.type == 8}">
-							<c:forEach var="option" items="${question.options}">
-								responseStr +='<div>';
-									responseStr +='<div style="float: left;">';
-										responseStr +="${option.optionStringEscaped}";
-									responseStr +='</div>';
-									responseStr +='<div style=" float: right; width: 20%;">';
-										responseStr +=' - '; 
-										<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
-											<c:if test="${option.uid == optionAnswer.optionUid}">
-												responseStr +="${optionAnswer.answerInt}";
-											</c:if>
-										</c:forEach>										
-									responseStr +='</div>';
-								responseStr +='</div>';
-								responseStr +='<br>';
-							</c:forEach>
+	<c:when test="${question.type == 8}">
+		<c:forEach var="option" items="${question.options}">
+			responseStr +='<div>';
+			responseStr +=	'<div style="float: left;">';
+			responseStr +=		"${option.optionStringEscaped}";
+			responseStr +=	'</div>';
+			responseStr +=	'<div style=" float: right; width: 20%;">';
+			responseStr +=		' - '; 
+			<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+				<c:if test="${option.uid == optionAnswer.optionUid}">
+					responseStr +="${optionAnswer.answerInt}";
+				</c:if>
+			</c:forEach>										
+			responseStr +=	'</div>';
+			responseStr +='</div>';
+			responseStr +='<br>';
+		</c:forEach>
 							
-							<c:if test="${question.hedgingJustificationEnabled}">
-								responseStr +="${questionResult.answerStringEscaped}";
-							</c:if>
-						</c:when>						
+	<c:if test="${question.hedgingJustificationEnabled}">
+		responseStr +="${questionResult.answerStringEscaped}";
+	</c:if>
+	</c:when>						
 	
-					</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -1,16 +1,14 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="assessment" value="${sessionMap.assessment}"/>
 
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/header.jsp"%>
+		<%@ include file="/common/header.jsp"%>		
 		
-		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-		<c:set var="assessment" value="${sessionMap.assessment}"/>
-		
-		<link type="text/css" href="<lams:LAMSURL />css/jquery-ui-redmond-theme.css" rel="stylesheet">
-		<link type="text/css" href="<lams:LAMSURL />css/jquery.jqGrid.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.jqGrid.css" rel="stylesheet" />
 		<style media="screen,projection" type="text/css">
 			.ui-jqgrid tr.jqgrow td {
 			    white-space: normal !important;
@@ -19,8 +17,7 @@
 			    padding-top:2px;
 			}
 		</style>
-		
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.locale-en.js"></script>
 	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.js"></script>
   	    <script>
@@ -52,7 +49,6 @@
 	  				   	],
 	  				   	
 	  				   	multiselect: false,
-	  				   	caption: "${question.titleEscaped}",
 	  				  	cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>',
 	  				  	cellEdit: true,
 	  				  	beforeEditCell: function (rowid,name,val,iRow,iCol){
@@ -128,6 +124,7 @@
 	  		            });
 	  		        }
 	  			});
+	  			setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 	  		});  	    	
 
     		function refreshSummaryPage()  { 
@@ -138,22 +135,23 @@
         		}
     		}
   		</script>
-		
-		
 	</lams:head>
 	
-	<body class="stripes" onload="parent.resizeIframe();">
-		<div id="content" >
-		
-			<h1>
+<body class="stripes" onload="parent.resizeIframe();">
+
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title">
 				<fmt:message key="label.monitoring.user.summary.history.responses" />
-			</h1>
-			<br><br>		
+			</div>
+		</div>
+			
+		<div class="panel-body">	
 			<%@ include file="/common/messages.jsp"%>
 			
-			<table class="forum">
+			<table class="table table-condensed">
 				<tr>
-					<th style="width: 180px; border-left: none; padding-top:0px; " >
+					<th style="width: 180px;" >
 						<fmt:message key="label.monitoring.user.summary.user.name" />
 					</th>
 					<td >
@@ -162,7 +160,7 @@
 				</tr>
 				
 				<tr>
-					<th style="width: 180px;" >
+					<th>
 						<fmt:message key="label.monitoring.user.summary.number.attempts" />
 					</th>
 					<td>
@@ -171,7 +169,7 @@
 				</tr>
 					
 				<tr>
-					<th style="width: 180px;" >
+					<th>
 						<fmt:message key="label.monitoring.user.summary.time.last.attempt" />
 					</th>
 					<td>
@@ -181,54 +179,59 @@
 				</tr>
 					
 				<tr>
-					<th style="width: 180px;" >
+					<th>
 						<fmt:message key="label.monitoring.user.summary.last.attempt.grade" />
 					</th>
 					<td>
 						<div id="lastAttemptGrade">${userSummary.lastAttemptGrade}</div>
 					</td>
 				</tr>
 			</table>
-			<br><br>
 			
 			<c:forEach var="userSummaryItem" items="${userSummary.userSummaryItems}" varStatus="status">
-				<div style="padding-left: 0px; padding-bottom: 30px; width:99%;">
-					<table style="font-size: small; padding-bottom: 5px;">
+				<div class="voffset20">
+					<div class="panel panel-default">
+						<div class="panel-heading">
+							<div class="panel-title">
+					<table style="font-size: small;">
 						<tr>
-							<td width="50px;">
+							<td width="70px;">
 								<fmt:message key="label.monitoring.user.summary.title" />
 							</td>
 							<td>
 								 <c:out value="${userSummaryItem.question.title}" escapeXml="true"/>
 							</td>
 						</tr>					
 						<tr>
-							<td width="50px;">
+							<td>
 								<fmt:message key="label.monitoring.user.summary.question" />
 							</td>
 							<td>
 								<c:out value="${userSummaryItem.question.question}" escapeXml="false"/>
 							</td>
 						</tr>
 					</table>
+							</div>
+						</div>
+				
+
 					
-					<table id="user${userSummaryItem.question.uid}" class="scroll" cellpadding="0" cellspacing="0" ></table>
-				</div>	
-			</c:forEach>	
+					<table id="user${userSummaryItem.question.uid}"></table>
+					</div>
+				</div>
+			</c:forEach>
 
+			<a href="#nogo" onclick="refreshSummaryPage();" class="btn btn-default btn-sm button-add-item voffset20 pull-right">
+				<fmt:message key="label.monitoring.user.summary.ok" /> 
+			</a>
 
-			<lams:ImgButtonWrapper>
-				<a href="#" onclick="refreshSummaryPage();" class="button space-left" style="float:right; margin-right:10px; padding-top:5px;">
-					<fmt:message key="label.monitoring.user.summary.ok" /> 
-				</a>
-			</lams:ImgButtonWrapper>
-
 		</div>
 		<!--closes content-->
 	
 		<div id="footer">
 		</div>
 		<!--closes footer-->		
-		
-	</body>
+
+	</div>		
+</body>
 </lams:html>
Index: lams_tool_assessment/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -rf494ac5c2f49f92be600b6392d9c85c291df7bb7 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision f494ac5c2f49f92be600b6392d9c85c291df7bb7)
+++ lams_tool_assessment/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -26,67 +26,43 @@
 		});
 	});		
 </script>
-		
-<h2>
-	<fmt:message key="label.number.learners.per.session" />
-</h2>
 
-<table cellspacing="3" style="width: 400px; padding-left: 30px;">
-
-	<c:choose>
-		<c:when test="${empty sessionDtos}">
-			<div align="center">
-				<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-			</div>
-		</c:when>
+<c:choose>
+	<c:when test="${empty sessionDtos}">
+		<lams:Alert type="warn" id="no-edit" close="false">
+			<fmt:message key="message.monitoring.summary.no.session" />
+		</lams:Alert>
+	</c:when>
 		
-		<c:otherwise>
+	<c:otherwise>
+	
+		<h5>
+			<fmt:message key="label.number.learners.per.session" />
+		</h5>
+	
+		<table class="table table-condensed table-striped">
 			<tr>
-				<th width="150px;" style="padding-left: 0px;">
+				<th width="150px;">
 					<fmt:message key="label.monitoring.summary.user.name" />
 				</th>
-				<th width="80px;" style="padding-left: 0px;">
+				<th width="80px;">
 					<fmt:message key="label.monitoring.summary.total" />
-				</th>					
-			</tr>	
-		</c:otherwise>
+				</th>		
+			</tr>
+		
+			<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="firstGroup">
+				<tr>				
+					<td>
+						<fmt:message key="monitoring.label.group" />&nbsp;${sessionDto.sessionName}
+					</td>
+					<td>
+						${sessionDto.numberLearners}
+					</td>
+				</tr>
+			</c:forEach>
+		</table>
 	
-	</c:choose>
-	
-	<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="firstGroup">
-		<tr>				
-			<td>
-				<fmt:message key="monitoring.label.group" /> ${sessionDto.sessionName}
-			</td>
-			<td>
-				${sessionDto.numberLearners}
-			</td>
-		</tr>
-	</c:forEach>
-</table>
+	</c:otherwise>
+</c:choose>
 
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="tree-icon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('tool-output'), document.getElementById('tree-icon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('tool-output'), document.getElementById('tree-icon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="label.tool.output" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="tool-output" style="display:none">
-	<select name="activityEvaluation" id="activity-evaluation" autocomplete="off">
-		<option value="dummy"></option>
-		
-		<c:forEach var="toolOutputDefinition" items="${sessionMap.toolOutputDefinitions}" varStatus="firstGroup">
-		
-			<option value="${toolOutputDefinition}"
-				<c:if test="${toolOutputDefinition == sessionMap.activityEvaluation}">selected="selected"</c:if>
-			>
-				<fmt:message key="output.desc.${toolOutputDefinition}" />
-			</option>
-			
-		</c:forEach>
-	</select>
-</div>
-
+<%@ include file="parts/toolOutput.jsp"%>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rada87c0ea51639a2e0741532ee4a508a2c821327 -rfb2d35766faadf7fa8e0247feb943da34f8fba4f
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ada87c0ea51639a2e0741532ee4a508a2c821327)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
@@ -9,7 +9,6 @@
 		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 		
 			jQuery("#list${sessionDto.sessionId}").jqGrid({
-			   	caption: "${sessionDto.sessionName}",
 			   	multiselect: false,
 				datatype: "json",
 				url: "<c:url value="/monitoring/getUsers.do"/>?sessionMapID=${sessionMapID}&sessionId=${sessionDto.sessionId}",
@@ -133,13 +132,14 @@
 		
 		//jqgrid autowidth (http://stackoverflow.com/a/1610197)
 		$(window).bind('resize', function() {
-			jQuery(".ui-jqgrid-btable:visible").each(function(index) {
-		    	var gridId = $(this).attr('id');
-		    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
-	        	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
-		    });
-		}).trigger('resize');
+			resizeJqgrid(jQuery(".ui-jqgrid-btable:visible"));
+		});
 
+		//resize jqGrid on openning of bootstrap collapsible
+		$('div[id^="collapse"]').on('shown.bs.collapse', function () {
+			resizeJqgrid(jQuery(".ui-jqgrid-btable:visible", this));
+		})
+
 		$("#questionUid").change(function() {
 			var questionUid = $("#questionUid").val();
 			if (questionUid != -1) {
@@ -148,10 +148,18 @@
 				$("#questionSummaryHref").attr("href", questionSummaryHref);	
 				$("#questionSummaryHref").click(); 		 
 			}
-	    }); 
+	    });
 	});
+
+	function resizeJqgrid(jqgrids) {
+		jqgrids.each(function(index) {
+			var gridId = $(this).attr('id');
+	    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+	    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+	    });
+	};
 	
-	function exportSummary(){   
+	function exportSummary() {
 		var url = "<c:url value='/monitoring/exportSummary.do'/>";
 	    var reqIDVar = new Date();
 		var param = "?sessionMapID=${sessionMapID}&reqID="+reqIDVar.getTime();
@@ -183,92 +191,97 @@
 		}
 	};
 	window.onresize = resizeIframe;
-	
-	// pass settings to monitorToolSummaryAdvanced.js
-	var submissionDeadlineSettings = {
-		lams: '<lams:LAMSURL />',
-		submissionDeadline: '${submissionDeadline}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
-		toolContentID: '${param.toolContentID}',
-		messageNotification: '<fmt:message key="monitor.summary.notification" />',
-		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
-		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
-	};
 </script>
 
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-
-<h1><c:out value="${assessment.title}" escapeXml="true"/></h1>
-
-<div class="instructions space-top">
-	<c:out value="${assessment.instructions}" escapeXml="false"/>
+<div class="panel">
+	<h4>
+	  <c:out value="${assessment.title}" escapeXml="true"/>
+	</h4>
+	
+	<div class="instructions voffset5">
+	  <c:out value="${assessment.instructions}" escapeXml="false"/>
+	</div>
+	
+	<c:if test="${empty sessionDtos}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="message.monitoring.summary.no.session" />
+		</lams:Alert>
+	</c:if>
 </div>
 
-
-<c:choose>
-	<c:when test="${empty sessionDtos}">
-		<div align="center">
-			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-		</div>	
-	</c:when>
-	<c:otherwise>
+<c:if test="${not empty sessionDtos}">
 	
-		<div style="padding-left: 20px; margin-bottom: 10px; margin-top: 15px;">
-			<H1><fmt:message key="label.monitoring.summary.summary" /></H1>
-		</div>	
+	<h5><fmt:message key="label.monitoring.summary.summary" /></h5>
 	
-		<div style="padding-left: 30px; font-size: small; margin-bottom: 20px; font-style: italic;">
-			<fmt:message key="label.monitoring.summary.double.click" />
-		</div>
+	<div class="comments">
+		<fmt:message key="label.monitoring.summary.double.click" />
+	</div>
 			
-		<div id="masterDetailArea">
-			<%@ include file="parts/masterDetailLoadUp.jsp"%>
-		</div>
-		<a onclick="" href="return false;" class="thickbox" id="userSummaryHref" style="display: none;"></a>	
+	<div id="masterDetailArea" class="voffset10">
+		<%@ include file="parts/masterDetailLoadUp.jsp"%>
+	</div>
+	<a onclick="" href="return false;" class="thickbox initially-hidden" id="userSummaryHref"></a>
 	
-		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
-			<div class="session-container" 
-				 	style="<c:if test='${!status.last}'>padding-bottom: 30px;</c:if><c:if test='${status.last}'>padding-bottom: 15px;</c:if> ">
-				<c:if test="${sessionMap.isGroupedActivity}">
-					<div class="session-header">
-						<B><fmt:message key="monitoring.label.group" /></B> ${sessionDto.sessionName}
-					</div>
-				</c:if>
+	<c:if test="${sessionMap.isGroupedActivity}">
+		<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+	</c:if>
+	
+	<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
+	
+		<c:if test="${sessionMap.isGroupedActivity}">	
+		    <div class="panel panel-default" >
+		        <div class="panel-heading" id="heading${sessionDto.sessionId}">
+		        	<span class="panel-title collapsable-icon-left">
+		        		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionDto.sessionId}" 
+								aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionDto.sessionId}" >
+							<fmt:message key="monitoring.label.group" />:	<c:out value="${sessionDto.sessionName}" />
+						</a>
+					</span>
+		        </div>
+	        
+	        <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" 
+	        		role="tabpanel" aria-labelledby="heading${sessionSummary.sessionId}">
+		</c:if>
 				
-				<table id="list${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-				<table id="userSummary${sessionDto.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-				<div id="listPager${sessionDto.sessionId}" class="scroll"></div>
-				
-			</div>
-		</c:forEach>	
+		<table id="list${sessionDto.sessionId}"></table>
+		<div class="voffset10"></div>
+		<table id="userSummary${sessionDto.sessionId}"></table>
+		<div id="listPager${sessionDto.sessionId}"></div>
+
+		<c:if test="${sessionMap.isGroupedActivity}">
+			</div> <!-- end collapse area  -->
+			</div> <!-- end collapse panel  -->
+		</c:if>
+		${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+
+	</c:forEach>
 		
-		<html:link href="javascript:exportSummary();" property="exportExcel" styleClass="button space-right float-right">
-			<fmt:message key="label.monitoring.summary.export.summary" />
-		</html:link>
+	<c:if test="${sessionMap.isGroupedActivity}">
+		</div> <!--  end panel group -->
+	</c:if>
 		
-		<div style="padding-left: 20px; margin-bottom: 15px; margin-top: 30px;">
-			<H1><fmt:message key="label.monitoring.summary.report.by.question" /></H1>
-		</div>
+	<html:link href="javascript:exportSummary();" property="exportExcel" styleClass="btn btn-default btn-xs pull-right">
+		<fmt:message key="label.monitoring.summary.export.summary" />
+	</html:link>
 		
-		<!-- Dropdown menu for choosing a question type -->
-		
-		<div style="padding-left: 30px; margin-top: 10px; margin-bottom: 25px;">	
-			<div style="margin-bottom: 6px; font-size: small; font-style: italic;">
-				<fmt:message key="label.monitoring.summary.results.question" />
-			</div>
+	<!-- Dropdown menu for choosing a question type -->	
+	<h5><fmt:message key="label.monitoring.summary.report.by.question" /></h5>
+	
+	<div class="comments">
+		<fmt:message key="label.monitoring.summary.results.question" />
+	</div>
 
-			<select id="questionUid" style="float: left">
-				<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
-    			<c:forEach var="question" items="${sessionMap.questionList}">
-					<option value="${question.uid}"><c:out value="${question.title}" escapeXml="true"/></option>
-			   	</c:forEach>
-			</select>
+	<div class="form-inline form-group voffset5">
+		<select id="questionUid" class="form-control input-sm">
+			<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
+    		<c:forEach var="question" items="${sessionMap.questionList}">
+				<option value="${question.uid}"><c:out value="${question.title}" escapeXml="true"/></option>
+		   	</c:forEach>
+		</select>
 			
-			<a onclick="" href="return false;" class="thickbox" id="questionSummaryHref" style="display: none;"></a>
-		</div>
-	
-	</c:otherwise>
-</c:choose>
+		<a onclick="" href="return false;" class="thickbox initially-hidden" id="questionSummaryHref"></a>
+	</div>
+</c:if>
 
 <br/>