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" />