Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r47cbd6e6676ba330de8e1256da0ae1f840c11d25 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 47cbd6e6676ba330de8e1256da0ae1f840c11d25)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -18,6 +18,7 @@
 <%-- 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" %>
@@ -106,16 +107,16 @@
 		jQuery('<tr/>').append(jQuery('<td/>', {
 			'class': 'criteria-info',
 		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
-		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="">'
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="" class="form-control">'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="up-arrow" title="<fmt:message key="${upLabel}"/>" />' + 
+			html: '<div class="fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
 		    		'<div class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<div class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" />'
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -124,30 +125,29 @@
 		addCriteria(); 
 		addCriteria();
 	</c:if>
+	reactivateArrows();
 	
 	function reactivateArrows() {
 		$('#criterias-table tr').each(function() {
 
 		    $this = $(this); // cache $(this)
 		    
 		    if ($this.is(':first-child')) {
-		    	$(".up-arrow", $this).addClass("up-arrow-disabled").removeClass("up-arrow");
-		        
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
 		    } else {
-		    	$(".up-arrow-disabled", $this).addClass("up-arrow").removeClass("up-arrow-disabled");
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
 		    }
 		    
 		    if ($this.is(':last-child')) {
-		    	$(".down-arrow", $this).addClass("down-arrow-disabled").removeClass("down-arrow");
-		    	
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
 		    } else {
-		    	$(".down-arrow-disabled", $this).addClass("down-arrow").removeClass("down-arrow-disabled");
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
 		    }
 		});
 	}
 	
 	//upCriteria
-	 $( "body" ).on( "click", ".up-arrow", function() {
+	 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
 		var currentRow = $(this).closest('tr');
 		var currentCriteriaTd = $( ".criteria-info", currentRow);
 		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
@@ -170,7 +170,7 @@
 	 } );
 	 
 	//downCriteria
-	 $( "body" ).on( "click", ".down-arrow", function() {
+	 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
 		var currentRow = $(this).closest('tr');
 		var currentCriteriaTd = $( ".criteria-info", currentRow);
 		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
@@ -193,7 +193,7 @@
 	 });
 	 
 	 //deleteCriteria
-	 $( "body" ).on( "click", ".delete-arrow", function() {
+	 $( "body" ).on( "click", ".fa-times", function() {
 		var currentRow = $(this).closest('tr');
 		currentRow.remove();
 		
@@ -241,112 +241,110 @@
 	}
 </script>
 
-<div class="rating-criteria-tag">
-	<h2>
-		<fmt:message key="${headerLabel}" />
-	</h2>
-	<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+<div class="rating-criteria-tag" style="${styleId}">
 
-	<table class="alternative-color" cellspacing="0" 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}">
-					</td>
-					
-					<td width="40px">
-						<c:if test="${not status.first}">
-							<div class="up-arrow" title="<fmt:message key="${upLabel}"/>"></div>
-							<c:if test="${status.last}">
-								<div class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>"></div>
-							</c:if>
-						</c:if>
+	<div class="panel panel-default voffset5">
+		<div class="panel-heading panel-title">
+			<label><fmt:message key="${headerLabel}" /></label>
+		</div>
 	
-						<c:if test="${not status.last}">
-							<c:if test="${status.first}">
-								<div class="up-arrow-disabled" title="<fmt:message key="${upLabel}"/>"></div>
-							</c:if>
+		<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:set var="isFirst" value="${criteria.commentsEnabled && (status.index == 1) || !criteria.commentsEnabled && (status.index == 0)}"></c:set>
+					<c:if test="${!criteria.commentsEnabled}">
+						<tr>${ criteria.commentsEnabled }${status.index == 1}${status.last}${  isFirst }
+							
+							<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 class="down-arrow" title="<fmt:message key="${downLabel}"/>"></div>
-						</c:if>
-					</td>
-	                
-					<td width="20px">
-						<div class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" ></div>
-					</td>
-				</tr>
+			<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>
-		</c:forEach>
-	</table>
 	
-	<div style="height: 30px;">
-		<a href="#nogo" class="button-add-item float-right" id="add-criteria">
-			<fmt:message key="${addLabel}" /> 
-		</a>
-	</div>
+			<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>
 	
-	<c:if test="${hasRatingLimits}">
-		<div>
-			<fmt:message key="${minimumLabel}" />
-			<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);">
-				<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>
-		
-			<fmt:message key="${maximumLabel}" />
-			<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);">
-				<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>
+				<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}"/>
+			</div>
 		</div>
-	</c:if>
-	
-	<div class="space-top">
-		<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
-			<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
-		/>
-		<label for="enable-comments">
-			<fmt:message key="${allowCommentsLabel}" />
-		</label>
-		
-		<div class="small-space-top" >
-			<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}"/>
-		</div>
-		
 	</div>
-	
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -rdc884b8e6274ebbc664d1ee940e565803445bb26 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'replace')}">
+	<c:set var="toolbarSet">${toolbarSet}Replace</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r47cbd6e6676ba330de8e1256da0ae1f840c11d25 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 47cbd6e6676ba330de8e1256da0ae1f840c11d25)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r613f0d0d76eb497ed58d7e6836eda34a245425a9 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 613f0d0d76eb497ed58d7e6836eda34a245425a9)
+++ lams_tool_pixlr/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r47cbd6e6676ba330de8e1256da0ae1f840c11d25 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 47cbd6e6676ba330de8e1256da0ae1f840c11d25)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -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,10 +408,18 @@
        <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>
@@ -440,17 +448,29 @@
 		<path>/WEB-INF/tags/DefineLater.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>TSTable</name>
-		<path>/WEB-INF/tags/TSTable.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Alert</name>
 		<path>/WEB-INF/tags/Alert.tag</path>
    	</tag-file>  
    	<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>
@@ -493,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_pixlr/web/common/messages.jsp
===================================================================
diff -u -r47cbd6e6676ba330de8e1256da0ae1f840c11d25 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/common/messages.jsp	(.../messages.jsp)	(revision 47cbd6e6676ba330de8e1256da0ae1f840c11d25)
+++ lams_tool_pixlr/web/common/messages.jsp	(.../messages.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,20 +1,8 @@
 <%-- Error Messages --%>
 <logic:messagesPresent>
-    <lams:Alert id="errorMessages" type="danger" close="false">
-        <html:messages id="error">
-            &nbsp&nbsp <html:img page="/images/iconWarning.gif" 
-               styleClass="icon"/>
-            &nbsp&nbsp <c:out value="${error}" escapeXml="false"/><br/>
-        </html:messages>
-    </lams:Alert>
-</logic:messagesPresent>
-
-<%-- Success Messages --%>
-<logic:messagesPresent message="true">
-	<lams:Alert id="successMessages" type="info" close="false">
-        <html:messages id="message" message="true">
-            &nbsp&nbsp <html:img page="/images/iconInformation.gif" styleClass="icon"/>
-            &nbsp&nbsp <c:out value="${message}" escapeXml="false"/><br/>
-        </html:messages>
+	<lams:Alert id="errorMessages" type="danger" close="false">
+		<html:messages id="error">
+			<c:out value="${error}" escapeXml="false"/><br/>
+		</html:messages>
 	</lams:Alert>
 </logic:messagesPresent>
Index: lams_tool_pixlr/web/includes/javascript/common.js
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/includes/javascript/common.js	(.../common.js)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/includes/javascript/common.js	(.../common.js)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,8 +1,7 @@
 
 var popupWindow = null;
-function openPopup(url, height, width)
-{	
-	if(popupWindow && popupWindow.open && !popupWindow.closed){
+function openPopup(url, height, width) {	
+	if (popupWindow && popupWindow.open && !popupWindow.closed) {
 		popupWindow.close();
 	}
 	popupWindow = window.open(url,'popupWindow','resizable,width=' +width+ ',height=' +height+ ',scrollbars');
Index: lams_tool_pixlr/web/layouts/defaultLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_pixlr/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,22 +1,20 @@
 <!DOCTYPE html>
-            
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <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-no-tabs"></div>
+	
+		<tiles:useAttribute name="pageTitleKey" ignore="true"/>
+		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+		<c:set var="title"><fmt:message key="${pTitleKey}" /></c:set>
+		
+		<lams:Page title="${title}" type="learner">
 			<div id="content">
 				<tiles:insert attribute="body" />
 			</div>
 			<div id="footer"></div>
-		</div>
+		</lams:Page>
+		
 	</body>
 </lams:html>
Index: lams_tool_pixlr/web/layouts/learningLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_pixlr/web/layouts/learningLayout.jsp	(.../learningLayout.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
-            
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
Index: lams_tool_pixlr/web/layouts/tabLayout.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_pixlr/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,18 +1,17 @@
 <!DOCTYPE html>
-            
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <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:useAttribute name="pageTitleKey" />
+		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+		<c:set var="title"><fmt:message key="${pTitleKey}" /></c:set>
+		
+		<lams:Page title="${title}" type="navbar">
 			<tiles:insert attribute="body" />
-		</div>
+		</lams:Page>
+
 	</body>
 </lams:html>
Index: lams_tool_pixlr/web/pages/admin/config.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/admin/config.jsp	(.../config.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_pixlr/web/pages/admin/config.jsp	(.../config.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
-        
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <html>
Index: lams_tool_pixlr/web/pages/authoring/advanced.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -2,50 +2,46 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<p class="small-space-top">
-	<html:checkbox property="lockOnFinished" value="1"
-		styleClass="noBorder" styleId="lockOnFinished"></html:checkbox>
-	<label for="lockOnFinished">
+<div class="checkbox">
+	<label for="lock-when-finished">
+		<html:checkbox property="lockOnFinished" styleId="lock-when-finished"/>
 		<fmt:message key="advanced.lockOnFinished" />
 	</label>
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:checkbox property="allowViewOthersImages" value="1"
-		styleClass="noBorder" styleId="allowViewOthersImages"></html:checkbox>
+<div class="checkbox">
 	<label for="allowViewOthersImages">
+		<html:checkbox property="allowViewOthersImages" value="1" styleId="allowViewOthersImages"/>
 		<fmt:message key="advanced.allowViewOthersImages" />
 	</label>
-</p>
+</div>
 
-<p>
-	<html:checkbox property="reflectOnActivity" value="1"
-		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-
-	<label for="reflectOnActivity">
+<!-- Reflection -->
+<div class="checkbox">
+	<label for="reflect-on-activity">
+		<html:checkbox property="reflectOnActivity" styleId="reflect-on-activity"/>
 		<fmt:message key="advanced.reflectOnActivity" />
 	</label>
-</p>
-<p>
-	<html:textarea property="reflectInstructions" cols="30" rows="3" styleId="reflectInstructions"/>
-</p>
+</div>
 
+<div class="form-group">
+	<html:textarea property="reflectInstructions" cols="60" rows="3" styleId="reflect-instructions" styleClass="form-control"/>
+</div>
+
 <script type="text/javascript">
-<!--
-//automatically turn on refect option if there are text input in refect instruction area
-	var ra = document.getElementById("reflectInstructions");
-	var rao = document.getElementById("reflectOnActivity");
+	//automatically turn on refect option if there are text input in refect instruction area
+	var ra = document.getElementById("reflect-instructions");
+	var rao = document.getElementById("reflect-on-activity");
 	function turnOnRefect(){
-		if(isEmpty(ra.value)){
+		if (isEmpty(ra.value)) {
 		//turn off	
 			rao.checked = false;
-		}else{
+		} else {
 		//turn on
 			rao.checked = true;		
 		}
 	}
 
 	ra.onkeyup=turnOnRefect;
-//-->
 </script>
 
Index: lams_tool_pixlr/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_pixlr/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,69 +1,52 @@
 <%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants"%>
 
-<%@ page
-	import="org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants"%>
-
-<html:form action="/authoring" styleId="authoringForm" method="post"
-	enctype="multipart/form-data">
-
-	<c:set var="formBean"
-		value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
-
 	<c:set var="defineLater" value="no" />
 	<c:if test="${sessionMap.mode == 'teacher'}">
 		<c:set var="defineLater" value="yes" />
 	</c:if>
-
-	<div id="header">
-
-		<!--  TITLE KEY PAGE GOES HERE -->
-		<lams:Tabs control="true">
-			<lams:Tab id="1" key="button.basic" />
-			<c:if test="${sessionMap.mode == 'author'}">
-				<lams:Tab id="2" key="button.advanced" />
-			</c:if>
-		</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="toolContentID" />
-		<html:hidden property="mode" value=""/>
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="existingImageFileName" />
-
-		<div id="message" style="text-align: center;">
-			<logic:messagesPresent>
-				<p class="warning">
-				        <html:messages id="error">
-				            <c:out value="${error}" escapeXml="false"/><br/>
-				        </html:messages>
-				</p>
-			</logic:messagesPresent>			
-		</div>
-
-		<lams:help toolSignature="<%=PixlrConstants.TOOL_SIGNATURE%>"
-			module="authoring" />
-
-		<%-- Page tabs --%>
-		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
+	
+	<html:hidden property="currentTab" styleId="currentTab" />
+	<html:hidden property="dispatch"  styleId="dispatch" value="updateContent" />
+	<html:hidden property="sessionMapID" />
+	<html:hidden property="toolContentID" />
+	<html:hidden property="mode" value=""/>
+	<html:hidden property="contentFolderID" />
+	<html:hidden property="existingImageFileName" />
+	
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PixlrConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+		<lams:Tab id="1" key="button.basic" />
 		<c:if test="${sessionMap.mode == 'author'}">
-			<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
+			<lams:Tab id="2" key="button.advanced" />
 		</c:if>
+	</lams:Tabs>
 
-		<lams:AuthoringButton formID="authoringForm"
-			clearSessionActionUrl="/clearsession.do" toolSignature="lapixl10"
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
-			toolContentID="${sessionMap.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
-			customiseSessionID="${sessionMap.sessionID}" 
-			contentFolderID="${sessionMap.contentFolderID}" />
-	</div>
+	<lams:TabBodyArea>
+		<%@ include file="/common/messages.jsp"%>
+		 		
+		<!--  Set up 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>
+		
+		<!-- Button Row -->
+		<div id="saveCancelButtons">
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do" toolSignature="<%=PixlrConstants.TOOL_SIGNATURE%>"
+				cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+				toolContentID="${sessionMap.toolContentID}"
+				accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+				contentFolderID="${sessionMap.contentFolderID}" />
+		</div>
+	</lams:TabBodyArea>
+
 </html:form>
 
 <div id="footer"></div>
Index: lams_tool_pixlr/web/pages/authoring/basic.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_pixlr/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -4,67 +4,56 @@
 <c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
-
 <script type="text/javascript">
-<!--
 	var image;
 	var origImageHeight;
 	var origImageWidth;
 	
-	function submitForm(dispatch)
-	{
+	function submitForm(dispatch) {
 		document.getElementById("dispatch").value = dispatch;
 		document.getElementById("authoringForm").submit();
 	}
 	
-	function openImage(url)
-	{
+	function openImage(url) {
 		openPopup(url, origImageHeight, origImageWidth);
-	}
-	
-//-->
+	}	
 </script>
 
-
 <!-- ========== Basic Tab ========== -->
-<table cellpadding="0">
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.title"></fmt:message>
-			</div>
-			<html:text property="title" style="width: 99%;"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
-			</div>
-			<lams:CKEditor id="instructions"
-				value="${formBean.instructions}"
-				contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			
+<div class="form-group">
+    <label for="title">
+    	<fmt:message key="label.authoring.basic.title"/>
+    </label>
+    <html:text property="title" styleClass="form-control"/>
+</div>
+
+<div class="form-group">
+    <label for="instructions">
+    	<fmt:message key="label.authoring.basic.instructions"/>
+    </label>
+	<lams:CKEditor id="instructions" value="${formBean.instructions}"
+			contentFolderID="${sessionMap.contentFolderID}" height="400">
+	</lams:CKEditor>
+</div>
+
+<div class="form-group">			
 			<c:choose>
 				<c:when test='${imageExists}'>
 					<div style="text-align:center;">
-					<img id="image"  title="<fmt:message key="tooltip.openfullsize" />" onclick="openImage('${imageURL}')" src="${imageURL}"/>
-					<br><br>
+						<img id="image" title="<fmt:message key="tooltip.openfullsize" />" 
+								onclick="openImage('${imageURL}')" src="${imageURL}"/>
+						<br>
 				
-					<a href="javascript:submitForm('deleteImage')"><fmt:message key="label.authoring.remove"></fmt:message></a>
+						<a href="javascript:submitForm('deleteImage')" class="btn btn-xs btn-default voffset10">
+							<fmt:message key="label.authoring.remove"/>
+						</a>
 					</div>
 				</c:when>
 				<c:otherwise>
-					<div class="field-name">
-						<fmt:message key="label.authoring.basic.add.image"></fmt:message>
-					</div>
+					<label for="file">
+				    	<fmt:message key="label.authoring.basic.add.image"/>
+				    </label>
 					<input type="file" name="file" />
 				</c:otherwise>
 			</c:choose>
-		</td>
-	</tr>
-</table>
+</div>
\ No newline at end of file
Index: lams_tool_pixlr/web/pages/authoring/headItems.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/authoring/headItems.jsp	(.../headItems.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -8,4 +8,3 @@
 
 <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -r47cbd6e6676ba330de8e1256da0ae1f840c11d25 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 47cbd6e6676ba330de8e1256da0ae1f840c11d25)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -42,8 +42,8 @@
 				
 				<c:choose>
 					<c:when test="${!empty learnerDTOs}">
-						<c:forEach var="learner" items="${learnerDTOs}">
-							<table >
+						<table class="table">
+							<c:forEach var="learner" items="${learnerDTOs}">
 								<tr>
 									<td width="30%">
 										<a href="javascript:openPopup('${pixlrImageFolderURL}/${learner.imageFileName}', ${learner.imageHeight}, ${learner.imageWidth})">
@@ -66,13 +66,9 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
-								</tr>
-							</table>
-								
-							<br />
-							<hr />
-						</c:forEach>
-						<br />
+								</tr>	
+							</c:forEach>
+						</table>
 					</c:when>
 						
 					<c:otherwise>
@@ -83,12 +79,12 @@
 				</c:choose>
 					
 				<%--Bottom buttons--------------------------------------------------%>
-				<html:submit styleClass="btn btn-default" onclick="javascript:document.getElementById('dispatch').value = 'viewAllImages';">
+				<html:submit styleClass="btn btn-default btn-sm" onclick="javascript:document.getElementById('dispatch').value = 'viewAllImages';">
 					<fmt:message key="button.refresh" />
 				</html:submit>
 					
 				<c:if test="${!pixlrDTO.lockOnFinish}">
-					<html:submit styleClass="btn btn-default" onclick="javascript:document.getElementById('dispatch').value = 'unspecified';">
+					<html:submit styleClass="btn btn-default btn-sm loffset5" onclick="javascript:document.getElementById('dispatch').value = 'unspecified';">
 						<fmt:message key="button.redo" />
 					</html:submit>
 				</c:if>
Index: lams_tool_pixlr/web/pages/monitoring/advanceOptions.jsp
===================================================================
diff -u
--- lams_tool_pixlr/web/pages/monitoring/advanceOptions.jsp	(revision 0)
+++ lams_tool_pixlr/web/pages/monitoring/advanceOptions.jsp	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -0,0 +1,70 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+
+	<table class="table table-condensed">
+	
+		<tr>
+			<td>
+				<fmt:message key="advanced.lockOnFinished" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${dto.lockOnFinish}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="advanced.allowViewOthersImages" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${dto.allowViewOthersImages}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="monitor.summary.td.addNotebook" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${dto.reflectOnActivity == true}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+		
+		<c:choose>
+			<c:when test="${dto.reflectOnActivity == true}">
+				<tr>
+					<td>
+						<fmt:message key="monitor.summary.td.notebookInstructions" />
+					</td>
+					<td>
+						<lams:out value="${dto.reflectInstructions}" escapeHtml="true"/>	
+					</td>
+				</tr>
+			</c:when>
+		</c:choose>
+	</table>
+</lams:AdvancedAccordian>
Index: lams_tool_pixlr/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r63ab4413a66861635ecc8d57de6256e4aefed77b -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
+++ lams_tool_pixlr/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,25 +1,24 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="dto" value="${pixlrDTO}" />
 
 <c:if test="${dto.contentInUse}">
-	<p class="warning">
+	<lams:Alert type="warn" id="alertContentEdit" 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%">
+			<td width="30%">
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
 				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
 		<tr>
-			<td class="field-name" width="30%">
+			<td width="30%">
 				<fmt:message key="label.authoring.basic.instructions" />
 			</td>
 			<td>
@@ -29,15 +28,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 pull-right" target="_blank">
+	<fmt:message key="button.editActivity" />
+</html:link>
 
 
Index: lams_tool_pixlr/web/pages/monitoring/image.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/monitoring/image.jsp	(.../image.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_pixlr/web/pages/monitoring/image.jsp	(.../image.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,26 +1,18 @@
-<!DOCTYPE html>
-        
+<!DOCTYPE html>      
 <%@ include file="/common/taglibs.jsp"%>
 
-<%
-String imageURL = request.getParameter("imageURL");
-%>
-
 <html>
 	<head>
-	
 		<script type="text/javascript">
-		<!--
-			function resize() 
-			{
+			function resize() {
 				var image = document.getElementById("image");
 				window.resizeBy(image.width, image.height); 
 			}
-		-->
 		</script>
 	</head>
+	
 	<body onload="resize();">
-		<img id="image" src='<%= imageURL %>' />
+		<img id="image" src='<%= request.getParameter("imageURL") %>' />
 	</body>
 </html>
 	
Index: lams_tool_pixlr/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_pixlr/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,23 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.pixlr.util.PixlrConstants"%>
+<script type="text/javascript">
+	var initialTabId = "${pixlrDTO.currentTab}";
+</script>
 
-<div id="header">
-	<lams:Tabs>
-		<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 = "${pixlrDTO.currentTab}";
-	</script>
-</div>
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PixlrConstants.TOOL_SIGNATURE %>" helpModule="monitoring" refreshOnClickAction="javascript:location.reload();">
+	<lams:Tab id="1" key="button.summary"/>
+	<lams:Tab id="2" key="button.editActivity"/>
+	<lams:Tab id="3" key="button.statistics"/>
+</lams:Tabs>
+	
+<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="content">
-	<lams:help toolSignature="<%= PixlrConstants.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>
Fisheye: Tag d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4 refers to a dead (removed) revision in file `lams_tool_pixlr/web/pages/monitoring/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_pixlr/web/pages/monitoring/pixlrDisplay.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/monitoring/pixlrDisplay.jsp	(.../pixlrDisplay.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/monitoring/pixlrDisplay.jsp	(.../pixlrDisplay.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,24 +1,25 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<table>
+<table class="table">
 	<tr>
 		<td colspan="2">
 			<h2>
 				${userDTO.firstName} ${userDTO.lastName }
 			</h2>
 		</td>
 	</tr>
+	
 	<tr>
-		<td class="field-name" width="20%">
+		<td width="20%">
 			<fmt:message key="label.created" />
 		</td>
 		<td>
 			<lams:Date value="${userDTO.entryDTO.createDate }"></lams:Date>
-			
 		</td>
 	</tr>
+	
 	<tr>
-		<td class="field-name" width="20%">
+		<td width="20%">
 			<fmt:message key="label.lastModified" />
 		</td>
 		<td>
@@ -27,7 +28,7 @@
 	</tr>
 
 	<tr>
-		<td class="field-name">
+		<td>
 			<fmt:message key="label.notebookEntry" />
 		</td>
 		<td>
Index: lams_tool_pixlr/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_pixlr/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,36 +1,44 @@
 <%@ include file="/common/taglibs.jsp"%>
-
 <c:set var="dto" value="${pixlrDTO}" />
+
+<c:if test="${empty dto.sessionDTOs}">
+	<lams:Alert type="info" id="no-session-summary" close="false">
+		<fmt:message key="message.summary" />
+	</lams:Alert>
+</c:if>
+
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
 	<c:if test="${isGroupedActivity}">
-		<table>
+		<div class="panel panel-default" >
+			<div class="panel-heading">
+				<span class="panel-title">
+					<fmt:message key="heading.group">
+						<fmt:param>${session.sessionName}</fmt:param>
+					</fmt:message>
+				</span>
+			</div>
+		</div>
+	</c:if>
+
+	<div class="panel-body">
+		<table class="table table-condensed">
 			<tr>
+				<td width="40%">
+					<fmt:message>heading.totalLearnersInGroup</fmt:message>
+				</td>
+				<td width="70%">
+					${session.numberOfLearners}
+				</td>
+			</tr>
+			<tr>
 				<td>
-					<h2>
-						${session.sessionName}
-					</h2>
+					<fmt:message>heading.totalFinishedLearnersInGroup</fmt:message>
 				</td>
+				<td>
+					${session.numberOfFinishedLearners}
+				</td>
 			</tr>
 		</table>
-	</c:if>
-
-	<table cellpadding="0">
-		<tr>
-			<td class="field-name" width="40%">
-				<fmt:message>heading.totalLearnersInGroup</fmt:message>
-			</td>
-			<td width="70%">
-				${session.numberOfLearners}
-			</td>
-		</tr>
-		<tr>
-			<td class="field-name" width="40%">
-				<fmt:message>heading.totalFinishedLearnersInGroup</fmt:message>
-			</td>
-			<td width="70%">
-				${session.numberOfFinishedLearners}
-			</td>
-		</tr>
-	</table>
+	</div>
 </c:forEach>
Index: lams_tool_pixlr/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r63ab4413a66861635ecc8d57de6256e4aefed77b -rd90a410fd0e5efc3e47d5a112843ab7db4d3bbc4
--- lams_tool_pixlr/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
+++ lams_tool_pixlr/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d90a410fd0e5efc3e47d5a112843ab7db4d3bbc4)
@@ -1,8 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-
 <c:set var="dto" value="${pixlrDTO}" />
 
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	function submitForm(method, uid) {
 		document.getElementById("dispatch").value = method;
@@ -11,56 +10,83 @@
 	}
 </script>
 
-<h1>
-	<c:out value="${dto.title}" escapeXml="true" />
-</h1>
-<div class="instructions small-space-top">
-	<c:out value="${dto.instructions}" escapeXml="false" />	
+<div class="panel">
+	<h4>
+	  <c:out value="${dto.title}" escapeXml="true"/>
+	</h4>
+	
+	<div class="instructions voffset5">
+	  <c:out value="${dto.instructions}" escapeXml="false"/>
+	</div>
+	
+	<c:if test="${empty dto.sessionDTOs}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="message.summary" />
+		</lams:Alert>
+	</c:if>
 </div>
-<br/>
+
+<c:if test="${isGroupedActivity}">
+	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+</c:if>
+
 <html:form action="/monitoring" method="post" styleId="monitoringForm">
 	
 	<html:hidden property="dispatch" styleId="dispatch" value="toggleHideImage" />
 	<html:hidden property="contentFolderID" value="${contentFolderID}" />	
 	<html:hidden property="toolContentID" value="${toolContentID}"/>
 	<html:hidden property="hideUserImageUid" styleId="hideUserImageUid"/>
 	
-	<c:forEach var="session" items="${dto.sessionDTOs}">
+	<c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
 	
-		<c:if test="${isGroupedActivity}">
-			<h2>
-				${session.sessionName}
-			</h2>
+		<c:if test="${isGroupedActivity}">	
+		    <div class="panel panel-default" >
+		        <div class="panel-heading" id="heading${session.sessionID}">
+		        	<span class="panel-title collapsable-icon-left">
+		        		<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${session.sessionID}" 
+								aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${session.sessionID}" >
+							<fmt:message key="heading.group" >
+								<fmt:param><c:out value="${session.sessionName}" /></fmt:param>
+							</fmt:message>
+						</a>
+					</span>
+		        </div>
+	        
+				<div id="collapse${session.sessionID}" class="panel-collapse collapse ${status.first ? 'in' : ''}" 
+	        			role="tabpanel" aria-labelledby="heading${session.sessionID}">
 		</c:if>
 	
-		<table cellpadding="0">
+		<table class="table table-centered voffset10">
 			<tr>
-				<td class="field-name" width="30%">
-					<fmt:message key="heading.totalLearners" />
-				</td>
-				<td width="70%">
-					${session.numberOfLearners}
-				</td>
-			</tr>
-		</table>
-	
-		<table cellpadding="0" class="alternative-color">
-			<tr>
-				<th><fmt:message key="monitoring.th.learner" /></th>
-				<th><fmt:message key="monitoring.th.image" /></th>
+				<th>
+					<fmt:message key="monitoring.th.learner" />
+				</th>
+				<th>
+					<fmt:message key="monitoring.th.image" />
+				</th>
 				<c:if test="${pixlrDTO.reflectOnActivity}">
-					<th><fmt:message key="monitoring.th.reflection" /></th>
+					<th>
+						<fmt:message key="monitoring.th.reflection" />
+					</th>
 				</c:if>
 			</tr>
 			
 			<c:forEach var="user" items="${session.userDTOs}">
 				<tr>
 					<td>
-						<a href="javascript:openPopup('${pixlrImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})">
-							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
-						</a>
+						<c:choose>
+							<c:when test="${user.imageFileName != null && user.imageFileName != pixlrDTO.imageFileName}">
+								<a href="javascript:openPopup('${pixlrImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})">
+									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
+								</a>
+							</c:when>
+							<c:otherwise>
+								<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
+							</c:otherwise>
+						</c:choose>
 					</td>
-					<td align="center">
+					
+					<td>
 						<c:choose>
 							<c:when test="${user.imageFileName != null && user.imageFileName != pixlrDTO.imageFileName}">
 								<img src="${pixlrImageFolderURL}/${user.imageFileName}" 
@@ -90,7 +116,7 @@
 					</td>
 					
 					<c:if test="${pixlrDTO.reflectOnActivity}">
-						<td >
+						<td>
 							<c:choose>
 								<c:when test="${user.finishedReflection}">
 									<lams:out escapeHtml="true" value="${user.notebookEntry}" />
@@ -104,85 +130,19 @@
 				</tr>
 			</c:forEach>
 		</table>
+		
+		<c:if test="${isGroupedActivity}">
+			</div> <!-- end collapse area  -->
+			</div> <!-- end collapse panel  -->
+		</c:if>
+		${ !isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
 	
 	</c:forEach>
 
 </html:form>
 
+<c:if test="${isGroupedActivity}">
+	</div> <!--  end panel group -->
+</c:if>
 
-<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" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.lockOnFinish}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="advanced.allowViewOthersImages" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.allowViewOthersImages}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.reflectOnActivity == true}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${dto.reflectOnActivity == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					<lams:out value="${dto.reflectInstructions}" escapeHtml="true"/>	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
-</div>
-
+<%@ include file="advanceOptions.jsp"%>