Index: lams_admin/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_admin/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_central/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_central/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_gradebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_gradebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_learning/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_learning/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_monitoring/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_monitoring/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -112,34 +112,36 @@
                 });
             }
 
-            initWebsocket('assessmentTimeLimit${sessionMap.assessment.contentId}',
-                '<lams:WebAppURL />'.replace('http', 'ws')
-                + 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}',
-                function (e) {
-                    // read JSON object
-                    var input = JSON.parse(e.data);
+            <c:if test="${mode != 'teacher'}">
+            	initWebsocket('assessmentTimeLimit${sessionMap.assessment.contentId}',
+                	'<lams:WebAppURL />'.replace('http', 'ws') + 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}',
+	                function (e) {
+	                    // read JSON object
+	                    var input = JSON.parse(e.data);
+	
+	                    if (input.clearTimer == true) {
+	                        // teacher stopped the timer, destroy it
+	                        $('#countdown').countdown('destroy').remove();
+	                    } else {
+	                        // teacher updated the timer
+	                        var secondsLeft = +input.secondsLeft,
+	                            counterInitialised = $('#countdown').length > 0;
+	
+	                        if (counterInitialised) {
+	                            // just set the new time
+	                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
+	                        } else {
+	                            // initialise the timer
+	                            displayCountdown(secondsLeft);
+	                        }
+	                    }
+	
+	                    // reset ping timer
+	                    websocketPing('assessmentTimeLimit${sessionMap.assessment.contentId}', true);
+	                }
+                );
+            </c:if>
 
-                    if (input.clearTimer == true) {
-                        // teacher stopped the timer, destroy it
-                        $('#countdown').countdown('destroy').remove();
-                    } else {
-                        // teacher updated the timer
-                        var secondsLeft = +input.secondsLeft,
-                            counterInitialised = $('#countdown').length > 0;
-
-                        if (counterInitialised) {
-                            // just set the new time
-                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
-                        } else {
-                            // initialise the timer
-                            displayCountdown(secondsLeft);
-                        }
-                    }
-
-                    // reset ping timer
-                    websocketPing('assessmentTimeLimit${sessionMap.assessment.contentId}', true);
-                });
-
             //autocomplete for VSA
             $('.ui-autocomplete-input').each(function(){
                 $(this).autocomplete({
Index: lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_chat/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -148,6 +148,7 @@
 	sessionMap.put(DacoConstants.ATTR_USER_FINISHED, dacoUser != null && dacoUser.isSessionFinished());
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
+	sessionMap.put(AttributeNames.PARAM_USER_ID, dacoUser.getUserId());
 	sessionMap.put(DacoConstants.ATTR_DACO, daco);
 	String currentView = request.getParameter(DacoConstants.ATTR_LEARNING_VIEW);
 	sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW,
@@ -893,16 +894,20 @@
     protected String changeView(HttpServletRequest request) {
 	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	Long userId = (Long) sessionMap.get(AttributeNames.PARAM_USER_ID);
+	
 	String currentView = (String) sessionMap.get(DacoConstants.ATTR_LEARNING_VIEW);
 	if (DacoConstants.LEARNING_VIEW_HORIZONTAL.equals(currentView)) {
 	    currentView = DacoConstants.LEARNING_VIEW_VERTICAL;
 	} else {
 	    currentView = DacoConstants.LEARNING_VIEW_HORIZONTAL;
 	}
-	return "redirect:start.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "="
-		+ sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID) + "&" + AttributeNames.PARAM_MODE + "="
-		+ sessionMap.get(AttributeNames.PARAM_MODE) + "&" + DacoConstants.ATTR_LEARNING_VIEW + "="
-		+ currentView;
+	
+	return "redirect:start.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID) + 
+		"&" + AttributeNames.PARAM_MODE + "=" + sessionMap.get(AttributeNames.PARAM_MODE) + 
+		(mode.isTeacher() ? "&" + AttributeNames.PARAM_USER_ID + "=" + userId : "") +
+		"&" + DacoConstants.ATTR_LEARNING_VIEW + "=" + currentView;
     }
 
     @RequestMapping("/refreshQuestionSummaries")
Index: lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_daco/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
diff -u -rb31ac55045b51d2098eb4b66772e3d6e2a5a89b6 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision b31ac55045b51d2098eb4b66772e3d6e2a5a89b6)
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	(.../listRecords.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -97,9 +97,8 @@
 						<div class="card-header">
 							<fmt:message key="label.learning.heading.recordnumber" />&nbsp;${recordStatus.index+1}
 							
-							<c:if test='${includeMode=="learning" and not finishedLock}'>
 							<%-- If the record can be edited, display these links. --%>
-								
+							<c:if test='${includeMode=="learning" and not finishedLock and (mode != "teacher")}'>
 								<div class="float-end">
 									<button type="button" class="no-decoration fa fa-trash text-bg-danger shadow rounded p-2"
 									   title="<fmt:message key="label.common.delete" />"
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
diff -u -rb31ac55045b51d2098eb4b66772e3d6e2a5a89b6 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision b31ac55045b51d2098eb4b66772e3d6e2a5a89b6)
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	(.../listRecordsHorizontalPart.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -48,8 +48,8 @@
 				<span class="bigNumber">
 					${recordStatus.index+1}
 				</span>
-					
-				<c:if test='${includeMode=="learning" and not finishedLock}'>
+
+				<c:if test='${includeMode=="learning" and not finishedLock and (sessionMap.mode != "teacher")}'>
 					<span class="float-end me-2">
 						<%-- If the record can be edited, display these links. --%>
 						<button type="button" class="no-decoration fa fa-trash text-bg-danger shadow rounded p-2"
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
diff -u -r9576915785bfd47231fe20f9da6f130d39dc9c34 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision 9576915785bfd47231fe20f9da6f130d39dc9c34)
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -216,7 +216,7 @@
         </c:forEach>
     </div>
 
-    <c:if test='${includeMode=="learning"}'>
+    <c:if test='${includeMode=="learning" and mode != "teacher"}'>
         <button type="button" class="btn btn-secondary btn-icon-refresh btn-disable-on-submit float-end mb-3" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')">
             <fmt:message key="label.common.summary.refresh" />
         </button>
Index: lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_doku/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -68,41 +68,43 @@
                         </c:if>
             });
 
-            let timeLimitExceeded = ${timeLimitExceeded};
-            initWebsocket('dokuTimeLimit${sessionMap.toolContentID}',
-                '<lams:WebAppURL />'.replace('http', 'ws')
-                + 'learningWebsocket?toolContentID=${sessionMap.toolContentID}',
-                function (e) {
-                    // create JSON object
-                    var input = JSON.parse(e.data);
+            <c:if test="${mode != 'teacher'}">
+            	let timeLimitExceeded = ${timeLimitExceeded};
+            	initWebsocket('dokuTimeLimit${sessionMap.toolContentID}',
+                	'<lams:WebAppURL />'.replace('http', 'ws') + 'learningWebsocket?toolContentID=${sessionMap.toolContentID}',
+	                function (e) {
+	                    // create JSON object
+	                    var input = JSON.parse(e.data);
+	
+	                    if (input.clearTimer == true) {
+	                        // teacher stopped the timer, destroy it
+	                        $('#countdown').countdown('destroy').remove();
+	                    } else if (typeof input.secondsLeft != 'undefined'){
+	                        // teacher updated the timer
+	                        var secondsLeft = +input.secondsLeft,
+	                            counterInitialised = $('#countdown').length > 0;
+	
+	                        if (counterInitialised) {
+	                            // just set the new time
+	                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
+	                        } else if (timeLimitExceeded){
+	                            if (secondsLeft > 0) {
+	                                // teacher gave extra time, reload to writable Etherpad
+	                                location.reload();
+	                                return;
+	                            }
+	                        } else {
+	                            // initialise the timer
+	                            displayCountdown(secondsLeft);
+	                        }
+	                    }
+	
+	                    // reset ping timer
+	                    websocketPing('dokuTimeLimit${sessionMap.toolContentID}', true);
+	                }
+                );
+           	</c:if>
 
-                    if (input.clearTimer == true) {
-                        // teacher stopped the timer, destroy it
-                        $('#countdown').countdown('destroy').remove();
-                    } else if (typeof input.secondsLeft != 'undefined'){
-                        // teacher updated the timer
-                        var secondsLeft = +input.secondsLeft,
-                            counterInitialised = $('#countdown').length > 0;
-
-                        if (counterInitialised) {
-                            // just set the new time
-                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
-                        } else if (timeLimitExceeded){
-                            if (secondsLeft > 0) {
-                                // teacher gave extra time, reload to writable Etherpad
-                                location.reload();
-                                return;
-                            }
-                        } else {
-                            // initialise the timer
-                            displayCountdown(secondsLeft);
-                        }
-                    }
-
-                    // reset ping timer
-                    websocketPing('dokuTimeLimit${sessionMap.toolContentID}', true);
-                });
-
             $('[data-bs-toggle="tooltip"]').each((i, el) => {
                 new bootstrap.Tooltip($(el))
             });
Index: lams_tool_forum/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_forum/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_images/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_images/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r169520b6cf03e63865f09db66f593677b1c5580b -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 169520b6cf03e63865f09db66f593677b1c5580b)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -194,7 +194,7 @@
             </div>
         </div>
 
-        <c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages) && imageGallery.allowShareImages && !finishedLock}">
+        <c:if test="${(imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages) && imageGallery.allowShareImages && !finishedLock}">
             <div id="new-image-input-area" class="mt-4"></div>
         </c:if>
 
Index: lams_tool_images/web/pages/learning/parts/commentsarea.jsp
===================================================================
diff -u -r169520b6cf03e63865f09db66f593677b1c5580b -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 169520b6cf03e63865f09db66f593677b1c5580b)
+++ lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(.../commentsarea.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -54,12 +54,12 @@
 	}
 </script>
 
-<c:if test="${(mode != 'teacher') && (imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">
+<c:if test="${(imageGallery.allowRank || imageGallery.allowVote || imageGallery.allowShareImages)}">
 
 	<%--Ranking area---------------------------------------%>
 	
 	<c:if test="${imageGallery.allowRank && isImageSelected}">
-		<lams:Rating5 itemRatingDto="${sessionMap.itemRatingDto}" disabled="${finishedLock}" isDisplayOnly="${sessionMap.isAuthor}"
+		<lams:Rating5 itemRatingDto="${sessionMap.itemRatingDto}" disabled="${finishedLock || (mode == 'teacher')}" isDisplayOnly="${sessionMap.isAuthor}"
 				maxRates="${imageGallery.maximumRates}" countRatedItems="${sessionMap.countRatedItems}"
 				minNumberWordsLabel="label.minimum.number.words"/>
 	</c:if>
@@ -74,7 +74,7 @@
 
 				<div id="favourite-button" class="form-check float-end">
 					<input type="checkbox" name="vote" class="form-check-input" id="voting-form-checkbox" 
-							<c:if test="${finishedLock}">disabled="disabled"</c:if>	
+							<c:if test="${finishedLock || (mode == 'teacher')}">disabled="disabled"</c:if>	
 							<c:if test="${sessionMap.isVoted}">checked="checked"</c:if>	
 					/>
 						
@@ -94,7 +94,7 @@
 			
 		<%--"Check for new", "Add new image" and "Delete" buttons---------------%>		
 		<div id="manage-image-buttons" class="btn-group" role="group" aria-label="Control buttons">	
-			<c:if test="${imageGallery.allowShareImages}">
+			<c:if test="${imageGallery.allowShareImages && (mode != 'teacher')}">
 				<button type="button" onclick="return checkNew()" class="btn btn-sm btn-outline-secondary btn-icon-refresh" id="check-for-new-button"> 
 					<fmt:message key="label.check.for.new" /> 
 				</button>
Index: lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r04d06545e4e45947fde176e6815546ec6c0c9f0d -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 04d06545e4e45947fde176e6815546ec6c0c9f0d)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -234,8 +234,8 @@
 			<form:hidden path="userOverPassMark" />
 			<form:hidden path="passMarkApplicable" />
 				
-			<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true') 
-					|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
+			<c:if test="${mode != 'teacher' && ((mcGeneralLearnerFlowDTO.retries != 'true') 
+					|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
 				<form:hidden path="learnerFinished" value="Finished" />
 
 				<button type="button" class="btn btn-primary na" id="finishButton">
Index: lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r169520b6cf03e63865f09db66f593677b1c5580b -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 169520b6cf03e63865f09db66f593677b1c5580b)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -293,7 +293,7 @@
 						</span>
 
                     <div class="float-end">
-                        <c:if test="${not finishedLock && !item.createByAuthor && userID == item.createBy.userId}">
+                        <c:if test="${not finishedLock && !item.createByAuthor && userID == item.createBy.userId && mode != 'teacher'}">
                             <button type="button" class="no-decoration fa fa-trash delete-item-button text-bg-danger shadow p-2"
                                     title="<fmt:message key="label.delete" />"
                                     aria-label="<spring:escapeBody javaScriptEscape='true'><fmt:message key="label.delete" /></spring:escapeBody>"
@@ -303,16 +303,17 @@
 
                         <c:if test="${!item.complete && !finishedLock}">
                             <button type="button" onClick="javascript:completeItem(${item.uid})"
-                                    class="complete-item-button btn btn-success no-shadow ms-2">
+                                    class="complete-item-button btn btn-success no-shadow ms-2"
+                                    ${mode == 'teacher'? 'disabled' : ''}>
                                 <i class="fa-solid fa-pen-to-square fa-xl me-1"></i>
                                 <fmt:message key="label.mark.completed" />
                             </button>
                         </c:if>
 
                         <c:if test="${item.complete || !finishedLock}">
-								<span class="text-bg-success icon-complete shadow p-2 ms-2 ${(!item.complete && !finishedLock) ? 'd-none' : ''}">
-									<i class="fa-regular fa-square-check fa-xl" title='<fmt:message key="label.completed" />'></i>
-								</span>
+							<span class="text-bg-success icon-complete shadow p-2 ms-2 ${(!item.complete && !finishedLock) ? 'd-none' : ''}">
+								<i class="fa-regular fa-square-check fa-xl" title='<fmt:message key="label.completed" />'></i>
+							</span>
                         </c:if>
                     </div>
                 </div>
@@ -345,7 +346,7 @@
                         <fmt:message key="label.check.for.new" />
                     </button>
                 </c:if>
-                <c:if test="${not finishedLock}">
+                <c:if test="${not finishedLock && mode != 'teacher'}">
                     <c:choose>
                         <c:when test="${resource.allowAddFiles && resource.allowAddUrls}">
                             <button onclick="javascript:gotoURL()" type="button" class="btn btn-secondary">
Index: lams_tool_leader/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_leader/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r7a1a9b453d15b75fbdbd78906aa7ced81f4c711e -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 7a1a9b453d15b75fbdbd78906aa7ced81f4c711e)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -26,20 +26,22 @@
                 $("#leaderSelectionDialog").modal('show');
             }
 
-            initWebsocket('leaderSelection${toolSessionID}',
-                '<lams:WebAppURL />'.replace('http', 'ws')
-                + 'learningWebsocket?toolSessionID=${toolSessionID}',
-                function (e) {
-                    // create JSON object
-                    var input = JSON.parse(e.data);
-
-                    // The leader has just been selected and all non-leaders should refresh their pages in order
-                    // to see new leader's name and a Finish button.
-                    if (input.pageRefresh) {
-                        location.reload();
-                        return;
-                    }
-                });
+            <c:if test="${mode != 'teacher'}">
+            	initWebsocket('leaderSelection${toolSessionID}',
+                	'<lams:WebAppURL />'.replace('http', 'ws') + 'learningWebsocket?toolSessionID=${toolSessionID}',
+	                function (e) {
+	                    // create JSON object
+	                    var input = JSON.parse(e.data);
+	
+	                    // The leader has just been selected and all non-leaders should refresh their pages in order
+	                    // to see new leader's name and a Finish button.
+	                    if (input.pageRefresh) {
+	                        location.reload();
+	                        return;
+	                    }
+	                }
+                );
+            </c:if>
         });
 
         function leaderSelection() {
@@ -90,30 +92,31 @@
                 </div>
             </div>
         </div>
-
-        <div id="actionbuttons" class="activity-bottom-buttons">
-            <c:if test="${!isSelectLeaderActive}">
-                <button type="button" class="btn btn-primary na" id="finishButton">
-                    <c:choose>
-                        <c:when test="${isLastActivity}">
-                            <fmt:message key="button.submit" />
-                        </c:when>
-                        <c:otherwise>
-                            <fmt:message key="button.finish" />
-                        </c:otherwise>
-                    </c:choose>
-                </button>
-            </c:if>
-
-            <button type="button" onclick="location.reload();"
-                    class="btn btn-secondary me-2 d-flex align-items-center">
-                <i class="fa fa-refresh me-1"></i>
-                <span class="d-none d-sm-block">
-					<fmt:message key="label.refresh" />
-				</span>
-            </button>
-        </div>
-
+        
+		<c:if test="${mode != 'teacher'}">
+	        <div id="actionbuttons" class="activity-bottom-buttons">
+	            <c:if test="${!isSelectLeaderActive}">
+	                <button type="button" class="btn btn-primary na" id="finishButton">
+	                    <c:choose>
+	                        <c:when test="${isLastActivity}">
+	                            <fmt:message key="button.submit" />
+	                        </c:when>
+	                        <c:otherwise>
+	                            <fmt:message key="button.finish" />
+	                        </c:otherwise>
+	                    </c:choose>
+	                </button>
+	            </c:if>
+	
+	            <button type="button" onclick="location.reload();"
+	                    class="btn btn-secondary me-2 d-flex align-items-center">
+	                <i class="fa fa-refresh me-1"></i>
+	                <span class="d-none d-sm-block">
+						<fmt:message key="label.refresh" />
+					</span>
+	            </button>
+	        </div>
+        </c:if>
     </div>
 
     <!-- leaderSelection dialog -->
Index: lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -r8ee5ee8207403f72c9857580439a36ffbbf54190 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 8ee5ee8207403f72c9857580439a36ffbbf54190)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -51,27 +51,27 @@
 				sessionId: "${sessionId}", mode: "${mode}" } , 
 	        dataType: "json", 
 	        success: function (response) {
-		        	initialActionId = response.lastActionId;
+		        initialActionId = response.lastActionId;
 		        lastActionId = initialActionId;
 		        var idea = content(response.mindmap);
 
 		        <c:if  test="${multiMode}">
     				window.mapModel.setLabelGenerator(labelGenerator, "CreatorNameLabels");
-    				</c:if>
+    			</c:if>
     				
 			    window.mapModel.setIdea(idea);
 		        <c:if test="${!contentEditable}">
 		    		    window.mapModel.setEditingEnabled(false);
-    			    </c:if>
+    			</c:if>
 		        <c:if  test="${multiMode && contentEditable}">
 			        idea.addEventListener('changed', onIdeaChangedLAMS); 
 		        </c:if>
 		        contentAggregate = window.mapModel.getIdea();
-		        <c:if  test="${multiMode && contentEditable}">
-
-				<%-- Websockets used to get the node updates from the server --%>
-				<%-- init the connection with server using server URL but with different protocol --%>
-				initWebsocket('mindmapNodes${sessionId}',
+		        
+		        <c:if  test="${multiMode && contentEditable && mode != 'teacher'}">
+					<%-- Websockets used to get the node updates from the server --%>
+					<%-- init the connection with server using server URL but with different protocol --%>
+					initWebsocket('mindmapNodes${sessionId}',
 						'<lams:WebAppURL />'.replace('http', 'ws')
 						+ 'learningWebsocket?toolSessionID=${sessionId}&lastActionId=' + initialActionId,
 						function (e) {
@@ -126,10 +126,10 @@
 							if ( valuesChanged ) {
 								window.mapModel.rebuildRequired();
 							}
-						// reset ping timer
-						websocketPing('mindmapNodes${sessionId}', true);
-					});
-
+							// reset ping timer
+							websocketPing('mindmapNodes${sessionId}', true);
+						}
+					);
 			    </c:if>
 			},
 			error: function (response) {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java	(.../LearningController.java)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -167,6 +167,7 @@
 
 	nbLearnerForm.copyValuesIntoForm(nbContent, readOnly, mode.toString());
 
+	request.setAttribute("mode", mode);
 	request.setAttribute("allowComments", nbContent.isAllowComments());
 	request.setAttribute("likeAndDislike", nbContent.isCommentsLikeAndDislike());
 	request.setAttribute("anonymous", nbContent.isAllowAnonymous());
Index: lams_tool_nb/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_nb/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r16a18ca21d32657e53766683da6e1a6af2fc8ea0 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 16a18ca21d32657e53766683da6e1a6af2fc8ea0)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -3,7 +3,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <lams:PageLearner title="${notebookDTO.title}" toolSessionID="${messageForm.toolSessionID}" >
-		<script type="text/javascript">
+	<script type="text/javascript">
 			checkNextGateActivity('finishButton', '${messageForm.toolSessionID}', '', function(){
 				submitForm('finish');
 			});
@@ -16,7 +16,9 @@
 			}
 
 			function textAreaReady() {
-				document.getElementById("finishButton").style.visibility = 'visible';
+				if (document.getElementById("finishButton")) {
+					document.getElementById("finishButton").style.visibility = 'visible';
+				}
 			}
 			
 			function submitForm(methodName) {
@@ -28,13 +30,11 @@
 			      	var isEmpty = editorcontent.length === 0;
 
 					if (forceResponse =="true" && isEmpty ) {
-
 						retValue = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message>message.learner.blank.alertforceResponse</fmt:message></spring:escapeBody>");
 						textAreaReady();
 						return retValue;
 						
 					} else if  (forceResponse =="false" && isEmpty && mode == "learner") {
-			
 						if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message>message.learner.blank.input</fmt:message></spring:escapeBody>")) {
 							// otherwise, focus on the text area
 							textAreaReady();
@@ -44,13 +44,11 @@
 				</c:when>		
 				<c:otherwise>
 					if (forceResponse =="true" && document.forms.messageForm.entryText.value == "") {
-
 						retValue = confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message>message.learner.blank.alertforceResponse</fmt:message></spring:escapeBody>");
 						textAreaReady();
 						return retValue;
 						
 					} else if  (forceResponse =="false" && document.forms.messageForm.entryText.value == "" && mode == "learner") {
-			
 						if (!confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message>message.learner.blank.input</fmt:message></spring:escapeBody>")) {
 							// otherwise, focus on the text area
 							textAreaReady();
@@ -72,7 +70,7 @@
 					}
 				</c:if>
 			}
-		</script>
+	</script>
 
 	<div id="container-main">
 	<form:form action="learning/finishActivity.do" method="post" modelAttribute="messageForm" id="messageForm">
Index: lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java	(.../LearningController.java)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -299,7 +299,6 @@
 		}
 		request.setAttribute("stepNumber", stepNum);
 	    }
-
 	}
 
 	sessionMap.put("isDisabled",
@@ -308,7 +307,7 @@
 	sessionMap.put("isSessionCompleted", user.getSession().getStatus() == PeerreviewConstants.COMPLETED);
 
 	// finally, work out which page to go to!
-	if (user.isSessionFinished()) {
+	if (user.isSessionFinished() || mode.isTeacher()) {
 	    String redirectURL = SHOW_RESULTS_REDIRECT;
 	    redirectURL = WebUtil.appendParameterToURL(redirectURL, PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    return redirectURL;
Index: lams_tool_preview/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_preview/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -372,7 +372,8 @@
 
                     // reset ping timer
                     websocketPing('scratchieTimeLimit${scratchie.contentId}', true);
-                });
+                }
+            );
         });
 
         function displayCountdown(secondsLeft){
Index: lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java	(.../LearningController.java)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java	(.../LearningController.java)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -201,15 +201,16 @@
 	    surveyForm.setPosition(SurveyConstants.POSITION_FIRST);
 	}
 
-	// if session is finished go to result pages.
-	if (surveyUser.isSessionFinished() && !survey.isShowOtherUsersAnswers()) {
+	// if session is finished go to result pages
+	if ((surveyUser.isSessionFinished() || mode.isTeacher()) && !survey.isShowOtherUsersAnswers()) {
 	    return "pages/learning/result";
 
-	    //if show other users is ON and response is finalized - show results page with other users answers
-	} else if (survey.isShowOtherUsersAnswers() && surveyUser.isResponseFinalized()) {
+	//if show other users is ON and response is finalized - show results page with other users answers
+	} else if ((survey.isShowOtherUsersAnswers() || mode.isTeacher()) && surveyUser.isResponseFinalized()) {
 	    String redirectURL = "redirect:/learning/showOtherUsersAnswers.do";
 	    redirectURL = WebUtil.appendParameterToURL(redirectURL, SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	    return redirectURL;
+	    
 	} else {
 	    request.setAttribute("surveyForm", surveyForm);
 	    return "pages/learning/learning";
Index: lams_tool_survey/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_survey/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -78,6 +78,8 @@
 		</div>
 
 		<c:forEach var="element" items="${sessionMap.questionList}">
+			<c:set var="question" value="${element.value}" />
+			
 			<div class="card lcard">
 				<div class="card-header">
 					<c:if test="${not question.optional}">
@@ -86,7 +88,6 @@
 						</abbr>
 					</c:if>
 
-					<c:set var="question" value="${element.value}" />
 					<c:out value="${question.description}" escapeXml="false" />
 				</div>
 				
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -105,15 +105,16 @@
 		</div>
 		
 		<c:forEach var="element" items="${sessionMap.questionList}">
+			<c:set var="question" value="${element.value}" />
+			
 			<div class="card lcard mt-n3">
 				<div class="card-header">
 					<c:if test="${not question.optional}">
 						<abbr class="float-end badge text-bg-danger" title="<fmt:message key='label.answer.required'/>"><i
 							class="fa fa-xs fa-asterisk"></i>
 						</abbr>
 					</c:if>
-
-					<c:set var="question" value="${element.value}" />
+					
 					<c:out value="${question.description}" escapeXml="false" />
 				</div>
 				
Index: lams_tool_task/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_task/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_vote/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_vote/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_whiteboard/web/pages/learning/learning.jsp
===================================================================
diff -u -r63a738421eca575a963ac5772a1662f3b40865ff -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 63a738421eca575a963ac5772a1662f3b40865ff)
+++ lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -81,40 +81,42 @@
             document.addEventListener("webkitfullscreenchange", whiteboardFullScreenChanged);
             document.addEventListener("msfullscreenchange", whiteboardFullScreenChanged);
 
-            let timeLimitExceeded = ${timeLimitExceeded};
-            initWebsocket('whiteboardTimeLimit${sessionMap.toolContentID}',
-                '<lams:WebAppURL />'.replace('http', 'ws')
-                + 'learningWebsocket?toolContentID=${sessionMap.toolContentID}',
-                function (e) {
-                    // create JSON object
-                    var input = JSON.parse(e.data);
-
-                    if (input.clearTimer == true) {
-                        // teacher stopped the timer, destroy it
-                        $('#countdown').countdown('destroy').remove();
-                    } else if (typeof input.secondsLeft != 'undefined'){
-                        // teacher updated the timer
-                        var secondsLeft = +input.secondsLeft,
-                            counterInitialised = $('#countdown').length > 0;
-
-                        if (counterInitialised) {
-                            // just set the new time
-                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
-                        } else if (timeLimitExceeded){
-                            if (secondsLeft > 0) {
-                                // teacher gave extra time, reload to writable Whiteboard
-                                location.reload();
-                                return;
-                            }
-                        } else {
-                            // initialise the timer
-                            displayCountdown(secondsLeft);
-                        }
-                    }
-
-                    // reset ping timer
-                    websocketPing('whiteboardTimeLimit${sessionMap.toolContentID}', true);
-                });
+            <c:if test="${mode != 'teacher'}">
+            	let timeLimitExceeded = ${timeLimitExceeded};
+            	initWebsocket('whiteboardTimeLimit${sessionMap.toolContentID}',
+                	'<lams:WebAppURL />'.replace('http', 'ws') + 'learningWebsocket?toolContentID=${sessionMap.toolContentID}',
+	                function (e) {
+	                    // create JSON object
+	                    var input = JSON.parse(e.data);
+	
+	                    if (input.clearTimer == true) {
+	                        // teacher stopped the timer, destroy it
+	                        $('#countdown').countdown('destroy').remove();
+	                    } else if (typeof input.secondsLeft != 'undefined'){
+	                        // teacher updated the timer
+	                        var secondsLeft = +input.secondsLeft,
+	                            counterInitialised = $('#countdown').length > 0;
+	
+	                        if (counterInitialised) {
+	                            // just set the new time
+	                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
+	                        } else if (timeLimitExceeded){
+	                            if (secondsLeft > 0) {
+	                                // teacher gave extra time, reload to writable Whiteboard
+	                                location.reload();
+	                                return;
+	                            }
+	                        } else {
+	                            // initialise the timer
+	                            displayCountdown(secondsLeft);
+	                        }
+	                    }
+	
+	                    // reset ping timer
+	                    websocketPing('whiteboardTimeLimit${sessionMap.toolContentID}', true);
+	                }
+                );
+            </c:if>
         });
 
         if (${!hasEditRight && mode != "teacher" && !finishedLock}) {
Index: lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_www/web/WEB-INF/tags/PageLearner.tag
===================================================================
diff -u -r0b1d534ce1915b907afff0171909f90226b31921 -r8969536d397a74ec1c26188bdd4b207dc605c569
--- lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 0b1d534ce1915b907afff0171909f90226b31921)
+++ lams_www/web/WEB-INF/tags/PageLearner.tag	(.../PageLearner.tag)	(revision 8969536d397a74ec1c26188bdd4b207dc605c569)
@@ -8,11 +8,13 @@
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="refresh" required="false" rtexprvalue="true"%>
 <%@ attribute name="hideHeader" required="false" rtexprvalue="true"%>
-<c:set var="showHeader">${empty hideHeader ? true : false }</c:set>
 <%@ attribute name="hideTitle" required="false" rtexprvalue="true"%>
-<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
 <%@ attribute name="lessonID" required="false" rtexprvalue="true"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
+<c:set var="showHeader">${(param.mode != "teacher" && sessionMap.mode != "teacher" && mode != "teacher") && (empty hideHeader || !hideHeader ? true : false)}</c:set>
+<c:set var="hideTitle">${empty hideTitle ? false : true }</c:set>
+
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="pageLearnerPortraitUuid"><lams:user property="portraitUuid" /></c:set>
 <c:choose>
@@ -47,16 +49,17 @@
         <script src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
         <script src="<lams:LAMSURL/>includes/javascript/bootstrap5.bundle.min.js"></script>
+        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
+        <lams:JSImport src="includes/javascript/websocket.js" />
+		<script>
+			const LAMS_URL = '<lams:LAMSURL/>';
+		</script>
         <c:if test="${showHeader}">
-	        <lams:JSImport src="learning/includes/javascript/gate-check5.js" />
-	        <lams:JSImport src="includes/javascript/websocket.js" />
 	        <lams:JSImport src="includes/javascript/dialog5.js" />
 	        <lams:JSImport src="includes/javascript/common.js" />
         	<lams:JSImport src="learning/includes/javascript/learnerPage.js" />
 	        <script>
-	            const LAMS_URL = '<lams:LAMSURL/>',
-	                decoderDiv = $('<div />'),
-	                LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
+	            const LABEL_CLICK_TO_OPEN = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.click.to.open' /></spring:escapeBody>",
 	                LABEL_SUPPORT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.support.activity' /></spring:escapeBody>",
 	                LABEL_COMPLETED_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.completed.activity' /></spring:escapeBody>",
 	                LABEL_CURRENT_ACTIVITY = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.current.activity' /></spring:escapeBody>",
@@ -184,7 +187,6 @@
 	                    	</span>
 	                    </${showHeader ? 'h2' : 'h1'} >
 	                </c:if>
-					
 	                <jsp:doBody/>
 	            </main>
 	        </div>
@@ -219,4 +221,4 @@
 		    </div>
 	    </c:if>
     </body>
-</lams:html>
\ No newline at end of file
+</lams:html>