Index: lams_tool_nb/web/author_page.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/Attic/author_page.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/web/author_page.jsp	16 Nov 2005 00:37:50 -0000	1.6
+++ lams_tool_nb/web/author_page.jsp	14 Dec 2005 03:59:06 -0000	1.7
@@ -122,7 +122,10 @@
 </div>
 
 <hr>
+<p align="right">
 <html:submit property="method" styleClass="button"><fmt:message key="button.save" /></html:submit>
+<html:button property="method" onclick="window.close()" styleClass="button"><fmt:message key="button.cancel" /></html:button>
+</p>
 <!-- end of content_b -->
 </div>
 
@@ -262,7 +265,10 @@
  </logic:notEqual>
  </logic:present>
 	<hr>
+<p align="right">
 <html:submit property="method" styleClass="button"><fmt:message key="button.save" /></html:submit>
+<html:button property="method" onclick="window.close()" styleClass="button"><fmt:message key="button.cancel" /></html:button>
+</p>
 
 
 <!-- end of content_a -->
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SbmtResources.properties,v
diff -u -r1.20 -r1.21
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	9 Dec 2005 05:05:24 -0000	1.20
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	14 Dec 2005 03:59:38 -0000	1.21
@@ -3,11 +3,9 @@
 label.download=Download
 #=========================labels===========================#
 #-------------------------Authoring Labels-----------------#
-label.authoring.heading.basic=Submission
+label.authoring.heading=Submission
 label.authoring.heading.basic.desc=Basic input information for submission 
-label.authoring.heading.instructions=Submission Instructions
 label.authoring.heading.instructions.desc=Please input online and offline instructions
-label.authoring.heading.advance=Submission Advance
 label.authoring.heading.advance.desc=Please input advance options for submission 
 
 label.authoring.basic.title=Title
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/advance.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/authoring/advance.jsp	9 Dec 2005 05:05:24 -0000	1.1
+++ lams_tool_sbmt/web/authoring/advance.jsp	14 Dec 2005 03:59:38 -0000	1.2
@@ -1,6 +1,5 @@
 <!---------------------------Advance Tab Content ------------------------>	
 	<div id='content_a'  class="tabbody content_a">
-	<h1><fmt:message key="label.authoring.heading.advance" /></h1>
 	<h2><fmt:message key="label.authoring.heading.advance.desc" /></h2>
 	<table class="forms">
 		<!-- Instructions Row -->
@@ -11,16 +10,16 @@
 				</html:checkbox>
 			</td>
 		</tr>
-		<!-- Button Row -->
 		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td><html:button property="cancel" onclick="window.close()" styleClass="button">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:button></td>
-			<td >
+		</table>		
+		<!-- Button Row -->
+		<p align="right">
 			<html:submit property="action" styleClass="button">
 				<fmt:message key="label.authoring.save.button" />
-			</html:submit></td>
-		</tr>
-	</table>
+			</html:submit>
+			<html:button property="cancel"
+				onclick="window.close()" styleClass="button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button>
+		</p>
 	</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_sbmt/web/authoring/authoring.jsp	9 Dec 2005 05:05:24 -0000	1.17
+++ lams_tool_sbmt/web/authoring/authoring.jsp	14 Dec 2005 03:59:38 -0000	1.18
@@ -28,6 +28,8 @@
 		<html:hidden property="toolContentID"/>
 		<html:hidden  property="currentTab" styleId="currentTab"/>
 
+<h1><fmt:message key="label.authoring.heading" /></h1>
+
 <!-- start tabs -->
 <!-- tab holder table -->
 <table border="0" cellspacing="0" cellpadding="0">
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/basic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/authoring/basic.jsp	9 Dec 2005 05:05:24 -0000	1.1
+++ lams_tool_sbmt/web/authoring/basic.jsp	14 Dec 2005 03:59:38 -0000	1.2
@@ -1,6 +1,5 @@
 	<!---------------------------Basic Tab Content ------------------------>
 	<div id='content_b' class="tabbody content_b" >
-	<h1><fmt:message key="label.authoring.heading.basic" /></h1>
 	<h2><fmt:message key="label.authoring.heading.basic.desc" /></h2>
 	<table class="forms">
 		<tr>
@@ -14,19 +13,18 @@
 				<c:out value="${authoring.instruction}" escapeXml="false"/>
 			</FCK:editor></td>
 		</tr>
-		<!-- Button Row -->
 		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td colspan="2" class="formcontrol"><html:button property="cancel"
-				onclick="window.close()">
+		</table>		
+		<!-- Button Row -->
+		<p align="right">
+			<html:submit property="action" styleClass="button">
+				<fmt:message key="label.authoring.save.button" />
+			</html:submit>
+			<html:button property="cancel"
+				onclick="window.close()" styleClass="button">
 				<fmt:message key="label.authoring.cancel.button" />
-				</html:button>
-				<html:submit property="action">
-					<fmt:message key="label.authoring.save.button" />
-				</html:submit>
-			</td>
-		</tr>
-	</table>
+			</html:button>
+		</p>
 
 	</div>
 	
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/Attic/instructions.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/web/authoring/instructions.jsp	9 Dec 2005 05:05:24 -0000	1.3
+++ lams_tool_sbmt/web/authoring/instructions.jsp	14 Dec 2005 03:59:38 -0000	1.4
@@ -1,7 +1,6 @@
 
 	<!---------------------------Instruction Tab Content ------------------------>
 	<div id='content_i'  class="tabbody content_i">
-	<h1><fmt:message key="label.authoring.heading.instructions" /></h1>
 	<h2><fmt:message key="label.authoring.heading.instructions.desc" /></h2>
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
@@ -103,18 +102,16 @@
 				</html:submit>
 			</td>
 		</tr>			
-		</tr>
-		<!-- Button Row -->
 		<tr><td colspan="2"><html:errors/></td></tr>
-		<tr>
-			<td class="formcontrol"><html:button property="cancel"
-				onclick="window.close()">
-				<fmt:message key="label.authoring.cancel.button" />
-			</html:button></td>
-			<td class="formcontrol">
-			<html:submit property="action">
+		</table>		
+		<!-- Button Row -->
+		<p align="right">
+			<html:submit property="action" styleClass="button">
 				<fmt:message key="label.authoring.save.button" />
-			</html:submit></td>
-		</tr>
-	</table>
+			</html:submit>
+			<html:button property="cancel"
+				onclick="window.close()" styleClass="button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button>
+		</p>
 	</div>
\ No newline at end of file