Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -rb5daecdbe5723e4f853a9b30225cb0e9ae13d4a6 -r48551771119f5d11f8e78d0608788e2d15ab3589
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision b5daecdbe5723e4f853a9b30225cb0e9ae13d4a6)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 48551771119f5d11f8e78d0608788e2d15ab3589)
@@ -274,5 +274,9 @@
        <name>SetEditor</name>
        <path>/WEB-INF/tags/SetEditor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>AuthoringButton</name>
+       <path>/WEB-INF/tags/AuthoringButton.tag</path>
+   	</tag-file>   	
 
 </taglib>
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r111bade25b2f36532bfe692b4292f56a5969094b -r48551771119f5d11f8e78d0608788e2d15ab3589
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 111bade25b2f36532bfe692b4292f56a5969094b)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 48551771119f5d11f8e78d0608788e2d15ab3589)
@@ -39,6 +39,8 @@
 <%@ attribute name="toolContentID" 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" %>
@@ -53,18 +55,21 @@
 <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>
 
 <!-- begin tab content -->
 <script type="text/javascript">
 	if(<c:choose><c:when test="${LAMS_AUTHORING_SUCCESS_FLAG == true}">true</c:when><c:otherwise>false</c:otherwise></c:choose>){
-        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=learner&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
+        	location.href="<c:url value='${clearSessionActionUrl}?action=confirm&mode=${accessMode}&signature=${toolSignature}&toolContentID=${toolContentID}'/>";
 		}
         function doSubmit() {
         	document.getElementById("${formID}").submit();
         }
         function doCancel() {
         	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
-	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=learner'/>";
+	        	location.href="<c:url value='${clearSessionActionUrl}?action=cancel&mode=${accessMode}'/>";
 	        	//just for depress alert window when call window.close()
 	        	//only available for IE browser
 	        	var userAgent=navigator.userAgent;
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -r111bade25b2f36532bfe692b4292f56a5969094b -r48551771119f5d11f8e78d0608788e2d15ab3589
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 111bade25b2f36532bfe692b4292f56a5969094b)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 48551771119f5d11f8e78d0608788e2d15ab3589)
@@ -4,17 +4,6 @@
 <html>
 	<head>
 		<lams:css />
-		<STYLE>
-		.buttonStyle{
-			font-size: 12px;
-			color: #000000;
-			text-decoration:none;
-			text-align: center;
-			background-color:#B4C8FE;
-			width: 150px;
-			height: 25px;
-		}
-		</STYLE>
 		<script type="text/javascript">
 			  function closeWindow() {
 				//just for depress alert window when call window.close()
@@ -36,10 +25,10 @@
 			<tr>
 				<td align="center">
 					<!-- Button Row -->
-					<html:button onclick="javascript:location.href='${param.reEditUrl}'" property="reedit" styleClass="buttonStyle">
+					<html:button onclick="javascript:location.href='${param.reEditUrl}'" property="reedit" style="width:150;height:25"  styleClass="buttonStyle">
 						<fmt:message key="label.authoring.re.edit" />
 					</html:button>
-					<html:button onclick="javascript:closeWindow();" property="close" styleClass="buttonStyle">
+					<html:button onclick="javascript:closeWindow();" property="close"  style="width:150;height:25"  styleClass="buttonStyle">
 						<fmt:message key="label.authoring.close" />
 					</html:button>
 				</td>
Index: lams_central/web/css/default.css
===================================================================
diff -u -r50d68fddcd33b33903cd4c0119f01080b9314b80 -r48551771119f5d11f8e78d0608788e2d15ab3589
--- lams_central/web/css/default.css	(.../default.css)	(revision 50d68fddcd33b33903cd4c0119f01080b9314b80)
+++ lams_central/web/css/default.css	(.../default.css)	(revision 48551771119f5d11f8e78d0608788e2d15ab3589)
@@ -235,3 +235,12 @@
 		border-top-color: #0D3F59;
 		border-right-color: #FFFFFF;
 }
+/* For  <input type="button"> style */
+.buttonStyle{
+	font-size: 12px;
+	color: #000000;
+	text-decoration:none;
+	text-align: center;
+	background-color:#B4C8FE;
+	width: 80px;
+}
\ No newline at end of file
