Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rbe0f74b3d01318467107b6a074df9a097ca56fc1
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision be0f74b3d01318467107b6a074df9a097ca56fc1)
@@ -270,17 +270,10 @@
 		 				 <tr>
 	 						<td NOWRAP valign=top> </td> 
 							<td NOWRAP class="input" colspan=3 align=left valign=top>								
-								<font size=2>
-									<p align="right">
-										<html:link href="javascript:submitMethod('submitQuestions');" property="submit" styleClass="button">
-											<bean:message key="button.submit" />
-										</html:link>
-										<html:link href="javascript:;" property="cancel"
-											onclick="window.close()" styleClass="button">
-											<bean:message key="button.cancel" />
-										</html:link>
-									</p>
-								</font>	
+								<!-- 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>