Index: lams_central/web/css/components-responsive.css
===================================================================
diff -u -r254e503fdee5a5f1ecec86dc51aeace21421da4b -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_central/web/css/components-responsive.css	(.../components-responsive.css)	(revision 254e503fdee5a5f1ecec86dc51aeace21421da4b)
+++ lams_central/web/css/components-responsive.css	(.../components-responsive.css)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -31,9 +31,6 @@
 	.pr {
 		padding-right: 0rem;
 	}
-	.pr-4 {
-		padding-right: 3rem !important;
-	}
 }
 
 @media ( max-width : 992px) {
Index: lams_tool_assessment/web/WEB-INF/tags/Panel.tag
===================================================================
diff -u -r3d7577122201e05495a07b77e10a0846400987f0 -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(.../Panel.tag)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
+++ lams_tool_assessment/web/WEB-INF/tags/Panel.tag	(.../Panel.tag)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -58,7 +58,7 @@
            	</a>
 		</div>
 		
-		<div id="${id}-content" class="row mt-3 collapse ${expanded ? ' show' : ''}">
+		<div id="${id}-content" class="mt-3 collapse ${expanded ? ' show' : ''}">
 			<jsp:doBody />
 		</div>
 	</div>
Index: lams_tool_assessment/web/pages/authoring/advance5.jsp
===================================================================
diff -u -rde980140fbbf28ae1a30f50e14268aec4c8f1e42 -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/advance5.jsp	(.../advance5.jsp)	(revision de980140fbbf28ae1a30f50e14268aec4c8f1e42)
+++ lams_tool_assessment/web/pages/authoring/advance5.jsp	(.../advance5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -1,171 +1,173 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO"%>
 
-<div class="col-12 col-xl-6 pr-5">
-	<lams:Dropdown name="assessment.questionsPerPage"
-		useSpringForm="true"
-		labelKey="label.authoring.advance.questions.per.page"
-		tooltipKey="label.authoring.advance.questions.per.page.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description">
-			<option value="0"><fmt:message key="label.authoring.advance.all.in.one.page" /></option>
-			<option value="10">10</option>
-			<option value="9">9</option>
-			<option value="8">8</option>
-			<option value="7">7</option>
-			<option value="6">6</option>
-			<option value="5">5</option>
-			<option value="4">4</option>
-			<option value="3">3</option>
-			<option value="2">2</option>
-			<option value="1">1</option>
-	</lams:Dropdown>
-
-	<lams:Switch name="assessment.shuffled" id="shuffled"
-		useSpringForm="true"
-		labelKey="label.authoring.advance.shuffle.questions"
-		tooltipKey="label.authoring.advance.shuffle.questions.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.shuffle.questions.tooltip.description" />
-
-	<lams:Switch name="assessment.numbered" id="questions-numbering"
-		useSpringForm="true"
-		labelKey="label.authoring.advance.numbered.questions"
-		tooltipKey="label.authoring.advance.numbered.questions.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description" />
-
-	<lams:Input
-		id="relativeTimeLimit"
-		labelKey="label.authoring.advance.time.limit"
-		tooltipKey="label.authoring.advance.time.limit.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description">
-			<form:input path="assessment.relativeTimeLimit" id="relativeTimeLimit" type="number" min="0" max="999" size="3" cssClass="form-control form-control-select"/>
-	</lams:Input>
+<div class="row">
+	<div class="col-12 col-xl-6 pr-4">
+		<lams:Dropdown name="assessment.questionsPerPage"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.questions.per.page"
+			tooltipKey="label.authoring.advance.questions.per.page.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.questions.per.page.tooltip.description">
+				<option value="0"><fmt:message key="label.authoring.advance.all.in.one.page" /></option>
+				<option value="10">10</option>
+				<option value="9">9</option>
+				<option value="8">8</option>
+				<option value="7">7</option>
+				<option value="6">6</option>
+				<option value="5">5</option>
+				<option value="4">4</option>
+				<option value="3">3</option>
+				<option value="2">2</option>
+				<option value="1">1</option>
+		</lams:Dropdown>
 	
+		<lams:Switch name="assessment.shuffled" id="shuffled"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.shuffle.questions"
+			tooltipKey="label.authoring.advance.shuffle.questions.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.shuffle.questions.tooltip.description" />
 	
-	<div class="col-sm-12 form-group row">
-		<label class="col-form-label"><fmt:message key="label.authoring.advance.choose.restriction" /></label>
-	</div>
+		<lams:Switch name="assessment.numbered" id="questions-numbering"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.numbered.questions"
+			tooltipKey="label.authoring.advance.numbered.questions.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.numbered.questions.tooltip.description" />
 	
-	<div class="form-group row">
-		<label class="col-sm-8 col-form-label" for="attemptsAllowedRadio">
-			<input type="radio" name="isAttemptsChosen" id="attemptsAllowedRadio" value="true"
-				<c:if test="${assessmentForm.assessment.passingMark == 0}">checked="checked"</c:if>
-			/>
-			&nbsp;
-			<fmt:message key="label.authoring.advance.attempts.allowed" />
-		</label>
+		<lams:Input
+			id="relativeTimeLimit"
+			labelKey="label.authoring.advance.time.limit"
+			tooltipKey="label.authoring.advance.time.limit.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.time.limit.tooltip.description">
+				<form:input path="assessment.relativeTimeLimit" id="relativeTimeLimit" type="number" min="0" max="999" size="3" cssClass="form-control form-control-select"/>
+		</lams:Input>
 		
-	    <div class="col-sm-4 justify-content-end d-flex">
-	    	<form:select path="assessment.attemptsAllowed" id="attemptsAllowed" cssClass="form-control form-control-select">
-					<form:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></form:option>
-					<form:option value="6">6</form:option>
-					<form:option value="5">5</form:option>
-					<form:option value="4">4</form:option>
-					<form:option value="3">3</form:option>
-					<form:option value="2">2</form:option>
-					<form:option value="1">1</form:option>
-			</form:select>
-	    </div>
-	</div>
-	
-	<div class="form-group row">
-		<label class="col-sm-8 col-form-label" for="passingMarkRadio">
-			<input type="radio" name="isAttemptsChosen" id="passingMarkRadio" value="false"
-				<c:if test="${assessmentForm.assessment.passingMark > 0}">checked="checked"</c:if>
-			/>
-			&nbsp;
-			<fmt:message key="label.authoring.advance.passing.mark" />
-		</label>
 		
-	    <div class="col-sm-4 justify-content-end d-flex">
-	    	<form:select path="assessment.passingMark" id="passingMark" cssClass="form-control form-control-select" />
-	    </div>
-	</div>
-	
-	<lams:Switch name="assessment.enableConfidenceLevels" id="enable-confidence-levels"
-		useSpringForm="true"
-		labelKey="label.enable.confidence.levels"
-		tooltipKey="label.enable.confidence.levels.tooltip"
-		tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description" />
+		<div class="col-sm-12 form-group row">
+			<label class="col-form-label"><fmt:message key="label.authoring.advance.choose.restriction" /></label>
+		</div>
 		
-	<lams:Dropdown name="assessment.confidenceLevelsType"
-		useSpringForm="true"
-		labelKey="label.scale">
-			<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_0_TO_100}">
-				<fmt:message key="label.0.to.100" />
-			</option>
-			<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_CONFIDENT}">
-				<fmt:message key="label.not.confident" />, <fmt:message key="label.confident" />, <fmt:message key="label.very.confident" />
-			</option>
-			<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_SURE}">
-				<fmt:message key="label.not.sure" />, <fmt:message key="label.sure" />, <fmt:message key="label.very.sure" />
-			</option>
-	</lams:Dropdown>
-	
-	<lams:Switch name="assessment.notifyTeachersOnAttemptCompletion" id="notifyTeachersOnAttemptCompletion"
-		useSpringForm="true"
-		labelKey="label.authoring.advanced.notify.on.attempt.completion"
-		tooltipKey="label.authoring.advanced.notify.on.attempt.completion.tooltip"
-		tooltipDescriptionKey="label.authoring.advanced.notify.on.attempt.completion.tooltip.description" />
-</div>
-
-
-<div class="col-12 col-xl-6 pr-4">
-	<lams:Switch name="assessment.displaySummary" id="display-summary"
-		useSpringForm="true"
-		labelKey="label.authoring.advance.display.summary"
-		tooltipKey="label.authoring.advance.display.summary.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description" />
-	
-	<div id="display-summary-area" class="loffset20" 
-		<c:if test="${!assessmentForm.assessment.displaySummary}">style="display:none;"</c:if>
-	>
-	
-		<lams:Switch name="assessment.allowQuestionFeedback" id="allowQuestionFeedback"
-			useSpringForm="true"
-			labelKey="label.authoring.advance.allow.students.question.feedback"
-			tooltipKey="label.authoring.advance.allow.students.question.feedback.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.allow.students.question.feedback.tooltip.description" />
+		<div class="form-group row">
+			<label class="col-sm-8 col-form-label" for="attemptsAllowedRadio">
+				<input type="radio" name="isAttemptsChosen" id="attemptsAllowedRadio" value="true"
+					<c:if test="${assessmentForm.assessment.passingMark == 0}">checked="checked"</c:if>
+				/>
+				&nbsp;
+				<fmt:message key="label.authoring.advance.attempts.allowed" />
+			</label>
+			
+		    <div class="col-sm-4 justify-content-end d-flex">
+		    	<form:select path="assessment.attemptsAllowed" id="attemptsAllowed" cssClass="form-control form-control-select">
+						<form:option value="0"><fmt:message key="label.authoring.advance.unlimited" /></form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="1">1</form:option>
+				</form:select>
+		    </div>
+		</div>
 		
-		<lams:Switch name="assessment.allowDiscloseAnswers" id="allowDiscloseAnswers"
-			useSpringForm="true"
-			labelKey="label.authoring.advance.disclose.answers"
-			tooltipKey="label.authoring.advance.disclose.answers.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.disclose.answers.tooltip.description" />
+		<div class="form-group row">
+			<label class="col-sm-8 col-form-label" for="passingMarkRadio">
+				<input type="radio" name="isAttemptsChosen" id="passingMarkRadio" value="false"
+					<c:if test="${assessmentForm.assessment.passingMark > 0}">checked="checked"</c:if>
+				/>
+				&nbsp;
+				<fmt:message key="label.authoring.advance.passing.mark" />
+			</label>
+			
+		    <div class="col-sm-4 justify-content-end d-flex">
+		    	<form:select path="assessment.passingMark" id="passingMark" cssClass="form-control form-control-select" />
+		    </div>
+		</div>
 		
-		<lams:Switch name="assessment.allowRightAnswersAfterQuestion" id="allowRightAnswersAfterQuestion"
+		<lams:Switch name="assessment.enableConfidenceLevels" id="enable-confidence-levels"
 			useSpringForm="true"
-			labelKey="label.authoring.advance.allow.students.right.answers"
-			tooltipKey="label.authoring.advance.allow.students.right.answers.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.allow.students.right.answers.tooltip.description" />
+			labelKey="label.enable.confidence.levels"
+			tooltipKey="label.enable.confidence.levels.tooltip"
+			tooltipDescriptionKey="label.enable.confidence.levels.tooltip.description" />
 			
-		<lams:Switch name="assessment.allowWrongAnswersAfterQuestion" id="allowWrongAnswersAfterQuestion"
+		<lams:Dropdown name="assessment.confidenceLevelsType"
 			useSpringForm="true"
-			labelKey="label.authoring.advance.allow.students.wrong.answers"
-			tooltipKey="label.authoring.advance.allow.students.wrong.answers.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.allow.students.wrong.answers.tooltip.description" />
-			
-		<lams:Switch name="assessment.allowWrongAnswersAfterQuestion" id="allowHistoryResponsesAfterAttempt"
+			labelKey="label.scale">
+				<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_0_TO_100}">
+					<fmt:message key="label.0.to.100" />
+				</option>
+				<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_CONFIDENT}">
+					<fmt:message key="label.not.confident" />, <fmt:message key="label.confident" />, <fmt:message key="label.very.confident" />
+				</option>
+				<option value="${ConfidenceLevelDTO.CONFIDENCE_LEVELS_TYPE_SURE}">
+					<fmt:message key="label.not.sure" />, <fmt:message key="label.sure" />, <fmt:message key="label.very.sure" />
+				</option>
+		</lams:Dropdown>
+		
+		<lams:Switch name="assessment.notifyTeachersOnAttemptCompletion" id="notifyTeachersOnAttemptCompletion"
 			useSpringForm="true"
-			labelKey="label.authoring.advance.allow.students.history.responses"
-			tooltipKey="label.authoring.advance.allow.students.history.responses.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.allow.students.history.responses.tooltip.description" />
+			labelKey="label.authoring.advanced.notify.on.attempt.completion"
+			tooltipKey="label.authoring.advanced.notify.on.attempt.completion.tooltip"
+			tooltipDescriptionKey="label.authoring.advanced.notify.on.attempt.completion.tooltip.description" />
 	</div>
 	
-	<lams:Switch name="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"
+	
+	<div class="col-12 col-xl-6 pr-4">
+		<lams:Switch name="assessment.displaySummary" id="display-summary"
 			useSpringForm="true"
-			labelKey="label.authoring.advance.allow.students.overall.feedback"
-			tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description" />
+			labelKey="label.authoring.advance.display.summary"
+			tooltipKey="label.authoring.advance.display.summary.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.display.summary.tooltip.description" />
+		
+		<div id="display-summary-area" class="loffset20" 
+			<c:if test="${!assessmentForm.assessment.displaySummary}">style="display:none;"</c:if>
+		>
+		
+			<lams:Switch name="assessment.allowQuestionFeedback" id="allowQuestionFeedback"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.question.feedback"
+				tooltipKey="label.authoring.advance.allow.students.question.feedback.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.question.feedback.tooltip.description" />
 			
-	<lams:Switch name="assessment.allowGradesAfterAttempt" id="allowGradesAfterAttempt"
-		useSpringForm="true"
-		labelKey="label.authoring.advance.allow.students.grades"
-		tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description" />
+			<lams:Switch name="assessment.allowDiscloseAnswers" id="allowDiscloseAnswers"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.disclose.answers"
+				tooltipKey="label.authoring.advance.disclose.answers.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.disclose.answers.tooltip.description" />
+			
+			<lams:Switch name="assessment.allowRightAnswersAfterQuestion" id="allowRightAnswersAfterQuestion"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.right.answers"
+				tooltipKey="label.authoring.advance.allow.students.right.answers.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.right.answers.tooltip.description" />
+				
+			<lams:Switch name="assessment.allowWrongAnswersAfterQuestion" id="allowWrongAnswersAfterQuestion"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.wrong.answers"
+				tooltipKey="label.authoring.advance.allow.students.wrong.answers.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.wrong.answers.tooltip.description" />
+				
+			<lams:Switch name="assessment.allowWrongAnswersAfterQuestion" id="allowHistoryResponsesAfterAttempt"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.history.responses"
+				tooltipKey="label.authoring.advance.allow.students.history.responses.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.history.responses.tooltip.description" />
+		</div>
 		
-	<lams:Switch name="assessment.allowAnswerJustification" id="allowAnswerJustification"
-		useSpringForm="true"
-		labelKey="label.authoring.advance.answer.justification"
-		tooltipKey="label.authoring.advance.answer.justification.tooltip"
-		tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description" />
+		<lams:Switch name="assessment.allowOverallFeedbackAfterQuestion" id="allowOverallFeedbackAfterQuestion"
+				useSpringForm="true"
+				labelKey="label.authoring.advance.allow.students.overall.feedback"
+				tooltipKey="label.authoring.advance.allow.students.overall.feedback.tooltip"
+				tooltipDescriptionKey="label.authoring.advance.allow.students.overall.feedback.tooltip.description" />
+				
+		<lams:Switch name="assessment.allowGradesAfterAttempt" id="allowGradesAfterAttempt"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.allow.students.grades"
+			tooltipKey="label.authoring.advance.allow.students.grades.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.allow.students.grades.tooltip.description" />
+			
+		<lams:Switch name="assessment.allowAnswerJustification" id="allowAnswerJustification"
+			useSpringForm="true"
+			labelKey="label.authoring.advance.answer.justification"
+			tooltipKey="label.authoring.advance.answer.justification.tooltip"
+			tooltipDescriptionKey="label.authoring.advance.answer.justification.tooltip.description" />
+	</div>
 </div>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r28111c604143a6a2e15e286df89b9bae782375ed -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 28111c604143a6a2e15e286df89b9bae782375ed)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -137,9 +137,7 @@
 
         <div id="content">
 			<lams:Panel id="basic" titleKey="label.authoring.heading.basic" iconClass="fa-file-o" colorClass="green">
-				<div class="col-12 p-0">
-					 <jsp:include page="basic5.jsp"/>
-				</div>
+				<jsp:include page="basic5.jsp"/>
 			</lams:Panel>
 				
            <lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
Index: lams_tool_assessment/web/pages/authoring/basic5.jsp
===================================================================
diff -u -r31a060938869a020a09965ed0b1b20a692ef9479 -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/basic5.jsp	(.../basic5.jsp)	(revision 31a060938869a020a09965ed0b1b20a692ef9479)
+++ lams_tool_assessment/web/pages/authoring/basic5.jsp	(.../basic5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -1,21 +1,19 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="col-12 p-0">
-	<div class="form-group">
-	    <label for="assessment.title">
-	    	<fmt:message key="label.authoring.basic.title"/>
-	    </label>
-	    <form:input path="assessment.title" cssClass="form-control" maxlength="255"/>
-	</div>
-	
-	<div class="form-group">
-	    <label for="assessment.instructions">
-	    	<fmt:message key="label.authoring.basic.instruction"/>
-	    </label>
-		<lams:CKEditor id="assessment.instructions"
-					   value="${assessmentForm.assessment.instructions}"
-					   contentFolderID="${assessmentForm.contentFolderID}"
-					   classes="form-control">
-		</lams:CKEditor>
-	</div>
-</div>
\ No newline at end of file
+<div class="form-group">
+    <label for="assessment.title">
+    	<fmt:message key="label.authoring.basic.title"/>
+    </label>
+    <form:input path="assessment.title" cssClass="form-control" maxlength="255"/>
+</div>
+
+<div class="form-group">
+    <label for="assessment.instructions">
+    	<fmt:message key="label.authoring.basic.instruction"/>
+    </label>
+	<lams:CKEditor id="assessment.instructions"
+				   value="${assessmentForm.assessment.instructions}"
+				   contentFolderID="${assessmentForm.contentFolderID}"
+				   classes="form-control">
+	</lams:CKEditor>
+</div>
Index: lams_tool_assessment/web/pages/authoring/feedback5.jsp
===================================================================
diff -u -rde980140fbbf28ae1a30f50e14268aec4c8f1e42 -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/feedback5.jsp	(.../feedback5.jsp)	(revision de980140fbbf28ae1a30f50e14268aec4c8f1e42)
+++ lams_tool_assessment/web/pages/authoring/feedback5.jsp	(.../feedback5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -1,9 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="col-12 p-0">	
-	<input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
-	<iframe id="advancedInputArea" name="advancedInputArea" 
-			style="width:100%; height:100%; border:0; display:block;" 
-			frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${assessmentForm.sessionMapID}">
-	</iframe>
-</div>
\ No newline at end of file
+<input type="hidden" name="overallFeedbackList" id="overallFeedbackList" />
+<iframe id="advancedInputArea" name="advancedInputArea" 
+		style="width:100%; height:100%; border:0; display:block;" 
+		frameborder="no" scrolling="no" src="<c:url value='/authoring/initOverallFeedback.do'/>?sessionMapID=${assessmentForm.sessionMapID}">
+</iframe>
Index: lams_tool_assessment/web/pages/authoring/leader5.jsp
===================================================================
diff -u -rde980140fbbf28ae1a30f50e14268aec4c8f1e42 -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/leader5.jsp	(.../leader5.jsp)	(revision de980140fbbf28ae1a30f50e14268aec4c8f1e42)
+++ lams_tool_assessment/web/pages/authoring/leader5.jsp	(.../leader5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -1,17 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="col-12 p-0">	
-	<lams:Switch name="assessment.useSelectLeaderToolOuput" id="useSelectLeaderToolOuput"
-		useSpringForm="true"
-		labelKey="label.use.select.leader.tool.output"
-		tooltipKey="label.use.select.leader.tool.output.tooltip"
-		tooltipDescriptionKey="label.use.select.leader.tool.output.tooltip.description" />
+<lams:Switch name="assessment.useSelectLeaderToolOuput" id="useSelectLeaderToolOuput"
+	useSpringForm="true"
+	labelKey="label.use.select.leader.tool.output"
+	tooltipKey="label.use.select.leader.tool.output.tooltip"
+	tooltipDescriptionKey="label.use.select.leader.tool.output.tooltip.description" />
 
-	<c:if test="${sessionMap.isQuestionEtherpadEnabled}">
-		<lams:Switch name="assessment.questionEtherpadEnabled" id="questionEtherpadEnabled"
-			useSpringForm="true"
-			labelKey="label.authoring.advance.question.etherpad"
-			tooltipKey="label.authoring.advance.question.etherpad.tooltip"
-			tooltipDescriptionKey="label.authoring.advance.question.etherpad.tooltip.description" />
-	</c:if>
-</div>
\ No newline at end of file
+<c:if test="${sessionMap.isQuestionEtherpadEnabled}">
+	<lams:Switch name="assessment.questionEtherpadEnabled" id="questionEtherpadEnabled"
+		useSpringForm="true"
+		labelKey="label.authoring.advance.question.etherpad"
+		tooltipKey="label.authoring.advance.question.etherpad.tooltip"
+		tooltipDescriptionKey="label.authoring.advance.question.etherpad.tooltip.description" />
+</c:if>
Index: lams_tool_assessment/web/pages/authoring/questions5.jsp
===================================================================
diff -u -r28111c604143a6a2e15e286df89b9bae782375ed -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/questions5.jsp	(.../questions5.jsp)	(revision 28111c604143a6a2e15e286df89b9bae782375ed)
+++ lams_tool_assessment/web/pages/authoring/questions5.jsp	(.../questions5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -159,7 +159,7 @@
     }
 </script>
 
-<div id="questionlist" class="col-12 p-0">
+<div id="questionlist">
 	<div id="itemArea">
 		<c:choose>
 			<c:when test="${isAuthoringRestricted}">
Index: lams_tool_assessment/web/pages/authoring/reflection5.jsp
===================================================================
diff -u -r023e019feae586433ba4b9086294aab7a424d1f9 -r7580e177ee211d4dcf3bc308792fffad8edf826e
--- lams_tool_assessment/web/pages/authoring/reflection5.jsp	(.../reflection5.jsp)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
+++ lams_tool_assessment/web/pages/authoring/reflection5.jsp	(.../reflection5.jsp)	(revision 7580e177ee211d4dcf3bc308792fffad8edf826e)
@@ -1,17 +1,15 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="col-12 p-0">
-	<lams:OutcomeAuthor5 toolContentId="${assessmentForm.assessment.contentId}" />
-	
-	<lams:Switch name="assessment.reflectOnActivity" id="reflectOnActivity"
-		useSpringForm="true"
-		labelKey="advanced.reflectOnActivity"
-		tooltipKey="advanced.reflectOnActivity.tooltip"
-		tooltipDescriptionKey="advanced.reflectOnActivity.tooltip.description" />
+<lams:OutcomeAuthor5 toolContentId="${assessmentForm.assessment.contentId}" />
 
-	<div class="form-group row">
-		<div class="col-sm-12">
-			<form:textarea path="assessment.reflectInstructions" rows="3" id="reflectInstructions" cssClass="form-control" />
-		</div>
+<lams:Switch name="assessment.reflectOnActivity" id="reflectOnActivity"
+	useSpringForm="true"
+	labelKey="advanced.reflectOnActivity"
+	tooltipKey="advanced.reflectOnActivity.tooltip"
+	tooltipDescriptionKey="advanced.reflectOnActivity.tooltip.description" />
+
+<div class="form-group row">
+	<div class="col-12">
+		<form:textarea path="assessment.reflectInstructions" rows="3" id="reflectInstructions" cssClass="form-control" />
 	</div>
-</div>
\ No newline at end of file
+</div>