Index: lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_admin/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rca098d61e6eb6a97a606dc32edb14a2afa01565e -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ca098d61e6eb6a97a606dc32edb14a2afa01565e)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -346,6 +346,10 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_central/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rb3dd7f3d65e4eec044f69c253259b5ff743b6700 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_central/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b3dd7f3d65e4eec044f69c253259b5ff743b6700)
+++ lams_central/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -70,8 +70,8 @@
 	            </a>
 
 				<c:if test="${showHeader}">
-		            <nav class="navbar navbar-expand-md mx-n2x">
-		  				<div class="container-fluid g-0x">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
 							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 								<span class="navbar-toggler-icon"></span>
 							</button>
Index: lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb07492361385e244e0869654979c73a16a6f1d59 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b07492361385e244e0869654979c73a16a6f1d59)
+++ lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,13 +29,15 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="accordion" id="accordionRestrictUsageDiv"> 
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
+
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
     <div class="accordion-item">
     	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
         	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
@@ -44,9 +46,42 @@
         </h2>
 
 		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
-      		<div>
-      			<jsp:doBody />
-      		</div>
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
       	</div>
 	</div>
 </div>
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rca098d61e6eb6a97a606dc32edb14a2afa01565e -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ca098d61e6eb6a97a606dc32edb14a2afa01565e)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -346,6 +346,10 @@
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_gradebook/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_gradebook/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_gradebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_gradebook/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_learning/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_learning/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_learning/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_learning/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_monitoring/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_monitoring/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_monitoring/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_monitoring/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_daco/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_daco/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_doku/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_doku/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_forum/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -rb3dd7f3d65e4eec044f69c253259b5ff743b6700 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b3dd7f3d65e4eec044f69c253259b5ff743b6700)
+++ lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rb3dd7f3d65e4eec044f69c253259b5ff743b6700 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b3dd7f3d65e4eec044f69c253259b5ff743b6700)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,8 +338,8 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
Index: lams_tool_gmap/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r5b49576bf16056685db96302cc25b044bd39e9ce -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_gmap/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 5b49576bf16056685db96302cc25b044bd39e9ce)
+++ lams_tool_gmap/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_gmap/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r5b49576bf16056685db96302cc25b044bd39e9ce -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 5b49576bf16056685db96302cc25b044bd39e9ce)
+++ lams_tool_gmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_images/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_images/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_images/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_images/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_images/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_images/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_images/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_imscc/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_imscc/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_imscc/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_lamc/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_lamc/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_lamc/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_laqa/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_laqa/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_laqa/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_larsrc/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_larsrc/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_larsrc/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_larsrc/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_leader/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_leader/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_leader/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_leader/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_leader/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_mindmap/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_mindmap/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_mindmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_mindmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_nb/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -rd2e5991474ab481bbdb37b36fc26546d21d7c52d -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_nb/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision d2e5991474ab481bbdb37b36fc26546d21d7c52d)
+++ lams_tool_nb/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -44,7 +44,7 @@
         </h2>
 
 		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
-      		<div class="">
+      		<div>
       			<jsp:doBody />
       		</div>
       	</div>
Index: lams_tool_nb/web/WEB-INF/tags/Breadcrumb.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/Breadcrumb.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/Breadcrumb.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,56 @@
+<% 
+ /**
+  * Breadcrumb.tag
+  *	Author: Marcin Cieslak
+  *	Description: Displays a row with a label and a styled select widget
+  *	
+  *	 
+  * We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+  * accessibility this way. Also ensure that all pages implement the same breadcrumb element
+  * 				
+  * BreadcrumbItems is an array that includes the breadcrumb details as follows
+  * 				
+  * String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+  * 				
+  * In the page, you build these as follows:
+  * 
+  * 	<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+  * 	<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+  * 	<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+  * 				
+  * Then you pass breadcrumbItems to the Page.tag as:
+  * 				
+  * <lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+*/
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
+
+<%@ attribute name="breadcrumbItems" required="true" rtexprvalue="true" %>
+
+<c:if test="${not empty breadcrumbItems}">
+	<nav aria-label="breadcrumb" role="navigation">
+		<ol class="breadcrumb">
+			<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+				<c:forEach var="item" items="${breadcrumbItem}">
+					<!--  <p>${breadcrumbItem.toString()}</p> -->
+					<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+					<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+							
+					<c:choose>
+						<c:when test="${bURL eq '.'}">
+							<li class="breadcrumb-item active" aria-current="page">${bLabel}</li>
+						</c:when>
+						<c:otherwise>
+							<li class="breadcrumb-item"><a href="${bURL}">${bLabel}</a></li>	
+						</c:otherwise>
+					</c:choose>
+				</c:forEach>
+			</c:forEach>
+		</ol>
+	</nav>
+</c:if>
Index: lams_tool_nb/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_nb/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_nb/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -rd2e5991474ab481bbdb37b36fc26546d21d7c52d -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision d2e5991474ab481bbdb37b36fc26546d21d7c52d)
+++ lams_tool_nb/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -3,21 +3,20 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
 <%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
 <%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
 <%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
 <%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
 <%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
-
 <%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
 <%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
 <%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
-
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
-
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
 <c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
 	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
 </c:if>
@@ -52,103 +51,92 @@
         <script src="${lams}includes/javascript/jquery.js"></script>
         <script src="${lams}includes/javascript/jquery-ui.js"></script>
         <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
-        <script src="${lams}includes/javascript/bootstrap5.tabcontroller.js" type="text/javascript"></script> 
         <lams:JSImport src="includes/javascript/common.js" />
-        <script>
-			var initialTabId = "${initialTabId}";
-			     
-			function init(){
-				if (initialTabId) {
-					selectTab(initialTabId);
-				} else {
-					selectTab(1); //select the default tab;
-				}
-			}  
-			        
-			function doSelectTab(tabId) {
-				var tag = document.getElementById("currentTab");
-				tag.value = tabId;
-				selectTab(tabId);
-					
-			   	//for statistic page change:
-			   	if(tabId == 3) {
-			   		doStatistic();
-			   	}
-			}
-				
-			function doStatistic(){
-				var url = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
-					
-				$("#statisticArea_Busy").show();
-				$.ajaxSetup({ cache: true });
-				$("#statisticArea").load(
-					url,
-					{
-						toolContentID: <c:out value="${param.toolContentID}" />, 
-						reqID: (new Date()).getTime()
-					},
-					function() {
-						$("#statisticArea_Busy").hide();
-					}
-				);		
-			}
-        </script>
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
     </lams:head>
 
-    <body class="component" onLoad='init()'>
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
     	<div class="component-page-wrapper">
 			<div class="component-page-content">
             	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
 	            	<fmt:message key='label.skip.to.main.content'/>
 	            </a>
 
-	            <nav class="navbar navbar-expand-md mx-n2x">
-	  				<div class="container-fluid g-0x">
-						<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-							<span class="navbar-toggler-icon"></span>
-						</button>
-						
-						<div class="collapse navbar-collapse" id="navbarSupportedContent">
-							 <div class="nav nav-tabs bg-light rounded-5 d-flex w-100 py-2 me-2" id="tabs" role="tablist">
-							    <button class="nav-link flex-fill active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" aria-controls="tab-1-content" aria-selected="true"><fmt:message key="${tab1Label}" /></button>
-							    <button class="nav-link flex-fill"		  id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" aria-controls="tab-2-content" aria-selected="false"><fmt:message key="${tab2Label}" /></button>
-							    <button class="nav-link flex-fill" 		  id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" aria-controls="tab-3-content" aria-selected="false"><fmt:message key="${tab3Label}" /></button>
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
 							</div>
-						</div>
-		                
-				        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
-						    <ul class="navbar-nav" id="page-actions">
-						        <c:if test="${not empty helpToolSignature}">
-							       	<li class="nav-item d-none d-md-block">
-							       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
 							       	</li>
-						        </c:if>
-						        <c:if test="${not empty helpPage}">
-						          	<li class="nav-item d-none d-md-block">
-						           		<lams:help page="${helpPage}" style="small"/>
-						           	</li>
-						        </c:if>
-						        <c:if test="${not empty extraControl}">
-						           	<li class="nav-item">
-						           		${extraControl}
-						           	</li>
-						        </c:if>
-						             
-								<li class="nav-item">
-									 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
-			                   			title="<fmt:message key='label.close.and.return'/>"></a>
-						       	</li>
-						   	</ul>
-				        </c:if>
-	  				</div>
-	  			</nav>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
 
 	            <main class="p-3" id="component-main-content" tabindex="-1">
-					<div class="tab-content m-3" id="tabs-content">
-						<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
-						<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
-						<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
-					</div>
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
 					
 	                <jsp:doBody/>
 	            </main>
Index: lams_tool_nb/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_nb/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd2e5991474ab481bbdb37b36fc26546d21d7c52d -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d2e5991474ab481bbdb37b36fc26546d21d7c52d)
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,8 +338,8 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
Index: lams_tool_notebook/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_notebook/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_notebook/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_pixlr/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_pixlr/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_pixlr/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_pixlr/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_pixlr/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_pixlr/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_preview/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_preview/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_preview/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_sbmt/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_sbmt/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_sbmt/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_scratchie/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scratchie/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_scratchie/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_scribe/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scribe/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_scribe/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scribe/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_spreadsheet/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_spreadsheet/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_survey/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_survey/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_survey/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_survey/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_survey/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_task/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_task/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_task/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_task/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_vote/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_vote/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_whiteboard/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_whiteboard/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_whiteboard/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_whiteboard/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_whiteboard/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_whiteboard/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_wiki/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_wiki/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_wiki/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_wiki/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_tool_zoom/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_zoom/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_zoom/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_tool_zoom/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_zoom/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file> 
Index: lams_www/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_www/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -35,19 +35,19 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionAdvanced" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingAdvanced">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<div class="accordion" id="accordionAdvanced"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingAdvanced">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#collapseAdvanced" aria-expanded="false" aria-controls="collapseAdvanced">
+	          	${title}
+    		</button>
+        </h2>
 
-        <div id="collapseAdvanced" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAdvanced">
-		<jsp:doBody />
-		</div>
+		<div id="collapseAdvanced" class="accordion-collapse collapse" aria-labelledby="headingAdvanced">
+      		<div>
+      			<jsp:doBody />
+      		</div>
+      	</div>
 	</div>
 </div>
 		
\ No newline at end of file
Index: lams_www/web/WEB-INF/tags/PageAdmin.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/PageAdmin.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/PageAdmin.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,84 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+
+<%@ attribute name="type" required="false" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="breadcrumbItems" required="false" rtexprvalue="true"%>
+ 
+<body class="component pb-4 pt-2 px-2 px-sm-4">
+	<div class="container-fluid" style="max-width: 1600px">
+		<a href="#content" class="sr-only sr-only-focusable visually-hidden visually-hidden-focusable">Skip to main content</a>
+	
+		<%-- The Breadcrumb
+			We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
+			accessibility this way. Also ensure that all pages implement the same breadcrumb element
+					
+			BreadcrumbItems is an array that includes the breadcrumb details as follows
+					
+			String[] breadcrumbItem = ["breadcrumbURL1|breadcrumbLabel1", "breadcrumbURL2|breadcrumbLabel2",...]
+					
+			In the page, you build these as follows:
+					
+				<c:set var="breadcrumbTop"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+				<c:set var="breadcrumbActive">. | <fmt:message key="admin.timezone.title"/></c:set>
+				<c:set var="breadcrumbItems" value="${breadcrumbTop}, ${breadcrumbActive}"/>
+					
+			Then you pass breadcrumbItems to the Page.tag as:
+			
+			<lams:Page5 type="admin" title="${title}" titleHelpURL="${help}" breadcrumbItems="${breadcrumbItems}" formID="timezoneForm">
+		--%>
+	
+		<header>
+			<c:if test="${not empty breadcrumbItems}">
+				<nav aria-label="breadcrumb" role="navigation">
+					<ol class="breadcrumb">
+						<c:forEach var="breadcrumbItem" items="${breadcrumbItems}">
+							<c:forEach var="item" items="${breadcrumbItem}">
+								<!--  <p>${breadcrumbItem.toString()}</p> -->
+								<c:set var="bURL">${fn:trim(fn:split(item,'|')[0])}</c:set>
+								<c:set var="bLabel">${fn:trim(fn:split(item,'|')[1])}</c:set>
+								
+								<c:choose>
+									<c:when test="${bURL eq '.'}">
+										<li class="breadcrumb-item active" aria-current="page">
+											${bLabel}
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li class="breadcrumb-item">
+											<a href="${bURL}">${bLabel}</a>
+										</li>	
+									</c:otherwise>
+								</c:choose>
+							</c:forEach>
+						</c:forEach>
+					</ol>
+				</nav>
+			</c:if>
+		</header>
+				
+		<c:if test="${not empty title}">
+			<c:if test="${not empty titleHelpURL}">
+				<span class="float-end">${titleHelpURL}</span>
+			</c:if>
+		</c:if>
+				
+		<div id="content">
+			<main role="main">
+				<c:if test="${not empty title}">
+					<h2>
+						<c:out value="${title}" escapeXml="true" />
+					</h2>
+				</c:if>
+				
+				<jsp:doBody />
+			</main>
+		</div>
+	</div>
+</body>
Index: lams_www/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -8,7 +8,7 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
 <c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
@@ -219,4 +219,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_www/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/PageMonitor.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/PageMonitor.tag	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -0,0 +1,146 @@
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Label" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab1Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab2Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="tab3Jsp" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpPage" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+<%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
+<c:set var="showHeader">${empty hideHeader || !hideHeader ? true : false }</c:set>
+<%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
+<%@ attribute name="initialTabId" required="false" rtexprvalue="true"%>
+<c:if test="${empty initialTabId && not empty pageScope.initialTabId}">
+	<c:set var="initialTabId">${pageScope.initialTabId}</c:set>
+</c:if>
+<c:if test="${empty tab1Label}">
+	<c:set var="tab1Label">monitoring.tab.summary</c:set>
+	<c:set var="tab2Label">monitoring.tab.edit.activity</c:set>
+	<c:set var="tab3Label">monitoring.tab.statistics</c:set>
+	
+	<c:set var="tab1Jsp">summary.jsp</c:set>
+	<c:set var="tab2Jsp">editactivity.jsp</c:set>
+	<c:set var="tab3Jsp">statistic.jsp</c:set>
+</c:if>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<lams:html>
+    <lams:head>
+        <title>LAMS ::
+            <c:choose>
+                <c:when test="${empty title}">
+                    <fmt:message key="activity.title"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${title}" />
+                </c:otherwise>
+            </c:choose>
+        </title>
+        <link rel="icon" type="image/x-icon" href="${lams}images/svg/lamsv5_logo.svg">
+
+        <link rel="stylesheet" href="${lams}css/components-monitoring.css">
+        <link rel="stylesheet" href="${lams}includes/font-awesome6/css/all.css">
+
+        <script src="${lams}includes/javascript/jquery.js"></script>
+        <script src="${lams}includes/javascript/jquery-ui.js"></script>
+        <script src="${lams}includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="includes/javascript/common.js" />
+        <c:if test="${showHeader}">
+	        <script src="${lams}/monitoring/includes/javascript/monitor-activity.js" type="text/javascript"></script>
+	        <script>
+				const INITIAL_TAB_ID = "${initialTabId}",
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />,
+					MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+	        </script>
+        </c:if>
+    </lams:head>
+
+    <body class="component" <c:if test="${showHeader}">onLoad='init()'</c:if>>
+    	<div class="component-page-wrapper">
+			<div class="component-page-content">
+            	<a href="#component-main-content" class="visually-hidden-focusable btn btn-sm btn-light p-2">
+	            	<fmt:message key='label.skip.to.main.content'/>
+	            </a>
+
+				<c:if test="${showHeader}">
+		            <nav class="navbar navbar-expand-md">
+		  				<div class="container-fluid">
+							<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+								<span class="navbar-toggler-icon"></span>
+							</button>
+							
+							<div class="collapse navbar-collapse" id="navbarSupportedContent">
+								 <div class="nav nav-tabs nav-justified bg-light rounded-5 w-100 py-2 me-2" id="tabs" role="tablist">
+								    <button class="nav-link active" id="tab-1" data-bs-toggle="tab" data-bs-target="#tab-1-content" type="button" role="tab" 
+								    		aria-controls="tab-1-content" 
+								    		aria-selected="true"
+								    		onclick="onSelectTab(1);">
+								    	<fmt:message key="${tab1Label}" />
+								    </button>
+								    <button class="nav-link"		id="tab-2" data-bs-toggle="tab" data-bs-target="#tab-2-content" type="button" role="tab" 
+								    		aria-controls="tab-2-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(2);">
+								    	<fmt:message key="${tab2Label}"/>
+								    </button>
+								    <button class="nav-link" 		id="tab-3" data-bs-toggle="tab" data-bs-target="#tab-3-content" type="button" role="tab" 
+								    		aria-controls="tab-3-content" 
+								    		aria-selected="false" 
+								    		onclick="onSelectTab(3);">
+								    	<fmt:message key="${tab3Label}"/>
+								    </button>
+								</div>
+							</div>
+			                
+					        <c:if test="${not empty helpToolSignature or not empty helpPage or not empty extraControl}">
+							    <ul class="navbar-nav" id="page-actions">
+							        <c:if test="${not empty helpToolSignature}">
+								       	<li class="nav-item d-none d-md-block">
+								       		<lams:help toolSignature="${helpToolSignature}" module="monitoring" style="small"/>
+								       	</li>
+							        </c:if>
+							        <c:if test="${not empty helpPage}">
+							          	<li class="nav-item d-none d-md-block">
+							           		<lams:help page="${helpPage}" style="small"/>
+							           	</li>
+							        </c:if>
+							        <c:if test="${not empty extraControl}">
+							           	<li class="nav-item">
+							           		${extraControl}
+							           	</li>
+							        </c:if>
+							             
+									<li class="nav-item">
+										 <a href="${lams}home/monitorLesson.do?lessonID=${param.lessonID}" id="btn-close" class="btn btn-light btn-close btn-sm nav-link" 
+				                   				title="<fmt:message key='label.close.and.return'/>"></a>
+							       	</li>
+							   	</ul>
+					        </c:if>
+		  				</div>
+		  			</nav>
+	  			</c:if>
+
+	            <main class="p-3" id="component-main-content" tabindex="-1">
+	            	<c:if test="${showHeader}">
+						<div class="tab-content m-3" id="tabs-content">
+							<div class="tab-pane fade show active"  id="tab-1-content" role="tabpanel" aria-labelledby="tab-1" tabindex="0"><jsp:include page="${tab1Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-2-content" role="tabpanel" aria-labelledby="tab-2" tabindex="0"><jsp:include page="${tab2Jsp}"/></div>
+							<div class="tab-pane fade" 				id="tab-3-content" role="tabpanel" aria-labelledby="tab-3" tabindex="0"><jsp:include page="${tab3Jsp}"/></div>
+						</div>
+						
+						<input type="hidden" name="currentTab" id="currentTab" />
+					</c:if>
+					
+	                <jsp:doBody/>
+	            </main>
+	        </div>
+	    </div>
+    </body>
+</lams:html>
Index: lams_www/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_www/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_www/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -29,26 +29,59 @@
 	 * Wiki: 
 	 */
 %>
-<%@ attribute name="title" required="true" rtexprvalue="true"%>
-
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
-<div class="panel-group" id="accordionRestrictUsageDiv" role="tablist" aria-multiselectable="true"> 
-    <div class="panel panel-default" >
-        <div class="panel-heading collapsable-icon-left" id="headingRestrictedUsageDiv">
-        	<span class="panel-title">
-	    	<a class="collapsed" role="button" data-toggle="collapse" href="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv" >
-          	${title}
-        	</a>
-      		</span>
-        </div>
+<%@ attribute name="title" required="true" rtexprvalue="true"%>
+<%@ attribute name="submissionDeadline" required="false" rtexprvalue="true"%>
+<%@ attribute name="cssClass" required="false" rtexprvalue="true"%>
 
+<div class="accordion ${cssClass}" id="accordionRestrictUsageDiv"> 
+    <div class="accordion-item">
+    	<h2 class="accordion-header" id="headingRestrictedUsageDiv">
+        	<button class="accordion-button collapsed text-bg-secondary" type="button" data-bs-toggle="collapse" data-bs-target="#restrictUsageDiv" aria-expanded="false" aria-controls="restrictUsageDiv">
+	          	${title}
+    		</button>
+        </h2>
 
-		<div id="restrictUsageDiv" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="headingRestrictedUsageDiv">
-		<jsp:doBody />
-		</div>
+		<div id="restrictUsageDiv" class="accordion-collapse collapse p-3" aria-labelledby="headingRestrictedUsageDiv">
+			<p>
+				<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+			</p>
+			
+			<div id="datetimeDiv" <c:if test='${not empty submissionDeadline}'> style="display: none;" </c:if>>
+				<div class="row align-items-center">
+					<div class="col-auto pe-0">
+						<label for="datetime">
+							<fmt:message key="monitor.summary.after.date" />
+						</label>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline" autocomplete="off"/>
+					</div>
+					
+					<div class="col-auto pe-0">
+						<button type="button" onclick="setSubmissionDeadline();" class="btn btn-secondary">
+							<i class="fa-solid fa-wrench me-1"></i>
+							<fmt:message key="monitor.summary.set.restriction" />
+						</button>
+					</div>
+				</div>
+			</div>
+		
+			<div id="dateInfoDiv" <c:if test='${empty submissionDeadline}'> style="display: none;" </c:if>>
+				<span>
+					<fmt:message key="monitor.summary.after.date" />
+					<span id="dateInfo" class="badge text-bg-danger mx-2"></span>
+				</span>
+				
+				<button type="button" onclick="removeSubmissionDeadline();" class="btn btn-secondary">
+					<i class="fa-solid fa-trash-can me-1"></i>
+					<fmt:message key="monitor.summary.unset.restriction" />
+				</button>
+			</div>
+      	</div>
 	</div>
 </div>
-		
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rfaa119a6a494bab9b265ba46a597ee3442bb56cd -rb59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision faa119a6a494bab9b265ba46a597ee3442bb56cd)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b59a58136ac5d8b2c6fbf0752dc4fd3a6b5f0389)
@@ -338,14 +338,18 @@
 		<path>/WEB-INF/tags/Page.tag</path>
    	</tag-file>  
    	<tag-file>
-	    <name>Page5</name>
-		<path>/WEB-INF/tags/Page5.tag</path>
+	    <name>PageAdmin</name>
+		<path>/WEB-INF/tags/PageAdmin.tag</path>
    	</tag-file>
    	<tag-file>
 	    <name>PageLearner</name>
 		<path>/WEB-INF/tags/PageLearner.tag</path>
    	</tag-file>
    	<tag-file>
+	    <name>PageMonitor</name>
+		<path>/WEB-INF/tags/PageMonitor.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>Popover</name>
        <path>/WEB-INF/tags/Popover.tag</path>
    	</tag-file>