Index: lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
+++ lams_tool_vote/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -56,8 +56,8 @@
 	        <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}"/>";
+					TOOL_CONTENT_ID = <c:out value="${param.toolContentID}" />;
+				var	MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
 	        </script>
         </c:if>
     </lams:head>
Index: lams_tool_vote/web/common/monitorheader.jsp
===================================================================
diff -u -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
+++ lams_tool_vote/web/common/monitorheader.jsp	(.../monitorheader.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,18 +1,17 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams">
-	<lams:LAMSURL />
-</c:set>
-<c:set var="tool">
-	<lams:WebAppURL />
-</c:set>
+<c:set var="lams" scope="request"><lams:LAMSURL /></c:set>
+<c:set var="tool" scope="request"><lams:WebAppURL /></c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 
 <!-- ********************  CSS ********************** -->
-<lams:css />
-<!DOCTYPE c:set PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><!-- ********************  javascript ********************** -->
-<lams:JSImport src="includes/javascript/common.js" />
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager5.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+<link type="text/css" href="${lams}/css/defaultHTML_chart.css" rel="stylesheet">
+
+<!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
@@ -21,15 +20,6 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
 <script type="text/javascript" src="${lams}includes/javascript/d3.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/chart.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
 <lams:JSImport src="includes/javascript/portrait5.js" />
-
-<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap5.css">
-<link type="text/css" href="${lams}css/jquery.tablesorter.pager5.css" rel="stylesheet">
-
-<link type="text/css" href="${lams}/css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
-<link type="text/css" href="${lams}/css/defaultHTML_chart.css" rel="stylesheet">
\ No newline at end of file
Fisheye: Tag 6d84bca45f8b0e7aa344729809c4ff5e714ef09c refers to a dead (removed) revision in file `lams_tool_vote/web/common/tabbedheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/monitoring/AdvanceOptions.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_vote/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,7 +1,41 @@
-<c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
+<c:set var="adTitle"><fmt:message key="label.editActivity" /></c:set>
 <lams:AdvancedAccordian title="${adTitle}">
+
+<lams:Alert5 id="editWarning" type="warning">
+    <fmt:message key="message.monitoring.edit.activity.warning" />
+</lams:Alert5>
+
+<form id='define-later-form' method='post' action='../authoring/definelater.do' target='definelater'>
+	<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
+	<input type="hidden" name="toolContentID" value="${toolContentID}" />
+	<input type="hidden" name="contentFolderID" value="${contentFolderID}" />
+</form>
+	
+<button type="button" onclick="launchDefineLaterPopup()" class="btn btn-secondary btn-icon-pen float-end me-2 mb-3">
+	<fmt:message key="label.edit" />
+</button>
              
 <table class="table table-striped table-condensed">
+	<tr>
+		<td><fmt:message key="label.authoring.title.col"></fmt:message></td>
+		<td><c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="true"/></td>
+	</tr>
+						
+	<tr>
+		<td><fmt:message key="label.authoring.instructions.col"></fmt:message></td>
+		<td><c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/></td>
+	</tr>
+	
+	<c:forEach items="${listQuestionDTO}" var="currentDTO" varStatus="status">
+		<tr>
+			<td>
+				<fmt:message key="label.nomination" />:
+			</td>
+			<td>
+				<c:out value="${currentDTO.question}" escapeXml="false"/> 
+			</td>
+		</tr>
+	</c:forEach>
 
 	<tr>
 		<td>
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	(.../AllSessionsSummary.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,48 +1,52 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
-<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
-
 <div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="false"> 
 
 <c:forEach var="sessionDto" items="${sessionDTOs}" varStatus="status">
 	<c:set var="sessionUid" value="${sessionDto.sessionUid}"/>
 
 	<c:set var="buttonbar">
-		<div class="pull-right">
+		<div class="float-end mb-3">
 			<c:if test="${useSelectLeaderToolOuput and sessionDto.sessionUserCount > 0 and not sessionDto.sessionFinished}">
-				<button type="button" class="btn btn-default btn-xs"
-						onClick="javascript:showChangeLeaderModal(${sessionDto.toolSessionId})">
+				<button type="button" class="btn btn-secondary me-2"
+						onClick="showChangeLeaderModal(${sessionDto.toolSessionId})">
+					<i class="fa-solid fa-user-pen me-1"></i>
 					<fmt:message key='label.monitoring.change.leader'/>
 				</button>
 			</c:if>		
-			&nbsp;
+			
 			<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${sessionDto.toolSessionId}&toolContentID=${toolContentID}" />
-			<a class="fa fa-pie-chart text-primary btn btn-xs btn-primary" 
-				title="<fmt:message key='label.tip.displayPieChart'/>"
-				onclick="javascript:drawChart('pie', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')"></a>
-			&nbsp;
-			<a class="fa fa-bar-chart text-primary btn btn-xs btn-primary"
-				title="<fmt:message key='label.tip.displayBarChart'/>" 
-				onclick="javascript:drawChart('bar', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')"></a>
+			<button type="button" class="fa fa-pie-chart text-primary btn btn-light me-2" 
+					title="<fmt:message key='label.tip.displayPieChart'/>"
+					onclick="drawChart('pie', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')"></button>
+			
+			<button type="button" class="fa fa-bar-chart text-primary btn btn-light me-2"
+					title="<fmt:message key='label.tip.displayBarChart'/>" 
+					onclick="drawChart('bar', 'chartDiv${sessionDto.toolSessionId}', '${chartURL}')"></button>
 		</div>
 	</c:set>						
-		
-	<div class="panel panel-default" >
-       <div class="panel-heading " id="heading${sessionUid}">
-  	    	<span class="panel-title  collapsable-icon-left">
-  	    	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${sessionUid}" 
-				aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${sessionUid}" >
-				<c:out value="${sessionDto.sessionName}"/>
-			</a>
-			</span>  
+	
+	<c:choose>
+		<c:when test="${isGroupedActivity}">
+			<div class="lcard" >
+		       <div class="card-header " id="heading${sessionUid}">
+		  	    	<span class="card-title collapsable-icon-left">
+			  	    	<button class="btn btn-secondary-darker no-shadow ${status.first ? '' : 'collapsed'}" type="button" data-bs-toggle="collapse" data-bs-target="#collapse${sessionUid}" 
+								aria-expanded="${status.first}" aria-controls="collapse${sessionUid}" >
+							<c:out value="${sessionDto.sessionName}"/>
+						</button>
+					</span>  
+					${buttonbar}
+		       </div>
+		       
+		       <div id="collapse${sessionUid}" class="card-collapse collapse ${status.first ? 'show' : ''}">
+		</c:when>
+		<c:otherwise>
 			${buttonbar}
-       </div>
-       
-       <div id="collapse${sessionUid}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${sessionUid}">
+		</c:otherwise>
+	</c:choose>
 
-	<table class="table table-condensed table-striped">							
-
+	<table class="table table-condensed table-striped">
 		<tr>
 			<th><fmt:message key="label.nomination"/></th>
 			<th style="width: 90px;"><fmt:message key="label.total.votes"/></th>
@@ -89,11 +93,11 @@
 
  	<p id="chartDiv${sessionDto.toolSessionId}" style="height: 220px; display: none;"></p>
  
-	</div> <!-- end collapse area  -->
-	</div> <!-- end collapse panel  -->
- 	${ ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+ 	<c:if test="${isGroupedActivity}">
+		</div> <!-- end collapse area  -->
+		</div> <!-- end collapse panel  -->
+	</c:if>
 	
 </c:forEach>				
 
 </div> <!--  end panel group -->
-
Index: lams_tool_vote/web/monitoring/Edit.jsp
===================================================================
diff -u -r7b3ea39ddf6e10186cf9916562121c205bb0e5ad -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 7b3ea39ddf6e10186cf9916562121c205bb0e5ad)
+++ lams_tool_vote/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,8 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:Alert id="editWarning" type="warning" close="false">
+<lams:Alert5 id="editWarning" type="warning">
     <fmt:message key="message.monitoring.edit.activity.warning" />
-</lams:Alert>
+</lams:Alert5>
 
 <table class="table table-condensed">
 	<tr>
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -4,61 +4,13 @@
 <%@ page import="java.util.Set" %>
 <%@ page import="org.lamsfoundation.lams.tool.vote.VoteAppConstants"%>
 
-<lams:html>
-	<lams:head>
-	<title> <fmt:message key="label.monitoring"/> </title>
-	<%@ include file="/common/monitorheader.jsp"%>
-
-	<script type="text/javascript">
-	   	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-	
-        function init(){
-            var tag = "${voteGeneralMonitoringDTO.currentTab}";
-	    	if(tag.value != "")
-	    		selectTab(tag.value);
-            else
-                selectTab(1); //select the default tab;
-        }     
-        
-        function doSelectTab(tabId) {
-        	// start optional tab controller stuff
-        	var tag = "${voteGeneralMonitoringDTO.currentTab}";
-	    	tag.value = tabId;
-	    	// end optional tab controller stuff
-	    	selectTab(tabId);
-
-	    	//for statistic page change:
-    		if(tabId == 3) doStatistic();
-        } 
-        
-		function doStatistic(){
-			var url = 'statistics.do?toolContentID=${toolContentID}';
-			$.ajaxSetup({ cache: true });
-			$("#statisticArea").load(url);
-		}
-	</script>
-</lams:head>
-<body class="stripes" onLoad="init();">
-	<c:set var="title"><fmt:message key="activity.title" /></c:set>
-	<lams:Page title="${title}" type="navbar">
-
-         <lams:Tabs control="true" title="${title}" helpToolSignature="<%= VoteAppConstants.MY_SIGNATURE %>" helpModule="monitoring">
-            <lams:Tab id="1" key="label.summary" />
-            <lams:Tab id="2" key="label.editActivity" />
-            <lams:Tab id="3" key="label.stats" />
-         </lams:Tabs>
-   
-        <lams:TabBodyArea>
-        <lams:TabBodys>
-            <lams:TabBody id="1" page="SummaryContent.jsp"/>
-	 		<lams:TabBody id="2" page="Edit.jsp" />
-			<lams:TabBody id="3" page="Stats.jsp" />
-        </lams:TabBodys>
-        </lams:TabBodyArea>
-       
-        <div id="footer"></div>
-	</lams:Page>
-	
-</body>
-</lams:html>
+<c:set var="title"><fmt:message key="label.monitoring" /></c:set>
+<lams:PageMonitor title="${title}" 
+	helpToolSignature="<%= VoteAppConstants.MY_SIGNATURE %>"
+	initialTabId="${voteGeneralMonitoringDTO.currentTab}"
+	tab1Label="label.summary"
+	tab2Label="label.editActivity"
+	tab3Label="label.stats"
+	tab1Jsp="SummaryContent.jsp"
+	tab2Jsp="Edit.jsp"
+	tab3Jsp="Stats.jsp"/>
Index: lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp
===================================================================
diff -u -raa1bcddda0a1f03ce15790e7f6d70ac9b0525f88 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp	(.../OtherTextNominationViewer.jsp)	(revision aa1bcddda0a1f03ce15790e7f6d70ac9b0525f88)
+++ lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp	(.../OtherTextNominationViewer.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,17 +1,11 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-	<lams:head>
-		<title> <fmt:message key="label.learnersVoted"/> </title>
-
-		<%@ include file="/common/monitorheader.jsp"%>
-
-		<script type="text/javascript">
-	
-			function submitOpenVote(currentUid, actionMethod) {
-
+<c:set var="title"><fmt:message key="label.openVotes" /></c:set>
+<lams:PageMonitor title="${title}" hideHeader="true">
+	<%@ include file="/common/monitorheader.jsp"%>
+	<script type="text/javascript">
+		function submitOpenVote(currentUid, actionMethod) {
 		        var submitUid = currentUid;
 		        $.ajax({
                     type: 'POST',
@@ -22,19 +16,22 @@
 				}).done(function( data ) {
                     location.reload();
 				});
-			}
+		}
 			
-			function buildShowHideLink(currentUid, actionMethod) {
-				var str = '<a href="#" onclick="javascript:submitOpenVote(\''+currentUid+'\', \''+actionMethod+'\');"  class="btn btn-primary btn-xs">';
-				if ( actionMethod == 'hideOpenVote' ) 
-					str += '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hide"/></spring:escapeBody></a>';
-				else
-					str += '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.show"/></spring:escapeBody></a>';
+		function buildShowHideLink(currentUid, actionMethod) {
+				var str = '<button type="button" onclick="submitOpenVote(\''+currentUid+'\', \''+actionMethod+'\')"  class="btn btn-light btn-sm">';
+				if ( actionMethod == 'hideOpenVote' ) {
+					str += 	'<i class="fa-regular fa-eye-slash me-1"></i>' +
+							'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hide"/></spring:escapeBody>';
+				} else {
+					str += '<i class="fa-regular fa-eye me-1"></i>' +
+							'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.show"/></spring:escapeBody>';
+				}
+				str += '</button>';
 				return str;
-			}
+		}
 
-			$(document).ready(function(){
-	    
+		$(document).ready(function(){
 			$(".tablesorter").tablesorter({
 				theme: 'bootstrap',
 			    sortInitialOrder: 'desc',
@@ -60,11 +57,11 @@
 	            cssPageSize: '.pagesize',
 	            cssDisabled: 'disabled',
 	            <c:choose>
-				<c:when test="${not empty param.sessionUid}">
-				ajaxUrl : "<lams:WebAppURL/>monitoring/getOpenTextNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=${param.sessionUid}&toolContentUID=${param.toolContentUID}",
-				</c:when><c:otherwise>
-				ajaxUrl : "<lams:WebAppURL/>monitoring/getOpenTextNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolContentUID=${param.toolContentUID}",
-				</c:otherwise>
+					<c:when test="${not empty param.sessionUid}">
+						ajaxUrl : "<lams:WebAppURL/>monitoring/getOpenTextNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=${param.sessionUid}&toolContentUID=${param.toolContentUID}",
+					</c:when><c:otherwise>
+						ajaxUrl : "<lams:WebAppURL/>monitoring/getOpenTextNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolContentUID=${param.toolContentUID}",
+					</c:otherwise>
 				</c:choose>
 				ajaxProcessing: function (data, table) {
 					if (data && data.hasOwnProperty('rows')) {
@@ -74,34 +71,36 @@
 						for (i = 0; i < data.rows.length; i++){
 							var userData = data.rows[i];
 
-							rows += '<tr>';
-							rows += '<td>';
-							rows += userData["userEntry"]; 
+							rows += '<tr>' +
+										'<td>' +
+											userData["userEntry"];	
+																			 
 							if ( userData["visible"] == false )
-								rows += ' <span class="label label-danger pull-right"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hidden"/></spring:escapeBody></spam>';							
-							rows += '</td>';
+								rows += 	'<span class="badge text-bg-warning float-end">' + 
+												'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hidden"/></spring:escapeBody>' + 
+											'</span>';
+							rows += 	'</td>' +
+							
+										'<td>' +
+											definePortraitPopover(userData["portraitId"], userData["userId"], userData["userName"], userData["userName"]) +
+										'</td>' +
 
-							rows += '<td>';
-							rows += definePortraitPopover(userData["portraitId"], userData["userId"], userData["userName"], userData["userName"]);
-							rows += '</td>';
+										'<td>' +
+											'<time class="timeago" title="' +
+													userData["attemptTime"] +
+													'" datetime="' +
+													userData["attemptTimeTimeago"] +
+											'"></time>' +
+										'</td>' +
 
-							rows += '<td>';
-							rows += '<time class="timeago" title="';
-							rows += userData["attemptTime"];
-							rows += '" datetime="';
-							rows += userData["attemptTimeTimeago"];
-							rows += '"></time>';
-							rows += '</td>';
-
-							rows += '<td><span id="link'+userData["userEntryUid"]+'">';
+										'<td><span id="link'+userData["userEntryUid"]+'">';
 							if ( userData["visible"] ) {
-								rows += buildShowHideLink(userData["userEntryUid"], 'hideOpenVote')
+								rows +=		buildShowHideLink(userData["userEntryUid"], 'hideOpenVote');
 							} else {
-								rows += buildShowHideLink(userData["userEntryUid"], 'showOpenVote')
+								rows += 	buildShowHideLink(userData["userEntryUid"], 'showOpenVote');
 							}
-							rows += '</span></td>';
-
-							rows += '</tr>';
+							rows += 	'</span></td>' +
+									'</tr>';
 						}
 			            
 						json.total = data.total_rows;
@@ -116,31 +115,36 @@
 				initializePortraitPopover('<lams:LAMSURL />');
 			})
 		});
-  	})
-</script>	
-	</lams:head>
-<body class="stripes">
+  		})
+	</script>
 
-	<c:set var="title"><fmt:message key="label.openVotes"/></c:set>
-	<lams:Page type="learner" title="${title}">
-		
+	<div class="container-main">
+		<h1 class="mb-4">
+			${title}: ${nominationText}
+		</h1>
+				
 		<c:choose>
-		<c:when test="${not empty param.sessionUid}">
-			<c:set var="dsi">data-session-id='${param.sessionUid}'</c:set>
-		</c:when><c:otherwise>
-			<c:set var="dsi">data-session-id='${param.toolContentUID}'</c:set>
-		</c:otherwise>
+			<c:when test="${not empty param.sessionUid}">
+				<c:set var="dsi">data-session-id='${param.sessionUid}'</c:set>
+			</c:when><c:otherwise>
+				<c:set var="dsi">data-session-id='${param.toolContentUID}'</c:set>
+			</c:otherwise>
 		</c:choose>
 	
-		<lams:TSTable numColumns="4" dataId="${dsi}">
-			<th><fmt:message key="label.vote"/></th>
-			<th> <fmt:message key="label.user"/></th>
-			<th> <fmt:message key="label.attemptTime"/></th>
-			<th style="width: 70px;"> <fmt:message key="label.visible"/></th>								  						 
-	     </lams:TSTable>
-		
-	<div id="footer"></div>
-	</lams:Page>
-
-</body>
-</lams:html>
+		<div class="shadow rounded-5">
+			<lams:TSTable5 numColumns="4" dataId="${dsi}">
+				<th><fmt:message key="label.vote"/></th>
+				<th> <fmt:message key="label.user"/></th>
+				<th> <fmt:message key="label.attemptTime"/></th>
+				<th style="width: 70px;"> <fmt:message key="label.visible"/></th>								  						 
+		     </lams:TSTable5>
+	     </div>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" onclick="window.close()" class="btn btn-primary">
+				<i class="fa-regular fa-circle-xmark me-1"></i>
+				<fmt:message key="label.close" />
+			</button>
+		</div>
+	</div>
+</lams:PageMonitor>
Index: lams_tool_vote/web/monitoring/StatsPart.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/StatsPart.jsp	(.../StatsPart.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/monitoring/StatsPart.jsp	(.../StatsPart.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,30 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:if test="${empty voteStatsDTO}">
-	<lams:Alert type="info" id="no-session-summary" close="false">
+	<lams:Alert5 type="info" id="no-session-summary" close="false">
 		<fmt:message key="error.noLearnerActivity"/>
-	</lams:Alert>
+	</lams:Alert5>
 </c:if>
  
+ <div class="lcard p-2" >
 <c:forEach var="stats" items="${voteStatsDTO}">
-
-	<c:if test="${isGroupedActivity}">	
-	    <div class="panel panel-default" >
-        <div class="panel-heading">
-			<span class="panel-title">
+			<h5>
 				${stats.sessionName}
-			</span>
-        </div>
+			</h5>
 
-        <div class="panel-body">
-	</c:if>
-
-	<p><fmt:message key="label.total.completed.students"/>&nbsp;${stats.countUsersComplete}</p>
+	<div><fmt:message key="label.total.completed.students"/>&nbsp;${stats.countUsersComplete}</div>
 	<p><fmt:message key="label.total.students"/>&nbsp;${stats.countAllUsers}</p>
-
-	<c:if test="${isGroupedActivity}">	
-		</div>
-		</div>
-	</c:if>	
 </c:forEach>
+</div>
 
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -rbe33897898483fec39439cf31c304bdb80c198f9 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision be33897898483fec39439cf31c304bdb80c198f9)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,14 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
-<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
+<%@ include file="/common/monitorheader.jsp"%>
 
 <script type="text/javascript">
+	MONITORING_STATISTIC_URL = "<c:url value="/monitoring/statistics.do?toolContentID=${toolContentID}"/>";
+	
 	$(window).on('load', function(){
 		<c:forEach var="currentDto" items="${voteGeneralMonitoringDTO.sessionDTOs}">
 			<c:set var="chartURL" value="${tool}chartGenerator.do?currentSessionId=${currentDto.sessionId}&toolContentID=${toolContentID}" />
 			drawChart('pie', 'chartDiv${currentDto.sessionId}', '${chartURL}');
 		</c:forEach>
 	});
+	
+	$(document).ready(function(){
+		doStatistic();
+	});
 
 	//pass settings to monitorToolSummaryAdvanced.js
 	var submissionDeadlineSettings = {
@@ -22,7 +27,6 @@
 		messageRestrictionRemoved: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.removed" /></spring:escapeBody>'
 	};
 
-
 	function showChangeLeaderModal(toolSessionId) {
 		$('#change-leader-modals').empty()
 		.load('<c:url value="/monitoring/displayChangeLeaderForGroupDialogFromActivity.do" />',{
@@ -55,33 +59,37 @@
 	}
 </script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+
+<c:if test="${useSelectLeaderToolOuput}">
+	<lams:Alert5 type="info" id="use-leader">
+		<fmt:message key="label.info.use.select.leader.outputs" />
+	</lams:Alert5>
+</c:if>
+
+<c:if test="${empty sessionDTOs}">
+	<lams:Alert5 type="info" id="no-session-summary">
+		<fmt:message key="error.noLearnerActivity"/>
+	</lams:Alert5>
+</c:if>
  
-<div class="panel">
-	<h4>
-	    <c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
-	</h4>
-	<div class="instructions voffset5">
-	    <c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
-	</div>
+<h1>
+    <c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
+</h1>
 	
-	<c:if test="${useSelectLeaderToolOuput}">
-		<lams:Alert type="info" id="use-leader" close="false">
-			<fmt:message key="label.info.use.select.leader.outputs" />
-		</lams:Alert>
-	</c:if>
-	
-	<c:if test="${empty sessionDTOs}">
-		<lams:Alert type="info" id="no-session-summary" close="false">
-			<fmt:message key="error.noLearnerActivity"/>
-		</lams:Alert>
-	</c:if>
-	
- </div>
+<div class="instructions">
+    <c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
+</div>
  
 <jsp:include page="/monitoring/AllSessionsSummary.jsp" />
+
+<h2 class="card-subheader fs-4" id="header-statistics">
+	<fmt:message key="label.stats" />
+</h2>
+<%@ include file="Stats.jsp"%>
  
+ <h2 class="card-subheader fs-4" id="header-settings">
+	Settings
+</h2>
 <%@include file="AdvanceOptions.jsp"%>
- 
 <lams:RestrictedUsageAccordian submissionDeadline="${submissionDeadline}"/>
- 
 <div id="change-leader-modals"></div>
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
diff -u -raa1bcddda0a1f03ce15790e7f6d70ac9b0525f88 -r6d84bca45f8b0e7aa344729809c4ff5e714ef09c
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision aa1bcddda0a1f03ce15790e7f6d70ac9b0525f88)
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 6d84bca45f8b0e7aa344729809c4ff5e714ef09c)
@@ -1,17 +1,12 @@
 <!DOCTYPE html>
-
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-	<lams:head>
-		<title> <fmt:message key="label.learnersVoted"/> </title>
+<c:set var="title"><fmt:message key="label.learnersVoted" /></c:set>
+<lams:PageMonitor title="${title}" hideHeader="true">
+	<%@ include file="/common/monitorheader.jsp"%>
 
-		<%@ include file="/common/monitorheader.jsp"%>
-
-		<script type="text/javascript">
-	
-			$(document).ready(function(){
-	    
+	<script type="text/javascript">
+		$(document).ready(function(){
 			$(".tablesorter").tablesorter({
 				theme: 'bootstrap',
 			    sortInitialOrder: 'desc',
@@ -75,22 +70,26 @@
 				initializePortraitPopover('<lams:LAMSURL />');
 			})
 		});
-  	})
-
-</script>	
-</lams:head>
-<body class="stripes">
-	<c:set var="title"><fmt:message key="label.learnersVoted"/></c:set>
-	<lams:Page type="learner" title="${title}">
+  		})
+	</script>
 		
-		<h4><fmt:message key="label.learnersVoted"/>: ${nominationText}</h4>
+	<div class="container-main">
+		<h1 class="mb-4">
+			${title}: ${nominationText}
+		</h1>
 
-		<lams:TSTable numColumns="2" dataId="data-session-id='${sessionUid}'">
-	       <th><fmt:message key="label.user"/></td>
-	       <th><fmt:message key="label.attemptTime"/></td>
-	     </lams:TSTable>
-		
-	<div id="footer"></div>
-	</lams:Page>
-</body>
-</lams:html>
+		<div class="shadow rounded-5">
+			<lams:TSTable5 numColumns="2" dataId="data-session-id='${sessionUid}'">
+		       <th><fmt:message key="label.user"/></td>
+		       <th><fmt:message key="label.attemptTime"/></td>
+		     </lams:TSTable5>
+	     </div>
+	
+		<div class="activity-bottom-buttons">
+			<button type="button" onclick="window.close()" class="btn btn-primary">
+				<i class="fa-regular fa-circle-xmark me-1"></i>
+				<fmt:message key="label.close" />
+			</button>
+		</div>
+	</div>
+</lams:PageMonitor>