Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -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 voffset5" >
+		<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_daco/web/WEB-INF/tags/HybridTabBody.tag
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/WEB-INF/tags/HybridTabBody.tag	(.../HybridTabBody.tag)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/WEB-INF/tags/HybridTabBody.tag	(.../HybridTabBody.tag)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -29,7 +29,6 @@
  */
 
 %>
-<%@ tag body-content="scriptless"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 
Index: lams_tool_daco/web/WEB-INF/tags/HybridTabHeader.tag
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/WEB-INF/tags/HybridTabHeader.tag	(.../HybridTabHeader.tag)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/WEB-INF/tags/HybridTabHeader.tag	(.../HybridTabHeader.tag)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -27,8 +27,7 @@
  *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
  */
 
-		%>
-<%@ tag body-content="scriptless"%>
+%>
 <%@ attribute name="control" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
Index: lams_tool_daco/web/pages/authoring/advanced.jsp
===================================================================
diff -u -ra8e7e92f2121c4b307fb49d28008a5828ad58c58 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision a8e7e92f2121c4b307fb49d28008a5828ad58c58)
+++ lams_tool_daco/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -8,13 +8,11 @@
 </script>
 
 <!-- Advance Tab Content -->
-
-<p class="small-space-top"><fmt:message key="label.authoring.advanced.record" /></p>
-<p>
+<div class="form-group">
+<label><fmt:message key="label.authoring.advanced.record" /></label><BR/>
 <!-- Minimum number of records learner must provide -->
-<label for="minRecords">
-<fmt:message key="label.common.min" /></label> <html:select property="daco.minRecords"
-	styleClass="noBorder">
+<label for="minRecords"><fmt:message key="label.common.min" /></label> 
+<html:select property="daco.minRecords" styleClass="roffset5">
 	<html:option value="0">
 		<fmt:message key="label.authoring.advanced.record.nolimit" />
 	</html:option>
@@ -23,7 +21,6 @@
 	</c:forEach>
 </html:select>
 <label for="maxRecords" style="space-left"> <fmt:message key="label.common.max" /> </label> 
-
 <!-- Maximum number of records learner must provide -->
 <html:select
 	property="daco.maxRecords" styleClass="noBorder">
@@ -34,23 +31,31 @@
 		<html:option value="${index}">${index}</html:option>
 	</c:forEach>
 </html:select>
+</div>
 
-</p>
-
-<p class="small-space-top"><html:checkbox property="daco.notifyTeachersOnLearnerEntry" styleClass="noBorder"
+<div class="form-group">
+<html:checkbox property="daco.notifyTeachersOnLearnerEntry"
 	styleId="notifyTeachersOnLearnerEntry">
-</html:checkbox> <label for="notifyTeachersOnLearnerEntry"> <fmt:message key="label.authoring.advanced.notify.onlearnerentry" /> </label></p>
+</html:checkbox> <label for="notifyTeachersOnLearnerEntry">&nbsp;<fmt:message key="label.authoring.advanced.notify.onlearnerentry" /> </label></p>
+</div>
 
-<p><html:checkbox property="daco.notifyTeachersOnRecordSumbit" styleClass="noBorder"
+<div class="form-group">
+<html:checkbox property="daco.notifyTeachersOnRecordSumbit"
 	styleId="notifyTeachersOnRecordSubmit">
-</html:checkbox> <label for="notifyTeachersOnRecordSubmit"> <fmt:message key="label.authoring.advanced.notify.onrecordsubmit" /> </label></p>
+</html:checkbox> <label for="notifyTeachersOnRecordSubmit">&nbsp;<fmt:message key="label.authoring.advanced.notify.onrecordsubmit" /> </label></p>
+</div>
 
-<p><html:checkbox property="daco.lockOnFinished" styleClass="noBorder"
+<div class="form-group">
+<html:checkbox property="daco.lockOnFinished" 
 	styleId="lockOnFinished">
-</html:checkbox> <label for="lockOnFinished"> <fmt:message key="label.authoring.advanced.lock.on.finished" /> </label></p>
+</html:checkbox> <label for="lockOnFinished">&nbsp;<fmt:message key="label.authoring.advanced.lock.on.finished" /> </label>
+</div>
 
-<p><html:checkbox property="daco.reflectOnActivity" styleClass="noBorder" styleId="reflectOn">
-</html:checkbox> <label for="reflectOn"> <fmt:message key="label.authoring.advanced.reflectOnActivity" /> </label></p>
-
-<p><html:textarea property="daco.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3"
-	onkeyup="javascript:turnOnReflect()" /></p>
\ No newline at end of file
+<div class="form-group">
+<html:checkbox property="daco.reflectOnActivity" styleId="reflectOn">
+</html:checkbox> <label for="reflectOn">&nbsp;<fmt:message key="label.authoring.advanced.reflectOnActivity" /> </label>
+<BR/>
+<div class="form-group">
+<html:textarea property="daco.reflectInstructions" styleId="reflectInstructions" cols="50" rows="3"
+	onkeyup="javascript:turnOnReflect()" />
+</div>
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/authoring.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-        
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+        "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.daco.DacoConstants"%>
@@ -36,57 +36,52 @@
  
 </lams:head>
 <body class="stripes" onLoad="init()">
+
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+<c:set var="formBean"  value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+
 <c:set var="title"><fmt:message key="label.author.title" /></c:set>
-<lams:Page type="learner" title="${title}">
+<lams:Page title="${title}" type="navbar">
 
-		<span class="pull-right voffset5">
-		<lams:help toolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" module="authoring"/>
-		</span>
+	<lams:HybridTabHeader control="true" title="${title}" helpToolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+			<lams:HybridTab id="1" key="label.authoring.heading.basic" />
+			<lams:HybridTab id="2" key="label.authoring.heading.advanced" />
+	</lams:HybridTabHeader>	
+
+	<lams:HybridTabBody>
+		<%@ include file="/common/messages.jsp"%>
+
+
+		<html:hidden property="daco.contentId" />
+		<html:hidden property="sessionMapID" />
+		<html:hidden property="contentFolderID" />
+		<html:hidden property="currentTab" styleId="currentTab" />
+
 		
-		<!-- start tabs -->
-		<lams:Tabs useKey="true" control="true">
-			<lams:Tab id="1" key="label.authoring.heading.basic" />
-			<lams:Tab id="2" key="label.authoring.heading.advanced" />
-		</lams:Tabs></div>
-		
 		<lams:TabBodys>
 			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.description" /> <!--  page="basic.jsp" -->
+			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.description" page="basic.jsp" />
 			<!-- end of content (Basic) -->
 
 			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advanced.description" page="advanced.jsp"  /> <!--  -->
+			<lams:TabBody id="2" titleKey="label.authoring.heading.advanced.description" page="advanced.jsp" />
 			<!-- end of content (Advanced) -->
 		</lams:TabBodys>
-		<!--  end tabs -->
 
- 		<%@ include file="/common/messages.jsp"%>
+		<!-- Button Row -->
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
+			toolSignature="<%=DacoConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.daco.contentId}" 
+			 customiseSessionID="${formBean.sessionMapID}"
+			 contentFolderID="${formBean.contentFolderID}"
+			 cancelConfirmMsgKey="message.authoring.cancel.save" />
 
- 		<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-<%--  		<c:set var="formBean"  value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
- --%>  		
- 			
-	 		<html:hidden property="daco.contentId" />
-			<html:hidden property="sessionMapID" />
-			<html:hidden property="contentFolderID" />
-			<html:hidden property="currentTab" styleId="currentTab" />  
+	</lams:HybridTabBody>
 
-			<!-- Button Row -->
-			<%--  Default value 
-				cancelButtonLabelKey="label.common.cancel"
-				saveButtonLabelKey="label.authoring.save.button"
-				cancelConfirmMsgKey="message.authoring.cancel.save"
-				accessMode="author"
-			--%>
- 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" 
-				toolSignature="<%=DacoConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.daco.contentId}" 
-				 customiseSessionID="${formBean.sessionMapID}"
-				 contentFolderID="${formBean.contentFolderID}"
-				 cancelConfirmMsgKey="message.authoring.cancel.save" />
-	</html:form>  
-
 <div id="footer"></div>
 <!-- end page div -->
 </lams:Page>
+
+</html:form>
+
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_daco/web/pages/authoring/basic.jsp
===================================================================
diff -u -r17c7be6f4155b1ad0317b5532709444439660e48 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 17c7be6f4155b1ad0317b5532709444439660e48)
+++ lams_tool_daco/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -81,23 +81,19 @@
 </script>
 
 <!-- Basic Tab Content -->
-
-<table>
-	<tr>
-		<td colspan="2">
-		<div class="field-name"><fmt:message key="label.authoring.basic.title" /></div>
-		<html:text property="daco.title" style="width: 99%;"></html:text></td>
-	</tr>
-	<tr>
-		<td colspan="2">
-		<div class="field-name"><fmt:message key="label.authoring.basic.instruction"></fmt:message></div>
-		<lams:CKEditor id="daco.instructions" value="${formBean.daco.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor></td>
-	</tr>
-</table>
+ <div class="form-group">
+    <label for="daco.title"><fmt:message key="label.authoring.basic.title" /></label>
+    <html:text property="daco.title" style="width: 100%;"></html:text>
+ </div>
+ <div class="form-group">
+    <label for="daco.title"><fmt:message key="label.authoring.basic.instruction" /></label>
+    <lams:CKEditor id="daco.instructions" value="${formBean.daco.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+ </div>
+  
 <!-- Dropdown menu for choosing a question type -->
 <div id="questionListArea"><c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 <%@ include	file="/pages/authoring/parts/questionlist.jsp"%></div>
-<p><select id="questionType" style="float: left">
+<div><select id="questionType">
 	<option selected="selected"><fmt:message key="label.authoring.basic.textfield" /></option>
 	<option><fmt:message key="label.authoring.basic.textarea" /></option>
 	<option><fmt:message key="label.authoring.basic.number" /></option>
@@ -108,9 +104,9 @@
 	<option><fmt:message key="label.authoring.basic.dropdown" /></option>
 	<option><fmt:message key="label.authoring.basic.checkbox" /></option>
 	<option><fmt:message key="label.authoring.basic.longlat" /></option>
-</select><html:link href="#" styleClass="button space-left" onclick="javascript:showQuestionInputAreaByType('${showMessageURL }')">
-	<fmt:message key="label.authoring.basic.question.add" />
-</html:link></p>
+</select><html:link href="#" styleClass="btn btn-default btn-xs loffset5" onclick="javascript:showQuestionInputAreaByType('${showMessageURL }')">
+	<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.basic.question.add" />
+</html:link></p></div>
 <a name="questionInputAreaAnchor"></a>
 <p><iframe onload="javascript:this.style.height=resizeOnMessageFrameLoad();window.location.hash = '#questionInputArea';" id="questionInputArea"
 	name="questionInputArea" style="width: 0px; height: 0px; border: 0px; display: none" frameborder="no" scrolling="no"> </iframe></p>
Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -7,10 +7,14 @@
 
 <div id="questionList">
 <%-- This image is shown when a question is being downloaded from a server. --%>
-<h2 class="spacer-left"><fmt:message key="label.authoring.basic.list.title" /> <img
-	src="${ctxPath}/includes/images/indicator.gif" style="display: none" id="questionListArea_Busy" /></h2>
 
-<table class="alternative-color" id="questionTable" cellspacing="0">
+<div class="panel panel-default voffset5">
+	<div class="panel-heading panel-title">
+		<fmt:message key="label.authoring.basic.list.title" /> 
+		<img src="${ctxPath}/includes/images/indicator.gif" style="display: none" id="questionListArea_Busy" />
+	</div>
+
+	<table class="table table-striped table-condensed" id="questionTable">
 	<tr>
 		<th width="24%"><fmt:message key="label.authoring.basic.list.header.type" /></th>
 		<th colspan="3"><fmt:message key="label.authoring.basic.list.header.question" /></th>
@@ -20,7 +24,7 @@
 
 	<c:forEach var="question" items="${sessionMap.questionList}" varStatus="status">
 		<tr>
-			<td><span class="field-name">
+			<td><label>
 				<c:choose>
 					<c:when test="${question.type == 1}">
 						<span class="field-name"> <fmt:message key="label.authoring.basic.textfield" />
@@ -53,18 +57,17 @@
 						 <fmt:message key="label.authoring.basic.longlat" />
 					</c:when>
 				</c:choose>
-				</span></td>
+				</label></td>
 				<td>${question.description}</td>
-				<td><img src="${tool}includes/images/edit.gif"
-					title="<fmt:message key="label.common.edit" />"
-					onclick="javascript:editQuestion(${status.index},'${sessionMapID}')" /></td>
-				<td><img src="${tool}includes/images/cross.gif"
-					title="<fmt:message key="label.common.delete" />"
-					onclick='javascript:if (confirm("<fmt:message key="message.authoring.delete.question" />")) deleteQuestion(${status.index},"${sessionMapID}");' /></td>
+				<td><i class="fa fa-pencil"	title="<fmt:message key="label.common.edit" />"
+					onclick="javascript:editQuestion(${status.index},'${sessionMapID}')"></i></td>
+				<td><i class="fa fa-times"	title="<fmt:message key="label.common.delete" />"
+					onclick='javascript:if (confirm("<fmt:message key="message.authoring.delete.question" />")) deleteQuestion(${status.index},"${sessionMapID}");'></i></td>
 		</tr>
 	</c:forEach>
-</table>
+	</table>
 </div>
+</div>
 
 <%-- This script will work when a new question is submited in order to refresh "Question List" panel. --%>
 <script type="text/javascript">
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -42,9 +42,6 @@
 </lams:head>
 
 <body class="stripes" id="body" onLoad="init()">
-<!-- <body class="stripes" onLoad="init()">
-<c:set var="title"><fmt:message key="label.learning.title" /></c:set>
--->
 <lams:Page type="learner" title="${daco.title}">
 
 <span class="pull-right voffset5">
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -21,10 +21,11 @@
 </c:set>
 <%-- Whether to display the vertical or horizontal view. --%>
 <c:set var="horizontal" value="${sessionMap.learningView=='horizontal'}" />
-<c:if test="${empty isIE}">
+<c:if test="${empty isIE}"> 
 	<%-- Some elements are displayed differently depending on the browser. --%>
-	<c:set var="userAgent" value='<%=request.getHeader("User-Agent") %>' />
-	<c:set var="isIE" value='${(not empty userAgent) && fn:indexOf(userAgent,"MSIE") != -1}' scope="session" />
+	<c:if test="${fn:contains(header['User-Agent'],'MSIE')}">
+		<c:set var="isIE" value='true' scope="session" />
+	</c:if>
 </c:if>
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:choose>
@@ -159,15 +160,9 @@
 												<c:when test="${question.type==4}">
 													<c:set var="date">
 														<c:if test="${not empty answer.answer}">
-															<c:set var="dateString" value="${answer.answer}" />
-															<%
-															  String answer = (String) pageContext.getAttribute("dateString");
-															  pageContext.setAttribute("parsedDate", 
-																  new java.text.SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy").parse(answer));
-															%>
-															<%-- To display a date a single textfield with formatted date is used. --%>
+															<fmt:parseDate pattern="EEE MMM dd HH:mm:ss zzz yyyy" value="${answer.answer}" var="parsedDate" />
 															<lams:Date value="${parsedDate}" type="date" style="medium"/>
-														</c:if>
+ 														</c:if>
 													</c:set>
 													<input type="text" size="20" readonly="readonly" value="${date}" />
 												</c:when>
Index: lams_tool_daco/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -37,7 +37,7 @@
 					<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 					<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 				</c:url>
-				<a href="#" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="button">
+				<a href="#" onclick="javascript:launchPopup('${authoringUrl}','definelater')" class="btn btn-default">
 					<fmt:message key="label.monitoring.edit.activity.edit" />
 				</a>
 			</td>
Index: lams_tool_daco/web/pages/monitoring/listRecords.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/monitoring/listRecords.jsp	(.../listRecords.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/monitoring/listRecords.jsp	(.../listRecords.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -31,50 +31,60 @@
 		</title>
 </lams:head> 
 <body class="stripes">
-<div id="page">
-	<div id="header-no-tabs">
-	</div>
-	<div id="content">
 
-			<div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
-				<%-- Switch between the horizontal and vertical views --%>
-				<c:url var="changeViewUrl" value='/monitoring/changeView.do'>
-					<c:param name="sessionMapID" value="${sessionMapID}" />
-					<c:param name="toolSessionID" value="${toolSessionID}" />
-					<c:param name="userId" value="${userId}" />
-					<c:param name="sort" value="${sort}" />
-				</c:url>
-				<img src="${tool}includes/images/uparrow.gif" title="<fmt:message key="label.common.view.change" />"
-				 onclick="javascript:document.location.href='${changeViewUrl}'" />
-			</div>
+<c:set var="title"><fmt:message key="title.monitoring.recordlist" /></c:set>
+<lams:Page type="monitor" title="${title}">
 
-			<c:if test="${sessionMap.isGroupedActivity}">
-			<h2  style="display: inline"><fmt:message key="label.monitoring.group" />: ${userGroup.sessionName}</h2>
-			</c:if>
-			<div class="float-right"><a href="#" onclick="javascript:self.close()" class="button"><fmt:message key="label.monitoring.close" /></a></div>
-			<c:forEach var="user" items="${userGroup.users}">
-					<table cellpadding="0" class="alternative-color">
-						<tr>
-							<th><fmt:message key="label.monitoring.fullname" /></th>
-							<th><fmt:message key="label.monitoring.recordcount" /></th>
-						</tr>
-						<tr>
-							<td style="height: 20px;">
-								 <c:out value="${user.fullName}" escapeXml="true"/>
-							</td>
-							<td>
-								 ${user.recordCount}
-							</td>
-						</tr>
-					</table>
-					<c:if test="${not empty user.records}">
-						<c:set var="recordList" value="${user.records}" />
-						<%@ include file="/pages/learning/listRecords.jsp" %>
-					</c:if>
-			</c:forEach>
-	</div>
+	<%-- Switch between the horizontal and vertical views --%>
+	<c:url var="changeViewUrl" value='/monitoring/changeView.do'>
+		<c:param name="sessionMapID" value="${sessionMapID}" />
+		<c:param name="toolSessionID" value="${toolSessionID}" />
+		<c:param name="userId" value="${userId}" />
+		<c:param name="sort" value="${sort}" />
+	</c:url>
+
+	<span class="pull-right voffset5">
+	<c:choose>
+		<c:when test="${sessionMap.learningView=='horizontal'}">
+		<i class="fa fa-ellipsis-h loffset10" title="<fmt:message key="label.common.view.change" />"
+		 onclick="javascript:document.location.href='${changeViewUrl}'" id="ellipsis"></i>
+		</c:when>
+		<c:otherwise>
+		<i class="fa fa-ellipsis-v loffset10" title="<fmt:message key="label.common.view.change" />"
+		 onclick="javascript:document.location.href='${changeViewUrl}'" id="ellipsis"></i>
+		</c:otherwise>
+	</c:choose>
+	</span>
+
+	<h4>
+	<c:if test="${sessionMap.isGroupedActivity}">
+		<fmt:message key="label.monitoring.group" />: ${userGroup.sessionName}
+	</c:if>
+	</h4>
+	
+ 	<c:forEach var="user" items="${userGroup.users}">
+		<table class="table table-striped table-condensed">
+		<tr>
+			<th><fmt:message key="label.monitoring.fullname" /></th>
+			<th><fmt:message key="label.monitoring.recordcount" /></th>
+		</tr>
+		<tr>
+			<td style="height: 20px;">
+				 <c:out value="${user.fullName}" escapeXml="true"/>
+			</td>
+			<td>
+				 ${user.recordCount}
+			</td>
+		</tr>
+		</table>
+ 		<c:if test="${not empty user.records}">
+			<c:set var="recordList" value="${user.records}" />
+ 			<%@ include file="/pages/learning/listRecords.jsp" %>
+		</c:if>
+	</c:forEach> 
+
 	<div id="footer">
 	</div>
-</div>
+</lams:Page>
 </body>
 </lams:html>
Index: lams_tool_daco/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -31,56 +31,13 @@
 			<lams:HybridTab id="3" key="tab.monitoring.statistics"/>
 		</lams:HybridTabHeader>	
 
-<%-- 			<div class="panel panel-default panel-monitor-page">
-			<div class="panel-heading navbar-heading">
-			
- 			 	<nav class="navbar navbar-default navbar-heading">
-				<div class="container-fluid">
-			    	<!-- Brand and toggle get grouped for better mobile display -->
-					<div class="navbar-header">
-				      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
-				        <span class="sr-only">Toggle navigation</span>
-				        <span class="icon-bar"></span>
-				        <span class="icon-bar"></span>
-				        <span class="icon-bar"></span>
-				      </button>
-				      <span class="navbar-brand">${title}</span>
-					</div>
-					<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
-			         <ul class="nav navbar-nav" id="page-tabs">
-	 			         <li role="separator" class="divider"></li>
-						 <li class="active"><a href="#t1"  data-toggle="tab"><i class="fa fa-th-list"></i> <fmt:message key="label.common.summary" /></a></li>
-			             <li><a href="#t2"  data-toggle="tab"><i class="fa fa-pencil"></i> <fmt:message key="tab.monitoring.edit.activity" /></a></li>
-			             <li><a href="#t3"  data-toggle="tab"><i class="fa fa-area-chart"></i> <fmt:message key="tab.monitoring.statistics" /></a></li>
-			         </ul>
-			         <ul class="nav navbar-nav navbar-right" id="page-controls">
-	 			         <li role="separator" class="divider"></li>
-			             <li class="navbar-text" ><span onclick="javascript:refreshPage()"><i class="fa fa-refresh"></i> 	<fmt:message key="label.common.summary.refresh" /></span></li>
- 			             <li class="navbar-text" ><lams:help toolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" module="monitoring" /></li>
-			         </ul>
-			 	    </div>
-				 </div>
-			     </nav>
-			     <!-- /top nav -->
-			</div>
-			
- --%>
- 
   		<lams:HybridTabBody>
 			<lams:TabBodys>			
 					<lams:TabBody id="1" titleKey="label.common.summary" page="summary.jsp"/>
 					<lams:TabBody id="2" titleKey="tab.monitoring.edit.activity" page="editactivity.jsp"/>	
 					<lams:TabBody id="3" titleKey="tab.monitoring.statistics" page="statistics.jsp"/>
 			</lams:TabBodys> 
 		</lams:HybridTabBody> 
-				
-<!-- 			<div class="panel-body panel-monitor-body">
- -->
-<%-- 	<lams:Tabs control="true">
-		<lams:Tab id="1" key="label.common.summary" />
-		<lams:Tab id="2" key="tab.monitoring.edit.activity" />			
-		<lams:Tab id="3" key="tab.monitoring.statistics" />
-	</lams:Tabs> --%>
 
 	<div id="footer"></div>
 	</lams:Page>
Index: lams_tool_daco/web/pages/monitoring/questionSummaries.jsp
===================================================================
diff -u -re48fc0e1f6819e257b87efa36c3baec3c1c488f0 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/monitoring/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision e48fc0e1f6819e257b87efa36c3baec3c1c488f0)
+++ lams_tool_daco/web/pages/monitoring/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -5,25 +5,25 @@
 <lams:head>
 		<%@ include file="/common/header.jsp"%>
 		<title>
-			<fmt:message key="tab.monitoring.statistics" />
+			<fmt:message key="label.common.summary" />
 		</title>
 </lams:head> 
 <body class="stripes">
-<div id="page">
-	<div id="header-no-tabs">
-	</div>
-	<div id="content">
-		<c:if test="${not empty param.includeMode}">
-			<c:set var="includeMode" value="${param.includeMode}" />
-		</c:if>
-		<c:if test="${empty includeMode}">
-			<c:set var="includeMode" value="monitoring" />
-		</c:if>
-		<%@ include file="/pages/learning/questionSummaries.jsp" %>
-	</div>
+<c:set var="title"><fmt:message key="label.common.summary" /></c:set>
+<lams:Page type="monitor" title="${title}">
+
+	<c:if test="${not empty param.includeMode}">
+		<c:set var="includeMode" value="${param.includeMode}" />
+	</c:if>
+	<c:if test="${empty includeMode}">
+		<c:set var="includeMode" value="monitoring" />
+	</c:if>
+	<%@ include file="/pages/learning/questionSummaries.jsp" %>
+
 	<div id="footer">
 	</div>
-</div>
+
+</lams:Page>
 </body>
 </lams:html>
 	
\ No newline at end of file
Index: lams_tool_daco/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rbe37ea9b52fd18c106254805e3cc45a6581bdd87 -rd55722236d2f82c6bb0c46a30cbc39c22ac01943
--- lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision be37ea9b52fd18c106254805e3cc45a6581bdd87)
+++ lams_tool_daco/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d55722236d2f82c6bb0c46a30cbc39c22ac01943)
@@ -61,7 +61,7 @@
 								rows +=	'&nbsp;&nbsp;<a href="#" onclick="javascript:launchPopup(\''+url+'\',\''+popUpTitle+'\');" class="btn btn-default btn-xs">';
 								rows += 'View Records'
 								url = '<c:url value="/monitoring/getQuestionSummaries.do"/>?sessionMapID=${sessionMapID}&toolSessionID='+$(table).attr('data-session-id')+'&userId='+userData["userId"];
-								popUpTitle = '<fmt:message key="tab.monitoring.statistics" />';
+								popUpTitle = '<fmt:message key="label.common.summary" />';
 								rows += '</a>&nbsp;&nbsp;<a href="#" onclick="javascript:launchPopup(\''+url+'\',\''+popUpTitle+'\');" class="btn btn-default btn-xs">';
 								rows += 'View Summary'
 								rows += '</a>';