Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -220,17 +220,17 @@
 						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>
 					
 			</form:form>
 
 		</div>		
 	</div>		
 	
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
-	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
 </lams:html>
Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -190,6 +190,10 @@
 						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>
 			</form:form>
 			
@@ -207,10 +211,6 @@
 		</div>		
 	</div>		
 	
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
-	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
 </lams:html>
Index: lams_central/web/qb/authoring/addmatchingpairs.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -169,6 +169,10 @@
 						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>
 				
 			</form:form>
@@ -187,10 +191,6 @@
 		</div>		
 	</div>	
 	
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
-	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
 </lams:html>
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -271,6 +271,10 @@
 						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div><!-- settings tab ends -->
 			</form:form>
 			
@@ -287,10 +291,6 @@
 		</div>	
 	</div>	
 	
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
-	
 	<%@ include file="addQuestionFooter.jsp"%>	
 </body>
 </lams:html>
Index: lams_central/web/qb/authoring/addnumerical.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -222,6 +222,10 @@
 						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>			
 				
 			</form:form>
@@ -253,11 +257,7 @@
 
 		</div>		
 	</div>	
-		
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
-	
+
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
 </lams:html>
Index: lams_central/web/qb/authoring/addordering.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -172,6 +172,10 @@
 						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>	
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>
 			</form:form>
 			
@@ -188,10 +192,6 @@
 
 		</div>		
 	</div>	
-		
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
 	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
Index: lams_central/web/qb/authoring/addshortanswer.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -181,6 +181,10 @@
 						<lams:CKEditor id="feedback" value="${assessmentQuestionForm.feedback}" 
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>
 
 			</form:form>
@@ -198,10 +202,6 @@
 
 		</div>	
 	</div>	
-		
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
 	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -r37e0fd07570d49c026b589611c7de693ecac9497 -r9284ed16906938b99d2e25acea5403b6a7d0d5f7
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 9284ed16906938b99d2e25acea5403b6a7d0d5f7)
@@ -181,14 +181,14 @@
 						<lams:CKEditor id="feedbackOnIncorrect" value="${assessmentQuestionForm.feedbackOnIncorrect}" 
 							placeholder="${FEEDBACK_ON_FALSE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
+					
+					<c:if test="${not empty assessmentQuestionForm.questionId}">
+						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+					</c:if>
 				</div>
 			</form:form>
 		</div>	
 	</div>
-		
-	<c:if test="${not empty assessmentQuestionForm.questionId}">
-		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-	</c:if>
 	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>