Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -rdfbb99403c997cedf75b210c97abd2901cdf8ba1 -r970d31830c85b6f6cd3e28b96c6c894617873c64
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision dfbb99403c997cedf75b210c97abd2901cdf8ba1)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 970d31830c85b6f6cd3e28b96c6c894617873c64)
@@ -349,7 +349,7 @@
 
 	request.setAttribute(CommonConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-	return "pages/authoring/authoring";
+	return "pages/authoring/authoring5";
     }
 
     /**
Index: lams_tool_assessment/web/includes/css/assessment.scss
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r970d31830c85b6f6cd3e28b96c6c894617873c64
--- lams_tool_assessment/web/includes/css/assessment.scss	(.../assessment.scss)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/web/includes/css/assessment.scss	(.../assessment.scss)	(revision 970d31830c85b6f6cd3e28b96c6c894617873c64)
@@ -120,4 +120,8 @@
 }
 .sortable-placeholder {
   background-color: rgba(241, 241, 241, 0.7); 
- }
\ No newline at end of file
+ }
+ 
+#saveCancelButtons {
+	margin: 20px 0;
+}
\ No newline at end of file
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -rde980140fbbf28ae1a30f50e14268aec4c8f1e42 -r970d31830c85b6f6cd3e28b96c6c894617873c64
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision de980140fbbf28ae1a30f50e14268aec4c8f1e42)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 970d31830c85b6f6cd3e28b96c6c894617873c64)
@@ -30,6 +30,28 @@
 	<script src="<lams:LAMSURL/>includes/javascript/common.js"></script> 
 	
 	<script>
+
+	    function validateForm() {
+	        //check with a teacher whether he forgot to add questions to the question bank
+	        var referenceCount = $("#referencesTable tr").length - 1;
+			if ((referenceCount == 0) && !confirm("<fmt:message key="label.no.questions.in.question.bank"/>")) {
+				return false;
+			}
+	
+			var timeLimit = $('#relativeTimeLimit').val();
+			if (!timeLimit) {
+				$('#relativeTimeLimit').val(0);
+			}
+	
+			//serialize overallFeedbackForm
+	        $("#overallFeedbackList").val($('#advancedInputArea').contents().find('#overallFeedbackForm').serialize(true));
+	        	
+	        //enable checkbox to allow its value been submitted
+	        $("#display-summary").removeAttr("disabled", "disabled");
+	
+	    	return true;
+	    }
+	    
 		$(document).ready(function(){
 			$('[data-toggle="tooltip"]').tooltip();
 			  
@@ -117,7 +139,7 @@
 		</lams:Alert>
 	</c:if>
 	
-	<form:form action="updateContent.do" method="post" modelAttribute="assessmentForm" id="authoringForm">
+	<form:form action="updateContent.do" method="post" modelAttribute="assessmentForm" id="authoringForm" onsubmit="return validateForm()">
 		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<input type="hidden" name="mode" value="${mode}">
 		
@@ -154,6 +176,13 @@
 					<jsp:include page="reflection5.jsp"/>
 				</lams:Panel>
 			</div>
+			
+			<!-- Button Row -->
+			<lams:AuthoringButton formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
+				toolContentID="${assessmentForm.assessment.contentId}"
+				accessMode="${mode}" defineLater="${mode=='teacher'}"
+				contentFolderID="${assessmentForm.contentFolderID}" />
 		</div>    
 	</form:form>
 </lams:PageComponent>