Index: lams_tool_bbb/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/monitoring/editActivity.jsp	27 Mar 2014 14:09:02 -0000	1.2
+++ lams_tool_bbb/web/pages/monitoring/editActivity.jsp	19 May 2016 07:02:19 -0000	1.2.2.1
@@ -2,42 +2,35 @@
 
 <c:set var="dto" value="${contentDTO}" />
 
+<div class="panel">
+	<p>
+		<fmt:message key="label.authoring.basic.title" />
+		:</br>
+		<c:out value="${dto.title}" escapeXml="true" />
+	</p>
+	<p>
+		<fmt:message key="label.authoring.basic.instructions" />
+		: </br>
+		<c:out value="${dto.instructions}" escapeXml="false" />
+	</p>
+</div>
+
 <c:if test="${dto.contentInUse}">
-	<p class="warning">
+	<lams:Alert id="edit" type="info" close="false">
 		<fmt:message key="message.alertContentEdit" />
-	</p>
+	</lams:Alert>
 </c:if>
 
-<table cellspacing="0">
-	<tbody>
-		<tr>
-			<td class="field-name" 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%">
-				<fmt:message key="label.authoring.basic.instructions" />
-			</td>
-			<td>
-				<c:out value="${dto.instructions}" escapeXml="false" />
-			</td>
-		</tr>
-	</tbody>
-</table>
 
-<p class="align-right">
+<div>
 	<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">
+	<html:link href="${authoringUrl}" styleClass="btn btn-primary pull-right voffset10" target="_blank">
 		<fmt:message key="button.editActivity" />
 	</html:link>
-</p>
+</div>
 
 
Index: lams_tool_bbb/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/monitoring/monitoring.jsp	17 Jan 2014 21:35:50 -0000	1.2
+++ lams_tool_bbb/web/pages/monitoring/monitoring.jsp	19 May 2016 07:02:19 -0000	1.2.2.1
@@ -1,23 +1,26 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.bbb.util.Constants"%>
 
-<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 = "${contentDTO.currentTab}";
-	</script>
-</div>
+<script type="text/javascript">
+	var initialTabId = "${contentDTO.currentTab}";
+</script>
 
-<div id="content">
-	<lams:help toolSignature="<%=Constants.TOOL_SIGNATURE%>" module="monitoring" />
+<c:set var="title">
+	<fmt:message key="activity.title" />
+</c:set>
 
-	<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>
+<lams:Tabs control="true" title="${title}" helpToolSignature="<%= Constants.TOOL_SIGNATURE %>" helpModule="monitoring">
+	<lams:Tab id="1" key="button.summary" />
+	<lams:Tab id="2" key="button.editActivity" />
+	<lams:Tab id="3" key="button.statistics" />
+</lams:Tabs>
 
+<lams:TabBodyArea>
+	<lams:TabBodys>
+		<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
+		<lams:TabBody id="2" titleKey="button.editActivity" page="editActivity.jsp" />
+		<lams:TabBody id="3" titleKey="button.statistics" page="statistics.jsp" />
+	</lams:TabBodys>
+</lams:TabBodyArea>
+
 <div id="footer"></div>
Index: lams_tool_bbb/web/pages/monitoring/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/notebook.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/monitoring/notebook.jsp	27 Mar 2014 14:09:02 -0000	1.2
+++ lams_tool_bbb/web/pages/monitoring/notebook.jsp	19 May 2016 07:02:19 -0000	1.2.2.1
@@ -1,20 +1,16 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div id="header"></div>
-
-<div id="content">
-
-	<h1>
-		<fmt:message key="heading.notebookEntry" />
-	</h1>
-
-	<h2>
+<c:set var="title">
+	<fmt:message key="heading.notebookEntry" />
+</c:set>
+<lams:Page title="${title}" type="learner">
+	<h4>
 		<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
-	</h2>
+	</h4>
 
-	<table>
+	<table class="table table-striped table-condensed">
 		<tr>
-			<td class="field-name" style="width: 20%;">
+			<td>
 				<fmt:message key="label.created" />
 			</td>
 			<td>
@@ -23,7 +19,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="field-name" style="width: 20%;">
+			<td>
 				<fmt:message key="label.lastModified" />
 			</td>
 			<td>
@@ -32,7 +28,7 @@
 		</tr>
 
 		<tr>
-			<td class="field-name" style="width: 20%;">
+			<td>
 				<fmt:message key="label.notebookEntry" />
 			</td>
 			<td>
@@ -41,9 +37,8 @@
 		</tr>
 	</table>
 
-	<html:link href="monitoring.do?"></html:link>
+	 <a href="javascript:history.back();" class="btn btn-sm btn-primary">
+	 	<fmt:message key="button.close"/>
+	 </a>
 
-</div>
-
-<div id="footer">
-</div>
+</lams:Page>
Index: lams_tool_bbb/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/statistics.jsp,v
diff -u -r1.1 -r1.1.4.1
--- lams_tool_bbb/web/pages/monitoring/statistics.jsp	4 May 2011 02:23:45 -0000	1.1
+++ lams_tool_bbb/web/pages/monitoring/statistics.jsp	19 May 2016 07:02:19 -0000	1.1.4.1
@@ -3,24 +3,24 @@
 <c:set var="dto" value="${contentDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
-	<h2>
-		${session.sessionName}
-	</h2>
+	<h4>
+		<c:out value="${session.sessionName}" escapeXml="true"/>
+	</h4>
 
-	<table>
+	<table class="table table-striped table-condensed">
 		<tr>
-			<td class="field-name" width="40%">
+			<td>
 				<fmt:message>heading.totalLearnersInGroup</fmt:message>
 			</td>
-			<td width="70%">
+			<td>
 				${session.numberOfLearners}
 			</td>
 		</tr>
 		<tr>
-			<td class="field-name" width="40%">
+			<td>
 				<fmt:message>heading.totalFinishedLearnersInGroup</fmt:message>
 			</td>
-			<td width="70%">
+			<td>
 				${session.numberOfFinishedLearners}
 			</td>
 		</tr>
Index: lams_tool_bbb/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/pages/monitoring/summary.jsp,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_bbb/web/pages/monitoring/summary.jsp	27 Mar 2014 14:09:02 -0000	1.2
+++ lams_tool_bbb/web/pages/monitoring/summary.jsp	19 May 2016 07:02:19 -0000	1.2.2.1
@@ -1,22 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js"></script>
 
 <c:set var="dto" value="${contentDTO}" />
 
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon"
-		onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+<div class="panel">
 
-	<a
-		href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');">
-		<fmt:message key="monitor.summary.th.advancedSettings" /> </a>
-</h1>
-<br />
+<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+	<table class="table table-striped table-condensed">
 
-<div class="monitoring-advanced" id="advancedDiv" style="display: none">
-	<table class="alternative-color">
-
 		<tr>
 			<td>
 				<fmt:message key="advanced.lockOnFinished" />
@@ -35,26 +26,22 @@
 		</tr>
 
 	</table>
-</div>
+</lams:AdvancedAccordian>
 
 
+
 	<c:forEach var="session" items="${dto.sessionDTOs}">
 	
-		<h1>
-			${session.sessionName}
-		</h1>
+		<h4>
+			<c:out value="${session.sessionName}" escapeXml="true"/>
+		</h4>
 	
-		<h2>
-			<fmt:message key="monitor.summary.bbbSettings" />
-		</h2>
-	
-		
 		<html:form action="monitoring"  target="bbbMonitor${session.sessionID}" onsubmit="window.open('', 'bbbMonitor${session.sessionID}', 'resizable=yes,scrollbars=yes')"> 
 			<html:hidden property="dispatch" value="startMeeting" />
 			<html:hidden property="toolSessionID" value="${session.sessionID}" />
 						
 			<p>
-				<html:submit styleClass="button">
+				<html:submit styleClass="btn btn-primary loffset5 voffset10">
 				<fmt:message key="label.monitoring.startConference" />
 				</html:submit>
 			</p>
@@ -67,7 +54,8 @@
 		</p>
 		
 		<c:if test="${contentDTO.reflectOnActivity}">
-			<table cellspacing="0" class="alternative-color">
+			<div class="table-responsive">
+			<table class="table table-striped">
 		
 				<tr>
 					<th style="width: 30%;">
@@ -101,6 +89,7 @@
 					</tr>
 				</c:forEach>
 			</table>
+			</div>
 		</c:if>