Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/Attic/ApplicationResources.properties,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	30 Nov 2005 03:36:13 -0000	1.15
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	14 Dec 2005 03:25:29 -0000	1.16
@@ -3,9 +3,7 @@
 #-------------------------Authoring Labels-----------------#
 label.authoring.heading.basic=Forum
 label.authoring.heading.basic.desc=Basic input information for forum
-label.authoring.heading.instructions=Forum Instructions
 label.authoring.heading.instructions.desc=Please input online and offline instructions
-label.authoring.heading.advance=Forum Advance
 label.authoring.heading.advance.desc=Please input advance options for Forum 
 label.authoring.create.new.topic=Create a new topic
 
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/authoring/advance.jsp	1 Nov 2005 05:30:55 -0000	1.4
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	14 Dec 2005 03:25:29 -0000	1.5
@@ -1,6 +1,5 @@
 	<!---------------------------Advance Tab Content ------------------------>	
-	<div id='content_a'  class="tabbody content_a">
-	<h1><fmt:message key="label.authoring.heading.advance" /></h1>
+	<div id='content_a'  class="tabbody content_a" >
 	<h2><fmt:message key="label.authoring.heading.advance.desc" /></h2>
 	<table class="forms">
 		<!-- Instructions Row -->
@@ -25,16 +24,18 @@
 				</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 >
-			<html:submit property="save" styleClass="button">
-				<fmt:message key="label.authoring.save.button" />
-			</html:submit></td>
-		</tr>
 	</table>
+
+		<!-- Button Row -->
+		<HR>
+		<p align="right">
+			<html:submit property="save" styleClass="a.button">
+				<fmt:message key="label.authoring.save.button" />
+			</html:submit>
+			<html:button property="cancel"
+				onclick="window.close()" styleClass="a.button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button>
+		</p>
 	</div>
\ No newline at end of file
Index: lams_tool_forum/web/jsps/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/authoring.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/authoring/authoring.jsp	2 Dec 2005 04:58:00 -0000	1.8
+++ lams_tool_forum/web/jsps/authoring/authoring.jsp	14 Dec 2005 03:25:29 -0000	1.9
@@ -31,6 +31,8 @@
 		<html:hidden property="toolContentID"/>
 		<html:hidden  property="currentTab" styleId="currentTab"/>
 
+<h1><fmt:message key="label.authoring.heading.basic" /></h1>
+
 <!-- start tabs -->
 <!-- tab holder table -->
 <table border="0" cellspacing="0" cellpadding="0">
Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/web/jsps/authoring/basic.jsp	28 Oct 2005 02:04:43 -0000	1.7
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	14 Dec 2005 03:25:29 -0000	1.8
@@ -19,8 +19,8 @@
 	}
 </script>
 <!---------------------------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>
@@ -41,26 +41,28 @@
 			<%@ include file="/jsps/message/topiclist.jsp" %>
 		</c:if></td>
 	</tr>
-	<tr>
-		<td colspan="2" align="left">
+	<td colspan="2" align="left">
 			<a href="javascript:launchPopup('<html:rewrite page="/authoring/newTopic.do"/>');">
 				<fmt:message key="label.authoring.create.new.topic" />
 			</a>
 		</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()">
-			<fmt:message key="label.authoring.cancel.button" />
-		</html:button> <html:submit property="save">
-			<fmt:message key="label.authoring.save.button" />
-		</html:submit></td>
-	</tr>
+	</table>
+
+		<!-- Button Row -->
+		<HR>
+		<p align="right">
+			<html:submit property="save" styleClass="a.button">
+				<fmt:message key="label.authoring.save.button" />
+			</html:submit>
+			<html:button property="cancel"
+				onclick="window.close()" styleClass="a.button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button>
+		</p>
 </table>
 
 </div>
Index: lams_tool_forum/web/jsps/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/Attic/instructions.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/web/jsps/authoring/instructions.jsp	28 Oct 2005 02:04:43 -0000	1.4
+++ lams_tool_forum/web/jsps/authoring/instructions.jsp	14 Dec 2005 03:25:29 -0000	1.5
@@ -2,7 +2,6 @@
 	<!---------------------------Instruction Tab Content ------------------------>
 	<div id='content_i'  class="tabbody content_i">
 	<script type="text/javascript"	src="<html:rewrite page='/includes/javascript/xmlrequest.js'/>"></script>
-	<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-->
@@ -118,17 +117,17 @@
 			</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="save">
+		</table>
+		<!-- Button Row -->
+		<HR>
+		<p align="right">
+			<html:submit property="save" styleClass="a.button">
 				<fmt:message key="label.authoring.save.button" />
-			</html:submit></td>
-		</tr>
-	</table>
+			</html:submit>
+			<html:button property="cancel"
+				onclick="window.close()" styleClass="a.button">
+				<fmt:message key="label.authoring.cancel.button" />
+			</html:button>
+		</p>
 	</div>
\ No newline at end of file