Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r1ca8633aea1d461a727b7e31c4493a21bfdff073 -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1ca8633aea1d461a727b7e31c4493a21bfdff073)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -598,10 +598,6 @@
             </lams:Alert5>
         </c:if>
 
-        <div id="instructions" class="instructions">
-            <c:out value="${assessment.instructions}" escapeXml="false"/>
-        </div>
-
         <lams:Alert5 id="warning-answers-required" type="warning" close="true">
             <fmt:message key="warn.answers.required" />
         </lams:Alert5>
@@ -616,6 +612,10 @@
 
         <lams:errors5/>
 
+        <div id="instructions" class="instructions">
+            <c:out value="${assessment.instructions}" escapeXml="false"/>
+        </div>
+
         <%@ include file="parts/paging.jsp"%>
 
         <div id="all-questions">
Index: lams_tool_chat/web/pages/learning/learning.jsp
===================================================================
diff -u -r793d3319ee7d2aa94af0559c0ee64c08ea6a4581 -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 793d3319ee7d2aa94af0559c0ee64c08ea6a4581)
+++ lams_tool_chat/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -31,11 +31,7 @@
 	<lams:JSImport src="includes/javascript/learning.js" relative="true" />
 	
 	<div id="container-main">
-		<div id="instructions" class="instructions">
-			<c:out value="${chatDTO.instructions}" escapeXml="false" />
-		</div>
-		
-		<!-- Announcements and advanced settings -->
+		<!-- Announcements -->
 		<c:if test="${chatDTO.lockOnFinish}">
 			<lams:Alert5 id="lockWhenFinished" type="info" close="true">
 				<c:choose>
@@ -59,6 +55,10 @@
 			</lams:Alert5>
 		</c:if>
 		
+		<div id="instructions" class="instructions">
+			<c:out value="${chatDTO.instructions}" escapeXml="false" />
+		</div>
+		
 		<!-- chat UI -->
 		<div class="row">
 			<div class="col-12 col-sm-3 col-md-3 col-lg-3">
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -50,10 +50,6 @@
     <script type="text/javascript" src="${tool}includes/javascript/learner.js"></script>
 
     <div id="container-main">
-        <div id="instructions" class="instructions">
-            <c:out value="${sessionMap.instruction}" escapeXml="false" />
-        </div>
-
         <!-- Announcements and advanced settings -->
         <c:if test="${not empty sessionMap.submissionDeadline}">
             <lams:Alert5 id="submissionDeadline" type="info" close="true">
@@ -133,6 +129,10 @@
         </c:if>
 
         <lams:errors5/>
+        
+        <div id="instructions" class="instructions">
+            <c:out value="${sessionMap.instruction}" escapeXml="false" />
+        </div>
 
         <!-- main UI -->
         <%@ include file="/jsps/learning/message/topiclist.jsp"%>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r1ca8633aea1d461a727b7e31c4493a21bfdff073 -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1ca8633aea1d461a727b7e31c4493a21bfdff073)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -134,12 +134,8 @@
         }
     </script>
     <div id="container-main">
-
-            <%--Advanced settings and notices-----------------------------------%>
-        <div id="instructions" class="instructions">
-            <c:out value="${imageGallery.instructions}" escapeXml="false"/>
-        </div>
-
+		<%--Advanced settings and notices-----------------------------------%>
+		
         <c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
             <lams:Alert5 type="danger" id="lock-on-finish" close="false">
                 <c:choose>
@@ -185,14 +181,18 @@
 
         <lams:errors5/>
 
-            <%--Main image---------------------------------------------------%>
+        <div id="instructions" class="instructions">
+            <c:out value="${imageGallery.instructions}" escapeXml="false"/>
+        </div>
+
+        <%--Main image---------------------------------------------------%>
         <div class="card lcard">
             <div class="card-body">
                 <div class="fotorama-container">
                     <div class="fotorama"></div>
                 </div>
 
-                    <%--Comments & Ranking/Voting area-------------------------------%>
+                <%--Comments & Ranking/Voting area-------------------------------%>
                 <div id="image-info">
                     <%@ include file="/pages/learning/parts/commentsarea.jsp"%>
                 </div>
@@ -203,7 +203,7 @@
             <div id="new-image-input-area" class="mt-4"></div>
         </c:if>
 
-            <%--Reflection--------------------------------------------------%>
+        <%--Reflection--------------------------------------------------%>
 
         <c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
             <lams:NotebookReedit
@@ -213,7 +213,7 @@
                     notebookHeaderLabelKey="title.reflection"/>
         </c:if>
 
-            <%--Bottom buttons-------------------------------------------%>
+        <%--Bottom buttons-------------------------------------------%>
 
         <c:if test="${mode != 'teacher'}">
             <div class="activity-bottom-buttons" id="learner-submit"
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r1ca8633aea1d461a727b7e31c4493a21bfdff073 -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 1ca8633aea1d461a727b7e31c4493a21bfdff073)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -114,10 +114,6 @@
       </script>
 
 	<div id="container-main">
-		<div id="instructions" class="instructions">
-			<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
-		</div>
-
 		<!-- Announcements and advanced settings -->
 		<c:if test="${not empty submissionDeadline}">
 			<lams:Alert5 close="false" id="submissionDeadline" type="danger">
@@ -139,6 +135,10 @@
 			<lams:LeaderDisplay idName="leader-info" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.userId}" />
 		</c:if>
 		<!-- End announcements and advanced settings -->
+		
+		<div id="instructions" class="instructions">
+			<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+		</div>
 
 		<div id="questions">
 			<form:form id="mcLearningForm" modelAttribute="mcLearningForm" action="displayMc.do" enctype="multipart/form-data"
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r572226a47e63b49ca60f35de579ec230feaa409a -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 572226a47e63b49ca60f35de579ec230feaa409a)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -24,38 +24,37 @@
 	</style>
 	
 	<div id="container-main">
+		<!-- Advanced settings and notices -->
 
+		<c:if test="${generalLearnerFlowDTO.noReeditAllowed}">
+			<lams:Alert5 type="danger" id="noRedosAllowed" close="false">
+				<fmt:message key="label.noredo.enabled" />
+			</lams:Alert5>
+		</c:if>
+
+		<c:if test="${not empty sessionMap.submissionDeadline}">
+			<lams:Alert5 type="danger" id="submission-deadline" close="false">
+				<fmt:message key="authoring.info.teacher.set.restriction">
+					<fmt:param>
+						<lams:Date value="${sessionMap.submissionDeadline}" />
+					</fmt:param>
+				</fmt:message>
+			</lams:Alert5>
+		</c:if>
+
+		<c:if test="${isLeadershipEnabled}">
+			<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
+		</c:if>
+
+		<!-- End advanced settings and notices -->
+
 		<div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.instructions'/>">
 			<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
 		</div>
 
 		<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
 		<form:form action="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential' ? 'getNextQuestion.do' : 'submitAnswersContent.do'}"
 				   method="POST" target="_self" id="qaLearningForm" modelAttribute="qaLearningForm">
-
-			<!-- Advanced settings and notices -->
-
-			<c:if test="${generalLearnerFlowDTO.noReeditAllowed}">
-				<lams:Alert5 type="danger" id="noRedosAllowed" close="false">
-					<fmt:message key="label.noredo.enabled" />
-				</lams:Alert5>
-			</c:if>
-
-			<c:if test="${not empty sessionMap.submissionDeadline}">
-				<lams:Alert5 type="danger" id="submission-deadline" close="false">
-					<fmt:message key="authoring.info.teacher.set.restriction">
-						<fmt:param>
-							<lams:Date value="${sessionMap.submissionDeadline}" />
-						</fmt:param>
-					</fmt:message>
-				</lams:Alert5>
-			</c:if>
-
-			<c:if test="${isLeadershipEnabled}">
-				<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
-			</c:if>
-
-			<!-- End advanced settings and notices -->
 			<form:hidden path="toolSessionID" id="tool-session-id" />
 			<form:hidden path="userID" />
 			<form:hidden path="sessionMapID" />
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -63,14 +63,11 @@
     <div id="container-main">
         <c:choose>
             <c:when test="${not empty groupLeader}">
-                <lams:LeaderDisplay
-                        username="${groupLeader.firstName} ${groupLeader.lastName}"
-                        userId="${groupLeader.userId}" />
+                <lams:LeaderDisplay username="${groupLeader.firstName} ${groupLeader.lastName}" userId="${groupLeader.userId}" />
             </c:when>
             <c:otherwise>
                 <fmt:message key="label.no.leader.yet.title" var="alertTitle"/>
-                <lams:Alert5 type="warning" id="no-leader" close="false"
-                             title="${alertTitle}">
+                <lams:Alert5 type="warning" id="no-leader" close="false" title="${alertTitle}">
                     <fmt:message key="label.no.leader.yet.body" />
                 </lams:Alert5>
             </c:otherwise>
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -reb8468afcebf13f633fa953b178b4a609b568c74 -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision eb8468afcebf13f633fa953b178b4a609b568c74)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -52,10 +52,6 @@
 			<input type="hidden" name="toolContentId" value="${toolContentID}" />
 			<form:hidden path="toolSessionID" />
 			<form:hidden path="mindmapContent" id="mindmapContent" />
-				
-			<div id="instructions" class="instructions">
-				<c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
-			</div>
 			
 			<%--Advanced settings and notices-----------------------------------%>
 			
@@ -80,6 +76,10 @@
 				 </lams:Alert5>
 			 </c:if>
 				
+			<div id="instructions" class="instructions">
+				<c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
+			</div>
+				
 			<%--MindMup -----------------------------------%>
 			<%@ include file="/common/mapjs.jsp"%>
 		 		
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -89,10 +89,6 @@
 		<form:hidden path="toolSessionID" />
 		<form:hidden path="contentEditable" value="${contentEditable}" />
 
-		<div id="instructions" class="instructions">
-			<c:out value="${notebookDTO.instructions}" escapeXml="false" />
-		</div>
-
 		<!-- Notifications and warnings -->
 		<c:if test="${not empty notebookDTO.submissionDeadline}">
 			<lams:Alert5 id="submissionDeadline" type="info" close="true">
@@ -123,6 +119,10 @@
 			</lams:Alert5>
 		</c:if>
 
+		<div id="instructions" class="instructions">
+			<c:out value="${notebookDTO.instructions}" escapeXml="false" />
+		</div>
+
 		<!-- Form -->
 		<div class="card lcard">
 			<div class="card-body">
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -39,9 +39,6 @@
     </c:choose>
 
     <div id="container-main">
-        <div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.basic.instruction'/>">
-            <c:out value="${sessionMap.instruction}" escapeXml="false" />
-        </div>
 
         <div id="notices">
             <!-- notices and announcements -->
@@ -105,6 +102,10 @@
         <div id="errors">
             <lams:errors5/>
         </div>
+        
+        <div id="instructions" class="instructions" aria-label="<fmt:message key='label.authoring.basic.instruction'/>">
+            <c:out value="${sessionMap.instruction}" escapeXml="false" />
+        </div>
 
         <div id="uploader">
             <!-- upload form (we display it only if the user is not finished and lockedWhenFinished or no more files allowed) -->
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -523,10 +523,6 @@
             </lams:Alert5>
         </c:if>
 
-        <div id="instructions" class="instructions">
-            <c:out value="${scratchie.instructions}" escapeXml="false" />
-        </div>
-
         <c:if test="${not empty sessionMap.submissionDeadline}">
             <lams:Alert5 id="submissionDeadline" close="true" type="info">
                 <fmt:message key="authoring.info.teacher.set.restriction">
@@ -550,6 +546,10 @@
 
         <lams:errors5/>
 
+        <div id="instructions" class="instructions">
+            <c:out value="${scratchie.instructions}" escapeXml="false" />
+        </div>
+
         <div id="questionListArea">
             <%@ include file="questionlist.jsp"%>
         </div>
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -rb16c939172548a36f20eaa242698f99cda07c222 -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b16c939172548a36f20eaa242698f99cda07c222)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -35,10 +35,6 @@
 			<form:hidden path="sessionMapID" />
 			<form:hidden path="position" />
 			<form:hidden path="currentIdx" />
-
-			<div id="instructions" class="instructions">
-				<c:out value="${sessionMap.instructions}" escapeXml="false" />
-			</div>
 			
 			<c:if test="${not empty sessionMap.submissionDeadline}">
 				<lams:Alert5 id="submissionDeadline" type="info" close="true">
@@ -49,6 +45,10 @@
 					</fmt:message>
 				</lams:Alert5>
 			</c:if>
+
+			<div id="instructions" class="instructions">
+				<c:out value="${sessionMap.instructions}" escapeXml="false" />
+			</div>
 			
 			<c:choose>
 				<%-- Show on one page or when learner does not choose edit one question --%>
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -35,10 +35,6 @@
     </script>
 
 	<div id="container-main">
-		<div id="instructions" class="instructions">
-			<c:out value="${sessionMap.instructions}" escapeXml="false" />
-		</div>
-
 		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher'}">
 			<c:choose>
 				<c:when test="${sessionMap.showOtherUsersAnswers}">
@@ -81,6 +77,10 @@
 				</c:otherwise>
 			</c:choose>
 		</c:if>
+		
+		<div id="instructions" class="instructions">
+			<c:out value="${sessionMap.instructions}" escapeXml="false" />
+		</div>
 
 		<c:forEach var="element" items="${sessionMap.questionList}">
 			<div class="card lcard">
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -r8121ab6e6a1166176a6c77a34a4eeee03ff0787c -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 8121ab6e6a1166176a6c77a34a4eeee03ff0787c)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -94,15 +94,15 @@
 	</script>
 
 	<div id="container-main">
-		<div id="instructions" class="instructions">
-			<c:out value="${sessionMap.instructions}" escapeXml="false" />
-		</div>
-
 		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher'}">
 			<lams:Alert5 id="activityLocked" type="info" close="true">
 				<fmt:message key="message.activityLocked" />
 			</lams:Alert5>
 		</c:if>
+		
+		<div id="instructions" class="instructions">
+			<c:out value="${sessionMap.instructions}" escapeXml="false" />
+		</div>
 
 		<%-- user personal results--%>
 		<div class="card-subheader mb-4">
Index: lams_tool_zoom/web/pages/learning/learning.jsp
===================================================================
diff -u -r7b7ac899c16df8dc0c99da2870a17154ee43685f -rdf77b7fe375d1d68d4e064748653be8ac8816f93
--- lams_tool_zoom/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7b7ac899c16df8dc0c99da2870a17154ee43685f)
+++ lams_tool_zoom/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision df77b7fe375d1d68d4e064748653be8ac8816f93)
@@ -22,11 +22,11 @@
 	</script>
 
 	<div id="container-main">
+		<lams:errors5/>
+		
 		<div id="instructions" class="instructions">
 			<c:out value="${contentDTO.instructions}" escapeXml="false" />
 		</div>
-	
-		<lams:errors5/>
 		
 		<c:if test="${not skipContent}">
 			<c:choose>