Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java
===================================================================
diff -u -rbe0f74b3d01318467107b6a074df9a097ca56fc1 -r7c258915bf9d46f8fe8dd192a2b1a77c024d1cad
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ClearSessionAction.java	(.../ClearSessionAction.java)	(revision 7c258915bf9d46f8fe8dd192a2b1a77c024d1cad)
@@ -29,7 +29,6 @@
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * This class give a chance to clear HttpSession when user save/close authoring page.
@@ -42,7 +41,6 @@
  */
 public class ClearSessionAction extends LamsAuthoringFinishAction {
 
-	@Override
 	public void clearSession(HttpSession session, ToolAccessMode mode) {
 		//only this tool save LAMS_AUTHORING_SUCCESS_FLAG into session, remove it!!!
 		session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG);
Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -rbe0f74b3d01318467107b6a074df9a097ca56fc1 -r7c258915bf9d46f8fe8dd192a2b1a77c024d1cad
--- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
+++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 7c258915bf9d46f8fe8dd192a2b1a77c024d1cad)
@@ -144,6 +144,7 @@
 		<!-- tab content 3 (Instructions) -->
 		<lams:TabBody id="3" titleKey="label.instructions" page="InstructionsContent.jsp" />
 		<!-- end of content (Instructions) -->
+		
 	</c:if> 			
 	
 	<c:if test="${sessionScope.activeModule == 'defineLater' }"> 			
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -rbe0f74b3d01318467107b6a074df9a097ca56fc1 -r7c258915bf9d46f8fe8dd192a2b1a77c024d1cad
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7c258915bf9d46f8fe8dd192a2b1a77c024d1cad)
@@ -267,17 +267,6 @@
 						  	</td>
 						</tr>
 	
-		 				 <tr>
-	 						<td NOWRAP valign=top> </td> 
-							<td NOWRAP class="input" colspan=3 align=left valign=top>								
-								<!-- Button Row -->
-								<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-								<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
-									cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.submit" toolContentID="${formBean.toolContentID}" />									
-			 			  	</td>
-							<td NOWRAP valign=top> </td> 
-							<td NOWRAP valign=top> </td>
-						</tr>
 					</c:if> 													
 					
 					<c:if test="${ (sessionScope.activeModule == 'defineLater') &&
@@ -321,3 +310,28 @@
 						
 					</c:if> 																																						
  				</table> 	 
+
+
+	      	<c:if test="${(activeModule == 'defineLater') && (defineLaterInEditMode == 'true')}"> 					
+				<p align="right">
+				    <a href="javascript:submitMethod('submitQuestions')" class="button">
+			        	<bean:message key="label.save"/></a>
+				</p>
+			</c:if> 					
+
+	      	<c:if test="${activeModule == 'monitoring' }"> 					
+				<p align="right">
+				    <a href="javascript:submitMethod('submitQuestions')" class="button">
+			        	<bean:message key="label.save"/></a>
+				</p>
+			</c:if> 					
+
+			<c:if test="${ activeModule == 'authoring' }"> 					
+					<p align="right">
+					<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+					<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lamc11" 
+					cancelButtonLabelKey="label.cancel" saveButtonLabelKey="label.save" toolContentID="${formBean.toolContentID}" />		
+				</p>
+			
+			</c:if> 					
+ 				
\ No newline at end of file