Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
===================================================================
diff -u -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -288,9 +288,10 @@
     }
 
     private String generatePreviewButton(Object toolSessionId, Object userId, String emailResultsText) {
-	return new StringBuilder("<button onclick=\"javascript:previewResultsForLearner(").append(toolSessionId)
+	return new StringBuilder("<button type='button' onclick=\"previewResultsForLearner(").append(toolSessionId)
 		.append(", ").append(userId)
-		.append(")\" class=\"btn btn-default btn-xs email-button btn-disable-on-submit\">")
+		.append(")\" class=\"btn btn-light btn-sm email-button btn-disable-on-submit\">")
+		.append("<i class='fa-solid fa-eye me-1'></i>")
 		.append(emailResultsText).append("</button>").toString();
     }
 
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java
===================================================================
diff -u -r34b8dc302ac56f6f4e64b41b26f684cfc6e1c438 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 34b8dc302ac56f6f4e64b41b26f684cfc6e1c438)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -51,7 +51,7 @@
 	sessionMap.put(PeerreviewConstants.ATTR_PEERREVIEW, peerreview);
 	sessionMap.put(PeerreviewConstants.ATTR_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(PeerreviewConstants.ATTR_IS_GROUPED_ACTIVITY, peerreviewService.isGroupedActivity(contentId));
-	sessionMap.put("tblMonitoring", true);
+	sessionMap.put("isTbl", true);
 
 	List<RatingCriteria> criterias = peerreviewService.getRatingCriterias(contentId);
 	List<RatingCriteria> flattenedCriterias = new ArrayList<>(criterias);
@@ -65,7 +65,7 @@
 
 	request.setAttribute(PeerreviewConstants.ATTR_CRITERIAS, flattenedCriterias);
 
-	return "/pages/monitoring/summary5";
+	return "/pages/monitoring/summary";
     }
 
 }
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/advanceoptions.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_preview/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -2,58 +2,56 @@
 
 <c:set var="adTitle"><spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.th.advancedSettings" /></spring:escapeBody></c:set>
 <lams:AdvancedAccordian title="${adTitle}">
-             
-<table class="table table-striped table-condensed">
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.lock.on.finished" />
-		</td>
+	<div class="ltable table-striped table-sm no-header mb-0">
+		<div class="row">
+			<div class="col">
+				<fmt:message key="label.authoring.advance.lock.on.finished" />
+			</div>
+			
+			<div class="col">
+				<c:choose>
+					<c:when test="${sessionMap.peerreview.lockWhenFinished}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</div>
+		</div>
 		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.peerreview.lockWhenFinished}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.show.ratings.left.for.user" />
-		</td>
+		<div class="row">
+			<div class="col">
+				<fmt:message key="label.show.ratings.left.for.user" />
+			</div>
+			
+			<div class="col">
+				<c:choose>
+					<c:when test="${sessionMap.peerreview.showRatingsLeftForUser}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</div>
+		</div>
 		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.peerreview.showRatingsLeftForUser}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.self.review" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.peerreview.selfReview}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-</table>
-
+		<div class="row">
+			<div class="col">
+				<fmt:message key="label.self.review" />
+			</div>
+			
+			<div class="col">
+				<c:choose>
+					<c:when test="${sessionMap.peerreview.selfReview}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</div>
+		</div>
+	</div>
 </lams:AdvancedAccordian>
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -1,15 +1,11 @@
 <!DOCTYPE html>
-        
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<lams:html>
-<lams:head>
-	<title><fmt:message key="label.monitoring.heading" /></title>
-	<%@ include file="/common/header.jsp"%>
-
+<c:set var="title"><fmt:message key="label.monitoring.heading" /></c:set>
+<lams:PageMonitor title="${title}" hideHeader="true">
 	<link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
 	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
 	<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
@@ -36,25 +32,26 @@
 	<lams:JSImport src="includes/javascript/monitorToolSummaryAdvanced.js" />
 	<lams:JSImport src="includes/javascript/rating.js" />
 	<lams:JSImport src="includes/javascript/portrait5.js" />
-</lams:head>
+	
+	
+		<h1 class="fs-3">
+			${criteria.title}
+		</h1>
+	
 
-<body class="stripes">
-	<lams:Page type="monitor" title="${criteria.rubricsStyleRating ? '' : title}">
-		<c:choose>
-			<c:when test="${criteria.rubricsStyleRating}">
-				<%@ include file="rubricspart.jsp" %>
-			</c:when>
-			<c:otherwise>
-				<%@ include file="criteriapart.jsp" %>
-			</c:otherwise>
-		</c:choose>
+	<c:choose>
+		<c:when test="${criteria.rubricsStyleRating}">
+			<%@ include file="rubricspart.jsp" %>
+		</c:when>
+		<c:otherwise>
+			<%@ include file="criteriapart.jsp" %>
+		</c:otherwise>
+	</c:choose>
 		
-		
- 		<span onclick="window.close()" class="btn btn-default voffset20 pull-right">
+	<div class="activity-bottom-buttons">
+ 		<button type="button" onclick="window.close()" class="btn btn-primary">
+ 			<i class="fa-solid fa-xmark me-1"></i>
  			<fmt:message key="label.close"/>
- 		</span>
-	</lams:Page>
-
-	<div id="footer"></div>
-</body>
-</lams:html>
\ No newline at end of file
+ 		</button>
+ 	</div>
+</lams:PageMonitor>
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -rb1018fb2d9bb8216f7a3e1753c47f03285d4eb03 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision b1018fb2d9bb8216f7a3e1753c47f03285d4eb03)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-
 <style>
     /* when item is editable - show pencil icon on hover */
     .editable-comment:hover +span+ i, /* when link is hovered select i */
@@ -12,18 +11,24 @@
 	.editable-comment +span+ i { /* in all other case hide it */
 	  visibility: hidden;
 	}
+	
+	<c:if test="${criteria.ratingStyle eq 1}">
+		.extra-controls-inner {
+		   height: 3.5rem; 
+		}
+	</c:if>
 </style>
 <c:choose>
-<c:when test="${criteria.ratingStyle eq 0 }">
+<c:when test="${criteria.ratingStyle eq 0}">
 	<c:set var="heading"></c:set>
 </c:when>
-<c:when test="${criteria.ratingStyle eq 1 }">
+<c:when test="${criteria.ratingStyle eq 1}">
 	<c:set var="heading"><fmt:message key="label.rating" /></c:set>
 </c:when>
-<c:when test="${criteria.ratingStyle eq 2 }">
+<c:when test="${criteria.ratingStyle eq 2}">
 	<c:set var="heading"><fmt:message key="label.rating.rank" /></c:set>
 </c:when>
-<c:when test="${criteria.ratingStyle eq 3 }">
+<c:when test="${criteria.ratingStyle eq 3}">
 	<c:set var="heading"><fmt:message key="label.mark" /></c:set>
 </c:when>
 </c:choose>
@@ -50,7 +55,7 @@
 			],
 		   	colModel:[
 		   		{name:'itemId', index:'itemId', width:0, hidden: true},
-		   		{name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false }, formatter:userNameFormatter},
+		   		{name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false, attr: {style: "text-align:left;"}}, formatter:userNameFormatter},
 		   		{name:'rating', index:'rating', width:100, align:"center", search:false},
 		   		{name:'itemDescription2', index:'itemId', width:0, hidden: true},
 				{name:'email', index:'email', width:100, align:"center", search:false}		   		
@@ -268,7 +273,7 @@
 
 <!--For send results feature-->
 <i class="fa fa-spinner messageArea2_Busy" style="display:none"></i>
-<div class="voffset5 messageArea2"></div>
+<div class="mt-2 messageArea2"></div>
 
 <p>
 	<c:choose>
@@ -296,4 +301,4 @@
 <table id="group${toolSessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
 <div id="pager${toolSessionId}"></div> 
 
-<div class="voffset10 emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
+<div class="mt-2 emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/emailpreview.jsp
===================================================================
diff -u -r8b49e3b7541a9694c6e8df561c8586231b6fca12 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/emailpreview.jsp	(.../emailpreview.jsp)	(revision 8b49e3b7541a9694c6e8df561c8586231b6fca12)
+++ lams_tool_preview/web/pages/monitoring/emailpreview.jsp	(.../emailpreview.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -2,22 +2,26 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="emailPreviewDTO" value="${sessionMap.emailPreviewDTO}"/>
-<lams:html>
-<lams:head>
-</lams:head>
-<body>
-<div class="panel panel-default">
-<div class="panel-heading">
-<div class="panel-title"><fmt:message key="label.email.preview"/></div>
+
+<div class="lcard mt-4">
+	<div class="card-header">
+		<fmt:message key="label.email.preview"/>
+	</div>
+	
+	<div class="card-body">
+		<div id="emailHTML">${emailPreviewDTO.emailHTML}</div>
+		
+		<div class="float-end mb-3">
+			<button type="button" onclick="closeResultsForLearner(${emailPreviewDTO.toolSessionId})" 
+					class="btn btn-secondary btn-sm btn-disable-on-submit">
+				<i class="fa-regular fa-eye-slash me-1"></i>
+				<fmt:message key="label.hide"/>
+			</button>
+			<button type="button" id="sendEmailNowButton" onclick="sendResultsForLearner(${emailPreviewDTO.toolSessionId}, ${emailPreviewDTO.learnerUserId}, ${emailPreviewDTO.dateTimeStamp})" 
+					class="btn btn-secondary btn-sm ms-2 btn-disable-on-submit">
+				<i class="fa-regular fa-sm fa-envelope me-1"></i>
+				<fmt:message key="button.email.results"/>
+			</button>
+		</div>
+	</div>
 </div>
-<div class="panel-body">
-<div id="emailHTML">${emailPreviewDTO.emailHTML}</div>
-<div class="pull-right">
-	<button onclick="javascript:closeResultsForLearner(${emailPreviewDTO.toolSessionId});return false;" class="btn btn-default btn-sm btn-disable-on-submit"><fmt:message key="label.hide"/></button>
-	<button id="sendEmailNowButton" onclick="javascript:sendResultsForLearner(${emailPreviewDTO.toolSessionId}, ${emailPreviewDTO.learnerUserId}, ${emailPreviewDTO.dateTimeStamp});return false;" 
-		class="btn btn-default btn-sm loffset5 btn-disable-on-submit"><i class="fa fa-sm fa-envelope-o">&nbsp;</i><fmt:message key="button.email.results"/></button>
-</div>
-</div>
-</div>
-</body>
-</lams:html>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/manageUsers.jsp
===================================================================
diff -u -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
+++ lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(.../manageUsers.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -4,33 +4,28 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<lams:html>
-	<lams:head>
-		<title><fmt:message key="label.monitoring.heading" /></title>
-		<%@ include file="/common/header.jsp"%>
+<c:set var="title"><fmt:message key="label.manage.users" /></c:set>
+<lams:PageMonitor title="${title}" hideHeader="true">
+	<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
+	<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
+	<style type="text/css">
+		.ui-jqgrid-labels {
+			display:none; !important;
+		}
+		.ui-search-toolbar th:nth-child(2){
+			display:none !important;
+		}
+	</style>
 
-		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme5.css" rel="stylesheet">
-		<link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
-		<link type="text/css" href="<lams:WebAppURL/>includes/css/learning.css" rel="stylesheet" />
-		<style type="text/css">
-			.ui-jqgrid-labels {
-				display:none; !important;
-			}
-			.ui-search-toolbar th:nth-child(2){
-				display:none !important;
-			}
-		</style>
-
-		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
-		<script type="text/javascript">
-			$(document).ready(function(){
-
+	<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function(){
 				//init all available jqGrids
 				$("[id^=group]").each(function() {
 					var groupTable = $(this),
-							toolSessionId = groupTable.data("session-id");
+						toolSessionId = groupTable.data("session-id");
 
-
 					groupTable.jqGrid({
 						url: "<c:url value='/monitoring/getManageUsers.do'/>?toolSessionId=" + toolSessionId,
 						datatype: "json",
@@ -48,7 +43,7 @@
 							{name:'userUid', index:'userUid', width:0, hidden: true},
 							{name: 'hidden', index: 'hidden', width:10, editable:true, edittype:'checkbox', editoptions: {value:"True:False"},
 								formatter: "checkbox", formatoptions: {disabled : false}, sortable:false, search: false},
-							{name:'userName', index:'userName', width:300, searchoptions: { clearSearch: false }}
+							{name:'userName', index:'userName', width:300, searchoptions: { clearSearch: false, attr: {style: "text-align:left;"} }}
 						],
 						sortname: "userUid",
 						rowNum:10,
@@ -57,7 +52,6 @@
 						viewrecords:true,
 						// caption: "${groupSummary.sessionName}" use Bootstrap panels as the title bar
 						loadComplete: function() {
-
 							// storing isHidden change to DB
 							$(":checkbox", groupTable).on("click", function(event){
 
@@ -106,61 +100,45 @@
 					});
 				};
 				setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+		});
+	</script>
+	
+	<h1 class="fs-3">
+		${title}
+	</h1>
 
-			});
-		</script>
+	<div class="instructions">
+		<fmt:message key="label.manage.users.description" />
+	</div>
 
-	</lams:head>
-	<body class="stripes">
-
-	<c:set var="title"><fmt:message key="label.manage.users" /></c:set>
-	<lams:Page type="monitor" title="${title}">
-
-		<h5>
-			<fmt:message key="label.manage.users.description" />
-		</h5>
-
+	<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
 		<c:if test="${sessionMap.isGroupedActivity}">
-			<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true">
-		</c:if>
-
-		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
-
-			<c:if test="${sessionMap.isGroupedActivity}">
-				<div class="panel panel-default" >
-				<div class="panel-heading" id="heading${groupSummary.sessionId}">
-			        	<span class="panel-title collapsable-icon-left">
-				        	<a role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}"
+			<div class="lcard" >
+				<div class="card-header" id="heading${groupSummary.sessionId}">
+			        <span class="card-title collapsable-icon-left">
+				       	<button type="button" class="btn btn-secondary-darker no-shadow" data-bs-toggle="collapse" data-bs-target="#collapse${groupSummary.sessionId}"
 							   aria-expanded="true" aria-controls="collapse${groupSummary.sessionId}">
-								<fmt:message key="monitoring.label.group" />: ${groupSummary.sessionName}
-							</a>
-						</span>
+							<fmt:message key="monitoring.label.group" />: ${groupSummary.sessionName}
+						</button>
+					</span>
 				</div>
 
-				<div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+				<div id="collapse${groupSummary.sessionId}" class="card-body collapse show">
 			</c:if>
 
 			<table id="group${groupSummary.sessionId}" class="scroll" data-session-id="${groupSummary.sessionId}" cellpadding="0" cellspacing="0"></table>
 			<div id="pager${groupSummary.sessionId}"></div>
 
-			<c:if test="${sessionMap.isGroupedActivity}">
-				</div> <!-- end collapse area  -->
-				</div> <!-- end collapse panel  -->
-			</c:if>
-			${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
-
-		</c:forEach>
-
 		<c:if test="${sessionMap.isGroupedActivity}">
-			</div> <!--  end panel group -->
+				</div> <!-- end collapse area  -->
+			</div> <!-- end collapse panel  -->
 		</c:if>
+	</c:forEach>
 
-		<span onclick="window.close()" class="btn btn-default voffset5 pull-right">
+	<div class="activity-bottom-buttons">
+ 		<button type="button" onclick="window.close()" class="btn btn-primary">
+ 			<i class="fa-solid fa-xmark me-1"></i>
  			<fmt:message key="label.close"/>
- 		</span>
-	</lams:Page>
-
-	<div id="footer"></div>
-
-	</body>
-</lams:html>
\ No newline at end of file
+ 		</button>
+ 	</div>
+</lams:PageMonitor>
Index: lams_tool_preview/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_preview/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -1,72 +1,10 @@
 <!DOCTYPE html>
-        
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants"%>
-
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
-<lams:html>
-	<lams:head>
-		<%@ include file="/common/tabbedheader.jsp" %>
-		 
-		<script>
-			var initialTabId = "${initialTabId}";
-	
-			function init(){
-				if (initialTabId) {
-					selectTab(initialTabId);
-				} else {
-					selectTab(1);
-				}
-		    }     
-		        
-		    function doSelectTab(tabId) {
-			   if ( tabId == 3) {
-				   doStatistic();
-			   }
-			   selectTab(tabId);
-		    } 
-		        
-			function doStatistic(){
-				var url = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
-				$("#statisticArea_Busy").show();
-				$.ajaxSetup({ cache: true });
-				$("#statisticArea").load(
-					url,
-					{
-						toolContentID: ${sessionMap.toolContentID}, 
-						reqID: (new Date()).getTime()
-					},
-					function() {
-						$("#statisticArea_Busy").hide();
-					}
-				);
-				
-			}       
-		</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">
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:PageMonitor title="${title}" 
+		helpToolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>"
+		initialTabId="${initialTabId}"/>
 
-        	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>" helpModule="monitoring">		
-				<lams:Tab id="1" key="monitoring.tab.summary" />
-				<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
-				<lams:Tab id="3" key="monitoring.tab.statistics" />
-			</lams:Tabs>
-			
-			<lams:TabBodyArea>
-			
-			<lams:TabBodys>
-				<lams:TabBody id="1" page="summary.jsp" />
-				<lams:TabBody id="2" page="editactivity.jsp" />			
-				<lams:TabBody id="3" page="statistic.jsp" />
-			</lams:TabBodys>
-
-			</lams:TabBodyArea>
-			
-			<div id="footer"></div>
-	
-		</lams:Page>
-	</body>
-</lams:html>
Index: lams_tool_preview/web/pages/monitoring/rubricspart.jsp
===================================================================
diff -u -re8c858ae097ae8b7861ec6e70e490daec543e34e -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(.../rubricspart.jsp)	(revision e8c858ae097ae8b7861ec6e70e490daec543e34e)
+++ lams_tool_preview/web/pages/monitoring/rubricspart.jsp	(.../rubricspart.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -1,14 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<style>
-	.panel-collapse > .rubrics-user-panel,
-	.panel-collapse > #emailPreviewArea {
-		margin: 10px;
-	}
-</style>
-
 <script>
-
 	function getResultsElement(sessionId, selector) {
 		let element = null;
 		if (sessionId) {
@@ -92,35 +84,32 @@
 
 <!--For send results feature-->
 <i class="fa fa-spinner messageArea2_Busy" style="display:none"></i>
-<div class="voffset5 messageArea2"></div>
-
+<div class="mt-2 messageArea2"></div>
 	     
-<c:forEach var="learnerData" items="${rubricsLearnerData}">
-  	    	
-<%-- List learners in the given session --%>
-<div class="panel panel-default rubrics-user-panel">
-      <div class="panel-heading" role="tab" id="rubrics-user-heading-${learnerData.key.uid}">
-      	<span class="panel-title collapsable-icon-left">
-      		<a class="collapsed" role="button" data-toggle="collapse" href="#rubrics-user-collapse-${learnerData.key.uid}" 
-				aria-expanded="false" aria-controls="rubrics-user-collapse-${learnerData.key.uid}">
-			<lams:Portrait userId="${learnerData.key.userId}" hover="false" />
-			&nbsp;<c:out value="${learnerData.key.firstName}" escapeXml="true"/>
-			&nbsp;<c:out value="${learnerData.key.lastName}" escapeXml="true"/>
-		</a>
-	</span>
-	<button class="btn btn-default pull-right email-button btn-disable-on-submit"
-			onClick="javascript:previewResultsForLearner(${toolSessionId}, ${learnerData.key.userId}, this)">
-		<fmt:message key="button.preview.results" />
-	</button>
-      </div>
-     
-     	<div id="rubrics-user-collapse-${learnerData.key.uid}" class="panel-collapse collapse" 
-     	    role="tabpanel" aria-labelledby="rubrics-user-heading-${learnerData.key.uid}">
-     	    	<%-- Display ratings given to this user --%>
-		<lams:StyledRating criteriaRatings="${learnerData.value}" showJustification="true" alwaysShowAverage="false"
-						   currentUserDisplay="true" rubricsInBetweenColumns="${sessionMap.peerreview.rubricsInBetweenColumns}" />
+<c:forEach var="learnerData" items="${rubricsLearnerData}">   	
+	<%-- List learners in the given session --%>
+	<div class="lcard rubrics-user-panel">
+		<div class="card-header" id="rubrics-user-heading-${learnerData.key.uid}">
+	      	<span class="card-title collapsable-icon-left">
+	      		<button type="button" class="btn btn-secondary-darker no-shadow collapsed" data-bs-toggle="collapse" data-bs-target="#rubrics-user-collapse-${learnerData.key.uid}" 
+						aria-expanded="false" aria-controls="rubrics-user-collapse-${learnerData.key.uid}">
+					<lams:Portrait userId="${learnerData.key.userId}" hover="false" />
+					&nbsp;<c:out value="${learnerData.key.firstName}" escapeXml="true"/>
+					&nbsp;<c:out value="${learnerData.key.lastName}" escapeXml="true"/>
+				</button>
+			</span>
+			<button type="button" class="btn btn-light float-end email-button btn-disable-on-submit"
+					onClick="previewResultsForLearner(${toolSessionId}, ${learnerData.key.userId}, this)">
+				<fmt:message key="button.preview.results" />
+			</button>
+		</div>
+	     
+		<div id="rubrics-user-collapse-${learnerData.key.uid}" class="card-body collapse">
+	     	<%-- Display ratings given to this user --%>
+			<lams:StyledRating criteriaRatings="${learnerData.value}" showJustification="true" alwaysShowAverage="false"
+							   currentUserDisplay="true" rubricsInBetweenColumns="${sessionMap.peerreview.rubricsInBetweenColumns}" />
+		</div>
 	</div>
-</div>
 </c:forEach>
 
-<div class="voffset10 emailPreviewArea" style="display:none" ></div>
\ No newline at end of file
+<div class="mt-3 emailPreviewArea" style="display:none" ></div>
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307 -rb6e741acd9098efb0ba6737a7ca4ecae1f3b9261
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b6e741acd9098efb0ba6737a7ca4ecae1f3b9261)
@@ -8,32 +8,24 @@
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
 <link type="text/css" href="${webapp}includes/css/learning.css" rel="stylesheet" >
 <link type="text/css" href="${lams}css/free.ui.jqgrid.custom.css" rel="stylesheet">
-<style type="text/css">
-	#common-buttons-area {
-		overflow: auto;
-		margin-bottom: 10px;
-	}
-</style>
 
-<lams:JSImport src="includes/javascript/common.js" />
-<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
 <script type="text/javascript">
 	//vars for rating.js
 	var MAX_RATES = 0,
 			MIN_RATES = 0,
 			COMMENTS_MIN_WORDS_LIMIT = 0,
 			MAX_RATINGS_FOR_ITEM = 0,
-			LAMS_URL = '',
 			COUNT_RATED_ITEMS = 0,
 			COMMENT_TEXTAREA_TIP_LABEL = '',
 			WARN_COMMENTS_IS_BLANK_LABEL = '',
 			WARN_MIN_NUMBER_WORDS_LABEL = '';
 </script>
 <lams:JSImport src="includes/javascript/monitorToolSummaryAdvanced.js" />
-
+<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
 <script src="${lams}includes/javascript/download.js" type="text/javascript" ></script>
 <script src="${lams}includes/javascript/portrait5.js" type="text/javascript" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
+<lams:JSImport src="includes/javascript/dialog5.js" />
 <lams:JSImport src="includes/javascript/rating.js" />
 <script type="text/javascript">
 	function exportResults() {
@@ -53,174 +45,188 @@
 		return element;
 	}
 
-	function sendResults(sessionId) {
-		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="confirm.notify.user.of.results" /></spring:escapeBody>')) {
-			return;
-		}
-		let buttons = sessionId ? getResultsElement(sessionId, ".btn-disable-on-submit") : $('.btn-disable-on-submit'),
-				messageArea = sessionId ? getResultsElement(sessionId, ".messageArea2") : $('#message-area-general'),
-				messageAreaBusy = sessionId ? getResultsElement(sessionId, ".messageArea2_Busy") : $('#message-area-busy-general'),
-				emailsSentIcons = sessionId ? $('#heading' + sessionId + ' .emails-sent-icon') : $('.emails-sent-icon'),
-				url = "<c:url value="/monitoring/sendResultsToSessionUsers.do"/>";
+	function sendResults(sessionId, isNotifyAllUsers) {
+		showConfirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="confirm.notify.user.of.results" /></spring:escapeBody>', function(){
+			let buttons = isNotifyAllUsers ? $('.btn-disable-on-submit') : getResultsElement(sessionId, ".btn-disable-on-submit"),
+				messageArea = isNotifyAllUsers ?  $('#message-area-general') : getResultsElement(sessionId, ".messageArea2"),
+				messageAreaBusy = isNotifyAllUsers ? $('#message-area-busy-general') : getResultsElement(sessionId, ".messageArea2_Busy"),
+				emailsSentIcons = isNotifyAllUsers ? $('.emails-sent-icon') : $('#heading' + sessionId + ' .emails-sent-icon');
 
-		messageArea.html("");
-		messageAreaBusy.show();
-		buttons.prop("disabled", true);
-		messageArea.load(
-				url,
-				{
-					sessionMapID: "${sessionMapID}",
-					toolContentID: ${sessionMap.toolContentID},
-					toolSessionId: sessionId,
-					reqID: (new Date()).getTime()
-				},
-				function() {
-					messageAreaBusy.hide();
-					buttons.prop("disabled", false);
-					emailsSentIcons.removeClass('hidden');
-				}
-		);
-		return false;
+			messageArea.html("");
+			messageAreaBusy.show();
+			buttons.prop("disabled", true);
+			messageArea.load(
+					"<c:url value="/monitoring/sendResultsToSessionUsers.do"/>",
+					{
+						sessionMapID: "${sessionMapID}",
+						toolContentID: ${sessionMap.toolContentID},
+						toolSessionId: sessionId ? sessionId : "",
+						reqID: (new Date()).getTime()
+					},
+					function() {
+						messageAreaBusy.hide();
+						buttons.prop("disabled", false);
+						$.each(emailsSentIcons, (index, item) => {
+						    $(item).parent().removeClass('d-none');
+						});
+					}
+			);
+		});
 	}
 </script>
 
-<div class="panel">
-	<h4>
+<div class="container-main ms-4">
+	<h3 class="mb-2">
 		<c:out value="${sessionMap.peerreview.title}" escapeXml="true"/>
-	</h4>
-	<div class="instructions voffset5">
+	</h3>
+	<div class="instructions">
 		<c:out value="${sessionMap.peerreview.instructions}" escapeXml="false"/>
 	</div>
 
 	<c:if test="${empty summaryList}">
-		<lams:Alert type="info" id="no-session-summary" close="false">
+		<lams:Alert5 type="info" id="no-session-summary">
 			<fmt:message key="message.monitoring.summary.no.session" />
-		</lams:Alert>
+		</lams:Alert5>
 	</c:if>
 
-	<!--For send results feature-->
-	<lams:WaitingSpinner id="messageArea_Busy"></lams:WaitingSpinner>
-	<div class="voffset5 help-block" id="messageArea"></div>
+	<div class="mt-4">
+		<!--For send results feature-->
+		<lams:WaitingSpinner id="messageArea_Busy"></lams:WaitingSpinner>
+		<div class="clearfix my-2">
+			<div class="badge text-bg-info help-block" id="messageArea"></div>
+		</div>
+	</div>
 
-</div>
+	<c:if test="${sessionMap.isGroupedActivity}">
+		<div class="accordion" id="accordionSessions" aria-multiselectable="true">
+	</c:if>
 
-<c:if test="${sessionMap.isGroupedActivity}">
-	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true">
-</c:if>
+	<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+		<c:if test="${sessionMap.isGroupedActivity}">
+			<div class="accordion-item">
+				<h4 class="accordion-header" id="heading${groupSummary.sessionId}">
+					<button class="accordion-button ${status.first ? '' : 'collapsed'}" type="button"
+							data-bs-toggle="collapse" data-bs-target="#collapse${groupSummary.sessionId}"
+							aria-expanded="${status.first}">
+						<fmt:message key="monitoring.label.group" />: ${groupSummary.sessionName}</a>
+						
+						<span title="<fmt:message key="label.notified.users.of.results" />" class="${groupSummary.emailsSent ? '' : 'd-none'}">
+		  					<i class="emails-sent-icon ms-3 fa fa-envelope" aria-hidden="true"></i>
+  							<i class="emails-sent-icon fa fa-check-circle text-success" aria-hidden="true"></i>
+						</span>
+					</button>
+				</h4>
 
-<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+				<div id="collapse${groupSummary.sessionId}" class="accordion-collapse collapse ${status.first ? 'show' : ''}"
+						aria-labelledby="heading${groupSummary.sessionId}">
+					<div class="accordion-body">
+		</c:if>
 
-	<c:if test="${sessionMap.isGroupedActivity}">
-		<div class="panel panel-default" >
-		<div class="panel-heading" id="heading${groupSummary.sessionId}">
-        	<span class="panel-title collapsable-icon-left">
-        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse"
-			   href="#collapse${groupSummary.sessionId}"
-			   aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${groupSummary.sessionId}">
-				<fmt:message key="monitoring.label.group"/>: ${groupSummary.sessionName}</a>
-				<span title="<fmt:message key="label.notified.users.of.results" />" class="${groupSummary.emailsSent ? "" : "hidden"}">
-  					<i class="emails-sent-icon loffset20 fa fa-envelope" aria-hidden="true"></i>
-  					<i class="emails-sent-icon fa fa-check-circle text-success" aria-hidden="true"></i>
-				</span>
-			</span>
-		</div>
+		<c:set var="rubricsCriteriaCounter" value="1" />
+		<c:choose>
+			<c:when test="${fn:length(criterias) eq 1}">
+				<c:set var="criteria" value="${criterias[0]}" scope="request"/>
+				<c:set var="toolSessionId" value="${groupSummary.sessionId}" scope="request"/>
+				<c:set var="criteria" value="${criteria}" scope="request"/>
+				<c:set var="sessionMap" value="${sessionMap}" scope="request"/>
+				<c:choose>
+					<c:when test="${criteria.rubricsStyleRating}">
+						<c:set var="rubricsLearnerData" value="${rubricsData[toolSessionId]}" scope="request"/>
+						<%@ include file="rubricspart.jsp" %>
+					</c:when>
+					
+					<c:otherwise>
+						<h4><c:out value="${criteria.title}" escapeXml="true"/></h4>
+						<%@ include file="criteriapart.jsp" %>
+					</c:otherwise>
+				</c:choose>
+			</c:when>
+			
+			<c:otherwise>
+				<c:forEach var="criteria" items="${criterias}">
+					<c:set var='url'><c:url value="/monitoring/criteria.do"/>?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&criteriaId=${criteria.ratingCriteriaId}</c:set>
+					<button type="button" onclick="launchPopup('${url}')" class="btn btn-light btn-disable-on-submit me-2">
+						<i class="fa-solid fa-eye me-1"></i>
+						<fmt:message key="label.monitoring.view">
+							<fmt:param>
+								<c:choose>
+									<c:when test="${criteria.rubricsStyleRating}">
+										<fmt:message key="label.rating.style.rubrics" />&nbsp;${rubricsCriteriaCounter}
+										<c:set var="rubricsCriteriaCounter" value="${rubricsCriteriaCounter + 1}" />
+									</c:when>
+									<c:otherwise>
+										<c:out value="${criteria.title}" escapeXml="true"/>
+									</c:otherwise>
+								</c:choose>
+							</fmt:param>
+						</fmt:message>
+					</button>
+				</c:forEach>
+			</c:otherwise>
+		</c:choose>
 
-		<div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
-	</c:if>
-
-	<c:set var="rubricsCriteriaCounter" value="1" />
-	<c:choose>
-		<c:when test="${fn:length(criterias) eq 1}">
-			<c:set var="criteria" value="${criterias[0]}" scope="request"/>
-			<c:set var="toolSessionId" value="${groupSummary.sessionId}" scope="request"/>
-			<c:set var="criteria" value="${criteria}" scope="request"/>
-			<c:set var="sessionMap" value="${sessionMap}" scope="request"/>
-			<c:choose>
-				<c:when test="${criteria.rubricsStyleRating}">
-					<c:set var="rubricsLearnerData" value="${rubricsData[toolSessionId]}" scope="request"/>
-					<%@ include file="rubricspart.jsp" %>
-				</c:when>
-				<c:otherwise>
-					<h4><c:out value="${criteria.title}" escapeXml="true"/></h4>
-					<%@ include file="criteriapart.jsp" %>
-				</c:otherwise>
-			</c:choose>
-		</c:when>
-		<c:otherwise>
-			<c:forEach var="criteria" items="${criterias}">
-				<c:set var='url'><c:url value="/monitoring/criteria.do"/>?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&criteriaId=${criteria.ratingCriteriaId}</c:set>
-				<button onclick="javascript:launchPopup('${url}');return false;" class="btn btn-default btn-disable-on-submit voffset5 loffset5">
-					<fmt:message key="label.monitoring.view">
-						<fmt:param>
-							<c:choose>
-								<c:when test="${criteria.rubricsStyleRating}">
-									<fmt:message key="label.rating.style.rubrics" />&nbsp;${rubricsCriteriaCounter}
-									<c:set var="rubricsCriteriaCounter" value="${rubricsCriteriaCounter + 1}" />
-								</c:when>
-								<c:otherwise>
-									<c:out value="${criteria.title}" escapeXml="true"/>
-								</c:otherwise>
-							</c:choose>
-						</fmt:param>
-					</fmt:message>
+		<div id="btns${groupSummary.sessionId}" class="mt-2">
+			<c:if test="${sessionMap.isGroupedActivity}">
+				<button type="button" onclick="sendResults(${groupSummary.sessionId}, false)" class="btn btn-light btn-disable-on-submit">
+					<i class="fa-solid fa-envelope me-1"></i>
+					<fmt:message key="label.notify.user.of.results"/>
 				</button>
-			</c:forEach>
-		</c:otherwise>
-	</c:choose>
+			</c:if>
 
-	<div id="btns${groupSummary.sessionId}" class="offset5">
-		<button onClick="return sendResults(${groupSummary.sessionId});"
-				class="btn btn-default btn-disable-on-submit"><fmt:message key="label.notify.user.of.results"/></button>
+			<c:if test="${fn:length(criterias) > 1}">
+				<!--For send results feature-->
+				<i class="fa fa-spinner messageArea2_Busy" style="display:none"></i>
+				<div class="clearfix">
+					<div class="badge text-bg-info messageArea2 mt-2"></div>
+				</div>
+			</c:if>
+		</div>
 
-		<c:if test="${fn:length(criterias) > 1}">
-			<!--For send results feature-->
-			<i class="fa fa-spinner messageArea2_Busy" style="display:none"></i>
-			<div class="voffset5 loffset5 help-block messageArea2"></div>
+		<c:if test="${sessionMap.isGroupedActivity}">
+					</div> <!-- end accordion body  -->
+				</div> <!-- end accordion collapse  -->
+			</div> <!-- end accordion item  -->
 		</c:if>
-	</div>
+	</c:forEach>
 
 	<c:if test="${sessionMap.isGroupedActivity}">
-		</div> <!-- end collapse area  -->
-		</div> <!-- end collapse panel  -->
+		</div> <!--  end accordion -->
 	</c:if>
-	${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
 
-</c:forEach>
+	<div class="clearfix">
+	<div class="float-end">
+		<lams:WaitingSpinner id="message-area-busy-general"></lams:WaitingSpinner>
+		<div class=" my-2">
+			<div class="badge text-bg-info help-block" id="message-area-general"></div>
+		</div>
+	</div>
+	</div>
 
-<c:if test="${sessionMap.isGroupedActivity}">
-	</div> <!--  end panel group -->
-</c:if>
+	<div id="activity-bottom-buttons" class="mt-2 d-flex justify-content-end my-3">
+		<c:if test="${!empty summaryList}">
+			<c:set var='url'>
+				<c:url value="/monitoring/manageUsers.do"/>?sessionMapID=${sessionMapID}
+			</c:set>
+			<button type="button" onclick="launchPopup('${url}')" class="btn btn-light btn-disable-on-submit">
+				<i class="fa-solid fa-users-gear me-1"></i>
+				<fmt:message key="label.manage.users" />
+			</button>
+		</c:if>
+		
+		<c:if test="${!sessionMap.isTbl}">
+			<button type="button" onclick="sendResults(null, true)" class="btn btn-light ms-2 btn-disable-on-submit">
+				<i class="fa-solid fa-envelope me-1"></i>
+				<fmt:message key="label.notify.user.of.results.all"/>
+			</button>
+		</c:if>
 
-<div style="text-align: right">
-	<lams:WaitingSpinner id="message-area-busy-general"></lams:WaitingSpinner>
-	<div class="voffset5 help-block" id="message-area-general"></div>
-</div>
-
-<div id="common-buttons-area">
-	<button onClick="return exportResults()" class="btn btn-default loffset5 pull-right btn-disable-on-submit">
-		<i class="fa fa-download" aria-hidden="true"></i>
-		<fmt:message key="label.export.team.results" />
-	</button>
-
-	<button onClick="return sendResults();"
-			class="btn btn-default loffset5 pull-right btn-disable-on-submit">
-		<i class="fa fa-envelope"></i>
-		<fmt:message key="label.notify.user.of.results.all"/>
-	</button>
-
-	<c:if test="${!empty summaryList}">
-		<c:set var='url'>
-			<c:url value="/monitoring/manageUsers.do"/>?sessionMapID=${sessionMapID}
-		</c:set>
-		<button onClick="javascript:launchPopup('${url}');return false;"
-				class="btn btn-default btn-disable-on-submit pull-right">
-			<i class="fa fa-user-circle-o" aria-hidden="true"></i>
-			<fmt:message key="label.manage.users" />
+		<button type="button" onclick="exportResults()" class="btn btn-light ms-2 btn-disable-on-submit">
+			<i class="fa fa-download me-1" aria-hidden="true"></i>
+			<fmt:message key="label.export.team.results" />
 		</button>
+	</div>
+
+	<c:if test="${!sessionMap.isTbl}">
+		<%@ include file="advanceoptions.jsp"%>
 	</c:if>
 </div>
-
-
-<c:if test="${!sessionMap.tblMonitoring}">
-	<%@ include file="advanceoptions.jsp"%>
-</c:if>
\ No newline at end of file
Fisheye: Tag b6e741acd9098efb0ba6737a7ca4ecae1f3b9261 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/monitoring/summary5.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?