Index: lams_central/web/css/components.css
===================================================================
diff -u -r3d7577122201e05495a07b77e10a0846400987f0 -r0bc73958f17fe53a99f0e38e96a7eda971b9ad8c
--- lams_central/web/css/components.css	(.../components.css)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
+++ lams_central/web/css/components.css	(.../components.css)	(revision 0bc73958f17fe53a99f0e38e96a7eda971b9ad8c)
@@ -42,7 +42,7 @@
 	min-height: 100%;
 	background-color: #F6F5FA;
 	border-radius: 2rem;
-	padding: 2rem 4.8rem;
+	padding: 1.5rem 4.8rem;
 }
 
 .top-menu-btn a {
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton5.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton5.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton5.tag	(revision 0bc73958f17fe53a99f0e38e96a7eda971b9ad8c)
@@ -0,0 +1,135 @@
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * AuthoringButton.tag
+  *	Author: Dapeng Ni, Marcin Cieslak
+  *	Description: Creates the save/cancel button for authoring page
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="formID" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
+<%@ attribute name="toolContentID" required="true" rtexprvalue="true" %>
+<%@ attribute name="contentFolderID" required="true" rtexprvalue="true" %>
+<%@ attribute name="clearSessionActionUrl" required="true" rtexprvalue="true" %>
+
+<%-- Optional attribute --%>
+<%@ attribute name="accessMode" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="saveButtonLabelKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="cancelConfirmMsgKey" required="false" rtexprvalue="true" %>
+<%@ attribute name="defineLater" required="false" rtexprvalue="true" %>
+<%@ attribute name="customiseSessionID" required="false" rtexprvalue="true" %>
+
+<%-- Default value for message key --%>
+<c:if test="${empty cancelButtonLabelKey}">
+	<c:set var="cancelButtonLabelKey" value="label.authoring.cancel.button" scope="request"/>
+</c:if>
+<c:if test="${empty saveButtonLabelKey}">
+	<c:set var="saveButtonLabelKey" value="label.authoring.save.button" scope="request"/>
+</c:if>
+<c:if test="${empty cancelConfirmMsgKey}">
+	<c:set var="cancelConfirmMsgKey" value="authoring.msg.cancel.save" scope="request"/>
+</c:if>
+<c:if test="${empty accessMode}">
+	<c:set var="accessMode" value="author" scope="request"/>
+</c:if>
+<c:if test="${not empty param.notifyCloseURL}">
+	<c:set var="notifyCloseURL" value="${param.notifyCloseURL}" scope="session"/>
+</c:if>
+
+<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
+
+<!-- begin tab content -->
+<script type="text/javascript">
+	//we set LAMS_AUTHORING_SUCCESS_FLAG to true in AuthoringAction.update() method 
+	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
+		
+		//if defineLater is true close current window
+		if (("${defineLater}" == "true") || ("${defineLater}" == "yes")) {
+			closeWindow("defineLater");
+			
+		//show confirmation page otherwise
+		} else {
+			location.href= "<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}&customiseSessionID=${customiseSessionID}&contentFolderID=${contentFolderID}'/>";
+		}
+	}
+    function doSubmit_Form_Only() {
+    	var form = document.getElementById("${formID}");
+    	//invoke onsubmit event if it's available, submit form afterwards
+    	if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) {
+    		form.submit();
+    	}
+    }
+    function doCancel() {
+    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    		closeWindow("cancel");
+    	}
+    }
+    function closeWindow(nextAction) {
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
+		if (notifyCloseURL == ""){
+			if (nextAction == "defineLater") {
+				refreshParentMonitoringWindow();
+			}
+			var clearSessionUrl = "<c:url value='${clearSessionActionUrl}?action=" + nextAction + "&mode=${accessMode}&defineLater=${defineLater}&customiseSessionID=${customiseSessionID}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+			doAjaxCall(clearSessionUrl);
+		} else {
+			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
+				window.location.href = notifyCloseURL + '&action=' + nextAction;
+			} else if (window.parent.opener == null){
+				doAjaxCall(notifyCloseURL);
+			} else {
+				window.parent.opener.location.href = notifyCloseURL;
+			}
+		}
+    	
+    	//just for depress alert window when call window.close()
+    	//only available for IE browser
+    	var userAgent=navigator.userAgent;
+    	if(userAgent.indexOf('MSIE') != -1)
+        	window.opener = "authoring"
+    	window.close();
+    }  				
+</script>	
+<div id="saveCancelButtons" class="d-flex justify-content-end">
+	<button id="cancelButton" onclick="javascript:doCancel()" type="button" class="btn btn-outline-secondary mr-2">
+		<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+	</button>
+	
+	<button id="saveButton" onClick="javascript:doSubmit_Form_Only();" class="btn btn-primary">
+		<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
+	</button>
+
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r023e019feae586433ba4b9086294aab7a424d1f9 -r0bc73958f17fe53a99f0e38e96a7eda971b9ad8c
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 023e019feae586433ba4b9086294aab7a424d1f9)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 0bc73958f17fe53a99f0e38e96a7eda971b9ad8c)
@@ -433,4 +433,8 @@
        <name>OutcomeAuthor5</name>
        <path>/WEB-INF/tags/OutcomeAuthor5.tag</path>
    	</tag-file> 
+   	<tag-file>
+       <name>AuthoringButton5</name>
+       <path>/WEB-INF/tags/AuthoringButton5.tag</path>
+   	</tag-file>  
 </taglib>
Index: lams_tool_assessment/web/pages/authoring/authoring5.jsp
===================================================================
diff -u -r3d7577122201e05495a07b77e10a0846400987f0 -r0bc73958f17fe53a99f0e38e96a7eda971b9ad8c
--- lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 3d7577122201e05495a07b77e10a0846400987f0)
+++ lams_tool_assessment/web/pages/authoring/authoring5.jsp	(.../authoring5.jsp)	(revision 0bc73958f17fe53a99f0e38e96a7eda971b9ad8c)
@@ -156,7 +156,7 @@
 				</div>
 			</lams:Panel>
 				
-              	<lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
+           <lams:Panel id="questions" titleKey="label.authoring.basic.question.list.title" iconClass="fa-question-circle-o" colorClass="yellow" expanded="true">
 				<jsp:include page="questions5.jsp"/>
 			</lams:Panel>
 			
@@ -176,18 +176,14 @@
 						colorClass="green2" expanded="false">
 				<jsp:include page="reflection5.jsp"/>
 			</lams:Panel>
+			
+			<!-- Button Row -->
+			<lams:AuthoringButton5 formID="authoringForm"
+				clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
+				toolContentID="${assessmentForm.assessment.contentId}"
+				accessMode="${mode}" defineLater="${mode=='teacher'}"
+				contentFolderID="${assessmentForm.contentFolderID}" />
 		</div>
-		
-		<!-- Button Row -->
-		<div class="row">
-			<div class="col-12 p-0">
-				<lams:AuthoringButton formID="authoringForm"
-					clearSessionActionUrl="/clearsession.do" toolSignature="<%=AssessmentConstants.TOOL_SIGNATURE%>"
-					toolContentID="${assessmentForm.assessment.contentId}"
-					accessMode="${mode}" defineLater="${mode=='teacher'}"
-					contentFolderID="${assessmentForm.contentFolderID}" />
-			</div>
-		</div>
 	</form:form>
 </lams:PageComponent>
 </body>