Index: lams_tool_wiki/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/AdvancedAccordian.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/AdvancedAccordian.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Arrow.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Arrow.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Comments.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r22588aeccec62ff32a76fcbad0cd98f044deba89 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 22588aeccec62ff32a76fcbad0cd98f044deba89)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/Rating.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/Rating.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/TSTable.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/TSTable.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -24,8 +24,8 @@
 
 	/**
 	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
 	 * Wiki: 
 	 */
 %>
@@ -54,6 +54,9 @@
 <%--
 	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
 	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
 --%>
 
 <c:if test="${methodCall == null}">
@@ -73,13 +76,14 @@
 	</c:set>
 </c:if>
 
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_tool_wiki/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -28,25 +28,17 @@
  * Wiki: 
  */
 
-		%>
-<%@ tag body-content="scriptless"%>
+%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
 
-</div>
-<!-- end tab content -->
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Index: lams_tool_wiki/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/TabBodyArea.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/TabBodyArea.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/TabBodys.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/TabBodys.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/TabBodys.tag	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -23,47 +23,70 @@
 
 /**
  * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
  */
 
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+%>
 <%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
 <c:set var="dControl" value="false" scope="request" />
 <c:if test="${control}">
 	<c:set var="dControl" value="${control}" scope="request" />
 </c:if>
 
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
 
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
 </div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_wiki/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -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_wiki/web/common/header.jsp
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/common/header.jsp	(.../header.jsp)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/common/header.jsp	(.../header.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -11,13 +11,8 @@
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
-	
-	
-	
-	
+
 	<lams:headItems />
 	<tiles:insert attribute="headItems" />
 	
-	
-	<link href="${tool}/includes/css/wiki_style.css" rel="stylesheet" type="text/css">
 </lams:head>
Index: lams_tool_wiki/web/common/learnerheader.jsp
===================================================================
diff -u -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
+++ lams_tool_wiki/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -11,7 +11,6 @@
 	<title>
 		<fmt:message key="activity.title" />
 	</title>
-	<link href="${tool}/includes/css/wiki_style.css" rel="stylesheet" type="text/css">
 	<lams:css/>
 
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_wiki/web/images/edit.gif
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
Binary files differ
Index: lams_tool_wiki/web/images/success.gif
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
Binary files differ
Fisheye: Tag ceae3062bc6d9ad73937168fc0fb12e4fdaa172d refers to a dead (removed) revision in file `lams_tool_wiki/web/includes/css/wiki_style.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/layouts/defaultLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_wiki/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -6,17 +6,6 @@
 <lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes">
-		<div id="page">	
-			<tiles:useAttribute name="pageTitleKey" ignore="true"/>
-			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-			<h1 class="no-tabs-below">
-				<fmt:message key="${pTitleKey}" />
-			</h1>
-			<div id="header"></div>
-			<div id="content">
-				<tiles:insert attribute="body" />
-			</div>
-			<div id="footer"></div>
-		</div>
+		<tiles:insert attribute="body" />
 	</body>
 </lams:html>
Index: lams_tool_wiki/web/layouts/tabLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_wiki/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -6,13 +6,6 @@
 <lams:html>
 	<tiles:insert attribute="header" />
 	<body class="stripes" onload="init();">
-		<div id="page">
-			<tiles:useAttribute name="pageTitleKey" />
-			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-			<h1>
-				<fmt:message key="${pTitleKey}" />
-			</h1>
-			<tiles:insert attribute="body" />
-		</div>
+		<tiles:insert attribute="body" />
 	</body>
 </lams:html>
Index: lams_tool_wiki/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -2,49 +2,53 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<p class="small-space-top"><html:checkbox property="lockOnFinished"
-	value="1" styleClass="noBorder" styleId="lockOnFinished"></html:checkbox>
-<label for="lockOnFinished"> <fmt:message
-	key="advanced.lockOnFinished" /> </label></p>
+<div class="checkbox">
+	<label for="lockOnFinished">
+	<html:checkbox property="lockOnFinished" value="1" styleId="lockOnFinished"></html:checkbox>
+	<fmt:message key="advanced.lockOnFinished" /></label>
+</div>
 
-<p class="small-space-top"><html:checkbox
-	property="allowLearnerCreatePages" value="1" styleClass="noBorder"
-	styleId="allowLearnerCreatePages"></html:checkbox> <label
-	for="allowLearnerCreatePages"> <fmt:message
-	key="advanced.allowLearnerCreatePages" /> </label></p>
+<div class="checkbox">
+	<label for="allowLearnerCreatePages"> 
+	<html:checkbox	property="allowLearnerCreatePages" value="1" styleId="allowLearnerCreatePages"></html:checkbox> 
+	<fmt:message key="advanced.allowLearnerCreatePages" /></label>
+</div>
 
-<p class="small-space-top"><html:checkbox
-	property="allowLearnerInsertLinks" value="1" styleClass="noBorder"
-	styleId="allowLearnerInsertLinks"></html:checkbox> <label
-	for="allowLearnerInsertLinks"> <fmt:message
-	key="advanced.allowLearnerInsertLinks" /> </label></p>
+<div class="checkbox">
+	<label	for="allowLearnerInsertLinks">
+	<html:checkbox property="allowLearnerInsertLinks" value="1" styleId="allowLearnerInsertLinks"></html:checkbox>  
+	<fmt:message key="advanced.allowLearnerInsertLinks" /></label>
+</div>
 
-<p class="small-space-top"><html:checkbox
-	property="allowLearnerAttachImages" value="1" styleClass="noBorder"
-	styleId="allowLearnerAttachImages"></html:checkbox> <label
-	for="allowLearnerAttachImages"> <fmt:message
-	key="advanced.allowLearnerAttachImages" /> </label></p>
+<div class="checkbox">
+	<label for="allowLearnerAttachImages"> 
+	<html:checkbox	property="allowLearnerAttachImages" value="1" styleId="allowLearnerAttachImages"></html:checkbox> 
+	<fmt:message key="advanced.allowLearnerAttachImages" /> </label>
+</div>
 	
-<p class="small-space-top"><html:checkbox
-	property="notifyUpdates" value="1" styleClass="noBorder"
-	styleId="notifyUpdates"></html:checkbox> <label
-	for="notifyUpdates"> <fmt:message
-	key="advanced.notifyChange" /> </label></p>
+<div class="checkbox">
+	<label	for="notifyUpdates">
+	<html:checkbox property="notifyUpdates" value="1" styleId="notifyUpdates"></html:checkbox>
+	<fmt:message key="advanced.notifyChange" /> </label>
+</div>
 
-<p><html:checkbox property="reflectOnActivity" value="1"
-	styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox> <label
-	for="reflectOnActivity"> <fmt:message
-	key="advanced.reflectOnActivity" /> </label></p>
-<p><html:textarea property="reflectInstructions" cols="30" rows="3"
-	styleId="reflectInstructions" /></p>
+<div class="checkbox">
+	<label for="reflectOnActivity">
+	<html:checkbox property="reflectOnActivity" value="1"
+	styleId="reflectOnActivity"></html:checkbox>
+	<fmt:message key="advanced.reflectOnActivity" /> </label>
+</div>
+<div class="form-group">
+	<html:textarea property="reflectInstructions" rows="3" styleClass="form-control" styleId="reflectInstructions" />
+</div>
 
 
-<h2><fmt:message key="advanced.editingLimits" /></h2>
+<h4><fmt:message key="advanced.editingLimits" /></h4>
 
-<p><fmt:message key="advanced.editingLimits.prompt" /></p>
+<div><fmt:message key="advanced.editingLimits.prompt" /></div>
 
-<p><fmt:message key="advanced.editingLimits.minimum" /> <html:select
-	property="minimumEdits" styleId="minimumEdits">
+<div><fmt:message key="advanced.editingLimits.minimum" />&nbsp;<html:select
+	property="minimumEdits" styleId="minimumEdits" styleClass="form-control form-control-inline input-sm">
 	<html:option value="0">
 		<fmt:message key="advanced.editingLimits.nominimum" />
 	</html:option>
@@ -58,8 +62,8 @@
 	<html:option value="8">8</html:option>
 	<html:option value="9">9</html:option>
 	<html:option value="10">10</html:option>
-</html:select> <fmt:message key="advanced.editingLimits.maximum" /> <html:select
-	property="maximumEdits" styleId="maximumEdits">
+</html:select>&nbsp;<fmt:message key="advanced.editingLimits.maximum" />&nbsp;<html:select
+	property="maximumEdits" styleId="maximumEdits" styleClass="form-control form-control-inline input-sm">
 	<html:option value="0">
 		<fmt:message key="advanced.editingLimits.nomaximum" />
 	</html:option>
@@ -73,7 +77,7 @@
 	<html:option value="8">8</html:option>
 	<html:option value="9">9</html:option>
 	<html:option value="10">10</html:option>
-</html:select></p>
+</html:select></div>
 
 
 <script type="text/javascript">
Index: lams_tool_wiki/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,10 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
-
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-	<link href="includes/css/wiki_style.css" rel="stylesheet" type="text/css">
 	
 <html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
 
@@ -16,63 +12,63 @@
 		<c:set var="defineLater" value="yes" scope="request" />
 	</c:if>
 
-	<div id="header">
-	
-		<!--  TITLE KEY PAGE GOES HERE -->
-		<lams:Tabs control="true">
+	<html:hidden property="currentTab" styleId="currentTab" />
+	<html:hidden property="dispatch" styleId="dispatch" value="updateContent" />
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="contentFolderID"/>
+	<html:hidden property="toolContentID"/>
+	<html:hidden property="mode" value="${sessionMap.mode}"/>
+	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
+	<html:hidden property="newPageName" styleId="newPageName"/>
+	<html:hidden property="historyPageContentId" styleId="historyPageContentId"/>
+		
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+
+		 <lams:Tabs control="true" title="${title}" helpToolSignature="<%= WikiConstants.TOOL_SIGNATURE %>" helpModule="authoring">
 			<lams:Tab id="1" key="button.basic" />
 			<c:if test="${sessionMap.mode == 'author'}">
 				<lams:Tab id="2" key="button.advanced" />
 			</c:if>
 		</lams:Tabs>
-	
-	</div>
-	<!--closes header-->
 
-	<div id="content">
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" styleId="dispatch" value="updateContent" />
-		<html:hidden property="sessionMapID" />
-		<html:hidden property="contentFolderID"/>
-		<html:hidden property="toolContentID"/>
-		<html:hidden property="mode" value="${sessionMap.mode}"/>
-		<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
-		<html:hidden property="newPageName" styleId="newPageName"/>
-		<html:hidden property="historyPageContentId" styleId="historyPageContentId"/>
-		
-		<div id="message" style="text-align: center;">
-			<c:if test="${currentWikiPage.deleted}">
-				<p class="warning"><fmt:message key="label.wiki.removed" /></p>
-			</c:if>
+		<c:if test="${currentWikiPage.deleted}">
+			<lams:Alert type="danger" id="wikiRemoved" close="false">	
+				<fmt:message key="label.wiki.removed" />
+			</lams:Alert>
+		</c:if>
+	
+	   <lams:TabBodyArea>
 			<logic:messagesPresent>
-				<p class="warning">
-				        <html:messages id="error">
-				            <c:out value="${error}" escapeXml="false"/><br/>
-				        </html:messages>
-				</p>
+				<lams:Alert type="danger" id="authorErrors" close="false">	
+			        <html:messages id="error">
+			            <c:out value="${error}" escapeXml="false"/><br/>
+			        </html:messages>
+				</lams:Alert>
 			</logic:messagesPresent>			
-		</div>
 		
-		<lams:help toolSignature="<%=WikiConstants.TOOL_SIGNATURE%>" module="authoring" />
-		
-		
+			<%-- Page tabs --%>
+			<lams:TabBodys>
+				<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+				<c:if test="${sessionMap.mode == 'author'}">
+					<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+				</c:if>
+			</lams:TabBodys>
+				
+			<div id="finishButtonDiv">
+				<lams:AuthoringButton formID="authoringForm"
+					clearSessionActionUrl="/clearsession.do" toolSignature="lawiki10"
+					cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+					toolContentID="${sessionMap.toolContentID}"
+					accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+					customiseSessionID="${sessionMap.sessionID}" 
+					contentFolderID="${sessionMap.contentFolderID}" />
+			</div>
 
-		<%-- Page tabs --%>
-		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
-		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-		</c:if>
+		</lams:TabBodyArea>
+			
+	<div id="footer"></div>
 
-		<div id="finishButtonDiv">
-			<lams:AuthoringButton formID="authoringForm"
-				clearSessionActionUrl="/clearsession.do" toolSignature="lawiki10"
-				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-				toolContentID="${sessionMap.toolContentID}"
-				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
-				customiseSessionID="${sessionMap.sessionID}" 
-				contentFolderID="${sessionMap.contentFolderID}" />
-		</div>
-	</div>
+	</lams:Page>
 </html:form>
-<div id="footer"></div>
 
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -2,79 +2,66 @@
 
 <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
 
-
-
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- ========== Basic Tab ========== -->
 
-<div id="wikimenu" style="margin-right:75px;">
-
-	<div id="breadcrumb" style="float: left; width: 50%;">
+<div id="wikimenu" class="panel panel-default">
+  <div class="panel-heading  panel-learner-title">
 		<c:if test="${currentWikiPage.title != mainWikiPage.title}">
 			<a href='javascript:changeWikiPage("${fn:escapeXml(mainWikiPage.javaScriptTitle)}")'>${fn:escapeXml(mainWikiPage.title)}</a> :
 		</c:if> 
 		<a href='javascript:changeWikiPage("${fn:escapeXml(currentWikiPage.javaScriptTitle)}")'>${fn:escapeXml(mainWikiPage.title)}</a>
-	</div>
-	
-	<div id="buttons" style="float: right; width: 50%; text-align:right; " >
-		<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>">
-			<fmt:message key="label.wiki.view"></fmt:message>
+
+    <!-- begin wiki menu-->
+    <div class="btn-group pull-right">
+
+		<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default">
+			<i class="fa fa-xm fa-play"></i> <fmt:message key="label.wiki.view"></fmt:message>
 		</a> 
-		&nbsp;
 		<c:if test="${not currentWikiPage.deleted}">
-			<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>">
-				<fmt:message key="label.wiki.edit"></fmt:message>
+			<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default">
+			<i class="fa fa-xm fa-pencil"></i> <fmt:message key="label.wiki.edit"></fmt:message>
 			</a> 
-			&nbsp;
 		</c:if>
-		<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>">
-			<fmt:message key="label.wiki.add"></fmt:message>
+		<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default">
+			<i class="fa fa-xm fa-plus"></i> <fmt:message key="label.wiki.add"></fmt:message>
 		</a> 
-		&nbsp;
-		<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>">
-			<fmt:message key="label.wiki.history"></fmt:message>
+		<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default">
+			<i class="fa fa-xm fa-history"></i> <fmt:message key="label.wiki.history"></fmt:message>
 		</a>
 		<c:if test="${currentWikiPage.title != mainWikiPage.title and not currentWikiPage.deleted}">
-			&nbsp;
 			<c:choose>
 				<c:when test="${defineLater eq 'yes'}">
 					<a href="javascript:doRemove('<fmt:message key="label.wiki.remove.mark.confirm"></fmt:message>')"
-					   title="<fmt:message key="label.wiki.remove.mark.toolTip"></fmt:message>">
-
+					   title="<fmt:message key="label.wiki.remove.mark.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default">
+					</a>
 				</c:when>
 				<c:otherwise>
 					<a href="javascript:doRemove('<fmt:message key="label.wiki.remove.confirm"></fmt:message>')"
-					   title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>">
+					   title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default">
 				</c:otherwise>
 			</c:choose>
-						<fmt:message key="label.wiki.remove"></fmt:message>
+					<i class="fa fa-xm fa-trash"></i> <fmt:message key="label.wiki.remove"></fmt:message>
 					</a>
 		</c:if>
 		<c:if test="${currentWikiPage.deleted}">
-			&nbsp;
 			<a href="javascript:submitWiki('restorePage')"
 				title="<fmt:message key="label.wiki.restore.toolTip"></fmt:message>"
 			>
-				<fmt:message key="label.wiki.restore"></fmt:message>
+				<i class="fa fa-xm fa-backward"></i> <fmt:message key="label.wiki.restore"></fmt:message>
 			</a>	
 		</c:if>
-	</div>
-</div>
+	</div> <!-- end wiki menu -->
+	</div> <!--  end panel-heading -->
+</div> <!--  end panel for overall heading & buttons -->
 
-<br />
-<br />
-<hr />
-<br />
-
-<div id="view" style="margin-right:75px;">
-	<h1>
-		<c:out value="${currentWikiPage.title}" escapeXml="true"/>
-	</h1>
-	
-	<br />
-	
-	<i> 
+<div class="panel panel-default" id="view">
+   <div class="panel-heading">
+     <h4 class="panel-title"><c:out value="${currentWikiPage.title}" escapeXml="true"/></h4>
+     <!-- Last edited -->
+     <div class="voffset5" style="font-size: 12px">
+     	<!-- Last edited -->
 		<fmt:message key="label.wiki.last.edit">
 			<fmt:param>
 				<c:choose>
@@ -86,31 +73,27 @@
 					</c:otherwise>
 				</c:choose>
 			</fmt:param>
-			<fmt:param>
-				<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
-			</fmt:param>
+            <fmt:param>
+               <time class="timeago" datetime="<fmt:formatDate value='${currentWikiPage.currentWikiContentDTO.editDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></time>
+             </fmt:param>
 		</fmt:message> 
-	</i> 
-	
-	<br />
-	<br />
-	
-	<div id="viewBody">
-		<c:out value="${currentWikiPage.currentWikiContentDTO.body}" escapeXml="false"/>
+		</div> <!-- End last edited -->
 	</div>
+    <div class="panel-body" id="viewBody">
+		<c:out value="${currentWikiPage.currentWikiContentDTO.body}" escapeXml="false"/>
+    </div>
 </div>
 
-<div id="history" style="display: none;">
-
-	<h1>
-	<fmt:message key="label.wiki.history" /> - <c:out value="${currentWikiPage.title}" />
-	</h1>
-	
-	<br />
-	
+<div class="panel panel-default" id="history" style="display: none">
+  <div class="panel-heading">
+    <h4 class="panel-title">
+      <fmt:message key="label.wiki.history" /> - <c:out value="${currentWikiPage.title}" />
+    </h4>
+  </div>
+  <div class="panel-body">
 	<c:choose>
 		<c:when test="${not empty wikiPageContentHistory}">
-			<table class="alternative-color">
+			<table class="table table-striped table-condensed">
 				<tr>
 					<th>
 						<fmt:message key="label.wiki.history.version"></fmt:message>
@@ -168,99 +151,80 @@
 		</c:otherwise>
 	</c:choose>
 </div>
+</div>
 
-
-<div id="edit" style="display: none;">
-	<h1>
-		<fmt:message key="label.wiki.edit"></fmt:message> - <c:out value="${currentWikiPage.title}" escapeXml="true"/>
-	</h1>
-	
-	<table cellpadding="0">
-		<tr>
-			<td>
-				<div class="field-name"><fmt:message key="label.authoring.basic.title"></fmt:message></div>
-				<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text><span style="display: none;'" class="title error"><fmt:message key="error.title.invalid.characters"/>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.wiki.body"></fmt:message>
-				</div>
-				<lams:CKEditor id="wikiBody"
-					value="${currentWikiPage.currentWikiContentDTO.body}"
-					contentFolderID="${sessionMap.contentFolderID}"
-					toolbarSet="CustomWiki" height="400px">
-				</lams:CKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<html:checkbox property="isEditable" value="1" styleClass="noBorder" styleId="isEditable"></html:checkbox>
-				&nbsp;
+<div class="panel panel-default" id="edit" style="display: none">
+	<div class="panel-heading">
+		<h4 clas="panel-title">
+			<fmt:message key="label.wiki.edit"></fmt:message> -  <c:out value="${currentWikiPage.title}" escapeXml="true"/>
+		</h4>
+	</div>
+	<div class="panel-body">
+	  	<div class="form-group">
+	  		<label for="title"><fmt:message key="label.authoring.basic.title"></fmt:message></label>
+			<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}" styleClass="form-control"></html:text>
+			<span style="display: none;'" class="title error"><fmt:message key="error.title.invalid.characters"/>
+		</div>
+	  	<div class="form-group">
+			<label for="wikiBody"><fmt:message key="label.wiki.body"></fmt:message></label>
+			<lams:CKEditor id="wikiBody"
+				value="${currentWikiPage.currentWikiContentDTO.body}"
+				contentFolderID="${sessionMap.contentFolderID}"
+				toolbarSet="CustomWiki" height="400px">
+			</lams:CKEditor>
+		</div>
+		<div class="checkbox">
+			<label for="isEditable">
+				<html:checkbox property="isEditable" value="1" styleId="isEditable"></html:checkbox>
 				<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-				<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-			</td>
-		</tr>
-	</table>
+			</label>
+		</div>
+		<div class="pull-right">
+			<a href="javascript:doEditOrAdd('editPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+			<a href="javascript:changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
+		</div>
+	</div>
 </div>
 
-<div id="add" style="display: none;">
-
-	<h1>
-		<fmt:message key="label.wiki.add"></fmt:message>
-	</h1>
-	<table cellpadding="0">
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.authoring.basic.title"></fmt:message>
-				</div>
-				<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text><span style="display: none;'" class="newPageTitle error"><fmt:message key="error.title.invalid.characters"/>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name">
-					<fmt:message key="label.wiki.body"></fmt:message>
-				</div>
-				<lams:CKEditor id="newPageWikiBody" value="" height="400px"
-					contentFolderID="${sessionMap.contentFolderID}"
-					toolbarSet="CustomWiki">
-				</lams:CKEditor>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<html:checkbox property="newPageIsEditable" styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>
-				&nbsp;
+<div class="panel panel-default" id="add" style="display: none">
+  <div class="panel-heading">
+    <h4 clas="panel-title">
+      <fmt:message key="label.wiki.add"></fmt:message>
+    </h4>
+  </div>
+  <div class="panel-body">
+  	  	<div class="form-group">
+	  		<label for="newPageTitle"><fmt:message key="label.authoring.basic.title"></fmt:message></label>
+			<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value="" styleClass="form-control"></html:text>
+			<span style="display: none;'" class="newPageTitle error"><fmt:message key="error.title.invalid.characters"/>
+		</div>
+	  	<div class="form-group">
+			<label for=newPageWikiBody><fmt:message key="label.wiki.body"></fmt:message></label>
+			<lams:CKEditor id="newPageWikiBody" value="" height="400px"
+				contentFolderID="${sessionMap.contentFolderID}"
+				toolbarSet="CustomWiki">
+			</lams:CKEditor>
+		</div>
+		<div class="checkbox">
+			<label for=newPageIsEditable>
+				<html:checkbox property="newPageIsEditable" value="1" styleId="newPageIsEditable"></html:checkbox>
 				<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-				<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-			</td>
-		</tr>
-	</table>
+			</label>
+		</div>
+		<div class="pull-right">
+			<a href="javascript:doEditOrAdd('addPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+			<a href="javascript:cancelAdd();changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
+		</div>
+  </div>
 </div>
 
-<br />
-<hr />
-<br />
+<!-- Wiki pages folders -->
+<h4>
+  <fmt:message key="label.wiki.pages"></fmt:message>
+</h4>
 
-<div class="field-name">
-	<fmt:message key="label.wiki.pages"></fmt:message>
-</div>
-
 <img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
-	onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
+     onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
 &nbsp;
 <a href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')">${fn:escapeXml(mainWikiPage.title)}</a>
 <div id="wikiList" style="display:none;">
@@ -271,7 +235,8 @@
 			<br />
 		</c:if> 
 	</c:forEach>
-</div>
+</div>                
+<!-- end wiki pages folders -->
 
 <script type="text/javascript">
 <!--
Index: lams_tool_wiki/web/pages/authoring/headItems.jsp
===================================================================
diff -u -r1082bdcc357c105126a5641cecc68acfa645b66b -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision 1082bdcc357c105126a5641cecc68acfa645b66b)
+++ lams_tool_wiki/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,8 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
 
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
 
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/wikiCommon.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/bootstrap.min.js"></script>
Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -18,8 +18,8 @@
       <html:hidden property="dispatch" value="openNotebook" />
       <html:hidden property="mode" value="${mode}" />	
       <html:hidden property="toolSessionID" styleId="toolSessionID"/>
-      <div class="panel panel-default">
-        <div class="panel heading">
+      <div class="panel panel-default voffset10">
+        <div class="panel-heading">
           <h4 class="panel-title">
             <lams:out value="${wikiDTO.reflectInstructions}" escapeHtml="true"/>
           </h4>
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -r49e5b8d736ebbedef20c3f3f96f4f18979b864d1 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 49e5b8d736ebbedef20c3f3f96f4f18979b864d1)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
   <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
-    <link href="includes/css/wiki_style.css" rel="stylesheet" type="text/css">
     <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
     <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
     <script language="JavaScript" type="text/javascript" src="includes/javascript/validation.js"></script>
@@ -50,8 +49,8 @@
       <div class="container" id="content">
         <div class="row no-gutter">
           <div class="col-xs-12">
-            <div class="panel panel-default panel-learner-title">
-              <div class="panel-heading">
+            <div class="panel panel-default">
+              <div class="panel-heading panel-learner-title">
                 <c:if test="${currentWikiPage.title != mainWikiPage.title}">
                   <a class="panel-title panel-learner-title pull-left" href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')"> ${fn:escapeXml(mainWikiPage.title)}</a>&nbsp;/&nbsp;
                 </c:if> 
@@ -113,6 +112,7 @@
                 </div> <!-- end wiki top menu -->               
               </div>
               <div class="panel-body">
+              
                 <!--
 <div style="float: right; margin-left: 10px; position:relative; padding-top: 4px" class="help">
 <lams:help toolSignature="<%=WikiConstants.TOOL_SIGNATURE%>" module="learning" />
@@ -252,7 +252,7 @@
                   <div class="panel-body">
                     <c:choose>
                       <c:when test="${not empty wikiPageContentHistory}">
-                        <table class="table table-stripped table-condensed">
+                        <table class="table table-striped table-condensed">
                           <tr>
                             <th>
                               <fmt:message key="label.wiki.history.version"></fmt:message>
@@ -322,7 +322,7 @@
                     </h4>
                   </div>
                   <div class="panel-body">
-                    <table class="table table-stripped table-condensed">
+                    <table class="table table-striped table-condensed">
                       <tr>
                         <td>
                           <div class="field-name">
Index: lams_tool_wiki/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -3,12 +3,12 @@
 <c:set var="dto" value="${wikiDTO}" />
 
 <c:if test="${dto.contentInUse}">
-	<p class="warning">
+	<lams:Alert type="warn" id="no-edit" close="false">
 		<fmt:message key="message.alertContentEdit" />
-	</p>
+	</lams:Alert>
 </c:if>
 
-<table cellspacing="0">
+<table class="table table-condensed">
 	<tbody>
 		<tr>
 			<td class="field-name" width="30%">
@@ -29,15 +29,13 @@
 	</tbody>
 </table>
 
-<p class="align-right">
-	<c:url value="/authoring.do" var="authoringUrl">
-		<c:param name="toolContentID" value="${dto.toolContentId}" />
-		<c:param name="mode" value="teacher" />
-		<c:param name="contentFolderID" value="${contentFolderID}" />
-	</c:url>
-	<html:link href="${authoringUrl}" styleClass="button" target="_blank">
-		<fmt:message key="button.editActivity" />
-	</html:link>
-</p>
+<c:url value="/authoring.do" var="authoringUrl">
+	<c:param name="toolContentID" value="${dto.toolContentId}" />
+	<c:param name="mode" value="teacher" />
+	<c:param name="contentFolderID" value="${contentFolderID}" />
+</c:url>
+<html:link href="${authoringUrl}" styleClass="btn btn-default" target="_blank">
+	<fmt:message key="button.editActivity" />
+</html:link>
 
 
Index: lams_tool_wiki/web/pages/monitoring/headItems.jsp
===================================================================
diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision 00ae80d4791f903bcb3661537fc7e129c72ad195)
+++ lams_tool_wiki/web/pages/monitoring/headItems.jsp	(.../headItems.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -7,5 +7,4 @@
 <script type="text/javascript" src="${tool}includes/javascript/monitoring.js">
 </script>
 
-<link href="<lams:WebAppURL />/includes/css/wiki_style.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="<lams:WebAppURL />/includes/javascript/wikiCommon.js"></script>
Index: lams_tool_wiki/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_wiki/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,23 +1,27 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
 
-<div id="header">
-	<lams:Tabs>
+<script type="text/javascript">
+	var initialTabId = "${wikiDTO.currentTab}";
+</script>
+
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Page title="${title}" type="navbar">
+
+	<lams:Tabs title="${title}" control="true" helpToolSignature="<%= WikiConstants.TOOL_SIGNATURE %>" helpModule="monitoring">
 		<lams:Tab id="1" key="button.summary" />
 		<lams:Tab id="2" key="button.editActivity" />
 		<lams:Tab id="3" key="button.statistics" />
 	</lams:Tabs>
-	<script type="text/javascript">
-		var initialTabId = "${wikiDTO.currentTab}";
-	</script>
-</div>
-
-<div id="content">
-	<lams:help toolSignature="<%= WikiConstants.TOOL_SIGNATURE %>" module="monitoring"/>
-
-	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
-</div>
-
-<div id="footer"></div>
+	
+	<lams:TabBodyArea>
+		<lams:TabBodys>
+			<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
+			<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+			<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+		</lams:TabBodys>
+	</lams:TabBodyArea>
+	
+	<div id="footer" />
+	
+</lams:Page>
Index: lams_tool_wiki/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r6d29456e3a6b018730d32c60729d6f2e693ac55e -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 6d29456e3a6b018730d32c60729d6f2e693ac55e)
+++ lams_tool_wiki/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,21 +1,25 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="dto" value="${wikiDTO}" />
+
+<c:if test="${empty dto.sessionDTOs}">
+	<lams:Alert type="info" id="no-session-summary" close="false">
+		<fmt:message key="monitor.nosessions"></fmt:message> 
+	</lams:Alert>
+</c:if>
+
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
 	<c:if test="${isGroupedActivity}">
-		<table>
-			<tr>
-				<td>
-					<h2>
-						${session.sessionName}
-					</h2>
-				</td>
-			</tr>
-		</table>
+		 <div class="panel panel-default" >
+	        <div class="panel-heading" id="heading${session.sessionID}">
+				<span class="panel-title">
+					<c:out value="${session.sessionName}" />
+				</span>
+	        </div>
 	</c:if>
 
-	<table cellpadding="0">
+	<table class="table table-condensed table-no-border">
 		<tr>
 			<td class="field-name" width="40%">
 				<fmt:message>heading.totalLearnersInGroup</fmt:message>
@@ -33,4 +37,9 @@
 			</td>
 		</tr>
 	</table>
+	
+	<c:if test="${isGroupedActivity}">
+		</div>
+	</c:if>
+	
 </c:forEach>
Index: lams_tool_wiki/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r725a8b0e55b44174a2911ac36ec6fef800c7ef20 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 725a8b0e55b44174a2911ac36ec6fef800c7ef20)
+++ lams_tool_wiki/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -28,19 +28,24 @@
 </script>
 
 <c:set var="dto" value="${wikiDTO}" />
+ 
+<div class="panel">
+	<h4>
+	    <c:out value="${dto.title}" escapeXml="true"/>
+	</h4>
+ 	<div class="instructions voffset5">
+		<c:out value="${dto.instructions}" escapeXml="false" />
+	</div>
 
-<h1>
-	<c:out value="${dto.title}" escapeXml="true" />
-</h1>
-
-<div class="instructions space-top">
-	<c:out value="${dto.instructions}" escapeXml="false" />
+	<c:if test="${empty dto.sessionDTOs}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="monitor.nosessions"></fmt:message> 
+		</lams:Alert>
+	</c:if> 
 </div>
-<br/>
 
-<c:choose>
-	<c:when test="${not empty dto.sessionDTOs}">
-		<table class="alternative-color">
+<c:if test="${not empty dto.sessionDTOs}">
+		<table class="table table-striped">
 			<tr>
 				<th>
 					<fmt:message key="monitor.th.sessions"></fmt:message>
@@ -60,26 +65,13 @@
 			</tr>
 			</c:forEach>
 		</table>
+</c:if>
 
-	</c:when>
-	<c:otherwise>
-		<fmt:message key="monitor.nosessions"></fmt:message> 
-	</c:otherwise>
-</c:choose>
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+             
+<table class="table table-striped table-condensed">
 
-
-<h1>
-	<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">
-
 	<tr>
 		<td>
 			<fmt:message key="advanced.lockOnFinished" />
@@ -201,7 +193,7 @@
 		</td>
 		
 		<td>
-			<fmt:message key="advanced.editingLimits.minimum" /> 
+			<fmt:message key="advanced.editingLimits.minimum" />&nbsp; 
 			<c:choose>
 				<c:when test="${dto.minimumEdits == 0}">
 					<fmt:message key="advanced.editingLimits.nominimum" />
@@ -213,7 +205,7 @@
 			
 			<br />
 			
-			<fmt:message key="advanced.editingLimits.maximum" /> 
+			<fmt:message key="advanced.editingLimits.maximum" /> &nbsp;
 			<c:choose>
 				<c:when test="${dto.maximumEdits == 0}">
 					<fmt:message key="advanced.editingLimits.nomaximum" />
@@ -226,4 +218,4 @@
 	</tr>
 	
 </table>
-</div>
\ No newline at end of file
+</lams:AdvancedAccordian> 
\ No newline at end of file
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -rde52cfba11fd4b6d179626e3b0c19c74d7391cfe -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision de52cfba11fd4b6d179626e3b0c19c74d7391cfe)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -1,115 +1,101 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.wiki.util.WikiConstants"%>
 
-<div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
-	<lams:help toolSignature="<%=WikiConstants.TOOL_SIGNATURE%>" module="monitoring" />
-</div>
-
 <html:form action="/monitoring" styleId="monitoringForm" method="post" enctype="multipart/form-data">
 
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<html:hidden property="dispatch" styleId="dispatch" />
-	<html:hidden property="toolSessionID" />
-	<html:hidden property="contentFolderID" />
-	<!--<html:hidden property="mode"/>-->
-	<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
-	<input type="hidden" id="wikiLinks" />
-	<html:hidden property="newPageName" styleId="newPageName" />
-	<html:hidden property="historyPageContentId" styleId="historyPageContentId" />
-	
-	<div id="wikimenu" style="margin-right:75px;">
-		<c:if test="${isGroupedActivity}">
-			<h4>
-				${sessionDTO.sessionName}
-			</h4>
-		</c:if>
-		<br />
-		<div id="breadcrumb" style="float: left; width: 50%;">
+<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<html:hidden property="dispatch" styleId="dispatch" />
+<html:hidden property="toolSessionID" />
+<html:hidden property="contentFolderID" />
+<!--<html:hidden property="mode"/>-->
+<html:hidden property="currentWikiPage" value="${currentWikiPage.uid}" styleId="currentWikiPage" />
+<input type="hidden" id="wikiLinks" />
+<html:hidden property="newPageName" styleId="newPageName" />
+<html:hidden property="historyPageContentId" styleId="historyPageContentId" />
+
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+
+<div class="container" id="content">
+  <div class="row no-gutter">
+    <div class="col-xs-12">
+      <div class="panel panel-default">
+		<!-- begin wiki main heading-->
+        <div class="panel-heading  panel-learner-title">
+			<c:if test="${isGroupedActivity}">
+				${sessionDTO.sessionName}:
+			</c:if>
 			<c:if test="${currentWikiPage.title != mainWikiPage.title}">
 				<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a> :
 			</c:if> 
 			<a href="javascript:changeWikiPage('${currentWikiPage.javaScriptTitle}')">${currentWikiPage.title}</a>
-		</div>
 
-		<div id="buttons" style="float: right; width: 50%; text-align:right;">
-			<a href="javascript:refreshPage();" title="<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>">
-				<fmt:message key="label.wiki.refresh"></fmt:message>
-			</a> 
-			&nbsp;
-			<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>">
-				<fmt:message key="label.wiki.view"></fmt:message>
-			</a> 
-			&nbsp;
-			<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>">
-				<fmt:message key="label.wiki.edit"></fmt:message>
-			</a> 
-			&nbsp;
-			<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>">
-				<fmt:message key="label.wiki.add"></fmt:message>
-			</a> 
-			&nbsp;
-			<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>" >
-				<fmt:message key="label.wiki.history"></fmt:message>
-			</a> 
-			<c:if test="${currentWikiPage.title != mainWikiPage.title}">
-				&nbsp;
-				<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
-					title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>"
-				>
-					<fmt:message key="label.wiki.remove"></fmt:message>
-				</a>
-			</c:if>
-		</div>
-	</div>
-
-	<br />
-	<br />
-	<hr />
-	<br />
-
-	<div id="view" style="margin-right:75px;">
-		<h1>
-			${currentWikiPage.title}
-		</h1>
+		    <div class="btn-group pull-right">
+				<a href="javascript:refreshPage();" title="<fmt:message key="label.wiki.refresh.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-refresh"></i> 
+					<fmt:message key="label.wiki.refresh"></fmt:message>
+				</a> 
+				<a href="javascript:changeDiv('view');" title="<fmt:message key="label.wiki.view.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-play"></i> 
+					<fmt:message key="label.wiki.view"></fmt:message>
+				</a> 
+				<a href="javascript:changeDiv('edit');" title="<fmt:message key="label.wiki.edit.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-pencil"></i> 
+					<fmt:message key="label.wiki.edit"></fmt:message>
+				</a> 
+				<a href="javascript:cancelAdd();changeDiv('add');" title="<fmt:message key="label.wiki.add.toolTip"></fmt:message>" type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-plus"></i> 
+					<fmt:message key="label.wiki.add"></fmt:message>
+				</a> 
+				<a href="javascript:changeDiv('history');" title="<fmt:message key="label.wiki.history.toolTip"></fmt:message>" 
+					type="button" class="btn btn-xs btn-default"><i class="fa fa-xm fa-history"></i> 
+					<fmt:message key="label.wiki.history"></fmt:message>
+				</a> 
+				<c:if test="${currentWikiPage.title != mainWikiPage.title}">
+					<a href="javascript:doRemove(&#39;<fmt:message key="label.wiki.remove.confirm"></fmt:message>&#39;)"
+						title="<fmt:message key="label.wiki.remove.toolTip"></fmt:message>"
+					 	type="button" class="btn btn-xs btn-default">
+					 	<i class="fa fa-xm fa-trash"></i> <fmt:message key="label.wiki.remove"></fmt:message>
+					</a>
+				</c:if>
+			</div>
+		</div> <!--  end of wiki main heading -->
+		<div class="panel-body">
 		
-		<br />
-		
-		<i> 
-			<fmt:message key="label.wiki.last.edit">
-				<fmt:param>
-					<c:choose>
-						<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
-							<fmt:message key="label.wiki.history.editor.author"></fmt:message>
-						</c:when>
-						<c:otherwise>
-							${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}
-						</c:otherwise>
-					</c:choose>
-				</fmt:param>
-				<fmt:param>
-					<lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" />
-				</fmt:param>
-			</fmt:message> 
-		</i> 
-		
-		<br />
-		<br />
-		
-		<div id="viewBody">${currentWikiPage.currentWikiContentDTO.body}
-		</div>
-	</div>
+		<!-- Wiki main -->
+	     <div class="panel panel-default" id="view">
+	       <div class="panel-heading">
+	         <h4 class="panel-title">${fn:escapeXml(currentWikiPage.title)}</h4>
+	         <!-- Last edited -->
+	         <div class="voffset5" style="font-size: 12px">
+	           <fmt:message key="label.wiki.last.edit">
+	             <fmt:param>
+	               <c:choose>
+	                 <c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO == null}">
+	                   <fmt:message key="label.wiki.history.editor.author"/>
+	                 </c:when>
+	                 <c:otherwise>
+	                   <c:out value="${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.lastName}" escapeXml="true"/>
+	                 </c:otherwise>
+	               </c:choose>
+	             </fmt:param>
+	             <fmt:param>
+	               <time class="timeago" datetime="<fmt:formatDate value='${currentWikiPage.currentWikiContentDTO.editDate}' pattern="yyyy-MM-dd'T'HH:mm:ss.S'Z'"/>"><lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}" /></time>
+	             </fmt:param>
+	           </fmt:message> 
+	         </div> <!-- End last edited -->
+	       </div>
+	       <div class="panel-body" id="viewBody">
+	         <c:out value="${currentWikiPage.currentWikiContentDTO.body}" escapeXml="false"/>
+	       </div>
+	     </div>
+		<!--  End of Wiki main -->
 
-	<div id="history" style="display: none;">
-
-		<h1>
-			<fmt:message key="label.wiki.history" /> - ${currentWikiPage.title}
-		</h1>
-		
-		<br />
-		
-		<c:choose>
-			<c:when test="${not empty wikiPageContentHistory}">
-				<table class="alternative-color">
+         <div class="panel panel-default" id="history" style="display: none">
+           <div class="panel-heading">
+             <h4 class="panel-title">
+               <fmt:message key="label.wiki.history" /> - ${fn:escapeXml(currentWikiPage.title)}
+             </h4>
+           </div>
+           <div class="panel-body">
+             <c:choose>
+               <c:when test="${not empty wikiPageContentHistory}">
+                 <table class="table table-striped table-condensed">
 					<tr>
 						<th>
 							<fmt:message key="label.wiki.history.version"></fmt:message>
@@ -165,24 +151,26 @@
 				</table>
 			</c:when>
 			<c:otherwise>
-				<fmt:message key="label.wiki.history.empty" />
-			</c:otherwise>
-		</c:choose>
-	</div>
-
-	<div id="edit" style="display: none;">
-		
-		<h1>
-			<fmt:message key="label.wiki.edit"></fmt:message> - ${currentWikiPage.title}
-		</h1>
-		
-		<table cellpadding="0">
+                 <fmt:message key="label.wiki.history.empty" />
+            </c:otherwise>
+            </c:choose>
+          </div>
+        </div>
+			
+        <div class="panel panel-default" id="edit" style="display: none">
+           <div class="panel-heading">
+             <h4 clas="panel-title">
+               <fmt:message key="label.wiki.edit"></fmt:message> - ${fn:escapeXml(currentWikiPage.title)}
+             </h4>
+           </div>
+           <div class="panel-body">
+             <table class="table table-striped table-condensed">
 			<tr>
 				<td>
 					<div class="field-name">
 						<fmt:message key="label.authoring.basic.title"></fmt:message>
 					</div>
-					<html:text property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
+					<html:text styleClass="form-control" property="title" styleId="title" style="width: 99%;" value="${currentWikiPage.title}"></html:text>
 				</td>
 			</tr>
 			<tr>
@@ -205,92 +193,72 @@
 				</td>
 			</tr>
 			<tr>
-				<td align="right">
-					<a href="javascript:doEditOrAdd('editPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-					<a href="javascript:changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
+				<div class="voffset5 pull-right">
+					<a href="javascript:doEditOrAdd('editPage');" class="btn btn-primary"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+					<a href="javascript:changeDiv('view');" class="btn btn-default"><fmt:message key="button.cancel"></fmt:message></a>
 				</td>
 			</tr>
-		</table>
+			</table>
+		</div>
 	</div>
 
-	<div id="add" style="display: none;">
+     	<div class="panel panel-default" id="add"  style="display: none">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <fmt:message key="label.wiki.add"></fmt:message>
+              </h4>
+            </div>
 
-		<h1>
-			<fmt:message key="label.wiki.add"></fmt:message>
-		</h1>
-		
-		<table cellpadding="0">
-			<tr>
-				<td>
-					<div class="field-name">
-						<fmt:message key="label.authoring.basic.title"></fmt:message>
-					</div>
-					<html:text property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<div class="field-name">
-						<fmt:message key="label.wiki.body"></fmt:message>
-					</div>
-					<lams:CKEditor id="newPageWikiBody" value="" height="400px"
-						contentFolderID="${contentFolderID}" toolbarSet="CustomWiki">
-					</lams:CKEditor>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<html:checkbox property="newPageIsEditable" styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>
+			<div class="panel-body">
+				<div class="field-name">
+					<fmt:message key="label.authoring.basic.title"></fmt:message>
+				</div>
+				<html:text styleClass="form-control" property="newPageTitle" styleId="newPageTitle" style="width: 99%;" value=""></html:text>
+				<div class="field-name">
+					<fmt:message key="label.wiki.body"></fmt:message>
+				</div>
+				<lams:CKEditor id="newPageWikiBody" value="" height="400px"
+					contentFolderID="${contentFolderID}" toolbarSet="CustomWiki">
+				</lams:CKEditor>
+				<html:checkbox property="newPageIsEditable" styleClass="noBorder" value="1" styleId="newPageIsEditable"></html:checkbox>
 					&nbsp;
-					<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
-				</td>
-			</tr>
-			<tr>
-				<td align="right">
-					<a href="javascript:doEditOrAdd('addPage');" class="button"><fmt:message key="label.wiki.savechanges"></fmt:message></a>
-					<a href="javascript:cancelAdd();changeDiv('view');" class="button"><fmt:message key="button.cancel"></fmt:message></a>
-				</td>
-			</tr>
-		</table>
-	</div>
+				<fmt:message key="label.authoring.basic.wikipagevisible"></fmt:message>
+				
+					<a href="javascript:doEditOrAdd('addPage');" class="class="btn btn-primary pull-right voffset5""><fmt:message key="label.wiki.savechanges"></fmt:message></a>
+					<a href="javascript:cancelAdd();changeDiv('view');" class="class="btn default pull-right voffset5""><fmt:message key="button.cancel"></fmt:message></a>
+			</div>
+		</div>
 
-	<br />
-	<hr />
-	<br />
+        <!-- Wiki pages folders -->
+        <h4>
+          <fmt:message key="label.wiki.pages"></fmt:message>
+        </h4>
 
-	<div class="field-name">
-		<fmt:message key="label.wiki.pages"></fmt:message>
-	</div>
+        <img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
+             onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
+        &nbsp;
+        <a href="javascript:changeWikiPage('${fn:escapeXml(mainWikiPage.javaScriptTitle)}')">${fn:escapeXml(mainWikiPage.title)}</a>
+        <div id="wikiList" style="display:none;">
+          <c:forEach var="wikiPage" items="${wikiPages}">
+            <c:if test="${wikiPage.title != mainWikiPage.title}">
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <a href="javascript:changeWikiPage('${fn:escapeXml(wikiPage.javaScriptTitle)}')">${fn:escapeXml(wikiPage.title)}</a>
+              <br />
+            </c:if> 
+          </c:forEach>
+        </div>                
+        <!-- end wiki pages folders -->
 	
-	<img src="<lams:WebAppURL />/images/tree_closed.gif" id="wikiListImage" 
-		onclick="javascript:toggleWikiList('<lams:WebAppURL />')" />
-	&nbsp;
-	<a href="javascript:changeWikiPage('${mainWikiPage.javaScriptTitle}')">${mainWikiPage.title}</a>
-	<div id="wikiList" style="display:none;">
-		<c:forEach var="wikiPage" items="${wikiPages}">
-			<c:if test="${wikiPage.title != mainWikiPage.title}">
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-				<a href="javascript:changeWikiPage('${wikiPage.javaScriptTitle}')">${wikiPage.title}</a>
-				<br />
-			</c:if> 
-		</c:forEach>
-		
-	</div>
-
 	<!-- Reflections -->
 	<c:if test="${not empty sessionDTO.userDTOs && sessionDTO.reflectOnActivity}">
-		<br />
-		<br />
-		<hr />
-		<br />
+     	<div class="panel panel-default voffset10" id="add">
+            <div class="panel-heading">
+              <h4 class="panel-title">
+                <fmt:message key="monitor.notebooks"></fmt:message>
+              </h4>
+            </div>
 
-		<h4>
-			<fmt:message key="monitor.notebooks"></fmt:message>
-		</h4>
-		
-		<br />
-		
-		<table class="alternative-color">
+			<table class="table table-condensed table-striped">
 			<c:forEach var="user" items="${sessionDTO.userDTOs}">
 				<c:if test="${not empty user.notebookEntry}">
 					<tr>
@@ -303,10 +271,14 @@
 					</tr>
 				</c:if>
 			</c:forEach>
-		</table>
+			</table>
+		</div>
 	</c:if>
 
 	<div id="finishButtonDiv"></div>
+
+</div></div></div></div></div>
+
 </html:form>
 
 <script type="text/javascript">
Index: lams_tool_wiki/web/pages/wiki/compare.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/wiki/compare.jsp	(.../compare.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_wiki/web/pages/wiki/compare.jsp	(.../compare.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -7,19 +7,15 @@
 		
 		<lams:headItems />
 		
-		<link href="<lams:WebAppURL />/includes/css/wiki_style.css" rel="stylesheet" type="text/css">
 	</lams:head>
 	
-	<div id="page">
 	<body class="stripes">
-		<div id="content" style="margin-right:75px;">
-			<h1>
-				${compareTitle} 
-			</h1>
-			
-			<h3>
+	
+		<lams:Page title="${compareTitle}" type="learner">
+		
+			<h4>
 				<fmt:message key="label.wiki.compare"><fmt:param>${compareVersions}</fmt:param></fmt:message>
-			</h3>
+			</h4>
 			
 			<span style='background-color:#99FFCC'>&nbsp;&nbsp;&nbsp;&nbsp;</span>
 			&nbsp;&nbsp;&nbsp;&nbsp;<fmt:message key="label.wiki.compare.added.line" />
@@ -32,13 +28,12 @@
 				${compareString}
 			</div>
 			
-			<br />
-			<p id="saveCancelButtons" >
-				<a href="javascript:window.close()" class="button right-buttons space-left"><fmt:message key="button.close" /></a>
-			</p>
-		</div>
-		<div id="footer">
-		</div>
+			<div id="saveCancelButtons" class="voffset10"> 
+				<a href="javascript:window.close()" class="btn btn-default"><fmt:message key="button.close" /></a>
+			</div>
+
+		<div id="footer"></div>
+		</lams:Page>
+		
 	</body>
-	</div>
 </lams:html>
\ No newline at end of file
Index: lams_tool_wiki/web/pages/wiki/viewWiki.jsp
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d
--- lams_tool_wiki/web/pages/wiki/viewWiki.jsp	(.../viewWiki.jsp)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_wiki/web/pages/wiki/viewWiki.jsp	(.../viewWiki.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
@@ -8,20 +8,16 @@
 		
 		<lams:headItems />
 		
-		<link href="<lams:WebAppURL />/includes/css/wiki_style.css" rel="stylesheet" type="text/css">
 	</lams:head>
 	
-	<div id="page">
 	<body class="stripes">
-		<div id="content" style="margin-right:75px;">	
-			<h1>
-				${currentWikiPage.title}
-			</h1>
+	
+		<lams:Page title="${currentWikiPage.title}" type="learner">
 			
-			<h3>
-				<fmt:message key="label.wiki.history.version"></fmt:message>: ${currentWikiPage.currentWikiContentDTO.version}<br />
-				<fmt:message key="label.wiki.history.date"></fmt:message>: <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}"/><br />
-				<fmt:message key="label.wiki.history.editor"></fmt:message>: 
+			<div>
+				<strong><fmt:message key="label.wiki.history.version"></fmt:message>:</strong> ${currentWikiPage.currentWikiContentDTO.version}<br />
+				<strong><fmt:message key="label.wiki.history.date"></fmt:message>:</strong> <lams:Date value="${currentWikiPage.currentWikiContentDTO.editDate}"/><br />
+				<strong><fmt:message key="label.wiki.history.editor"></fmt:message>:</strong> 
 				<c:choose>
 					<c:when test="${currentWikiPage.currentWikiContentDTO.editorDTO != null}">
 						${currentWikiPage.currentWikiContentDTO.editorDTO.firstName} ${currentWikiPage.currentWikiContentDTO.editorDTO.firstName}
@@ -30,20 +26,18 @@
 						<fmt:message key="label.wiki.history.editor.author"></fmt:message>
 					</c:otherwise>
 				</c:choose>
-			</h3>
+			</div>
 			
-			<br />	
 			<div id="viewBody">
-				${currentWikiPage.currentWikiContentDTO.body}
+				<strong><fmt:message key="label.wiki.body"></fmt:message>:</strong> ${currentWikiPage.currentWikiContentDTO.body}
 			</div>
 			
-			<p id="saveCancelButtons" >
-				<a href="javascript:window.close()" class="button right-buttons space-left"><fmt:message key="button.close" /></a>
-			</p>
-		</div>
+			<div id="saveCancelButtons" class="voffset10"> 
+				<a href="javascript:window.close()" class="btn btn-default"><fmt:message key="button.close" /></a>
+			</div>
 		
-		<div id="footer">
-		</div>
-	</div>
+		<div id="footer"></div>
+		</lams:Page>
+		
 	</body>
 </lams:html>
\ No newline at end of file