Index: lams_monitoring/web/timeLimit.jsp
===================================================================
diff -u -rfc63987bf348f0821378370cd71e6b933129edfd -rbe926f6ed52a22831f928df2066024ff7df6be11
--- lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision fc63987bf348f0821378370cd71e6b933129edfd)
+++ lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision be926f6ed52a22831f928df2066024ff7df6be11)
@@ -537,13 +537,15 @@
 <c:set var="absoluteTimeLimitEnabled" value="${not empty param.absoluteTimeLimitFinish and param.absoluteTimeLimitFinish != 'null'}" />
 <c:set var="relativeTimeLimitEnabled" value="${param.relativeTimeLimit != 0}" />
 
-<div class="card mt-4" id="time-limit-panel">
-	<div class="card-header text-bg-secondary">
-       	<span class="card-title">
-       		<fmt:message key="label.monitoring.time.limit"/>
-     	</span>
-	</div>
-	<div class="card-body">
+<div class="accordion mt-2" id="time-limit-panel"> 
+<div class="accordion-item">
+	<h2 class="accordion-header" id="time-limit-header">
+       	<button class="accordion-button text-bg-secondary ${param.isTbl ? '' : 'collapsed'}" type="button" data-bs-toggle="collapse" data-bs-target="#time-limit-collapse" aria-expanded="${param.isTbl}" aria-controls="time-limit-collapse">
+          	<fmt:message key="label.monitoring.time.limit"/>
+   		</button>
+    </h2>
+        
+	<div id="time-limit-collapse" class="accordion-collapse collapse ${param.isTbl ? 'show' : ''}" aria-labelledby="time-limit-header">
 		<table id="time-limit-table" class="table align-middle">
 			<tr>
 				<td colspan="6" class="no-border-bottom">
@@ -733,6 +735,7 @@
 		</table>
 	</div>
 </div>
+</div>
 
 <div class="card" id="time-limit-widget">
 	<div class="card-header collapsed" role="button" id="time-limit-widget-heading">
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
===================================================================
diff -u -re748cf900ce6ae64d6edc1bd8aab6302fd08fb14 -rbe926f6ed52a22831f928df2066024ff7df6be11
--- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision e748cf900ce6ae64d6edc1bd8aab6302fd08fb14)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision be926f6ed52a22831f928df2066024ff7df6be11)
@@ -75,7 +75,7 @@
 			let data = JSON.parse(event.data);
 			$('#time-limit-panel-placeholder').load('<lams:LAMSURL/>monitoring/timeLimit.jsp?toolContentId=${toolContentID}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
 					+ '&relativeTimeLimit=' + data.relativeTimeLimit + '&absoluteTimeLimit=' + data.absoluteTimeLimit
-					+ '&isTbl=true&controllerContext=tool/lascrt11/monitoring');
+					+ '&isTbl=${isTbl}&controllerContext=tool/lascrt11/monitoring');
 		});
 
 		<c:if test="${fn:length(sessionDtos) > 10}">