Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -re8eddfaeb868b5eb85ca87765cb1cb9487edb44f -rde3d5da4dbb6c75897cd46e0eb8167eca22b50ad
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision e8eddfaeb868b5eb85ca87765cb1cb9487edb44f)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision de3d5da4dbb6c75897cd46e0eb8167eca22b50ad)
@@ -1,6 +1,9 @@
+
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
 <!---------------------------Advance Tab Content ------------------------>	
-	<div id='content_a'  class="tabbody content_a">
-	<h2><fmt:message key="label.authoring.heading.advance.desc" /></h2>
 	<table class="forms">
 		<!-- Instructions Row -->
 		<tr>
@@ -11,15 +14,4 @@
 			</td>
 		</tr>
 		<tr><td colspan="2"><html:errors/></td></tr>
-		</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>
-		</p>
-	</div>
\ No newline at end of file
+	</table>
\ No newline at end of file
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
diff -u -re8eddfaeb868b5eb85ca87765cb1cb9487edb44f -rde3d5da4dbb6c75897cd46e0eb8167eca22b50ad
--- lams_tool_sbmt/web/authoring/basic.jsp	(.../basic.jsp)	(revision e8eddfaeb868b5eb85ca87765cb1cb9487edb44f)
+++ lams_tool_sbmt/web/authoring/basic.jsp	(.../basic.jsp)	(revision de3d5da4dbb6c75897cd46e0eb8167eca22b50ad)
@@ -1,30 +1,24 @@
+
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="dolly" %>
+
 	<!---------------------------Basic Tab Content ------------------------>
-	<div id='content_b' class="tabbody content_b" >
-	<h2><fmt:message key="label.authoring.heading.basic.desc" /></h2>
 	<table class="forms">
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.title" />:</td>
 			<td class="formcontrol"><html:text property="title" /></td>
 		</tr>
 		<tr>
 			<td class="formlabel"><fmt:message key="label.authoring.basic.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="instructions"
+			<td NOWRAP width="700">
+				<dolly:SetEditor id="Instructions" text="${authoring.instruction}"/>
+			<!-- remove <FCK:editor id="instructions"
 				basePath="/lams/fckeditor/" height="150" width="85%">
 				<c:out value="${authoring.instruction}" escapeXml="false"/>
-			</FCK:editor></td>
+			</FCK:editor> -->
+			</td>
 		</tr>
 		<tr><td colspan="2"><html:errors/></td></tr>
-		</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>
-		</p>
-
-	</div>
-	
\ No newline at end of file
+		</table>
Index: lams_tool_sbmt/web/authoring/instructions.jsp
===================================================================
diff -u -re8eddfaeb868b5eb85ca87765cb1cb9487edb44f -rde3d5da4dbb6c75897cd46e0eb8167eca22b50ad
--- lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision e8eddfaeb868b5eb85ca87765cb1cb9487edb44f)
+++ lams_tool_sbmt/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision de3d5da4dbb6c75897cd46e0eb8167eca22b50ad)
@@ -1,7 +1,9 @@
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="dolly" %>
 
 	<!---------------------------Instruction Tab Content ------------------------>
-	<div id='content_i'  class="tabbody content_i">
-	<h2><fmt:message key="label.authoring.heading.instructions.desc" /></h2>
 	<table class="forms">
 		<!--hidden field contentID passed by flash-->
 		<tr>
@@ -10,10 +12,14 @@
 		<tr>
 			<td class="formlabel"><fmt:message
 				key="label.authoring.online.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="onlineInstruction"
+			<td NOWRAP width="700">
+			
+			<!-- remove <FCK:editor id="onlineInstruction"
 				basePath="/lams/fckeditor/" height="150" width="85%">
 				<c:out value="${authoring.onlineInstruction}" escapeXml="false"/>
-			</FCK:editor></td>
+			</FCK:editor>-->
+			<dolly:SetEditor id="OnlineInstruction" text="${authoring.onlineInstruction}"/>
+			</td>
 		</tr>
 		<tr>
 			<td></td>
@@ -52,19 +58,22 @@
 				<html:file property="onlineFile">
 					<fmt:message key="label.authoring.choosefile.button" />
 				</html:file>
-				<html:submit property="action">
+				<html:link href="javascript:;" property="submit" onclick="doSubmit('uploadOnline')">
 					<fmt:message key="label.authoring.upload.online.button" />
-				</html:submit>
+				</html:link>
 			</td>
 		</tr>	
 		<!------------Offline Instructions ----------------------->
 		<tr>
 			<td class="formlabel"><fmt:message
 				key="label.authoring.offline.instruction" />:</td>
-			<td class="formcontrol"><FCK:editor id="offlineInstruction"
+			<td NOWRAP width="700">
+			<!-- remove <FCK:editor id="offlineInstruction"
 				basePath="/lams/fckeditor/" height="150" width="85%">
 				<c:out value="${authoring.offlineInstruction}" escapeXml="false"/>
-			</FCK:editor></td>
+			</FCK:editor>-->
+			<dolly:SetEditor id="OfflineInstruction" text="${authoring.offlineInstruction}"/>
+			</td>
 		</tr>
 		<tr>
 			<td></td>
@@ -97,21 +106,10 @@
 				<html:file property="offlineFile">
 					<fmt:message key="label.authoring.choosefile.button" />
 				</html:file>
-				<html:submit property="action">
+				<html:link href="javascript:;" property="submit" onclick="doSubmit('uploadOffline')">
 					<fmt:message key="label.authoring.upload.offline.button" />
-				</html:submit>
+				</html:link>
 			</td>
 		</tr>			
 		<tr><td colspan="2"><html:errors/></td></tr>
-		</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>
-		</p>
-	</div>
\ No newline at end of file
+		</table>
\ No newline at end of file