Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -rd3e018640cd224eb44ff920ffb4afe5459bedd66
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision d3e018640cd224eb44ff920ffb4afe5459bedd66)
@@ -178,14 +178,6 @@
 			<%@ include file="/authoring/candidateAnswersList.jsp"%>
 			
 			<div class="form-group">
-				<label for="feedback"><fmt:message key="label.feedback"></fmt:message></label>
-				<lams:CKEditor id="feedback"
-				value="${mcGeneralAuthoringDTO.editableQuestionFeedback}"
-				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
-			</lams:CKEditor>
-			</div>
-
-			<div class="form-group">
 				<html:button property="newCandidate" onclick="javascript:submitMethod('newCandidateBox');" styleClass="btn btn-default btn-sm">
 					<fmt:message key="label.add.candidates" />
 				</html:button>
@@ -209,6 +201,17 @@
 				&nbsp;<fmt:message key="label.marks"></fmt:message>
 			</div>
 
+			<div class="form-group">
+				<a data-toggle="collapse" data-target="#feedbackDiv"><i class="fa fa-xs fa-plus-square-o roffset5" aria-hidden="true"></i><fmt:message key="label.feedback" /></a>
+				<div id="feedbackDiv" class="panel-body collapse <c:if test="${not empty mcGeneralAuthoringDTO.editableQuestionFeedback}">in</c:if>">
+					<lams:CKEditor id="feedback"
+						value="${mcGeneralAuthoringDTO.editableQuestionFeedback}"
+						contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
+					</lams:CKEditor>
+				</div>
+			</div>
+
+
 			<div class="pull-right">
 				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm roffset5"> 
 					<fmt:message key="label.cancel" />