Index: lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp,v
diff -u -r1.10.2.3 -r1.10.2.4
--- lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	8 Nov 2016 06:55:15 -0000	1.10.2.3
+++ lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp	13 Nov 2016 13:42:17 -0000	1.10.2.4
@@ -54,7 +54,7 @@
 						</lams:CKEditor>
 					</td>		
 					
-					<td width="60px" class="text-center">
+					<td width="20px" class="text-center">
 						<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
 							<c:set var="SELECTED_ANSWER" scope="request" value="" />
 							<c:set var="ISCORRECT" scope="request" value="Incorrect" />
@@ -63,9 +63,7 @@
 								<c:set var="SELECTED_ANSWER" scope="request" value="CHECKED" />
 								<c:set var="ISCORRECT" scope="request" value="Correct" />
 							</c:if>
-	                        <div class="radio">
 							<input type="radio" name="correct" value="<c:out value="${caIndex}"/>" ${SELECTED_ANSWER} >  
-	                          </div>
 						</c:forEach>
 					</td>		
 					
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/editQuestionBox.jsp,v
diff -u -r1.18.2.7 -r1.18.2.8
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	11 Nov 2016 15:52:37 -0000	1.18.2.7
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	13 Nov 2016 13:42:17 -0000	1.18.2.8
@@ -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" />
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.18.2.9 -r1.18.2.10
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	11 Nov 2016 15:52:37 -0000	1.18.2.9
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	13 Nov 2016 13:42:17 -0000	1.18.2.10
@@ -193,23 +193,24 @@
 			</div>
 
 			<div class="form-group">
-				<label for="feedback"><fmt:message key="label.feedback"></fmt:message></label>
-				<lams:CKEditor id="feedback"
-				value="${feedback}"
-				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
-			</lams:CKEditor>
+				<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">
+					<lams:CKEditor id="feedback"
+						value="${feedback}"
+						contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
+					</lams:CKEditor>
+				</div>
 			</div>
 			
 				
-			
-			<a href="#" onclick="addItem();" onmousedown="self.focus();" class="btn btn-default btn-sm pull-right"> 
-				<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" />
-			</a>
-			
-			<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm pull-right roffset5"> 
-				<fmt:message key="label.cancel" />
-			</a>
-			
+			<div id="actionButtons" 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" />
+				</a>
+				<a href="#" onclick="addItem();" onmousedown="self.focus();" class="btn btn-default btn-sm"> 
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" />
+				</a>
+			</div>
 		
 
 		</lams:Page>