Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
===================================================================
diff -u -r3cdf562682c8dda602c4583956be0b13bdaf98c4 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 3cdf562682c8dda602c4583956be0b13bdaf98c4)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(.../EditQbQuestionController.java)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -137,6 +137,7 @@
 	
 	//populate question information to its form for editing
 	form.setUid(qbQuestion.getUid());
+	form.setQuestionId(qbQuestion.getQuestionId());
 	//TODO remove hardcoded value, once we transfer contentFolderId from old DB entries
 	form.setContentFolderID(qbQuestion.getContentFolderId() == null ? "temp" : qbQuestion.getContentFolderId());
 	form.setTitle(qbQuestion.getName());
Index: lams_central/web/qb/authoring/addQuestionHeader.jsp
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addQuestionHeader.jsp	(.../addQuestionHeader.jsp)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/qb/authoring/addQuestionHeader.jsp	(.../addQuestionHeader.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -4,6 +4,7 @@
  <!-- ********************  CSS ********************** -->
 <lams:css />
 <link href="<lams:LAMSURL/>/tool/laasse10/includes/css/assessment.css" rel="stylesheet" type="text/css">
+<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />
 <link href="<lams:LAMSURL/>css/qb-question.css" rel="stylesheet" type="text/css">
 
 <!-- ********************  javascript ********************** -->
@@ -23,6 +24,7 @@
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/qb-option.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.slider.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.touch-punch.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/Sortable.js"></script>
\ No newline at end of file
Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -225,8 +225,12 @@
 			</form:form>
 
 		</div>		
-	</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 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -205,8 +205,12 @@
 			</div>
 
 		</div>		
-	</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 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -187,6 +187,10 @@
 		</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 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -284,10 +284,13 @@
 					</a>
 				</form>
 			</div>		
-
 		</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 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -253,6 +253,10 @@
 
 		</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/addordering.jsp
===================================================================
diff -u -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -188,6 +188,10 @@
 
 		</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 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -198,6 +198,10 @@
 
 		</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 -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -185,6 +185,10 @@
 			</form:form>
 		</div>	
 	</div>
+		
+	<c:if test="${not empty assessmentQuestionForm.questionId}">
+		<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
+	</c:if>
 	
 	<%@ include file="addQuestionFooter.jsp"%>
 </body>
Index: lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
===================================================================
diff -u -r21b12237b13026b0ff5303fd68e8bcf92d71eb73 -r37e0fd07570d49c026b589611c7de693ecac9497
--- lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 21b12237b13026b0ff5303fd68e8bcf92d71eb73)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java	(.../QbQuestionForm.java)	(revision 37e0fd07570d49c026b589611c7de693ecac9497)
@@ -32,6 +32,7 @@
 public class QbQuestionForm {
 
     private Long uid;
+    private Integer questionId;
     private String sessionMapID;
     private String contentFolderID;
     private Long oldCollectionUid;
@@ -61,7 +62,7 @@
     private int maxWordsLimit;
     private int minWordsLimit;
     private boolean hedgingJustificationEnabled;
-    
+
     private boolean authoringRestricted;
 
     public Long getUid() {
@@ -72,6 +73,14 @@
 	this.uid = uid;
     }
 
+    public Integer getQuestionId() {
+	return questionId;
+    }
+
+    public void setQuestionId(Integer questionId) {
+	this.questionId = questionId;
+    }
+
     public String getSessionMapID() {
 	return sessionMapID;
     }
@@ -87,22 +96,23 @@
     public void setContentFolderID(String contentFolderID) {
 	this.contentFolderID = contentFolderID;
     }
-    
+
     public Long getOldCollectionUid() {
 	return oldCollectionUid;
     }
 
     public void setOldCollectionUid(Long oldCollectionUid) {
 	this.oldCollectionUid = oldCollectionUid;
     }
-    
+
     public Long getNewCollectionUid() {
 	return newCollectionUid;
     }
 
     public void setNewCollectionUid(Long newCollectionUid) {
 	this.newCollectionUid = newCollectionUid;
     }
+
     public String getMode() {
 	return mode;
     }
@@ -254,23 +264,23 @@
     public void setMinWordsLimit(int minWordsLimit) {
 	this.minWordsLimit = minWordsLimit;
     }
-    
+
     public boolean isPrefixAnswersWithLetters() {
 	return prefixAnswersWithLetters;
     }
 
     public void setPrefixAnswersWithLetters(boolean prefixAnswersWithLetters) {
 	this.prefixAnswersWithLetters = prefixAnswersWithLetters;
     }
-    
+
     public boolean isHedgingJustificationEnabled() {
 	return hedgingJustificationEnabled;
     }
 
     public void setHedgingJustificationEnabled(boolean hedgingJustificationEnabled) {
 	this.hedgingJustificationEnabled = hedgingJustificationEnabled;
     }
-    
+
     public boolean isAuthoringRestricted() {
 	return authoringRestricted;
     }