Index: lams_central/web/css/qb-question.scss
===================================================================
diff -u -r6cbd849584c40532c6be292f9f009c88cde9439c -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_central/web/css/qb-question.scss	(.../qb-question.scss)	(revision 6cbd849584c40532c6be292f9f009c88cde9439c)
+++ lams_central/web/css/qb-question.scss	(.../qb-question.scss)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -137,7 +137,7 @@
    	z-index: 2;
    	visibility:hidden;
 }	
-#assessmentQuestionForm:hover #question-settings-link, #question-settings-link.btn-primary {
+form:hover #question-settings-link, #question-settings-link.btn-primary {
 	visibility:visible;
 }
 
Index: lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r6eab3045a755dac9c5596e1bbe544a0784b2bb3e -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6eab3045a755dac9c5596e1bbe544a0784b2bb3e)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -232,5 +232,6 @@
 message.qb.modified.update =The question in Question Bank will be updated
 message.qb.modified.version =A new version of the question will be created in Question Bank
 message.qb.modified.new =A new question will be created in Question Bank
+label.settings =Settings
 
 #======= End labels: Exported 217 labels for en AU =====
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
===================================================================
diff -u -r35ebea0b2dfa2e0323f604242035c2d7e5a299dd -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java	(.../QaAuthoringController.java)	(revision 35ebea0b2dfa2e0323f604242035c2d7e5a299dd)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java	(.../QaAuthoringController.java)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -334,6 +334,7 @@
 
 	    qbQuestion = new QbQuestion();
 	    qbQuestion.setType(QbQuestion.TYPE_ESSAY);
+	    qbQuestion.setQuestionId(form.getQuestionId());
 
 	    qaQuestion = new QaQueContent();
 	    int maxSeq = 1;
@@ -368,13 +369,12 @@
 	switch (isQbQuestionModified) {
 	    case IQbService.QUESTION_MODIFIED_VERSION_BUMP: {
 		// impossible scenario as long as ESSAY question type can't have version
-		throw new RuntimeException("Impossible scenario as long as ESSAY question type can't have version");
+		throw new RuntimeException("Impossible scenario as long as ESSAY question type can't have new versions");
 	    }
 	    case IQbService.QUESTION_MODIFIED_ID_BUMP: {
 		// new question gets created
 		updatedQuestion = qbQuestion.clone();
 		updatedQuestion.clearID();
-		updatedQuestion.setQuestionId(qbService.generateNextQuestionId());
 		updatedQuestion.setVersion(1);
 		updatedQuestion.setCreateDate(new Date());
 	    }
@@ -412,6 +412,7 @@
 	    @RequestParam String sessionMapID, @RequestParam String contentFolderID) {
 	form.setSessionMapID(sessionMapID);
 	form.setContentFolderID(contentFolderID);
+	form.setQuestionId(qbService.generateNextQuestionId()); // generate a new question ID right away, so another user won't "take it"
 	
 	QbUtils.fillFormWithUserCollections(qbService, form, null);
 
@@ -435,6 +436,7 @@
 	QaQueContent qaQuestion = rList.get(questionIndex);
 	QbQuestion qbQuestion = qaQuestion.getQbQuestion();
 
+	form.setQuestionId(qbQuestion.getQuestionId());
 	form.setTitle(qbQuestion.getName());
 	form.setDescription(qbQuestion.getDescription());
 	if (questionIndex >= 0) {
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r86c25c80d92701a94c3161575c76c363891402ad -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 86c25c80d92701a94c3161575c76c363891402ad)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -73,7 +73,13 @@
 		    		    };
 		    		    				
 		    			$('#newQuestionForm').ajaxSubmit(items);
-		    		}
+		    		},
+		    		invalidHandler: formValidationInvalidHandler,
+					errorElement: "em",
+					errorPlacement: formValidationErrorPlacement,
+					success: formValidationSuccess,
+					highlight: formValidationHighlight,
+					unhighlight: formValidationUnhighlight
 		  		});
 
 			   	//spinner
@@ -102,56 +108,65 @@
 			</div>
 			
 			<div class="panel-body panel-${type}-body">
-	
-			<lams:errors/>
-			
 			<form:form action="/lams/tool/laqa11/authoring/saveQuestion.do" method="post" modelAttribute="newQuestionForm" id="newQuestionForm">
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="itemIndex" />
 				<form:hidden path="contentFolderID"/>
+				<form:hidden path="questionId" />
 				<form:hidden path="oldCollectionUid" id="old-collection-uid"/>
 				<form:hidden path="newCollectionUid" id="new-collection-uid"/>
+			
+				<button type="button" id="question-settings-link" class="btn btn-default btn-sm">
+					<fmt:message key="label.settings" />
+				</button>
+				
+				<div class="question-tab">
+					<lams:errors/>
 	
-				<div id="title-container" class="form-group">
-					<c:set var="TITLE_LABEL"><fmt:message key="label.title"/> </c:set>
-					<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255" 
-					    	placeholder="${TITLE_LABEL}"/>
+					<div id="title-container" class="form-group">
+						<c:set var="TITLE_LABEL"><fmt:message key="label.title"/> </c:set>
+						<form:input path="title" id="title" cssClass="form-control borderless-text-input" tabindex="1" maxlength="255" 
+						    	placeholder="${TITLE_LABEL}"/>
+					</div>
+	
+					<div class="form-group form-group-cke">
+						<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.question"/></c:set>
+						<lams:CKEditor id="description" value="${newQuestionForm.description}" contentFolderID="${newQuestionForm.contentFolderID}" 
+							placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
+					</div>
 				</div>
-
-				<div class="form-group form-group-cke">
-					<c:set var="QUESTION_DESCRIPTION_LABEL"><fmt:message key="label.question"/></c:set>
-					<lams:CKEditor id="description" value="${newQuestionForm.description}" contentFolderID="${newQuestionForm.contentFolderID}" 
-						placeholder="${QUESTION_DESCRIPTION_LABEL}"	 />
-				</div>
 				
-				<div class="checkbox">
-					<label> 
-						<form:checkbox path="answerRequired"/>&nbsp;<fmt:message key="label.required.desc" />
-					</label>
-				</div>
-			
-				<div class="form-group row form-inline" style="display: flex; align-items: center;">
-				    <label for="min-words-limit-checkbox" class="col-sm-3">
-						<input type="checkbox" id="min-words-limit-checkbox" name="noname"
-							<c:if test="${newQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
-				    	<fmt:message key="label.minimum.number.words" >
-							<fmt:param> </fmt:param>
-						</fmt:message>
-				    </label>
-					    
-				    <div class="col-sm-9">
-				    	<form:input path="minWordsLimit" id="min-words-limit"/>
-				    	<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
-				    </div>
-				</div>
+				<div class="settings-tab">
+					<div class="checkbox">
+						<label> 
+							<form:checkbox path="answerRequired"/>&nbsp;<fmt:message key="label.required.desc" />
+						</label>
+					</div>
+				
+					<div class="form-group row form-inline" style="display: flex; align-items: center;">
+					    <label for="min-words-limit-checkbox" class="col-sm-4">
+							<input type="checkbox" id="min-words-limit-checkbox" name="noname"
+								<c:if test="${newQuestionForm.minWordsLimit != 0}">checked="checked"</c:if>/>
+					    	<fmt:message key="label.minimum.number.words" >
+								<fmt:param> </fmt:param>
+							</fmt:message>
+					    </label>
+						    
+					    <div class="col-sm-8">
+					    	<form:input path="minWordsLimit" id="min-words-limit"/>
+					    	<label id="min-words-limit-error" class="alert alert-danger" for="min-words-limit" style="display: none;"></label>
+					    </div>
+					</div>
+						
+					<div class="form-group">
+						<c:set var="FEEDBACK_LABEL"><fmt:message key="label.feedback"/></c:set>
+						<lams:CKEditor id="feedback" value="${newQuestionForm.feedback}" 
+							placeholder="${FEEDBACK_LABEL}" contentFolderID="${newQuestionForm.contentFolderID}" />
+					</div>
 					
-				<div class="form-group">
-					<c:set var="FEEDBACK_LABEL"><fmt:message key="label.feedback"/></c:set>
-					<lams:CKEditor id="feedback" value="${newQuestionForm.feedback}" 
-						placeholder="${FEEDBACK_LABEL}" contentFolderID="${newQuestionForm.contentFolderID}" />
+					<lams:OutcomeAuthor qbQuestionId="${newQuestionForm.questionId}"  />
 				</div>
 			</form:form>
-
 			</div>
 		</div>
 			
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -rb4eeced9a946a0a62d6b51698addd3db798c0498 -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -11,16 +11,16 @@
 					<div class="panel panel-default">
 						<div class="panel-heading">
 							<div class="panel-title">
-								<strong> 
-									<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
-								</strong>
+								<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
 							</div>
 						</div>
 						
 						<div class="panel-body">
-							<div class="panel">
-								<c:out value="${questionEntry.value.description}" escapeXml="false" />
-							</div>
+							<c:if test="${not empty questionEntry.value.description}">
+								<div class="panel">
+									<c:out value="${questionEntry.value.description}" escapeXml="false" />
+								</div>
+							</c:if>
 						
 							<div class="answer-req">
 								<fmt:message key="label.learning.yourAnswer" /> 
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -rb4eeced9a946a0a62d6b51698addd3db798c0498 -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -323,9 +323,11 @@
 							</div>
 							
 							<div class="panel-body">
-								<div class="panel">
-									<c:out value="${userResponse.qaQuestion.qbQuestion.description}" escapeXml="false" />
-								</div>
+								<c:if test="${not empty userResponse.qaQuestion.qbQuestion.description}">
+									<div class="panel">
+										<c:out value="${userResponse.qaQuestion.qbQuestion.description}" escapeXml="false" />
+									</div>
+								</c:if>
 	
 								<div class="row no-gutter">
 									<!-- split if ratings are on -->
@@ -373,9 +375,7 @@
 	
 				<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 					<p>
-						<strong> 
-							${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
-						</strong>
+						${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
 					</p>
 	
 					<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -rb4eeced9a946a0a62d6b51698addd3db798c0498 -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -305,9 +305,11 @@
 						</div>
 						
 						<div class="panel-body">
-							<div class="panel">
-								<c:out value="${userResponse.qaQuestion.qbQuestion.description}" escapeXml="false" />
-							</div>
+							<c:if test="${not empty userResponse.qaQuestion.qbQuestion.description}">
+								<div class="panel">
+									<c:out value="${userResponse.qaQuestion.qbQuestion.description}" escapeXml="false" />
+								</div>
+							</c:if>
 
 							<div class="row no-gutter">
 								<!-- split if ratings are on -->
@@ -368,9 +370,7 @@
 			<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
 
 				<p>
-					<strong> 
-						${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
-					</strong>
+					${status.count}. <c:out value="${question.qbQuestion.name}" escapeXml="false" />
 				</p>
 
 				<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -rb4eeced9a946a0a62d6b51698addd3db798c0498 -r6a00057c1bd113919030bcd00ce1e3c7327c7b2e
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision b4eeced9a946a0a62d6b51698addd3db798c0498)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 6a00057c1bd113919030bcd00ce1e3c7327c7b2e)
@@ -13,15 +13,17 @@
 				<div class="panel panel-default">
 					<div class="panel-heading">
 						<div class="panel-title">
-							<strong>
-								<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
-							</strong>
+							<c:out value="${questionEntry.key}" />. <c:out value="${questionEntry.value.name}" escapeXml="false" />
 						</div>
 					</div>
+					
 					<div class="panel-body">
-						<div class="panel">
-							<c:out value="${questionEntry.value.description}" escapeXml="false" />
-						</div>
+						<c:if test="${not empty questionEntry.value.description}">
+							<div class="panel">
+								<c:out value="${questionEntry.value.description}" escapeXml="false" />
+							</div>
+						</c:if>
+						
 						<div class="answer-req">
 							<fmt:message key="label.learning.yourAnswer" />
 							<c:if test="${questionEntry.value.required}">
@@ -56,15 +58,17 @@
 						</div>
 
 						<input type="hidden" name="currentQuestionIndex" value="${questionEntry.key}" />
+					</div>
+				</div>
+			</div>
+		</div>
 	</c:if>
 </c:forEach>
 
-
 <div class="">
 	<!--question content ends here-->
 	<c:choose>
-		<c:when
-			test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+		<c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }">
 
 			<button id="btnGetPrevious" type="button" onclick="javascript:submitMethod('getPreviousQuestion');"
@@ -82,8 +86,7 @@
 
 		</c:when>
 
-		<c:when
-			test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+		<c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }">
 			<div align="right-buttons">
 				<button id="btnDone" type="button" onclick="javascript:submitMethod('submitAnswersContent');"
@@ -94,8 +97,7 @@
 
 		</c:when>
 
-		<c:when
-			test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
+		<c:when test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
 				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}">
 
 			<button id="btnGetPrevious" type="button" onclick="javascript:submitMethod('getPreviousQuestion');"
@@ -123,7 +125,6 @@
 </div>
 <!-- End pane body -->
 
-
 <script type="text/javascript">
 	window.onload = function() {
 		document.getElementById("answer").focus();