Index: lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag
===================================================================
diff -u -r5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610 -r46358bb2cef0e2a5a519979662d27657f194bf1d
--- lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 5c2c403d7a8a0e1b7894ee7c49f3e0031a5a3610)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageMonitor.tag	(.../PageMonitor.tag)	(revision 46358bb2cef0e2a5a519979662d27657f194bf1d)
@@ -29,7 +29,8 @@
 	<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>
+<c:set var="lams" scope="request"><lams:LAMSURL /></c:set>
+<c:set var="tool" scope="request"><lams:WebAppURL/></c:set>
 
 <lams:html>
     <lams:head>
Fisheye: Tag 46358bb2cef0e2a5a519979662d27657f194bf1d refers to a dead (removed) revision in file `lams_tool_mindmap/web/includes/javascript/monitoring.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r7b3ea39ddf6e10186cf9916562121c205bb0e5ad -r46358bb2cef0e2a5a519979662d27657f194bf1d
--- lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 7b3ea39ddf6e10186cf9916562121c205bb0e5ad)
+++ lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 46358bb2cef0e2a5a519979662d27657f194bf1d)
@@ -1,45 +1,79 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="dto" value="${mindmapDTO}" />
 
-<c:if test="${dto.contentInUse}">
-	<lams:Alert type="warn" id="alertContentEdit" close="false">
-		<fmt:message key="message.alertContentEdit" />
-	</lams:Alert>
-</c:if>
+<c:set var="adTitle"><fmt:message key="button.editActivity" /></c:set>
+<lams:AdvancedAccordian title="${adTitle}">
+	<c:if test="${dto.contentInUse}">
+		<lams:Alert5 type="warn" id="alertContentEdit">
+			<fmt:message key="message.alertContentEdit" />
+		</lams:Alert5>
+	</c:if>
+	
+	
+		<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="${dto.toolContentId}" />
+			<input type="hidden" name="contentFolderID" value="${contentFolderID}" />
+		</form>
+	
+		<button type="button" onclick="launchDefineLaterPopup()" class="btn btn-secondary btn-icon-pen float-end m-3">
+			<fmt:message key="button.editActivity" />
+		</button>
+	
 
-<table class="table table-condensed">
-	<tbody>
+	<table class="table table-condensed table-striped mb-0">
 		<tr>
-			<td width="10%" nowrap>
+			<td>
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
+			
 			<td>
 				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
+		
 		<tr>
-			<td width="10%" nowrap valign="top">
+			<td>
 				<fmt:message key="label.authoring.basic.instructions" />
 			</td>
+			
 			<td>
 				<c:out value="${dto.instructions}" escapeXml="false" />
 			</td>
 		</tr>
-	</tbody>
-</table>
-
-<p class="align-right">
-	<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="${dto.toolContentId}" />
-		<input type="hidden" name="contentFolderID" value="${contentFolderID}" />
-	</form>
-	
-	<c:if test="${dto.contentInUse == false}">
-		<a href="#nogo" onclick="javascript:launchDefineLaterPopup()" class="btn btn-default pull-right">
-			<fmt:message key="button.editActivity" />
-		</a>
-	</c:if>
-</p>
-
-
+		
+		<tr>
+			<td>
+				<fmt:message key="advanced.lockOnFinished" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${dto.lockOnFinish}">
+						<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="advanced.multiUserMode" />
+			</td>
+			
+			<td>
+				<c:choose>
+					<c:when test="${dto.multiUserMode}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>	
+			</td>
+		</tr>
+	</table>
+</lams:AdvancedAccordian>
Fisheye: Tag 46358bb2cef0e2a5a519979662d27657f194bf1d refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/monitoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r46358bb2cef0e2a5a519979662d27657f194bf1d
--- lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp	(.../mindmapDisplay.jsp)	(revision 46358bb2cef0e2a5a519979662d27657f194bf1d)
@@ -1,64 +1,40 @@
 <!DOCTYPE html>
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-		<c:set var="lams"> <lams:LAMSURL /> </c:set>
-		<c:set var="tool">	<lams:WebAppURL /> </c:set>
-	
-	<lams:head>
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:headItems />
-		<script type="text/javascript">
-			var initialTabId = "${mindmapDTO.currentTab}";
-		</script>
-		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
+<c:set var="title"><fmt:message key="activity.title" /></c:set>
+<lams:PageMonitor title="${title}" hideHeader="true">
+	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.minicolors.css"></link>
+	<link rel="stylesheet" type="text/css" href="${tool}includes/css/mapjs.css"></link>
+	<link rel="stylesheet" type="text/css" href="${tool}includes/css/mindmap.css"></link>
 		
-		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-		<lams:JSImport src="includes/javascript/common.js" />
-		
-		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.minicolors.css"></link>
-		<link rel="stylesheet" type="text/css" href="${tool}includes/css/mapjs.css"></link>
-		<link rel="stylesheet" type="text/css" href="${tool}includes/css/mindmap.css"></link>
-		
-		<script src="${lams}includes/javascript/jquery.minicolors.min.js"></script>
-		<script src="${tool}includes/javascript/jquery.timer.js"></script>
-		<script src="<lams:LAMSURL/>includes/javascript/fullscreen.js"></script>
-		<script src="${tool}includes/javascript/mapjs/main.js"></script>
-		<script src="${tool}includes/javascript/mapjs/underscore-min.js"></script>
-	</lams:head>
+	<script src="${lams}includes/javascript/jquery.minicolors.min.js"></script>
+	<script src="${tool}includes/javascript/jquery.timer.js"></script>
+	<script src="${lams}includes/javascript/fullscreen.js"></script>
+	<script src="${tool}includes/javascript/mapjs/main.js"></script>
+	<script src="${tool}includes/javascript/mapjs/underscore-min.js"></script>
 
-	<body class="stripes">	
-	
-		<c:set var="title"><fmt:message key="activity.title" /></c:set>
-		<lams:Page title="${title}" type="learner">
-
-			
-			<div id="content">
-
-				<c:choose>
+	<div class="main-container">
+		<h1 class="fs-3 mb-3">
+			<c:choose>
 				<c:when test="${isMultiUserMode}">
-					<h4><fmt:message key="label.multimode" /></h4>
+					<fmt:message key="label.multimode" />
 				</c:when>
+				
 				<c:otherwise>
-					<h4><c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/></h4>
+					<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 				</c:otherwise>
-				</c:choose>
+			</c:choose>
+		</h1>
 				
-				<%--  Monitor cannot edit mindmaps. mapjs.jsp also uses sessionId and mindmapId --%>
-				<c:set var="multiMode">${isMultiUserMode}</c:set>
-				<c:set var="contentEditable">false</c:set>
-								
-				<%@ include file="/common/mapjs.jsp"%>
+		<%--  Monitor cannot edit mindmaps. mapjs.jsp also uses sessionId and mindmapId --%>
+		<c:set var="multiMode">${isMultiUserMode}</c:set>
+		<c:set var="contentEditable">false</c:set>				
+		<%@ include file="/common/mapjs.jsp"%>
 				
-				<button class="btn btn-primary voffset10 pull-right" name="backButton" onclick="history.go(-1)">
-					<fmt:message>button.back</fmt:message>
-				</button>
-
-			</div>
-		</lams:Page>
-		<div id="footer"></div>
-	</body>
-</lams:html>
\ No newline at end of file
+		<div class="activity-bottom-buttons">
+			<button class="btn btn-primary btn-icon-return" name="backButton" onclick="history.go(-1)" type="button">
+				<fmt:message>button.back</fmt:message>
+			</button>
+		</div>
+	</div>
+</lams:PageMonitor>
Index: lams_tool_mindmap/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r46358bb2cef0e2a5a519979662d27657f194bf1d
--- lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_mindmap/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 46358bb2cef0e2a5a519979662d27657f194bf1d)
@@ -1,41 +1,14 @@
 <!DOCTYPE html>
+<%@page import="org.lamsfoundation.lams.tool.mindmap.MindmapConstants"%>
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:html>
-		<c:set var="lams"> 	<lams:LAMSURL /> </c:set>
-		<c:set var="tool"> 	<lams:WebAppURL /> </c:set>
-	
-	<lams:head>
-		<title>
-			<fmt:message key="activity.title" />
-		</title>
-		<lams:headItems />
-		<script type="text/javascript">
-			var initialTabId = "${mindmapDTO.currentTab}";
-		</script>
-		<script type="text/javascript" src="${tool}includes/javascript/monitoring.js"></script>
-
-	</lams:head>
-
-	<body class="stripes" onload="init();">
-	
-		<c:set var="title"><fmt:message key="${pageTitle.monitoring}" /></c:set>
-		<lams:Page title="${title}" type="navbar">
-		
-			<c:set var="title"><fmt:message key="activity.title" /></c:set>
-			<lams:Tabs control="true" title="${title}" helpToolSignature="lamind10" helpModule="monitoring" refreshOnClickAction="javascript:location.reload();">
-				<lams:Tab id="1" key="button.summary"/>
-				<lams:Tab id="2" key="button.editActivity"/>
-				<lams:Tab id="3" key="button.statistics"/>
-			</lams:Tabs>
-				
-			<lams:TabBodyArea>
-				<lams:TabBodys>
-					<lams:TabBody id="1" page="summary.jsp" />
-					<lams:TabBody id="2" page="editActivity.jsp" />			
-					<lams:TabBody id="3" page="statistics.jsp" />
-				</lams:TabBodys> 
-			</lams:TabBodyArea>
-		</lams:Page>
-	</body>
-</lams:html>
+<c:set var="title"><fmt:message key="pageTitle.monitoring" /></c:set>
+<lams:PageMonitor title="${title}" 
+	helpToolSignature="<%= MindmapConstants.TOOL_SIGNATURE %>"
+	initialTabId="${mindmapDTO.currentTab}"
+	tab1Label="button.summary"
+	tab2Label="button.editActivity"
+	tab3Label="button.statistics"
+	tab1Jsp="summary.jsp"
+	tab2Jsp="editActivity.jsp"
+	tab3Jsp="statistics.jsp"/>
Index: lams_tool_mindmap/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r46358bb2cef0e2a5a519979662d27657f194bf1d
--- lams_tool_mindmap/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_mindmap/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 46358bb2cef0e2a5a519979662d27657f194bf1d)
@@ -2,13 +2,12 @@
 <c:set var="dto" value="${mindmapDTO}" />
 
 <c:if test="${empty dto.sessionDTOs}">
-	<lams:Alert type="info" id="no-session-summary" close="false">
+	<lams:Alert5 type="info" id="no-session-summary">
 		<fmt:message key="label.nogroups" />
-	</lams:Alert>
+	</lams:Alert5>
 </c:if>
 
 <c:forEach var="session" items="${dto.sessionDTOs}">
-
 	<c:if test="${isGroupedActivity}">
 		<div class="panel panel-default" >
 			<div class="panel-heading">
@@ -20,7 +19,7 @@
 	</c:if>
 
 	<div class="panel-body">
-		<table class="table table-condensed">
+		<table class="table table-condensed table-striped">
 			<tr>
 				<td width="40%">
 					<fmt:message>heading.totalLearnersInGroup</fmt:message>
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rbe33897898483fec39439cf31c304bdb80c198f9 -r46358bb2cef0e2a5a519979662d27657f194bf1d
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision be33897898483fec39439cf31c304bdb80c198f9)
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 46358bb2cef0e2a5a519979662d27657f194bf1d)
@@ -1,5 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="dto" value="${mindmapDTO}" />
 
 <link href="${lams}css/rating.css" rel="stylesheet" type="text/css">
@@ -35,11 +34,6 @@
 	#gallery-walk-rating-table td {
 		text-align: center;
 	}
-	
-	#gallery-walk-rating-table th:first-child,
-	#gallery-walk-rating-table td:first-child {
-		text-align: right;
-	}
 								
 	.mindmap-frame {
 		width: calc(100% - 35px);
@@ -48,6 +42,7 @@
 		border: none;
 	}
 </style>
+
 <script type="text/javascript">
 	//pass settings to monitorToolSummaryAdvanced.js
 	var submissionDeadlineSettings = {
@@ -70,7 +65,6 @@
 		COUNT_RATED_ITEMS = true,
 		ALLOW_RERATE = false;
 </script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script> 
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
@@ -79,6 +73,7 @@
 
 <script type="text/javascript">
 	$(document).ready(function(){
+		doStatistic();
 		initializePortraitPopover("<lams:LAMSURL />");
 
 		// show mindmaps only on Group expand
@@ -160,31 +155,28 @@
 			}
 		});
 	}
-	
 </script>
 
-<div class="panel">
-	<h4>
-	  <c:out value="${mindmapDTO.title}" escapeXml="true"/>
-	</h4>
+<c:if test="${empty dto.sessionDTOs}">
+	<lams:Alert5 type="info" id="no-session-summary">
+		<fmt:message key="label.nogroups" />
+	</lams:Alert5>
+</c:if>
+
+<h1>
+  <c:out value="${mindmapDTO.title}" escapeXml="true"/>
+</h1>
 	
-	<div class="instructions voffset5">
-	  <c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
-	</div>
-	
-	<c:if test="${empty dto.sessionDTOs}">
-		<lams:Alert type="info" id="no-session-summary" close="false">
-			<fmt:message key="label.nogroups" />
-		</lams:Alert>
-	</c:if>
+<div class="instructions voffset5">
+  <c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
 </div>
 	
 <c:if test="${not empty dto.sessionDTOs and mindmapDTO.galleryWalkEnabled}">
-	<div class="panel panel-default ${mindmapDTO.galleryWalkFinished and not mindmapDTO.galleryWalkReadOnly ? 'gallery-walk-panel-ratings' : ''}"
-		 id="gallery-walk-panel">
-	  <div class="panel-heading">
-	    <h3 class="panel-title">
+	<div class="card shadow mb-5 ${mindmapDTO.galleryWalkFinished and not mindmapDTO.galleryWalkReadOnly ? 'gallery-walk-panel-ratings' : ''}"
+			id="gallery-walk-panel">
+		<div class="card-header">
 			<fmt:message key="label.gallery.walk" />&nbsp;
+			
 			<b>
 				<c:choose>
 					<c:when test="${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished}">
@@ -201,46 +193,52 @@
 					<fmt:message key="label.gallery.walk.state.learner.edit.enabled" />
 				</c:if>
 			</b>
-		</h3>
-	  </div>
-	  <div class="panel-body">
-	   		<button id="gallery-walk-start" type="button"
-			        class="btn btn-primary
-			        	   ${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'hidden'}"
-			        onClick="javascript:startGalleryWalk()">
+		</div>
+
+		<div class="card-body">
+			<button id="gallery-walk-start" type="button"
+			        class="btn btn-primary ${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'd-none'}"
+			        onClick="startGalleryWalk()">
+			    <i class="fa-solid fa-play me-1"></i>
 				<fmt:message key="monitoring.summary.gallery.walk.start" /> 
 			</button>
 			
 			<button id="gallery-walk-finish" type="button"
-			        class="btn btn-primary ${mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'hidden'}"
-			        onClick="javascript:finishGalleryWalk()">
+			        class="btn btn-primary ${mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'd-none'}"
+			        onClick="finishGalleryWalk()">
+				<i class="fa-regular fa-circle-stop me-1"></i>
 				<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
 			</button>
 			
 			<br>
 
 			<button id="gallery-walk-skip" type="button"
-					  class="btn btn-danger
-							   ${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'hidden'}"
-					  onClick="javascript:skipGalleryWalk()">
-				  <fmt:message key="monitoring.summary.gallery.walk.skip" />
+					  class="btn btn-light ${not mindmapDTO.galleryWalkStarted and not mindmapDTO.galleryWalkFinished ? '' : 'd-none'}"
+					  onClick="skipGalleryWalk()">
+				<i class="fa-solid fa-forward me-1"></i>
+				<fmt:message key="monitoring.summary.gallery.walk.skip" />
 			</button>
 
 			<button id="gallery-walk-learner-edit" type="button"
-			        class="btn btn-default ${not mindmapDTO.galleryWalkEditEnabled and (mindmapDTO.galleryWalkStarted or mindmapDTO.galleryWalkFinished) ? '' : 'hidden'}"
-			        onClick="javascript:enableGalleryWalkLearnerEdit()">
+			        class="btn btn-light ${not mindmapDTO.galleryWalkEditEnabled and (mindmapDTO.galleryWalkStarted or mindmapDTO.galleryWalkFinished) ? '' : 'd-none'}"
+			        onClick="enableGalleryWalkLearnerEdit()">
+			    <i class="fa-regular fa-pen-to-square me-1"></i>
 				<fmt:message key="monitoring.summary.gallery.walk.learner.edit" /> 
 			</button>
 			
 			<c:if test="${mindmapDTO.galleryWalkFinished and not mindmapDTO.galleryWalkReadOnly}">
-				<h4 style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
-				<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
-				  <thead class="thead-light">
+				<h4 style="text-align: center">
+					<fmt:message key="label.gallery.walk.ratings.header" />
+				</h4>
+				
+				<table id="gallery-walk-rating-table" class="table table-hover table-condensed mb-0">
+				  <thead class="text-bg-light">
 				    <tr>
 				      <th scope="col"><fmt:message key="monitoring.label.group" /></th>
 				      <th scope="col"><fmt:message key="label.rating" /></th>
 				    </tr>
 				  </thead>
+				  
 				  <tbody>
 					<c:forEach var="mindmapSession" items="${mindmapDTO.sessionDTOs}">
 						<tr>
@@ -264,30 +262,37 @@
 </c:if>
 
 <c:forEach var="session" items="${dto.sessionDTOs}" varStatus="status">
+	<c:set var="totalLearnersHtml">
+		<div class="badge text-bg-light m-2 float-end">
+			<fmt:message key="heading.totalLearners" />&nbsp;${session.numberOfLearners}
+		</div>
+	</c:set>
 
-	<c:if test="${isGroupedActivity}">	
-	    <div class="panel panel-default" >
-	        <div class="panel-heading" id="heading${session.sessionID}">
-	        	<span class="panel-title collapsable-icon-left">
-	        		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${session.sessionID}" 
-							aria-expanded="false" aria-controls="collapse${session.sessionID}" >
-						<fmt:message key="heading.group" >
-							<fmt:param><c:out value="${session.sessionName}" /></fmt:param>
-						</fmt:message>
-					</a>
-				</span>
-	        </div>
-        
-			<div id="collapse${session.sessionID}" class="panel-collapse collapse mindmap-collapse" 
-        			role="tabpanel" aria-labelledby="heading${session.sessionID}">
-	</c:if>
+	<c:choose>
+		<c:when test="${isGroupedActivity}">	
+		    <div class="lcard" >
+		        <div class="card-header" id="heading${session.sessionID}">
+					${totalLearnersHtml}
+		
+		        	<span class="card-title collapsable-icon-left">
+		        		<button class="btn btn-secondary-darker no-shadow collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse${session.sessionID}" 
+								aria-expanded="false" aria-controls="collapse${session.sessionID}" >
+							<fmt:message key="heading.group" >
+								<fmt:param><c:out value="${session.sessionName}" /></fmt:param>
+							</fmt:message>
+						</button>
+					</span>
+		        </div>
+	        
+				<div id="collapse${session.sessionID}" class="card-collapse collapse mindmap-collapse">
+		</c:when>
+		<c:otherwise>
+			${totalLearnersHtml}
+		</c:otherwise>
+	</c:choose>
 	
-	<div class="loffset10">
-		<fmt:message key="heading.totalLearners" />&nbsp;${session.numberOfLearners}
-	</div>
-	
 	<c:if test="${dto.multiUserMode}">
-		<iframe class="mindmap-frame"
+		<iframe class="mindmap-frame ${isGroupedActivity ? '' : 'shadow'} p-1"
 			<c:choose>
 				<c:when test="${isGroupedActivity}">
 					<%-- iframe is loaded on collapse panel open --%>
@@ -303,12 +308,12 @@
 	</c:if>
 
 	<c:if test="${not dto.multiUserMode}">
-		<table class="table table-striped table-condensed voffset10">
-	
+		<table class="table table-striped table-condensed mt-2">
 			<tr>
 				<th width="40%">
 					<fmt:message key="heading.learner" />
 				</th>
+				
 				<c:if test="${not dto.multiUserMode}">
 					<th width="40%">
 						<fmt:message key="heading.mindmapEntry" />
@@ -325,7 +330,6 @@
 							</td>
 					
 							<td width="30%">
-								
 							</td>
 						</tr>
 					</c:forEach>
@@ -343,8 +347,11 @@
 									<c:when test="${user.finishedActivity != true}">
 										<fmt:message key="label.notAvailable" />
 									</c:when>
+									
 									<c:otherwise>
-										<a href="showMindmap.do?allowPrinting=true&userUID=${user.uid}&toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}">
+										<a href="showMindmap.do?allowPrinting=true&userUID=${user.uid}&toolContentID=${dto.toolContentId}&toolSessionID=${session.sessionID}"
+												class="btn btn-sm btn-light">
+											<i class="fa-regular fa-eye me-1"></i>
 											<fmt:message key="label.view" />
 										</a>									
 									</c:otherwise>
@@ -353,24 +360,27 @@
 						</tr>
 					</c:forEach>
 				</c:otherwise>
-				
 			</c:choose>
-	
 		</table>
 	</c:if>
 	
-		<c:if test="${isGroupedActivity}">
+	<c:if test="${isGroupedActivity}">
 		</div> <!-- end collapse area  -->
 		</div> <!-- end collapse panel  -->
 	</c:if>
-	${ !isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
-	
 </c:forEach>
 
 <c:if test="${isGroupedActivity}">
 	</div> <!--  end panel group -->
 </c:if>
 
-<%@ include file="advanceOptions.jsp"%>
+<h2 class="card-subheader fs-4 mt-3" id="header-statistics">
+	<fmt:message key="button.statistics" />
+</h2>
+<%@ include file="statistics.jsp"%>
 
+<h2 class="card-subheader fs-4" id="header-settings">
+	Settings
+</h2>
+<%@ include file="editActivity.jsp"%>
 <lams:RestrictedUsageAccordian submissionDeadline="${submissionDeadline}"/>