Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -237,16 +237,16 @@
 	    Set<Long> completedTaskUids = userDto.getCompletedTaskUids();
 	    for (TaskListItem item : items) {
 		String completionImage = completedTaskUids.contains(item.getUid())
-			? "<img src='" + TOOL_URL + "/includes/images/completeitem.gif' border='0'>"
-			: "<img src='" + TOOL_URL + "/includes/images/dash.gif' border='0'>";
+			? "<i class=\"fa fa-check\"></i>"
+			: "<i class=\"fa fa-minus\"></i>";
 		userData.put(completionImage);
 	    }
 
 	    if (tasklist.isMonitorVerificationRequired()) {
 		String label = StringEscapeUtils.escapeHtml(service.getMessage("label.confirm"));
 
 		String verificationStatus = userDto.isVerifiedByMonitor()
-			? "<img src='" + TOOL_URL + "/includes/images/tick.gif' border='0'>"
+			? "<i class=\"fa fa-check\"></i>"
 			: "<a id='verif-" + userDto.getUserId()
 				+ "' href='javascript:;' onclick='return setVerifiedByMonitor(this, "
 				+ userDto.getUserId() + ");'>" + label + "</a>";
@@ -321,8 +321,8 @@
 	    userData.put(fullName);
 
 	    String completionImage = userDto.isCompleted()
-		    ? "<img src='" + TOOL_URL + "/includes/images/completeitem.gif' border='0'>"
-		    : "<img src='" + TOOL_URL + "/includes/images/dash.gif' border='0'>";
+		    ? "<i class=\"fa fa-check\"></i>"
+		    : "<i class=\"fa fa-minus\"></i>";
 	    userData.put(completionImage);
 
 	    String accessDate = (userDto.getAccessDate() == null) ? ""
Index: lams_tool_task/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/AdvancedAccordian.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Arrow.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -0,0 +1,35 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+
+<%-- state = up: up arrow;  state = down: down arrow --%>
+<%@ attribute name="state" required="true" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+
+<c:choose>
+	<c:when test="${not empty title}">
+		<c:set var="fullTitle">title="${title}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullTitle" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty onclick}">
+		<c:set var="fullOnclick">onclick="${onclick}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullOnclick" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+	</c:when>
+	<c:otherwise>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+	</c:otherwise>
+</c:choose>
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_task/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Comments.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7a381230743673d067b20cd5a3f00430d58659d1 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7a381230743673d067b20cd5a3f00430d58659d1)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/Rating.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/TSTable.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r68cefba7d15519f37436278fb0790fef8abc3b62 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 68cefba7d15519f37436278fb0790fef8abc3b62)
+++ lams_tool_task/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,85 +1,89 @@
-<%
-	 /****************************************************************
-	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-	 * =============================================================
-	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
-	 * 
-	 * This program is free software; you can redistribute it and/or modify
-	 * it under the terms of the GNU General Public License version 2.0
-	 * as published by the Free Software Foundation.
-	 * 
-	 * This program is distributed in the hope that it will be useful,
-	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
-	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	 * GNU General Public License for more details.
-	 * 
-	 * You should have received a copy of the GNU General Public License
-	 * along with this program; if not, write to the Free Software
-	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-	 * USA
-	 * 
-	 * http://www.gnu.org/licenses/gpl.txt
-	 * ****************************************************************
-	 */
-
-	/**
-	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
-	 * Wiki: 
-	 */
-%>
-<%@ tag body-content="empty"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="value" required="false" rtexprvalue="true"%>
-<%@ attribute name="key" required="false" rtexprvalue="true"%>
-<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
-
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-
-<%-- Check if  bundle is set --%>
-<c:if test="${not empty bundle}">
-	<fmt:setBundle basename="${bundle}"/>
-</c:if>
-
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-
-<c:set var="tabTitle" value="${value}" />
-
-<%--
-	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-	this is handy if the page needs different logic on initialisation and user switching tabs
---%>
-
-<c:if test="${methodCall == null}">
-	<c:choose>
-		<c:when test="${dControl}">
-			<c:set var="methodCall" value="doSelectTab" />
-		</c:when>
-		<c:otherwise>
-			<c:set var="methodCall" value="selectTab" />
-		</c:otherwise>
-	</c:choose>
-</c:if>
-
-<c:if test="${key != null && value == null}">
-	<c:set var="tabTitle">
-		<fmt:message key="${key}" />
-	</c:set>
-</c:if>
-
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<%
+	 /****************************************************************
+	 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+	 * =============================================================
+	 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+	 * 
+	 * This program is free software; you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License version 2.0
+	 * as published by the Free Software Foundation.
+	 * 
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	 * GNU General Public License for more details.
+	 * 
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program; if not, write to the Free Software
+	 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+	 * USA
+	 * 
+	 * http://www.gnu.org/licenses/gpl.txt
+	 * ****************************************************************
+	 */
+
+	/**
+	 * Tab.tag
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
+	 * Wiki: 
+	 */
+%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%-- Check if  bundle is set --%>
+<c:if test="${not empty bundle}">
+	<fmt:setBundle basename="${bundle}"/>
+</c:if>
+
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+
+<c:set var="tabTitle" value="${value}" />
+
+<%--
+	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
+--%>
+
+<c:if test="${methodCall == null}">
+	<c:choose>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
+	</c:choose>
+</c:if>
+
+<c:if test="${key != null && value == null}">
+	<c:set var="tabTitle">
+		<fmt:message key="${key}" />
+	</c:set>
+</c:if>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_tool_task/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r68cefba7d15519f37436278fb0790fef8abc3b62 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 68cefba7d15519f37436278fb0790fef8abc3b62)
+++ lams_tool_task/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,52 +1,44 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * TabBody.tag
- *	Author: Mitchell Seaton
- *	Description: Creates the body container for a tab element
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
-<%@ attribute name="page" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-
-</div>
-<!-- end tab content -->
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * TabBody.tag
+ *	Author: Mitchell Seaton
+ *	Description: Creates the body container for a tab element
+ * Wiki: 
+ */
+
+%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
+
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_task/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/TabBodyArea.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/TabBodys.tag	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r68cefba7d15519f37436278fb0790fef8abc3b62 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 68cefba7d15519f37436278fb0790fef8abc3b62)
+++ lams_tool_task/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,69 +1,92 @@
-<%/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-/**
- * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
- */
-
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
-<%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<c:set var="dControl" value="false" scope="request" />
-<c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request" />
-</c:if>
-
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
-
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
-</div>
+<%/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/**
+ * Tabs.tag
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
+ */
+
+%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
+<c:set var="dControl" value="false" scope="request" />
+<c:if test="${control}">
+	<c:set var="dControl" value="${control}" scope="request" />
+</c:if>
+
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
+
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
+</div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_task/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -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_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rbfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision bfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,18 +408,34 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
    	<tag-file>
        <name>AuthoringButton</name>
        <path>/WEB-INF/tags/AuthoringButton.tag</path>
-   	</tag-file>   	
+   	</tag-file>   
    	<tag-file>
+       <name>AuthoringRatingCriteria</name>
+       <path>/WEB-INF/tags/AuthoringRatingCriteria.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>Rating</name>
+       <path>/WEB-INF/tags/Rating.tag</path>
+   	</tag-file>    		
+   	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
    	</tag-file>
@@ -438,8 +454,24 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
+   	</tag-file>
+   	<tag-file>
+	    <name>TSTable</name>
+		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
@@ -481,5 +513,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_task/web/common/header.jsp
===================================================================
diff -u -rbfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/common/header.jsp	(.../header.jsp)	(revision bfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc)
+++ lams_tool_task/web/common/header.jsp	(.../header.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -10,10 +10,10 @@
 
  	<!-- ********************  javascript ********************** -->
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/taskListcommon.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/jquery.timeago.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/taskListcommon.js'/>"></script>
 
 	
Index: lams_tool_task/web/common/monitorheader.jsp
===================================================================
diff -u
--- lams_tool_task/web/common/monitorheader.jsp	(revision 0)
+++ lams_tool_task/web/common/monitorheader.jsp	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -0,0 +1,25 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
+
+ 	<!-- ********************  CSS ********************** -->
+	<link href="<html:rewrite page='/includes/css/taskList.css'/>" rel="stylesheet" type="text/css">
+	<lams: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/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
+	
+	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
+	
\ No newline at end of file
Index: lams_tool_task/web/common/tabbedheader.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_task/web/common/tabbedheader.jsp	(.../tabbedheader.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -5,12 +5,13 @@
 
  	<!-- ********************  CSS ********************** -->
 	<link href="<html:rewrite page='/includes/css/taskList.css'/>" rel="stylesheet" type="text/css">
-	<lams:css style="main"/>
+	<lams: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/taskListcommon.js'/>"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
 
 	
Index: lams_tool_task/web/includes/images/completeitem.gif
===================================================================
diff -u -r182743b20b3ea04f99193cdce3a176f04d055641 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/cross.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/dash.gif
===================================================================
diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/downarrow.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/downarrow_disabled.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/edit.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/empty_checkbox.jpeg
===================================================================
diff -u -r9992a84545c9a3b15516ad92bc79e3bff228dc5f -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/incompleteitem.gif
===================================================================
diff -u -r182743b20b3ea04f99193cdce3a176f04d055641 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/indicator.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/spacer.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/tick.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/tree_closed.gif
===================================================================
diff -u -r341a816804f6b2b61a5f180479b56d8fd0d1ea29 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/tree_open.gif
===================================================================
diff -u -r341a816804f6b2b61a5f180479b56d8fd0d1ea29 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/uparrow.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/images/uparrow_disabled.gif
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
Binary files differ
Index: lams_tool_task/web/includes/javascript/taskListcommon.js
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/includes/javascript/taskListcommon.js	(.../taskListcommon.js)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/web/includes/javascript/taskListcommon.js	(.../taskListcommon.js)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,10 +1,16 @@
 	function showBusy(targetDiv){
 		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
+			$("#"+targetDiv+"_Busy").show();
 		}
 	}
 	function hideBusy(targetDiv){
 		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
+			$("#"+targetDiv+"_Busy").hide();
 		}				
 	}
+	function refreshCKEditors() {
+		// make sure all the ckeditors are refreshed, not just the validated ones
+		for (var i in CKEDITOR.instances) {
+       		CKEDITOR.instances[i].updateElement();
+   		}
+	}
\ No newline at end of file
Index: lams_tool_task/web/pages/authoring/advance.jsp
===================================================================
diff -u -rac170eba5ee70135e473b3a5525d1743d0098bc8 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision ac170eba5ee70135e473b3a5525d1743d0098bc8)
+++ lams_tool_task/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -3,25 +3,25 @@
 
 <!-- Advance Tab Content -->
 
-<p class="small-space-top">
-	<html:checkbox property="taskList.lockWhenFinished"	styleClass="noBorder" styleId="lockWhenFinished" />
+<div class="checkbox">
 	<label for="lockWhenFinished">
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	<html:checkbox property="taskList.lockWhenFinished"	styleId="lockWhenFinished" />
+	<fmt:message key="label.authoring.advance.lock.on.finished" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="taskList.sequentialOrder" styleClass="noBorder" styleId="sequentialOrder"/>
+<div class="checkbox">
 	<label for="sequentialOrder">
-		<fmt:message key="label.authoring.advance.run.content.sequentialOrder" />
+	<html:checkbox property="taskList.sequentialOrder" styleId="sequentialOrder"/>
+	<fmt:message key="label.authoring.advance.run.content.sequentialOrder" />
 	</label>
-</p>
+</div>
 
-<p>
+<div class="form-group">
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<html:select property="taskList.minimumNumberTasks"	styleId="minimumNumberTasks" style="width:50px">
+	<html:select property="taskList.minimumNumberTasks"	styleId="minimumNumberTasks" styleClass="form-control form-control-inline input-sm">
 <!-- 		<c:forEach begin="1" end="${fn:length(sessionMap.taskListList)}" varStatus="status">
 			<c:choose>
 				<c:when	test="${formBean.taskList.minimumNumberTasks == status.index}">
@@ -42,32 +42,32 @@
 	<label for="minimumNumberTasks">
 		<fmt:message key="label.authoring.advance.minimum.number.tasks" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="taskList.allowContributeTasks" styleClass="noBorder" styleId="allowContributeTasks" />
+<div class="checkbox">
 	<label for="allowContributeTasks">
-		<fmt:message key="label.authoring.advance.allow.contribute.tasks" />
+	<html:checkbox property="taskList.allowContributeTasks" styleId="allowContributeTasks" />
+	<fmt:message key="label.authoring.advance.allow.contribute.tasks" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="taskList.monitorVerificationRequired" styleClass="noBorder" styleId="monitorVerificationRequired" />
+<div class="checkbox">
 	<label for="monitorVerificationRequired">
-		<fmt:message key="label.authoring.advance.monitor.verification.required" />
+	<html:checkbox property="taskList.monitorVerificationRequired" styleId="monitorVerificationRequired" />
+	<fmt:message key="label.authoring.advance.monitor.verification.required" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="taskList.reflectOnActivity" styleClass="noBorder" styleId="reflectOn" />
+<div class="checkbox">
 	<label for="reflectOn">
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	<html:checkbox property="taskList.reflectOnActivity" styleId="reflectOn" />
+	<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:textarea property="taskList.reflectInstructions"	styleId="reflectInstructions" cols="30" rows="3" />
-</p>
+<div class="form-group">
+	<html:textarea property="taskList.reflectInstructions"	styleId="reflectInstructions" styleClass="form-control" rows="3" />
+</div>
 
 <script type="text/javascript">
 <!--
Index: lams_tool_task/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_task/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -11,7 +11,6 @@
 
 	<%@ include file="/common/tabbedheader.jsp"%>
 
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 	<script>
         function init(){
             var tag = document.getElementById("currentTab");
@@ -69,63 +68,58 @@
 
 <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:Tab id="3" key="label.authoring.heading.conditions" />
-		</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">
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<html:hidden property="taskList.contentId" />
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="contentFolderID" />
+	<html:hidden property="currentTab" styleId="currentTab" />
 
-		<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="taskList.contentId" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
+		<c:set var="title"><fmt:message key="activity.title" /></c:set>
+		<lams:Page title="${title}" type="navbar">
 
-		<lams:help toolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" module="authoring"/>
+			 <lams:Tabs control="true" title="${title}" helpToolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+				<lams:Tab id="1" key="label.authoring.heading.basic" />
+				<lams:Tab id="2" key="label.authoring.heading.advance" />
+				<lams:Tab id="3" key="label.authoring.heading.conditions" />
+			</lams:Tabs>
+			
+			<lams:TabBodyArea>
+				<%@ include file="/common/messages.jsp"%>
+		
+				<lams:TabBodys>
+					<!-- 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) -->
+		
+					<!-- tab content 3 (Conditions) -->
+					<lams:TabBody id="3" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
+					<!-- end of content (Instructions) -->
+				</lams:TabBodys>
+				
+					<!-- 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="<%=TaskListConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.taskList.contentId}" 
+						 customiseSessionID="${formBean.sessionMapID}"
+						 contentFolderID="${formBean.contentFolderID}" />
+			</lams:TabBodyArea>
+	
+			<div id="footer"></div>
 
-			<!-- 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) -->
-
-			<!-- tab content 3 (Conditions) -->
-			<lams:TabBody id="3" titleKey="label.authoring.heading.conditions.desc" page="conditions.jsp" />
-			<!-- end of content (Instructions) -->
-
-			<!-- 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="<%=TaskListConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.taskList.contentId}" 
-				 customiseSessionID="${formBean.sessionMapID}"
-				 contentFolderID="${formBean.contentFolderID}" />
+		</lams:Page>	
 	</html:form>
 
-</div>
-
-<div id="footer"></div>
-<!-- end page div -->
-</div>
-
 <script type="text/javascript">
 	changeMinTasks(${formBean.taskList.minimumNumberTasks});
 </script>
Index: lams_tool_task/web/pages/authoring/basic.jsp
===================================================================
diff -u -rfb9d13eb115f5281b03ab1624ec10a22ba3b81b7 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision fb9d13eb115f5281b03ab1624ec10a22ba3b81b7)
+++ lams_tool_task/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -8,29 +8,14 @@
 	 * Launches the popup window for the instruction files
 	 */
 	function showMessage(url) {
-		var area=document.getElementById("resourceInputArea");
-		if(area != null){
-			area.style.width="100%";
-			area.src=url;
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
-		location.hash = "resourceInputArea";
+		$("#resourceInputArea").load(url, function() {
+			$(this).show();
+			$("#saveCancelButtons").hide();
+		});
 	}
 	function hideMessage(){
-		var area=document.getElementById("resourceInputArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
+		$("#resourceInputArea").hide();
+		$("#saveCancelButtons").show();
 	}
 
 	function editItem(idx, sessionMapID){
@@ -49,20 +34,14 @@
  		}
 		
 		if (deletionConfirmed) {
-			var url = "<c:url value="/authoring/removeItem.do"/>";
 		    var reqIDVar = new Date();
-			var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
+			var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;
+			var url = "<c:url value="/authoring/removeItem.do"/>?"+param;
 			deleteItemLoading();
-		    var myAjax = new Ajax.Updater(
-			    	taskListListTargetDiv,
-			    	url,
-			    	{
-			    		method:'get',
-			    		parameters:param,
-			    		onComplete:deleteItemComplete,
-			    		evalScripts:true
-			    	}
-		    );
+			$('#taskListListArea').load(url, function() {
+				debugger;
+	    		deleteItemComplete();
+			});
  		}
 		
 	}
@@ -74,82 +53,53 @@
 	}
 	
 	function upQuestion(idx, sessionMapID){
-		var url = "<c:url value="/authoring/upItem.do"/>";
 	    var reqIDVar = new Date();
-		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
+		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;
+		var url = "<c:url value="/authoring/upItem.do"/>?"+param;
 		deleteItemLoading();
-	    var myAjax = new Ajax.Updater(
-		    	taskListListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
-		    	}
-	    );
+		$('#taskListListArea').load(url, function() {
+			debugger;
+			deleteItemComplete();
+		});
 	}
 	function downQuestion(idx, sessionMapID){
-		var url = "<c:url value="/authoring/downItem.do"/>";
 	    var reqIDVar = new Date();
 		var param = "itemIndex=" + idx +"&reqID="+reqIDVar.getTime()+"&sessionMapID="+sessionMapID;;
+		var url = "<c:url value="/authoring/downItem.do"/>?"+param;
 		deleteItemLoading();
-	    var myAjax = new Ajax.Updater(
-		    	taskListListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteItemComplete,
-		    		evalScripts:true
-		    	}
-	    );
+		$('#taskListListArea').load(url, function() {
+			debugger;
+			deleteItemComplete();
+		});
 	}
-	function resizeOnMessageFrameLoad(){
-		var messageAreaFrame = document.getElementById("resourceInputArea");
-		messageAreaFrame.style.height=messageAreaFrame.contentWindow.document.body.scrollHeight+'px';
-	}
+	
+	//Packs additional elements and submits the question form
+	function submitTask(){
+		debugger;
+		refreshCKEditors();
+		var form = $('#taskListItemForm');
+		$('#taskListListArea').load(form.attr('action'), form.serialize());
+	} 
+	
 </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="taskList.title" style="width: 99%;"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.description"></fmt:message>
-			</div>
-			<lams:CKEditor id="taskList.instructions"
-				value="${formBean.taskList.instructions}"
-				contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
+<div class="form-group">
+    <label for="taskList"><fmt:message key="label.authoring.basic.title"/></label>
+    <html:text property="taskList.title" styleClass="form-control"></html:text>
+</div>
+<div class="form-group">
+    <label for="taskList"><fmt:message key="label.authoring.basic.description" /></label>
+    <lams:CKEditor id="taskList.instructions" value="${formBean.taskList.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+</div>
 
-</table>
-
 <div id="taskListListArea">
 	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 	<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
 </div>
 
-<p class="small-space-bottom">
-	<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}"/>');" class="button-add-item">
-	<fmt:message key="label.authoring.basic.add.task" /></a> 
-</p>
+<a href="javascript:showMessage('<html:rewrite page="/authoring/newItemInit.do?sessionMapID=${formBean.sessionMapID}"/>');" class="btn btn-default btn-sm">
+		<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.add.task" /></a> 
 
+<div id="resourceInputArea" name="resourceInputArea" class="voffset10"></div>
 
-<p>
-	<iframe
-		onload="javascript:resizeOnMessageFrameLoad();"
-		id="resourceInputArea" name="resourceInputArea"
-		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-		scrolling="no">
-	</iframe>
-</p>
Index: lams_tool_task/web/pages/authoring/conditions.jsp
===================================================================
diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650)
+++ lams_tool_task/web/pages/authoring/conditions.jsp	(.../conditions.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -4,99 +4,49 @@
 <script lang="javascript">
 <!-- Common Javascript functions for LAMS -->
 
-	/**
-	 * Launches the popup window for the instruction files
-	 */
-	function showConditionMessage(url) {
-		var area=document.getElementById("conditionInputArea");
-		if(area != null){
-			area.style.width="650px";
-			area.style.height="100%";
-			area.src=url;
-			area.style.display="block";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="none";
-		}
-		location.hash = "conditionInputArea";
-	}
-	function hideConditionMessage(){
-		var area=document.getElementById("conditionInputArea");
-		if(area != null){
-			area.style.width="0px";
-			area.style.height="0px";
-			area.style.display="none";
-		}
-		var elem = document.getElementById("saveCancelButtons");
-		if (elem != null) {
-			elem.style.display="block";
-		}
-	}
+function showConditionMessage(url) {
+	$("#conditionInputArea").load(url, function() {
+		$(this).show();
+		$("#saveCancelButtons").hide();
+	});
+}
+function hideConditionMessage(){
+	$("#conditionInputArea").hide();
+	$("#saveCancelButtons").show();
+}
 
-	function editCondition(sequenceId,sessionMapID){
-		 var reqIDVar = new Date();
-		var url = "<c:url value="/authoring/editCondition.do?sequenceId="/>" + sequenceId +"&sessionMapID="+sessionMapID;;
-		showConditionMessage(url);
-	}
-	//The panel of taskList list panel
-	var conditionListTargetDiv = "conditionsArea";
-	function deleteCondition(sequenceId,sessionMapID){
-		var url = "<c:url value="/authoring/removeCondition.do"/>";
-	    var reqIDVar = new Date();
-		var param = "sequenceId=" + sequenceId +"&sessionMapID="+sessionMapID;;
-		deleteConditionLoading();
-	    var myAjax = new Ajax.Updater(
-		    	conditionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteConditionComplete,
-		    		evalScripts:true
-		    	}
-	    );
-	}
-	function deleteConditionLoading(){
-		showBusy(conditionListTargetDiv);
-	}
-	function deleteConditionComplete(){
-		hideBusy(conditionListTargetDiv);
-	}
-	
-	function upCondition(sequenceId,sessionMapID){
-		var url = "<c:url value="/authoring/upCondition.do"/>";
-	    var reqIDVar = new Date();
-		var param = "sequenceId=" + sequenceId + "&sessionMapID="+sessionMapID;;
-		deleteConditionLoading();
-	    var myAjax = new Ajax.Updater(
-		    	conditionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteConditionComplete,
-		    		evalScripts:true
-		    	}
-	    );
-	}
-	function downCondition(sequenceId,sessionMapID){
-		var url = "<c:url value="/authoring/downCondition.do"/>";
-	    var reqIDVar = new Date();
-		var param = "sequenceId=" + sequenceId + "&sessionMapID="+sessionMapID;;
-		deleteConditionLoading();
-	    var myAjax = new Ajax.Updater(
-		    	conditionListTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:deleteConditionComplete,
-		    		evalScripts:true
-		    	}
-	    );
-	}
+function editCondition(sequenceId,sessionMapID){
+	var url = "<c:url value="/authoring/editCondition.do?sequenceId="/>" + sequenceId +"&sessionMapID="+sessionMapID;
+	showConditionMessage(url);
+}
 
+function deleteCondition(sequenceId, sessionMapID){
+	var param = "sequenceId=" + sequenceId +"&sessionMapID="+sessionMapID;
+	var url = "<c:url value="/authoring/removeCondition.do"/>?"+param;
+	$("#conditionsArea").load(url);
+}
+
+function upCondition(sequenceId,sessionMapID){
+	var param = "sequenceId=" + sequenceId + "&sessionMapID="+sessionMapID;;
+	var url = "<c:url value="/authoring/upCondition.do"/>?"+param;
+	alert(url);
+	$("#conditionListTargetDiv").load(url,function() {
+		alert("loaded");
+	});
+}
+function downCondition(sequenceId,sessionMapID){
+	var param = "sequenceId=" + sequenceId + "&sessionMapID="+sessionMapID;
+	var url = "<c:url value="/authoring/downCondition.do"/>?"+param;
+	$("#conditionListTargetDiv").load(url);
+}
+
+//Packs additional elements and submits the question form
+function submitCondition(){
+	refreshCKEditors();
+	var form = $('#taskListConditionForm');
+	$('#conditionInputArea').load(form.attr('action'), form.serialize());
+} 
+
 </script>
 
 <!-- Conditions Tab Content -->
@@ -106,17 +56,9 @@
 	<%@ include file="/pages/authoring/parts/conditionlist.jsp"%>
 </div>
 
-<p class="small-space-bottom">
-	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.sessionMapID}"/>');" class="button-add-item">
-	<fmt:message key="label.authoring.conditions.add.condition" /></a> 
-</p>
+ <div class="form-inline">
+	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.sessionMapID}"/>');"
+		 class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.conditions.add.condition" /></a> 
+</div>
 
-
-<p>
-	<iframe
-		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-		id="conditionInputArea" name="conditionInputArea"
-		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-		scrolling="no">
-	</iframe>
-</p>
+<div id="conditionInputArea" name="conditionInputArea" class="voffset10"></div>
Index: lams_tool_task/web/pages/authoring/definelater.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_task/web/pages/authoring/definelater.jsp	(.../definelater.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -4,12 +4,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="java.util.HashSet"%>
 <%@ page import="org.lamsfoundation.lams.tool.taskList.TaskListConstants"%>
-<%@ page import="java.util.Set"%>
-<%Set tabs = new HashSet();
-			tabs.add("label.authoring.heading.basic");
-			pageContext.setAttribute("tabs", tabs);
-
-			%>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.authoring.title" /></title>
@@ -20,12 +14,6 @@
         
         function init(){
             selectTab(1); //select the default tab;
-            
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("OnlineInstruction");
-            initEditor("OfflineInstruction");
-            
         }     
         
         function doSelectTab(tabId) {
@@ -43,43 +31,40 @@
 
 </lams:head>
 <body class="stripes" onLoad="init()">
-<div id="page">
+
 	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 		<html:hidden property="taskList.contentId" />
 		<html:hidden property="mode" value="teacher"/>
 		<html:hidden property="contentFolderID" />
 		<html:hidden property="sessionMapID" />
-		
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
-<div id="header">
-		<!-- start tabs -->
-		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
-</div>
-<div id="content">
-		<%@ include file="/common/messages.jsp"%>
-		
-		<lams:help toolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" module="authoring"/>
-		<!-- end tab buttons -->
-		<div class="tabbody">
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
 
+		<c:set var="title"><fmt:message key="activity.title" /></c:set>
+		<lams:Page title="${title}" type="navbar">
 
-			<!-- Button Row -->
-			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=TaskListConstants.TOOL_SIGNATURE%>" 
-				toolContentID="${formBean.taskList.contentId}"  accessMode="teacher" defineLater="yes"  
-				customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
-		</div>
+			 <lams:Tabs control="true" title="${title}" helpToolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+				<lams:Tab id="1" key="label.authoring.heading.basic" />
+			</lams:Tabs>
+			
+			<lams:TabBodyArea>
+				<%@ include file="/common/messages.jsp"%>
+		
+				<lams:TabBodys>
+					<!-- tab content 1 (Basic) -->
+					<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+					<!-- end of content (Basic) -->
+				</lams:TabBodys>
+				
+				<!-- Button Row -->
+				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=TaskListConstants.TOOL_SIGNATURE%>" 
+					toolContentID="${formBean.taskList.contentId}"  accessMode="teacher" defineLater="yes"  
+					customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
+			</lams:TabBodyArea>
 
+		<div id="footer"></div>
 
+		</lams:Page>
+
 	</html:form>
-	
-</div>
-<div id="footer"></div>
-</div>
-</body>
+</body>	
 </lams:html>
Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -5,60 +5,58 @@
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		<lams:css style="main" />
-		<script type="text/javascript"> 
-			function callHideConditionMessage() {
-				try {
-					if (window.parent && window.parent.hideConditionMessage) {
-						window.parent.hideConditionMessage();
-					} else if (window.top && window.top.hideConditionMessage) {
-						window.top.hideConditionMessage();
-					}
-				} catch(err) {
-					// mute cross-domain iframe access errors
-				}
-			}
-		</script>
+		<lams:css/>
 	</lams:head>
-	<body class="tabpart">
-		<!-- Basic Info Form-->
-		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="taskListConditionForm" focus="name" >
 
-			<html:hidden property="sessionMapID" />
-			<html:hidden property="sequenceId" />
-			<h2 class="no-space-left">
+	<body>
+	
+		<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title">
 				<fmt:message key="label.authoring.conditions.add.condition" />
-			</h2>
-
-			<div class="field-name">
-            	<fmt:message key="label.authoring.conditions.condition.name" />
 			</div>
-
-			<div class="small-space-bottom">
-         		<html:text property="name" size="55"/>
+		</div>
+	
+		<div class="panel-body">
+	
+			<!-- Basic Info Form-->
+			<%@ include file="/common/messages.jsp"%>
+			<html:form action="/authoring/saveOrUpdateCondition" method="post" styleId="taskListConditionForm" focus="name" >
+				<html:hidden property="sessionMapID" />
+				<html:hidden property="sequenceId" />
+	
+				<div class="form-group">
+	            	<label for="name"><fmt:message key="label.authoring.conditions.condition.name" /></label>
+	         		<html:text property="name" styleClass="form-control"/>
+				</div>
+	
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />					
+	        	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />				
+		    	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+		    
+		    	<div class="form-group form-inline">
+			    <logic:iterate name="taskListConditionForm" id="itemE" property="possibleItems">
+				  	<html:multibox property="selectedItems" styleClass="form-control">
+				    	<bean:write name="itemE" property="value" />
+				  	</html:multibox>
+				    &nbsp;<bean:write name="itemE" property="label" />
+				    <br />
+				</logic:iterate>
+				</div>
+				
+			<div class="voffset5">
+				<a href="#" onclick="submitCondition()"
+					class="btn btn-default btn-xs"><fmt:message key="button.add" />
+				</a> <a href="#" onclick="hideConditionMessage()"
+					class="btn btn-default btn-xs"><fmt:message key="label.cancel" />
+				</a>
 			</div>
-
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />					
-	        <c:set var="sessionMapID" value="${formBean.sessionMapID}" />				
-		    <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-
-
-			<logic:iterate name="taskListConditionForm" id="itemE" property="possibleItems">
-			  	<html:multibox property="selectedItems">
-			    	<bean:write name="itemE" property="value" />
-			  	</html:multibox>
-			    <bean:write name="itemE" property="label" />
-			    <br />
-			</logic:iterate>
-
-		</html:form>
-
-		<lams:ImgButtonWrapper>
-			<a href="#" onclick="taskListConditionForm.submit();" class="button-add-item"><fmt:message
-					key="button.add" /> </a> 
-			<a href="javascript:;" onclick="javascript:callHideConditionMessage()"
-				class="button space-left"><fmt:message key="label.cancel" /> </a>
-		</lams:ImgButtonWrapper>
+			
+			</html:form>
+	
+			
+		</div>
+		</div>
+		
 	</body>
 </lams:html>
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,180 +1,139 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
-<script type="text/javascript">
-
-	function uncheckIsFilesRequired() {
-		document.getElementById("isFilesRequired").checked=false;
-	}
-	
-	function uncheckIsCommentsRequired() {
-		document.getElementById("isCommentsRequired").checked=false;
-	}
-	
-	function callHideMessage() {
-		try {
-			if (window.parent && window.parent.hideMessage) {
-				window.parent.hideMessage();
-			} else if (window.top && window.top.hideMessage) {
-				window.top.hideMessage();
-			}
-		} catch(err) {
-			// mute cross-domain iframe access errors
-		}
-	}
-	
-	$(function() {
-		//change size of an iframe on ckeditor's autogrow 
-		CKEDITOR.instances.description.on("instanceReady", function(e) {
-		    e.editor.on('resize', function(reEvent){
-		    	var iframe = window.parent.document.getElementById("resourceInputArea");
-		    	iframe.style.height = eval(iframe.contentWindow.document.body.scrollHeight) + 'px';
-		    });
-		});
-	});
-</script>
-
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
-		<lams:css style="main" />
+		<lams:css />
 
+		<script type="text/javascript">
+		
+			function uncheckIsFilesRequired() {
+				document.getElementById("isFilesRequired").checked=false;
+			}
+			
+			function uncheckIsCommentsRequired() {
+				document.getElementById("isCommentsRequired").checked=false;
+			}
+		</script>
+
 	</lams:head>
-	<body class="tabpart">
-		<!-- Basic Info Form-->
-		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="taskListItemForm" focus="title" >
+	<body>
 
-			<html:hidden property="sessionMapID" />
-			<html:hidden property="itemIndex" />
-			
-			<html:hidden property="commentsFilesAllowed" value="${true}"/>
-			<html:hidden property="showCommentsToAll" value="${true}"/>
-			
-			<h2 class="no-space-left">
+		<div class="panel panel-default add-file">
+			<div class="panel-heading panel-title">
 				<fmt:message key="label.authoring.basic.add.task" />
-			</h2>
-
-			<div class="field-name">
-            	<fmt:message key="label.authoring.basic.resource.title.input" />
 			</div>
-
-			<div class="small-space-bottom">
-         			<html:text property="title" size="55"/>
-			</div>
-
-			<div class="field-name">
-            	<fmt:message key="label.authoring.basic.resource.description.input" />
-			</div>
 			
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-			<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
-			<div class="small-space-bottom" >
-				<lams:CKEditor id="description" value="${formBean.description}" 
-					contentFolderID="${sessionMap.taskListForm.contentFolderID}" width="99%" 
-					resizeParentFrameName="resourceInputArea" />
-			</div>
+			<div class="panel-body">
 
-			<div class="space-top">
-				<html:checkbox property="required" styleClass="noBorder"
-					styleId="isRequired">
-				</html:checkbox>
+			<%@ include file="/common/messages.jsp"%>
 
-				<label for="isRequired">
+			<html:form action="/authoring/saveOrUpdateItem" method="post" styleId="taskListItemForm" focus="title" >
+	
+				<html:hidden property="sessionMapID" />
+				<html:hidden property="itemIndex" />
+				
+				<html:hidden property="commentsFilesAllowed" value="${true}"/>
+				<html:hidden property="showCommentsToAll" value="${true}"/>
+				
+				<div class="form-group">
+	            	<label for="title"><fmt:message key="label.authoring.basic.resource.title.input" /></label>
+	       			<html:text property="title" size="55" styleClass="form-control"/>
+				</div>
+	
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<c:set var="sessionMap"	value="${sessionScope[formBean.sessionMapID]}" />
+	
+				<div class="form-group">
+					<label for="description"><fmt:message key="label.authoring.basic.resource.description.input" /></label>
+					<lams:CKEditor id="description" value="${formBean.description}" contentFolderID="${sessionMap.taskListForm.contentFolderID}"/>
+				</div>
+	
+				<div class="checkbox">
+					<label for="isRequired">
+					<html:checkbox property="required" styleId="isRequired">
+					</html:checkbox>
 					<fmt:message key="label.authoring.basic.task.isRequired" />
-				</label>
-			</div>
-			
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />					
-	        <c:set var="sessionMapID" value="${formBean.sessionMapID}" />				
-		    <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-		    
-		    <div class="space-top">
-				<html:checkbox property="commentsAllowed" styleClass="noBorder"	styleId="isCommentsAllowed"
-					onclick="uncheckIsCommentsRequired(); document.taskListItemForm.commentsRequired.disabled = !document.taskListItemForm.commentsRequired.disabled;">
-				</html:checkbox>
-
-				<label for="isCommentsAllowed">
+					</label>
+				</div>
+				
+				<div class="checkbox">
+					<label for="isCommentsAllowed">
+					<html:checkbox property="commentsAllowed" styleId="isCommentsAllowed"
+						onclick="uncheckIsCommentsRequired(); document.taskListItemForm.commentsRequired.disabled = !document.taskListItemForm.commentsRequired.disabled;">
+					</html:checkbox>
 					<fmt:message key="label.authoring.basic.task.isCommentsAllowed" />
-				</label>
-			</div>
-					
-			<div class="space-top">
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-				<html:checkbox property="commentsRequired" styleClass="noBorder" styleId="isCommentsRequired" 
-					disabled="${not formBean.commentsAllowed}" >
-				</html:checkbox>
-					
-				<label for="isCommentsRequired">
+					</label>
+				</div>
+						
+				<div class="checkbox loffset10">
+					<label for="isCommentsRequired">
+					<html:checkbox property="commentsRequired" styleId="isCommentsRequired" 
+						disabled="${not formBean.commentsAllowed}" >
+					</html:checkbox>
 					<fmt:message key="label.authoring.basic.task.isCommentsRequired" />
-				</label>
-			</div>
-			
-		    <div class="space-top">
-				<html:checkbox property="filesAllowed" styleClass="noBorder" styleId="isFilesAllowed"
-					onclick="uncheckIsFilesRequired(); document.taskListItemForm.filesRequired.disabled = !document.taskListItemForm.filesRequired.disabled; ">
-				</html:checkbox>
-
-				<label for="isFilesAllowed">
+					</label>
+				</div>
+				
+				<div class="checkbox">
+					<label for="isFilesAllowed">
+					<html:checkbox property="filesAllowed" styleId="isFilesAllowed"
+						onclick="uncheckIsFilesRequired(); document.taskListItemForm.filesRequired.disabled = !document.taskListItemForm.filesRequired.disabled; ">
+					</html:checkbox>
 					<fmt:message key="label.authoring.basic.task.isFilesAllowed" />
-				</label>
-			</div>
-					
-			<div class="space-top">
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;	
-				<html:checkbox property="filesRequired" styleClass="noBorder" styleId="isFilesRequired"  
-					disabled="${not formBean.filesAllowed}" >
-				</html:checkbox>
-					
-				<label for="isFilesRequired">
+					</label>
+				</div>
+						
+				<div class="checkbox loffset10">
+					<label for="isFilesRequired">
+					<html:checkbox property="filesRequired" styleId="isFilesRequired"  disabled="${not formBean.filesAllowed}" >
+					</html:checkbox>
 					<fmt:message key="label.authoring.basic.task.isFilesRequired" />
-				</label>
-			</div>
-			
-			<div class="space-top" ">
-				<html:checkbox property="childTask" styleClass="noBorder" 
-					disabled="${(fn:length(sessionMap.taskListList) == 0) || (fn:length(sessionMap.taskListList) == 1) && (formBean.itemIndex > -1)}"
-					styleId="isChildTask" onclick="document.taskListItemForm.parentTaskName.disabled = !document.taskListItemForm.parentTaskName.disabled;">
-				</html:checkbox>
-
-				<label for="isChildTask">
+					</label>
+				</div>
+				
+				<div class="checkbox">
+					<label for="isChildTask">
+					<html:checkbox property="childTask" 
+						disabled="${(fn:length(sessionMap.taskListList) == 0) || (fn:length(sessionMap.taskListList) == 1) && (formBean.itemIndex > -1)}"
+						styleId="isChildTask" onclick="document.taskListItemForm.parentTaskName.disabled = !document.taskListItemForm.parentTaskName.disabled;">
+					</html:checkbox>
 					<fmt:message key="label.authoring.basic.task.isChildTask" />
-				</label>
-
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<label  for="parentTaskName">
-					<fmt:message key="label.authoring.basic.task.parent.task.name" />
-				</label>
-
-				<html:select property="parentTaskName" styleId="parentTaskName" style="width:150px" disabled="${!formBean.childTask}" >
-					<c:forEach var="taskListItem" items="${sessionMap.taskListList}">
-						<c:choose>
-							<c:when	test="${formBean.parentTaskName == taskListItem.title}">
-								<option value="${fn:escapeXml(taskListItem.title)}" selected="true">
-									<c:out value="${taskListItem.title}"/>
-								</option>
-							</c:when>
-							<c:when	test="${formBean.title == taskListItem.title}">
-							</c:when>
-							<c:otherwise>
-								<option value="${fn:escapeXml(taskListItem.title)}">
-									<c:out value="${taskListItem.title}"/>
-								</option>
-							</c:otherwise>
-						</c:choose>
-					</c:forEach>
-				</html:select>
+					</label>
+	
+					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+					<label  for="parentTaskName">
+						<fmt:message key="label.authoring.basic.task.parent.task.name" />
+					</label>
+	
+					<html:select property="parentTaskName" styleId="parentTaskName" disabled="${!formBean.childTask}" styleClass="form-control form-control-inline input-sm">
+						<c:forEach var="taskListItem" items="${sessionMap.taskListList}">
+							<c:choose>
+								<c:when	test="${formBean.parentTaskName == taskListItem.title}">
+									<option value="${fn:escapeXml(taskListItem.title)}" selected="true">
+										<c:out value="${taskListItem.title}"/>
+									</option>
+								</c:when>
+								<c:when	test="${formBean.title == taskListItem.title}">
+								</c:when>
+								<c:otherwise>
+									<option value="${fn:escapeXml(taskListItem.title)}">
+										<c:out value="${taskListItem.title}"/>
+									</option>
+								</c:otherwise>
+							</c:choose>
+						</c:forEach>
+					</html:select>
+				</div>
+	
+			</html:form>
+	
+			<a href="#" onclick="javascript:submitTask();" class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="button.add" /> </a>
+			<a href="#" onclick="javascript:hideMessage()" class="btn btn-default btn-sm"><fmt:message key="label.cancel" /> </a>
+			
 			</div>
+		</div>
 
-		</html:form>
-
-		<lams:ImgButtonWrapper>
-			<a href="#" onclick="taskListItemForm.submit();" class="button-add-item"><fmt:message
-					key="button.add" /> </a>
-			<a href="javascript:;" onclick="javascript:callHideMessage()"
-				class="button space-left"><fmt:message key="label.cancel" /> </a>
-		</lams:ImgButtonWrapper>
 	</body>
 </lams:html>
Index: lams_tool_task/web/pages/authoring/parts/conditionlist.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,18 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
-
 <div id="conditionList">
-	<h2 class="spacer-left">
-		<fmt:message key="label.authoring.conditions.list.title" />
-		<img src="${ctxPath}/includes/images/indicator.gif"	style="display:none" id="conditionListArea_Busy" />
-	</h2>
-	
-	<table class="alternative-color" id="conditionTable" cellspacing="0">
+	<table class="table table-striped table-condensed" id="conditionTable" >
 		<tr>
 			<th width="8%">
 				<fmt:message key="label.authoring.conditions.order" />
@@ -40,62 +30,31 @@
 					${condition.name}
 				</td>
 
-				<td width="40px" align="center">
+				<td class="arrows" style="width:5%">
 					<c:if test="${not status.first}">
-						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.up"/>"
-							onclick="upCondition(${status.index},'${sessionMapID}')">
-						<c:if test="${status.last}">
-							<img
-								src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.down"/>">
-						</c:if>
+						<c:set var="title"><fmt:message key='label.authoring.up'/></c:set>
+						<lams:Arrow state="up" title="${title}" onclick="upCondition(${status.index},'${sessionMapID}')"/>
 					</c:if>
-
 					<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.up"/>">
-						</c:if>
-
-						<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.down"/>"
-							onclick="downCondition(${status.index},'${sessionMapID}')">
+						<c:set var="title"><fmt:message key='label.authoring.down'/></c:set>
+						<lams:Arrow state="down" title="${title}" onclick="downCondition(${status.index},'${sessionMapID}')"/>
 					</c:if>
 				</td>
 				
-				<td width="20px">
-					<img src="${tool}includes/images/edit.gif"
-						title="<fmt:message key="label.authoring.basic.resource.edit" />"
-						onclick="editCondition(${status.index},'${sessionMapID}')" />
-                </td>
-                
-				<td width="20px">
-					<img src="${tool}includes/images/cross.gif"
-						title="<fmt:message key="label.authoring.basic.resource.delete" />"
-						onclick="deleteCondition(${status.index},'${sessionMapID}')" />
-				</td>
+				<td align="center" style="width:5%"><i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.resource.edit" />"
+					onclick="editCondition(${status.index},'${sessionMapID}')"></i></td>
+					
+				<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.authoring.basic.resource.delete" />" 
+					onclick="deleteCondition(${status.index},'${sessionMapID}')"></i></td>
+				
 			</tr>
 		</c:forEach>
 	</table>
 </div>
 
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript"> 
-	var win = null;
-	try {
-		if (window.parent && window.parent.hideConditionMessage) {
-			win = window.parent;
-		} else if (window.top && window.top.hideConditionMessage) {
-			win = window.top;
-		}
-	} catch(err) {
-		// mute cross-domain iframe access errors
-	}
-	if (win) {
-		win.hideConditionMessage();
-		var obj = win.document.getElementById('conditionsArea');
-		obj.innerHTML= document.getElementById("conditionList").innerHTML;
-	}
+	hideConditionMessage();
+	var obj = document.getElementById('conditionsArea');
+	obj.innerHTML= document.getElementById("conditionList").innerHTML;
 </script>
Index: lams_tool_task/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -7,81 +7,52 @@
 </c:set>
 
 <div id="itemList">
-	<h2 class="spacer-left">
+	<h4>
 		<fmt:message key="label.authoring.basic.task.list.title" />
-		<img src="${ctxPath}/includes/images/indicator.gif"
-			style="display:none" id="taskListListArea_Busy" />
-	</h2>
+		<i class="fa fa-spinner" style="display: none" id="taskListListArea_Busy"></i>
+	</h4>
 	
-	<table class="alternative-color" id="itemTable" cellspacing="0">
+	<table class="table table-condensed table-striped" id="itemTable">
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
 		<c:forEach var="taskList" items="${sessionMap.taskListList}"
 			varStatus="status">
 			<tr>
-				<td width="4%" class="field-name align-right">
+				<td width="5%" class="field-name align-right">
 					<fmt:message key="label.authoring.basic.resource.task" />
 				</td>
-                                <td>
+                 <td>
 					<c:out value="${taskList.title}" escapeXml="true"/>
 				</td>
 
-				<td width="40px" align="center">
+				<td class="arrows" style="width:5%">
 					<c:if test="${not status.first}">
-						<img src="<html:rewrite page='/includes/images/uparrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.up"/>"
-							onclick="upQuestion(${status.index},'${sessionMapID}')">
-						<c:if test="${status.last}">
-							<img
-								src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
-								border="0" title="<fmt:message key="label.authoring.down"/>">
-						</c:if>
+						<c:set var="title"><fmt:message key='label.authoring.up'/></c:set>
+						<lams:Arrow state="up" title="${title}" onclick="upQuestion(${status.index},'${sessionMapID}')"/>
 					</c:if>
-
 					<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.up"/>">
-						</c:if>
-
-						<img src="<html:rewrite page='/includes/images/downarrow.gif'/>"
-							border="0" title="<fmt:message key="label.authoring.down"/>"
-							onclick="downQuestion(${status.index},'${sessionMapID}')">
+						<c:set var="title"><fmt:message key='label.authoring.down'/></c:set>
+						<lams:Arrow state="down" title="<fmt:message key='label.authoring.down'/>" onclick="downQuestion(${status.index},'${sessionMapID}')"/>
 					</c:if>
 				</td>
 				
-				<td width="20px">
-					<img src="${tool}includes/images/edit.gif"
-						title="<fmt:message key="label.authoring.basic.resource.edit" />"
-						onclick="editItem(${status.index},'${sessionMapID}')" />
+				<td align="center" style="width:5%">
+					<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.resource.edit" />"
+						onclick="editItem(${status.index},'${sessionMapID}')"></i>
                 </td>
                 
-				<td width="20px">
-					<img src="${tool}includes/images/cross.gif"
-						title="<fmt:message key="label.authoring.basic.resource.delete" />"
-						onclick="deleteItem(${status.index},'${sessionMapID}')" />
+				<td  align="center" style="width:5%">
+					<i class="fa fa-times"	title="<fmt:message key="label.authoring.basic.resource.delete" />"
+						onclick="deleteItem(${status.index},'${sessionMapID}')"></i>
 				</td>
 			</tr>
 		</c:forEach>
 	</table>
 </div>
 
-<%-- This script will works when a new resoruce item submit in order to refresh "TaskList List" panel. --%>
+<%-- This script will works when a new item is submitted in order to refresh "TaskList List" panel. --%>
 <script lang="javascript">
-	var win = null;
-	try {
-		if (window.parent && window.parent.hideMessage) {
-			win = window.parent;
-		} else if (window.top && window.top.hideMessage) {
-			win = window.top;
-		}
-	} catch(err) {
-		// mute cross-domain iframe access errors
-	}
-	if (win) {
-		win.hideMessage();
-		var obj = win.document.getElementById('taskListListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;
-	}
+	hideMessage();
+	var obj = document.getElementById('taskListListArea');
+	obj.innerHTML= document.getElementById("itemList").innerHTML;
 </script>
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -rbfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision bfb35f4f0e90063d8ea06eea71a7f6768ee0f1dc)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -50,10 +50,12 @@
 					</span>
 				</html:link>
 			</div>
+
+			<div id="footer"></div>
+			<!--closes footer-->
+		</lams:Page>
+			
 	</html:form>
 
-	<div id="footer"></div>
-	<!--closes footer-->
-	</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_task/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r9160b34eb0b4725a21c894d886c89f418868888a -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 9160b34eb0b4725a21c894d886c89f418868888a)
+++ lams_tool_task/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -3,12 +3,12 @@
 <c:set var="taskList" value="${sessionMap.taskList}"/>
 
 <c:if test="${sessionMap.isPageEditable}">
-	<p class="warning">
+	<lams:Alert type="info" id="no-session-summary" close="false">
 		<fmt:message key="message.alertContentEdit" />
-	</p>
+	</lams:Alert>
 </c:if>
 
-<table cellpadding="0">
+<table class="table table-condensed table-no-border">
 	<tr>
 		<td width="15%" nowrap>
 			<fmt:message key="label.authoring.basic.title" />
@@ -28,16 +28,12 @@
 			<c:out value="${taskList.instructions}" escapeXml="false" />
 		</td>
 	</tr>
-
-	<tr>
-		<td colspan="2">
-			<c:url  var="authoringUrl" value="/definelater.do">
-				<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">
-				<fmt:message key="label.monitoring.edit.activity.edit" />
-			</html:link>
-		</td>
-	</tr>
 </table>
+
+<c:url  var="authoringUrl" value="/definelater.do">
+	<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="btn btn-default">
+	<fmt:message key="label.monitoring.edit.activity.edit" />
+</html:link>
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -8,11 +8,8 @@
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
+	<%@ include file="/common/monitorheader.jsp"%>
 		
-	<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
-	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.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;
@@ -22,10 +19,6 @@
 		}
 	</style>
 		
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
 			<c:forEach var="sessionDto" items="${sessionDtos}">
Index: lams_tool_task/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_task/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -6,7 +6,21 @@
 
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/tabbedheader.jsp" %>
+	
+		<script type="text/javascript">
+			//pass settings to monitorToolSummaryAdvanced.js
+			var submissionDeadlineSettings = {
+				lams: '${lams}',
+				submissionDeadline: '${sessionMap.submissionDeadline}',
+				setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+				toolContentID: '${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>
+	
+		<%@ include file="/common/monitorheader.jsp" %>
 		<script>
 
 	        function init(){
@@ -26,26 +40,27 @@
 	    </script>		 
 	</lams:head>
 	<body class="stripes" onLoad="init()">
-	<div id="page">
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
-	<div id="header">
-		<lams:Tabs>
+
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+	
+		<lams:Tabs title="${title}" control="true" helpToolSignature="<%= TaskListConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
 			<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="<%= TaskListConstants.TOOL_SIGNATURE %>" module="monitoring"/>
-	
+		
+		<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>
-	<div id="footer"></div>
-	
-	</div>
+		</lams:TabBodys>
+		</lams:TabBodyArea>
+		
+		<div id="footer" />
+		
+	</lams:Page>
+
 	</body>
 </lams:html>
Index: lams_tool_task/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u -rd7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision d7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f)
+++ lams_tool_task/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,15 +1,7 @@
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
-
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+             
+<table class="table table-striped table-condensed">
 	<tr>
 		<td>
 			<fmt:message key="label.monitoring.summary.lock.when.finished" ><fmt:param> </fmt:param></fmt:message>
@@ -106,4 +98,4 @@
 		</td>
 	</tr>
 </table>
-</div>
\ No newline at end of file
+</lams:AdvancedAccordian>
\ No newline at end of file
Index: lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp
===================================================================
diff -u -rd7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp	(.../daterestriction.jsp)	(revision d7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f)
+++ lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp	(.../daterestriction.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,43 +1,29 @@
 <%@include file="/common/taglibs.jsp"%>
 
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+<c:set var="ddTitle"><fmt:message key="monitor.summary.date.restriction" /></c:set>
+<lams:RestrictedUsageAccordian title="${ddTitle}">
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.date.restriction" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
-
-	<div>
-		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
-	</div>
+	<p><fmt:message key="monitor.summary.when.date.restriction.is.set" /></p>
 		
 	<div id="datetimeDiv" <c:if test='${not empty sessionMap.submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
-		<input type="text" name="datetime" id="datetime" value=""/>
-				
-		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+		<div class="form-group">
+		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
+		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
+		</label>							
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.set.restriction" />
 		</html:link>
+		</div>
 	</div>
 
 	<div id="dateInfoDiv" <c:if test='${empty sessionMap.submissionDeadline}'> style="display: none;" </c:if>>
-		<span>
-			<fmt:message key="monitor.summary.after.date" />
-		</span>
-		
+		<label><fmt:message key="monitor.summary.after.date" /></span>
 		<span id="dateInfo">
 		</span>
-				
-		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+		</label>
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="btn btn-default">
 			<fmt:message key="monitor.summary.unset.restriction" />
 		</html:link>
 	</div>
 
-</div>
\ No newline at end of file
+</lams:RestrictedUsageAccordian>
Index: lams_tool_task/web/pages/monitoring/parts/reflections.jsp
===================================================================
diff -u -rd7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/parts/reflections.jsp	(.../reflections.jsp)	(revision d7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f)
+++ lams_tool_task/web/pages/monitoring/parts/reflections.jsp	(.../reflections.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -1,23 +1,28 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<br>
-<table class="alternative-color" id="reflections">
-						
-	<tr>
-		<th>
-			<fmt:message key="label.monitoring.summary.title.reflection"/>
-		</th>
-	</tr>
+<div class="panel panel-default" >
+	<div class="panel-heading" id="headingReflections">
+    	<span class="panel-title collapsable-icon-left">
+    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseReflections" 
+			aria-expanded="true" aria-controls="collapseReflections" >
+		<fmt:message key="label.monitoring.summary.title.reflection"/></a>
+		</span>
+    </div>
+    
+    <div id="collapseReflections" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingReflections">
 
-	<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
-		<tr>
-			<td valign=top class="align-left">
-				<c:out value="${reflectDTO.fullName}" escapeXml="true"/> - <lams:Date value="${reflectDTO.date}"/>
-				<br>
-				<lams:out value="${reflectDTO.reflect}" escapeHtml="true"/>
+		<table class="table table-condensed table-striped">				
+			<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
+				<tr>
+					<td valign=top class="align-left">
+						<c:out value="${reflectDTO.fullName}" escapeXml="true"/> - <lams:Date value="${reflectDTO.date}"/>
+						<br>
+						<lams:out value="${reflectDTO.reflect}" escapeHtml="true"/>
+			
+					</td>
+				</tr>
+			</c:forEach>
+		</table>
 
-			</td>
-		</tr>
-	</c:forEach>
-
-</table>
+	</div>
+</div>
\ No newline at end of file
Index: lams_tool_task/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -rd7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision d7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f)
+++ lams_tool_task/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -3,25 +3,31 @@
 <c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 
 <c:if test="${empty sessionDtos}">
-	<div align="center">
+	<lams:Alert type="info" id="no-session-summary" close="false">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-	</div>
+	</lams:Alert>
 </c:if>
 
-<c:out value="${sessionMap.isGroupedActivity}"/>
 <c:forEach var="sessionDto" items="${sessionDtos}">
-	<%-- display group name on first row--%>
-	<h1><fmt:message key="monitoring.label.group" /> ${sessionDto.sessionName}	</h1>	
-		
-	<table cellspacing="3" class="alternative-color small-space-top">
+
+	<c:if test="${sessionMap.isGroupedActivity}">	
+	   <div class="panel panel-default" >
+	      <div class="panel-heading">
+			<span class="panel-title">
+				<fmt:message key="monitoring.label.group" />&nbsp;${sessionDto.sessionName}
+			</span>
+	      </div>
+	</c:if>
+
+	<table class="table table-condensed table-striped">
 		<tr>
 			<th width="45%">
 				<fmt:message key="monitoring.label.title" />
 			</th>
 			<th width="35%">
 				<fmt:message key="monitoring.label.suggest" />
 			</th>
-			<th width="20%" align="center">
+			<th width="20%" class="text-center">
 				<fmt:message key="monitoring.label.number.learners" />
 			</th>
 		</tr>
@@ -30,10 +36,8 @@
 	
 			<c:if test="${item.uid == -1}">
 				<tr>
-					<td colspan="3">
-						<div align="left">
-							<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
-						</div>
+					<td colspan="3" class="text-center">
+						<b> <fmt:message key="message.monitoring.summary.no.resource.for.group" /> </b>
 					</td>
 				</tr>
 			</c:if>
@@ -45,12 +49,16 @@
 					<td>
 						<c:out value="${item.createBy.loginName}" escapeXml="true"/>
 					</td>
-					<td align="center">
+					<td class="text-center">
 						${sessionDto.visitNumbers[status.index]}
 					</td>
 				</tr>
 			</c:if>
 		</c:forEach>
-	
 	</table>	
+	
+	<c:if test="${sessionMap.isGroupedActivity}">	
+		</div>
+	</c:if>
+
 </c:forEach>
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rd7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f -rd6dcae53cbe27a85aedf62b8545ee3193ec55220
--- lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d7d4d5cebf80f837b74cde8a3b8daaa66d6e9d4f)
+++ lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d6dcae53cbe27a85aedf62b8545ee3193ec55220)
@@ -5,55 +5,21 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/jquery-ui.timepicker.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;
-	    height:auto;
-	    vertical-align:text-top;
-	    padding-top:2px;
-	}
-	.ui-jqgrid .ui-jqgrid-bdiv {
-		overflow: auto;
-	}
-</style>
-
 <script type="text/javascript">
-	//pass settings to monitorToolSummaryAdvanced.js
-	var submissionDeadlineSettings = {
-		lams: '${lams}',
-		submissionDeadline: '${sessionMap.submissionDeadline}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
-		toolContentID: '${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/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-<script type="text/javascript">
 	$(document).ready(function(){
 		<c:forEach var="sessionDto" items="${sessionDtos}">
 		
 			jQuery("#group${sessionDto.sessionId}").jqGrid({
 				datatype: "json",
 				url: "<c:url value='/monitoring/getPagedUsers.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}",
-				height: 'auto',
-				shrinkToFit: ${(200 + ((sessionMap.monitorVerificationRequired? 1 : 0)*130) + fn:length(sessionDto.taskListItems)*100) < 800},
-				width: '800',
+				height: '100%',
+				autowidth: true,
+				shrinkToFit: false,
 				pager: 'pager-${sessionDto.sessionId}',
 				rowList:[10,20,30,40,50,100],
 				rowNum:10,
 				viewrecords:true,
-			   	caption: "${sessionDto.sessionName}",
+//			   	caption: "${sessionDto.sessionName}",
 			   	colNames:[
 						'userUid'
 						,"<fmt:message key="label.monitoring.summary.user" />"
@@ -86,20 +52,24 @@
 	        			
 		</c:forEach>
 
-		//jqgrid autowidth
-		function resizeFunc(){
-			var grid;
-		    if (grid = jQuery(".ui-jqgrid-btable:visible")) {
-		    	grid.each(function(index) {
-			        var gridId = $(this).attr('id');
-			        
-				    var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
-				    jQuery('#' + gridId).setGridWidth(gridParentWidth, false);
-		        });
-		    }
-		}
-		resizeFunc();
-		$(window).bind('resize', resizeFunc);
+		//jqgrid autowidth (http://stackoverflow.com/a/1610197)
+		$(window).bind('resize', function() {
+			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));
+		})
+
+		function resizeJqgrid(jqgrids) {
+			jqgrids.each(function(index) {
+				var gridId = $(this).attr('id');
+		    	var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+		    	jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+		    });
+		};
+		setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
 	});
 
 	function summaryTask(itemUid){
@@ -114,43 +84,66 @@
 			url: '<c:url value="/monitoring/setVerifiedByMonitor.do"/>',
 			data: { userUid: userUid },
 			success: function(response) {
-				$("#verif-"+response).html('<img src="<html:rewrite page='/includes/images/tick.gif'/>" >');
+				$("#verif-"+response).html('<i class="fa fa-check"></i>');
 			}
 		});
 		
 		return false;
 	}
 
 </script>
-
-<h1>
-	<c:out value="${taskList.title}" escapeXml="true"/>
-</h1>
-<div class="instructions space-top space-bottom">
-	<c:out value="${taskList.instructions}" escapeXml="false"/>
+<div class="panel">
+	<h4>
+	    <c:out value="${taskList.title}" escapeXml="true"/>
+	</h4>
+	<div class="instructions voffset5">
+	    <c:out value="${taskList.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>
 
+
 <%-- Summary list  --%>
-<c:if test="${empty sessionDtos}">
-	<div align="center">
-		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
-	</div>
+<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">
 			
-	<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
-		<c:if test="${sessionMap.isGroupedActivity}">
-			<div style="padding-bottom: 5px; font-size: small;">
-				<B><fmt:message key="monitoring.label.group" /></B> ${sessionDto.sessionName}
-			</div>
-		</c:if>
-		
+	<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" />&nbsp;${sessionDto.sessionName}</a>
+			</span>
+	       </div>
+	       
+	       <div id="collapse${sessionDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionDto.sessionId}">
+	</c:if>
+			
 		<table id="group${sessionDto.sessionId}"></table>
 		<div id="pager-${sessionDto.sessionId}"></div>
-	</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>
+
+<c:if test="${sessionMap.isGroupedActivity}">
+</div> <!--  end accordianSessions --> 
+</c:if>
 				
 <br/>
 <c:if test="${taskList.reflectOnActivity && not empty sessionMap.reflectList}">