Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_laqa/web/authoring/BasicContent.jsp	17 Oct 2006 20:32:56 -0000	1.29
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	18 Oct 2006 03:16:13 -0000	1.30
@@ -70,7 +70,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
 								<html:text property="title" style="width: 100%;"></html:text>
@@ -80,7 +80,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.instructions.col"></fmt:message>
 								</div>
 								<lams:FCKEditor id="instructions"
Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	17 Oct 2006 20:32:56 -0000	1.13
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	18 Oct 2006 03:16:13 -0000	1.14
@@ -25,7 +25,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
 						  			<c:out value="${qaGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
@@ -35,7 +35,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.instructions.col"></fmt:message>
 								</div>
 						  			<c:out value="${qaGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	17 Oct 2006 20:32:56 -0000	1.17
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	18 Oct 2006 03:16:13 -0000	1.18
@@ -26,7 +26,7 @@
 
 				<tr>
 					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.onlineInstructions.col"></fmt:message>
 						</div>
 						<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
@@ -68,7 +68,7 @@
 													                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
 													                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 													                         	target="_self" styleClass="button">
-													                	<fmt:message key="link.delete" />
+													                	<bean:message key="link.delete" />
 													                </html:link> 
 													            </td>
 												           	</tr>
@@ -93,14 +93,14 @@
 				
 				<tr> 
 					<td class="field-name"> 
-	          				<fmt:message key="label.onlineFiles" />
+	          				<bean:message key="label.onlineFiles" />
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOnlineFile"></html:file>
 					 	<html:submit property="submitOnlineFile" 
                                      styleClass="linkbutton" 
                                      onclick="submitMethod('addNewFile');">
-								<fmt:message key="label.upload"/>
+								<bean:message key="label.upload"/>
 						</html:submit>
 					</td> 
 				
@@ -109,7 +109,7 @@
 
 				<tr>
 					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.offlineInstructions.col"></fmt:message>
 						</div>
 						<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
@@ -140,18 +140,18 @@
 												        	<tr>
 												            	<td>
 												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-												                   		<fmt:message key="link.view" />
+												                   		<bean:message key="link.view" />
 												                    </a>
 																	&nbsp&nbsp
 													            	<html:link page="<%=download%>" styleClass="button">
-													                	<fmt:message key="link.download" />
+													                	<bean:message key="link.download" />
 													                </html:link>
 																	&nbsp&nbsp
 													            	<html:link page="/authoring.do?dispatch=deleteFile&httpSessionID=${qaGeneralAuthoringDTO.httpSessionID}&toolContentID=${qaGeneralAuthoringDTO.toolContentID}&contentFolderID=${qaGeneralAuthoringDTO.contentFolderID}&activeModule=${qaGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${qaGeneralAuthoringDTO.defaultContentIdStr}&synchInMonitor=${qaGeneralAuthoringDTO.synchInMonitor}&usernameVisible=${qaGeneralAuthoringDTO.usernameVisible}&questionsSequenced=${qaGeneralAuthoringDTO.questionsSequenced}&reflect=${qaGeneralAuthoringDTO.reflect}&reflectionSubject=${qaGeneralAuthoringDTO.reflectionSubject}"
 													            	paramId="uuid" paramName="attachment" paramProperty="uuid"
 													                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 													                         	target="_self" styleClass="button">
-													                	<fmt:message key="link.delete" />
+													                	<bean:message key="link.delete" />
 													                </html:link> 
 													            </td>
 												           	</tr>
@@ -175,14 +175,14 @@
 
 				<tr> 
 					<td class="field-name"> 
-          				<fmt:message key="label.offlineFiles" />
+          				<bean:message key="label.offlineFiles" />
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOfflineFile"></html:file>
 					 	<html:submit property="submitOfflineFile" 
                                      styleClass="linkbutton" 
                                      onclick="submitMethod('addNewFile');">
-								<fmt:message key="label.upload"/>
+								<bean:message key="label.upload"/>
 						</html:submit>
 					</td> 
 				</tr>          		
Index: lams_tool_laqa/web/authoring/editQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/editQuestionBox.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/authoring/editQuestionBox.jsp	17 Oct 2006 20:32:56 -0000	1.3
+++ lams_tool_laqa/web/authoring/editQuestionBox.jsp	18 Oct 2006 03:16:13 -0000	1.4
@@ -64,7 +64,7 @@
 		
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.edit.question"></fmt:message>
 						</div>
 						
@@ -77,7 +77,7 @@
 
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.feedback"></fmt:message>
 						</div>
 						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/newQuestionBox.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	17 Oct 2006 20:32:56 -0000	1.3
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	18 Oct 2006 03:16:13 -0000	1.4
@@ -61,7 +61,7 @@
 		
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.add.new.question"></fmt:message>
 						</div>
 						<lams:FCKEditor id="newQuestion"
@@ -73,7 +73,7 @@
 
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.feedback"></fmt:message>
 						</div>
 						<html:textarea property="feedback" rows="3" cols="70"></html:textarea>							
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/advance.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	29 Sep 2006 06:11:15 -0000	1.9
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	18 Oct 2006 03:17:59 -0000	1.10
@@ -1,66 +1,67 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean"
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-<!-- Advance Tab Content -->	
-	<table class="forms">
-		<!-- Instructions Row -->
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.lockWhenFinished" styleClass="noBorder">
-					<fmt:message key="label.authoring.advance.lock.on.finished" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.runAuto" styleClass="noBorder">
-					<fmt:message key="label.authoring.advance.run.content.auto" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td class="formcontrol">
-				<html:select property="resource.miniViewResourceNumber" styleId="viewNumList">
-					<c:forEach begin="1" end="${fn:length(resourceList)}" varStatus="status">
-						<c:choose>
-							<c:when test="${formBean.resource.miniViewResourceNumber == status.index}">
-								<option value="${status.index}" selected="true">${status.index}</option>
-							</c:when>
-							<c:otherwise>
-								<option value="${status.index}">${status.index}</option>
-							</c:otherwise>
-						</c:choose>
-					</c:forEach>
-				</html:select>
-			</td>
-			<td class="formcontrol"  width="97%">
-					<fmt:message key="label.authoring.advance.mini.number.resources.view" />
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.allowAddUrls" styleClass="noBorder">
-					<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="resource.allowAddFiles" styleClass="noBorder">
-					<fmt:message key="label.authoring.advance.allow.learner.add.files" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<html:checkbox property="resource.reflectOnActivity" styleClass="noBorder"  styleId="reflectOn">
-					<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<html:textarea property="resource.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
-			</td>
-		</tr>		
-	</table>
\ No newline at end of file
+<!-- Advance Tab Content -->
+
+<p class="small-space-top">
+	<html:checkbox property="resource.lockWhenFinished"
+		styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="resource.runAuto" styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.run.content.auto" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:select property="resource.miniViewResourceNumber"
+		styleId="viewNumList">
+		<c:forEach begin="1" end="${fn:length(resourceList)}"
+			varStatus="status">
+			<c:choose>
+				<c:when
+					test="${formBean.resource.miniViewResourceNumber == status.index}">
+					<option value="${status.index}" selected="true">
+						${status.index}
+					</option>
+				</c:when>
+				<c:otherwise>
+					<option value="${status.index}">
+						${status.index}
+					</option>
+				</c:otherwise>
+			</c:choose>
+		</c:forEach>
+	</html:select>
+
+	<fmt:message key="label.authoring.advance.mini.number.resources.view" />
+</p>
+
+<p>
+	<html:checkbox property="resource.allowAddUrls" styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.allow.learner.add.urls" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="resource.allowAddFiles" styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.allow.learner.add.files" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="resource.reflectOnActivity"
+		styleClass="noBorder" styleId="reflectOn">
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:textarea property="resource.reflectInstructions"
+		styleId="reflectInstructions" cols="30" rows="3" />
+</p>
Index: lams_tool_larsrc/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/basic.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_larsrc/web/pages/authoring/basic.jsp	17 Oct 2006 04:19:36 -0000	1.21
+++ lams_tool_larsrc/web/pages/authoring/basic.jsp	18 Oct 2006 03:17:59 -0000	1.22
@@ -74,15 +74,15 @@
 	<table>
 		<tr>
 			<td colspan="2">
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.title"></fmt:message>
 				</div>
-				<html:text property="resource.title" style="width: 100%;"></html:text>
+				<html:text property="resource.title" style="width: 99%;"></html:text>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2">
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.instruction"></fmt:message>
 				</div>
 				<lams:FCKEditor id="resource.instructions"
Index: lams_tool_larsrc/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_larsrc/web/pages/authoring/instructions.jsp	1 Sep 2006 02:47:00 -0000	1.11
+++ lams_tool_larsrc/web/pages/authoring/instructions.jsp	18 Oct 2006 03:17:59 -0000	1.12
@@ -1,7 +1,10 @@
-<%@ include file="/common/taglibs.jsp" %>
-<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page
+	import="org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
+<c:set var="formBean"
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
 <script type="text/javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -58,77 +61,72 @@
 	<!-- Instructions Row -->
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.instruction"></fmt:message>
 			</div>
-			<html:textarea property="resource.onlineInstructions" rows="3" cols="80"></html:textarea>
+			<html:textarea property="resource.onlineInstructions" rows="3"
+				cols="75"></html:textarea>
 		</td>
 	</tr>
 	<tr>
 		<td>
 			<c:set var="fileTypeFlag"
-				value="<%=IToolContentHandler.TYPE_ONLINE %>" />
+				value="<%=IToolContentHandler.TYPE_ONLINE%>" />
 			<div id="onlinefileArea">
 				<%@ include file="parts/instructionfilelist.jsp"%>
 			</div>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.file" />
 			</div>
+			<html:file property="onlineFile">
+				<fmt:message key="label.authoring.choosefile.button" />
+			</html:file>
+			<a href="#" onclick="javascript:doUploadOnline();" class="button">
+				<fmt:message key="label.authoring.upload.online.button" /> </a>
 		</td>
 	</tr>
+
 	<tr>
 		<td>
-			<html:file property="onlineFile">
-				<fmt:message key="label.authoring.choosefile.button" />
-			</html:file>
-			<a href="#" onclick="javascript:doUploadOnline();"
-				class="button"> <fmt:message
-					key="label.authoring.upload.online.button" /> </a>
+
+			<hr />
 		</td>
 	</tr>
-</table>
 
-<hr />
 
-<table>
 	<!-- Offline Instructions -->
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left;">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.instruction"></fmt:message>
 			</div>
 			<html:textarea property="resource.offlineInstructions" rows="3"
-				cols="80"></html:textarea>
+				cols="75"></html:textarea>
 		</td>
 	</tr>
 	<tr>
 		<td>
 			<c:set var="fileTypeFlag"
-				value="<%=IToolContentHandler.TYPE_OFFLINE %>" />
+				value="<%=IToolContentHandler.TYPE_OFFLINE%>" />
 			<div id="offlinefileArea">
 				<%@ include file="parts/instructionfilelist.jsp"%>
 			</div>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align:left">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.file" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
 			<html:file property="offlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
-			<a href="#" onclick="javascript:doUploadOffline();"
-				class="button"> <fmt:message
-					key="label.authoring.upload.offline.button" /> </a>
+			<a href="#" onclick="javascript:doUploadOffline();" class="button">
+				<fmt:message key="label.authoring.upload.offline.button" /> </a>
 		</td>
 	</tr>
 </table>
Index: lams_tool_nb/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/advance.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_nb/web/authoring/advance.jsp	19 Sep 2006 06:37:24 -0000	1.2
+++ lams_tool_nb/web/authoring/advance.jsp	18 Oct 2006 03:18:31 -0000	1.3
@@ -2,25 +2,18 @@
 
 <!-- ========== Advanced Tab ========== -->
 <table cellpadding="0">
-	<tbody>
-		<tr>
-			<td align="right">
-				<html:checkbox property="reflectOnActivity" value="1"
-					styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-			</td>
-			<td>
-				<label for="reflectOnActivity">
-					<fmt:message key="advanced.reflectOnActivity" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<html:textarea property="reflectInstructions" cols="30" rows="3" />
-			</td>
-		</tr>
-	</tbody>
-</table>
\ No newline at end of file
+	<tr>
+		<td>
+			<html:checkbox property="reflectOnActivity" value="1"
+				styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
+			<label for="reflectOnActivity">
+				<fmt:message key="advanced.reflectOnActivity" />
+			</label>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:textarea property="reflectInstructions" cols="30" rows="3" />
+		</td>
+	</tr>
+</table>
Index: lams_tool_nb/web/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/basic.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/web/authoring/basic.jsp	31 Aug 2006 01:31:54 -0000	1.4
+++ lams_tool_nb/web/authoring/basic.jsp	18 Oct 2006 03:18:31 -0000	1.5
@@ -1,24 +1,21 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <!-- Basic Tab Content  -->
 <table cellpadding="0">
-	<tbody>
-		<tr>
-			<td>
-				<div class="field-name" style="text-align: left;">
-					<fmt:message key="basic.title"></fmt:message>
-				</div>
-				<html:text property="title" style="width: 100%;"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="field-name" style="text-align: left;">
-					<fmt:message key="basic.content"></fmt:message>
-				</div>
-				<lams:FCKEditor id="content"
-					value="${NbAuthoringForm.content}"
-					contentFolderID="${NbAuthoringForm.contentFolderID}"></lams:FCKEditor>
-			</td>
-		</tr>
-	</tbody>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="basic.title"></fmt:message>
+			</div>
+			<html:text property="title" style="width: 99%;"></html:text>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="basic.content"></fmt:message>
+			</div>
+			<lams:FCKEditor id="content" value="${NbAuthoringForm.content}"
+				contentFolderID="${NbAuthoringForm.contentFolderID}"></lams:FCKEditor>
+		</td>
+	</tr>
 </table>
Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/Attic/instructions.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_nb/web/authoring/instructions.jsp	19 Sep 2006 08:33:07 -0000	1.8
+++ lams_tool_nb/web/authoring/instructions.jsp	18 Oct 2006 03:18:31 -0000	1.9
@@ -16,10 +16,10 @@
 <table>
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="instructions.onlineInstructions"></fmt:message>
 			</div>
-			<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
+			<html:textarea property="onlineInstructions" rows="3" cols="75"></html:textarea>
 		</td>
 	</tr>
 
@@ -62,31 +62,30 @@
 
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="instructions.uploadOnlineInstr" />
 			</div>
+
+			<html:file property="onlineFile" />
+			<html:link href="javascript:doUpload();" property="submit"
+				styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
 		</td>
 	</tr>
+
 	<tr>
 		<td>
-			<html:file property="onlineFile" />
-			<html:link href="javascript:doUpload();"
-				property="submit" styleClass="button">
-				<fmt:message key="button.upload" />
-			</html:link>
+			<hr />
 		</td>
 	</tr>
-</table>
 
-<hr />
-
-<table>
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left;">
+			<div class="field-name-alternative-color">
 				<fmt:message key="instructions.offlineInstructions"></fmt:message>
 			</div>
-			<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
+			<html:textarea property="offlineInstructions" rows="3" cols="75"></html:textarea>
 		</td>
 	</tr>
 
@@ -129,16 +128,13 @@
 
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left;">
+			<div class="field-name-alternative-color">
 				<fmt:message key="instructions.uploadOfflineInstr" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
+
 			<html:file property="offlineFile" />
-			<html:link href="javascript:doUpload();"
-				property="submit" styleClass="button">
+			<html:link href="javascript:doUpload();" property="submit"
+				styleClass="button">
 				<fmt:message key="button.upload" />
 			</html:link>
 		</td>
Index: lams_tool_notebook/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/advanced.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	31 Aug 2006 06:18:58 -0000	1.4
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	18 Oct 2006 03:18:47 -0000	1.5
@@ -1,25 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- ========== Advanced Tab ========== -->
-<table cellpadding="0">
-	<tbody>
-		<tr>
-			<td>
-				<html:checkbox property="lockOnFinished" value="1"
-					styleClass="noBorder" styleId="lockOnFinished"></html:checkbox>
-				<label for="lockOnFinished">
-					<fmt:message key="advanced.lockOnFinished" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<html:checkbox property="allowRichEditor" value="1"
-					styleClass="noBorder" styleId="allowRichEditor"></html:checkbox>
-				<label for="allowRichEditor">
-					<fmt:message key="advanced.allowRichEditor" />
-				</label>
-			</td>
-		</tr>
-	</tbody>
-</table>
+
+<p class="small-space-top">
+	<html:checkbox property="lockOnFinished" value="1"
+		styleClass="noBorder" styleId="lockOnFinished"></html:checkbox>
+	<label for="lockOnFinished">
+		<fmt:message key="advanced.lockOnFinished" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="allowRichEditor" value="1"
+		styleClass="noBorder" styleId="allowRichEditor"></html:checkbox>
+	<label for="allowRichEditor">
+		<fmt:message key="advanced.allowRichEditor" />
+	</label>
+</p>
+
Index: lams_tool_notebook/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/basic.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/authoring/basic.jsp	31 Aug 2006 00:29:51 -0000	1.2
+++ lams_tool_notebook/web/pages/authoring/basic.jsp	18 Oct 2006 03:18:47 -0000	1.3
@@ -5,24 +5,22 @@
 
 <!-- ========== Basic Tab ========== -->
 <table cellpadding="0">
-	<tbody>
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.title"></fmt:message>
 				</div>
-				<html:text property="title" style="width: 100%;"></html:text>
+				<html:text property="title" style="width: 99%;"></html:text>
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 				</div>
 				<lams:FCKEditor id="instructions"
 					value="${authoringForm.instructions}"
 					contentFolderID="${authoringForm.contentFolderID}"></lams:FCKEditor>
 			</td>
 		</tr>
-	</tbody>
 </table>
Index: lams_tool_notebook/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_notebook/web/pages/authoring/instructions.jsp	31 Aug 2006 00:29:51 -0000	1.2
+++ lams_tool_notebook/web/pages/authoring/instructions.jsp	18 Oct 2006 03:18:47 -0000	1.3
@@ -3,213 +3,205 @@
 <html:hidden property="deleteFileUuid" />
 
 <table cellpadding="0">
-	<tbody>
-		<%-- Online Instructions --%>
+
+	<%-- Online Instructions --%>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="instructions.onlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstruction" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
+
+	<%-- Online Attachments --%>
+	<c:if
+		test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
-					<fmt:message key="instructions.onlineInstructions"></fmt:message>
-				</div>
-				<html:textarea property="onlineInstruction" rows="3" cols="80"></html:textarea>
-			</td>
-		</tr>
+				<div class="space-left">
+					<ul>
 
-		<%-- Online Attachments --%>
-		<c:if
-			test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
-			<tr>
-				<td>
-					<div class="space-left">
-						<ul>
-							
-							<%-- Online Saved Files	--%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.onlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+						<%-- Online Saved Files	--%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.onlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<html:link
+									href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-							<%-- Online Unsaved Files --%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.unsavedOnlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									*
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+						<%-- Online Unsaved Files --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.unsavedOnlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								*
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<html:link
+									href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-						</ul>
-					</div>
-				</td>
-			</tr>
-		</c:if>
-
-		<%-- Online Attachments Upload --%>
-		<tr>
-			<td>
-				<div class="field-name" style="text-align: left">
-					<fmt:message key="instructions.uploadOnlineInstr" />
+					</ul>
 				</div>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div class="space-left">
-					<html:file property="onlineFile">
-					</html:file>
-					<html:link href="javascript:doSubmit('uploadOnline');"
-						property="submit" styleClass="button">
-						<fmt:message key="button.upload" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
-	</tbody>
-</table>
+	</c:if>
 
-<hr />
+	<%-- Online Attachments Upload --%>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="instructions.uploadOnlineInstr" />
+			</div>
 
-<table>
-	<tbody>
-		<%-- Offline Instructions --%>
-		<tr>
-			<td>
-				<div class="field-name-alternative-color" style="text-align: left;">
-					<fmt:message key="instructions.offlineInstructions"></fmt:message>
-				</div>
-				<html:textarea property="offlineInstruction" rows="3" cols="80"></html:textarea>
-			</td>
-		</tr>
+			<html:file property="onlineFile">
+			</html:file>
+			<html:link href="javascript:doSubmit('uploadOnline');"
+				property="submit" styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
 
+		</td>
+	</tr>
 
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
-		<%-- Offline Attachments --%>
-		<c:if
-			test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
-			<tr>
-				<td>
-					<div class="space-left">
-						<ul>
+	<%-- Offline Instructions --%>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="instructions.offlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="offlineInstruction" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
 
-							<%-- Offline Saved Attachments --%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.offlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
-	
-								<%-- Offline Unsaved Attachments --%>
-								<c:forEach var="file"
-									items="${requestScope.sessionMap.unsavedOfflineFiles}">
-									<li>
-										<c:out value="${file.fileName}" />
-										*
-										<c:set var="viewURL">
-											<html:rewrite
-												page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-										</c:set>
-										<a
-											href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+	<%-- Offline Attachments --%>
+	<c:if
+		test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
+		<tr>
+			<td>
+				<div class="space-left">
+					<ul>
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+						<%-- Offline Saved Attachments --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.offlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-						</ul>
-					</div>
-				</td>
-			</tr>
-		</c:if>
+								<html:link
+									href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-		<%--Offline Attachments Upload --%>
-		<tr>
-			<td>
-				<div class="field-name-alternative-color" style="text-align: left;">
-					<fmt:message key="instructions.uploadOfflineInstr" />
+						<%-- Offline Unsaved Attachments --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.unsavedOfflineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								*
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
+
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
+
+								<html:link
+									href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
+
+					</ul>
 				</div>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div class="space-left">
-					<html:file property="offlineFile">
-					</html:file>
-					<html:link href="javascript:doSubmit('uploadOffline');"
-						property="submit" styleClass="button">
-						<fmt:message key="button.upload" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
-	</tbody>
+	</c:if>
+
+	<%--Offline Attachments Upload --%>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="instructions.uploadOfflineInstr" />
+			</div>
+
+			<html:file property="offlineFile">
+			</html:file>
+			<html:link href="javascript:doSubmit('uploadOffline');"
+				property="submit" styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
+
+		</td>
+	</tr>
+
 </table>
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/advance.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_sbmt/web/authoring/advance.jsp	29 Sep 2006 06:11:19 -0000	1.9
+++ lams_tool_sbmt/web/authoring/advance.jsp	18 Oct 2006 03:19:03 -0000	1.10
@@ -1,42 +1,40 @@
 <%@include file="/common/taglibs.jsp"%>
 
 <!-- Advance Tab Content -->
-<table cellpadding="0">
-	<!-- Instructions Row -->
-	<tr>
-		<td>
-			<html:checkbox property="lockOnFinished" styleClass="noBorder">
-				<fmt:message key="label.authoring.advance.lock.on.finished" />
-			</html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<html:checkbox property="limitUpload" styleId="limitUpload" styleClass="noBorder" onclick="limitUploadChange()">
-				<fmt:message key="label.limit.number.upload" />
-			</html:checkbox>
-			<html:select property="limitUploadNumber" styleId="limitUploadNumber">
-				<html:option value="1">1</html:option>
-				<html:option value="2">2</html:option>
-				<html:option value="3">3</html:option>
-				<html:option value="4">4</html:option>
-				<html:option value="5">5</html:option>
-			</html:select>
-		</td>
-	</tr>
-	<tr>
-		<td >
-			<html:checkbox property="reflectOnActivity" styleClass="noBorder"  styleId="reflectOn">
-				<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-			</html:checkbox>
-		</td>
-	</tr>
-	<tr>
-		<td >
-			<html:textarea property="reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
-		</td>
-	</tr>		
-</table>
+
+<p>
+	<html:checkbox property="lockOnFinished" styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="limitUpload" styleId="limitUpload"
+		styleClass="noBorder" onclick="limitUploadChange()">
+		<fmt:message key="label.limit.number.upload" />
+	</html:checkbox>
+
+	<html:select property="limitUploadNumber" styleId="limitUploadNumber">
+		<html:option value="1">1</html:option>
+		<html:option value="2">2</html:option>
+		<html:option value="3">3</html:option>
+		<html:option value="4">4</html:option>
+		<html:option value="5">5</html:option>
+	</html:select>
+</p>
+
+<p>
+	<html:checkbox property="reflectOnActivity" styleClass="noBorder"
+		styleId="reflectOn">
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:textarea property="reflectInstructions"
+		styleId="reflectInstructions" cols="30" rows="3" />
+
+</p>
 <script type="text/javascript">
 	function limitUploadChange(){
 		var lu = document.getElementById("limitUpload");
@@ -49,4 +47,4 @@
 	}
 	//initial set
 	limitUploadChange();
-</script>
\ No newline at end of file
+</script>
Index: lams_tool_sbmt/web/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/basic.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_sbmt/web/authoring/basic.jsp	31 Aug 2006 05:48:27 -0000	1.9
+++ lams_tool_sbmt/web/authoring/basic.jsp	18 Oct 2006 03:19:03 -0000	1.10
@@ -6,15 +6,15 @@
 <table cellpadding="0">
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.basic.title"></fmt:message>
 			</div>
-			<html:text property="title" style="width: 100%;"></html:text>
+			<html:text property="title" style="width: 99%;"></html:text>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
 			</div>
 			<lams:FCKEditor id="instructions"
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.16 -r1.17
--- lams_tool_sbmt/web/authoring/instructions.jsp	11 Oct 2006 02:36:37 -0000	1.16
+++ lams_tool_sbmt/web/authoring/instructions.jsp	18 Oct 2006 03:19:03 -0000	1.17
@@ -68,10 +68,10 @@
 	<!-- Instructions Row -->
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.instruction"></fmt:message>
 			</div>
-			<html:textarea property="onlineInstruction" cols="80" rows="3"></html:textarea>
+			<html:textarea property="onlineInstruction" cols="75" rows="3"></html:textarea>
 		</td>
 	</tr>
 	<tr>
@@ -85,13 +85,9 @@
 	</tr>
 	<tr>
 		<td class="field-name">
-			<div class="field-name" style="text-align: left">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.file" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
 			<html:file property="onlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
@@ -100,18 +96,20 @@
 					key="label.authoring.upload.online.button" /> </a>
 		</td>
 	</tr>
-</table>
 
-<hr />
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
-<table>
 	<!-- Offline Instructions -->
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left;">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.instruction"></fmt:message>
 			</div>
-			<html:textarea property="offlineInstruction" cols="80" rows="3"></html:textarea>
+			<html:textarea property="offlineInstruction" cols="75" rows="3"></html:textarea>
 		</td>
 	</tr>
 	<tr>
@@ -125,13 +123,9 @@
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.file" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
 			<html:file property="offlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
Index: lams_tool_scribe/web/pages/authoring/advanced.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/advanced.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/authoring/advanced.jsp	15 Sep 2006 03:09:52 -0000	1.1
+++ lams_tool_scribe/web/pages/authoring/advanced.jsp	18 Oct 2006 03:19:22 -0000	1.2
@@ -1,62 +1,39 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- ========== Advanced Tab ========== -->
-<table cellpadding="0">
-	<tbody>
-		<tr>
-			<td align="right">
-				<html:checkbox property="lockOnFinished" styleClass="noBorder"
-					styleId="lockOnFinished" disabled="true">
-				</html:checkbox>
-			</td>
-			<td>
-				<label for="lockOnFinished">
-					<fmt:message key="advanced.lockOnFinished" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<html:checkbox property="reflectOnActivity" value="1"
-					styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
-			</td>
-			<td>
-				<label for="reflectOnActivity">
-					<fmt:message key="advanced.reflectOnActivity" />
-				</label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				<html:textarea property="reflectInstructions" cols="30" rows="3" />
-			</td>
-		</tr>
 
-		<tr>
-			<td colspan="2">
-				<div class="field-name" style="text-align: left;">
-					<fmt:message key="advanced.selectScribe"/>
-				</div>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<html:radio property="autoSelectScribe" value="true"></html:radio>
-			</td>
-			<td>
-				<fmt:message key="advanced.firstLearner"/>
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<html:radio property="autoSelectScribe" value="false"></html:radio>
-			</td>
-			<td>
-				<fmt:message key="advanced.selectInMonitor"/>
-			</td>
-		</tr>
-	</tbody>
-</table>
+<p class="small-space-top">
+	<html:checkbox property="lockOnFinished" styleClass="noBorder"
+		styleId="lockOnFinished" disabled="true">
+	</html:checkbox>
+
+	<label for="lockOnFinished">
+		<fmt:message key="advanced.lockOnFinished" />
+	</label>
+</p>
+
+<p>
+	<html:checkbox property="reflectOnActivity" value="1"
+		styleClass="noBorder" styleId="reflectOnActivity"></html:checkbox>
+
+	<label for="reflectOnActivity">
+		<fmt:message key="advanced.reflectOnActivity" />
+	</label>
+</p>
+<p>
+	<html:textarea property="reflectInstructions" cols="30" rows="3" />
+</p>
+
+<h2>
+	<fmt:message key="advanced.selectScribe" />
+</h2>
+
+<p>
+	<html:radio property="autoSelectScribe" value="true"></html:radio>
+
+	<fmt:message key="advanced.firstLearner" />
+
+	<html:radio property="autoSelectScribe" value="false"></html:radio>
+
+	<fmt:message key="advanced.selectInMonitor" />
+</p>
Index: lams_tool_scribe/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/basic.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/pages/authoring/basic.jsp	16 Oct 2006 07:09:38 -0000	1.3
+++ lams_tool_scribe/web/pages/authoring/basic.jsp	18 Oct 2006 03:19:22 -0000	1.4
@@ -41,15 +41,15 @@
 	<tbody>
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.title"></fmt:message>
 				</div>
-				<html:text property="title" style="width: 100%;"></html:text>
+				<html:text property="title" style="width: 99%;"></html:text>
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 				</div>
 				<lams:FCKEditor id="instructions" value="${formBean.instructions}"
@@ -58,7 +58,7 @@
 		</tr>
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.heading" />
 				</div>
 				<div id="itemListArea">
Index: lams_tool_scribe/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/web/pages/authoring/instructions.jsp	15 Sep 2006 03:09:52 -0000	1.1
+++ lams_tool_scribe/web/pages/authoring/instructions.jsp	18 Oct 2006 03:19:22 -0000	1.2
@@ -3,213 +3,200 @@
 <html:hidden property="deleteFileUuid" />
 
 <table cellpadding="0">
-	<tbody>
-		<%-- Online Instructions --%>
+	<%-- Online Instructions --%>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="instructions.onlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstruction" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
+
+	<%-- Online Attachments --%>
+	<c:if
+		test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
 		<tr>
 			<td>
-				<div class="field-name" style="text-align: left;">
-					<fmt:message key="instructions.onlineInstructions"></fmt:message>
-				</div>
-				<html:textarea property="onlineInstruction" rows="3" cols="80"></html:textarea>
-			</td>
-		</tr>
+				<div class="space-left">
+					<ul>
 
-		<%-- Online Attachments --%>
-		<c:if
-			test="${not empty requestScope.sessionMap.onlineFiles or not empty requestScope.sessionMap.unsavedOnlineFiles}">
-			<tr>
-				<td>
-					<div class="space-left">
-						<ul>
-							
-							<%-- Online Saved Files	--%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.onlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+						<%-- Online Saved Files	--%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.onlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<html:link
+									href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-							<%-- Online Unsaved Files --%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.unsavedOnlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									*
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+						<%-- Online Unsaved Files --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.unsavedOnlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								*
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+								<html:link
+									href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-						</ul>
-					</div>
-				</td>
-			</tr>
-		</c:if>
-
-		<%-- Online Attachments Upload --%>
-		<tr>
-			<td>
-				<div class="field-name" style="text-align: left">
-					<fmt:message key="instructions.uploadOnlineInstr" />
+					</ul>
 				</div>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div class="space-left">
-					<html:file property="onlineFile">
-					</html:file>
-					<html:link href="javascript:doSubmit('uploadOnline');"
-						property="submit" styleClass="button">
-						<fmt:message key="button.upload" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
-	</tbody>
-</table>
+	</c:if>
 
-<hr />
+	<%-- Online Attachments Upload --%>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="instructions.uploadOnlineInstr" />
+			</div>
+			<html:file property="onlineFile">
+			</html:file>
+			<html:link href="javascript:doSubmit('uploadOnline');"
+				property="submit" styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
+		</td>
+	</tr>
 
-<table>
-	<tbody>
-		<%-- Offline Instructions --%>
-		<tr>
-			<td>
-				<div class="field-name-alternative-color" style="text-align: left;">
-					<fmt:message key="instructions.offlineInstructions"></fmt:message>
-				</div>
-				<html:textarea property="offlineInstruction" rows="3" cols="80"></html:textarea>
-			</td>
-		</tr>
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
+	<%-- Offline Instructions --%>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="instructions.offlineInstructions"></fmt:message>
+			</div>
+			<html:textarea property="offlineInstruction" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
 
 
-		<%-- Offline Attachments --%>
-		<c:if
-			test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
-			<tr>
-				<td>
-					<div class="space-left">
-						<ul>
 
-							<%-- Offline Saved Attachments --%>
-							<c:forEach var="file"
-								items="${requestScope.sessionMap.offlineFiles}">
-								<li>
-									<c:out value="${file.fileName}" />
-									<c:set var="viewURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-									</c:set>
-									<a
-										href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+	<%-- Offline Attachments --%>
+	<c:if
+		test="${not empty requestScope.sessionMap.offlineFiles or not empty requestScope.sessionMap.unsavedOfflineFiles}">
+		<tr>
+			<td>
+				<div class="space-left">
+					<ul>
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+						<%-- Offline Saved Attachments --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.offlineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-									<html:link
-										href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
-	
-								<%-- Offline Unsaved Attachments --%>
-								<c:forEach var="file"
-									items="${requestScope.sessionMap.unsavedOfflineFiles}">
-									<li>
-										<c:out value="${file.fileName}" />
-										*
-										<c:set var="viewURL">
-											<html:rewrite
-												page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
-										</c:set>
-										<a
-											href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-										<fmt:message key="link.view" /> </a> &nbsp;
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-									<c:set var="downloadURL">
-										<html:rewrite
-											page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
-									</c:set>
-									<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-										<fmt:message key="link.download" /> </a> &nbsp;
+								<html:link
+									href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
 
-									<html:link
-										href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
-										<fmt:message key="link.delete" />
-									</html:link>
-								</li>
-							</c:forEach>
+						<%-- Offline Unsaved Attachments --%>
+						<c:forEach var="file"
+							items="${requestScope.sessionMap.unsavedOfflineFiles}">
+							<li>
+								<c:out value="${file.fileName}" />
+								*
+								<c:set var="viewURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=false" />
+								</c:set>
+								<a
+									href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+									<fmt:message key="link.view" /> </a> &nbsp;
 
-						</ul>
-					</div>
-				</td>
-			</tr>
-		</c:if>
+								<c:set var="downloadURL">
+									<html:rewrite
+										page="/download/?uuid=${file.fileUuid}&amp;preferDownload=true" />
+								</c:set>
+								<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+									<fmt:message key="link.download" /> </a> &nbsp;
 
-		<%--Offline Attachments Upload --%>
-		<tr>
-			<td>
-				<div class="field-name-alternative-color" style="text-align: left;">
-					<fmt:message key="instructions.uploadOfflineInstr" />
+								<html:link
+									href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
+									<fmt:message key="link.delete" />
+								</html:link>
+							</li>
+						</c:forEach>
+
+					</ul>
 				</div>
 			</td>
 		</tr>
-		<tr>
-			<td>
-				<div class="space-left">
-					<html:file property="offlineFile">
-					</html:file>
-					<html:link href="javascript:doSubmit('uploadOffline');"
-						property="submit" styleClass="button">
-						<fmt:message key="button.upload" />
-					</html:link>
-				</div>
-			</td>
-		</tr>
-	</tbody>
+	</c:if>
+
+	<%--Offline Attachments Upload --%>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="instructions.uploadOfflineInstr" />
+			</div>
+			<html:file property="offlineFile">
+			</html:file>
+			<html:link href="javascript:doSubmit('uploadOffline');"
+				property="submit" styleClass="button">
+				<fmt:message key="button.upload" />
+			</html:link>
+		</td>
+	</tr>
+
 </table>
Index: lams_tool_survey/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/advance.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_survey/web/pages/authoring/advance.jsp	29 Sep 2006 03:46:07 -0000	1.3
+++ lams_tool_survey/web/pages/authoring/advance.jsp	18 Oct 2006 03:20:17 -0000	1.4
@@ -1,33 +1,31 @@
-<%@ include file="/common/taglibs.jsp" %>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="formBean"
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
-<!-- Advance Tab Content -->	
-	<table class="forms">
-		<!-- Instructions Row -->
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="survey.lockWhenFinished" styleClass="noBorder">
-					<fmt:message key="label.authoring.advance.lock.on.finished" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2 class="formcontrol">
-				<html:checkbox property="survey.showOnePage" styleClass="noBorder">
-					<fmt:message key="label.authoring.advance.show.on.one.page" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<html:checkbox property="survey.reflectOnActivity" styleClass="noBorder"  styleId="reflectOn">
-					<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-				</html:checkbox>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<html:textarea property="survey.reflectInstructions" styleId="reflectInstructions" cols="30" rows="3" />
-			</td>
-		</tr>		
-	</table>
+<!-- Advance Tab Content -->
+
+<p class="small-space-top">
+	<html:checkbox property="survey.lockWhenFinished" styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.lock.on.finished" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="survey.showOnePage" styleClass="noBorder">
+		<fmt:message key="label.authoring.advance.show.on.one.page" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:checkbox property="survey.reflectOnActivity"
+		styleClass="noBorder" styleId="reflectOn">
+		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
+	</html:checkbox>
+</p>
+
+<p>
+	<html:textarea property="survey.reflectInstructions"
+		styleId="reflectInstructions" cols="30" rows="3" />
+</p>
+
Index: lams_tool_survey/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/basic.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_survey/web/pages/authoring/basic.jsp	17 Oct 2006 04:19:36 -0000	1.8
+++ lams_tool_survey/web/pages/authoring/basic.jsp	18 Oct 2006 03:20:17 -0000	1.9
@@ -9,7 +9,7 @@
 	function showMessage(url) {
 		var area=document.getElementById("questionInputArea");
 		if(area != null){
-			area.style.width="670px";
+			area.style.width="685px";
 			area.style.height="100%";
 			area.src=url;
 			area.style.display="block";
@@ -111,15 +111,15 @@
 	<table>
 		<tr>
 			<td colspan="2">
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.title"></fmt:message>
 				</div>
-				<html:text property="survey.title" style="width: 100%;"></html:text>
+				<html:text property="survey.title" style="width: 99%;"></html:text>
 			</td>
 		</tr>
 		<tr>
 			<td colspan="2">
-				<div class="field-name" style="text-align: left;">
+				<div class="field-name">
 					<fmt:message key="label.authoring.basic.instruction"></fmt:message>
 				</div>
 				<lams:FCKEditor id="survey.instructions"
Index: lams_tool_survey/web/pages/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_survey/web/pages/authoring/instructions.jsp	12 Sep 2006 04:15:19 -0000	1.1
+++ lams_tool_survey/web/pages/authoring/instructions.jsp	18 Oct 2006 03:20:17 -0000	1.2
@@ -1,7 +1,10 @@
-<%@ include file="/common/taglibs.jsp" %>
-<%@ page import=" org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}"/>
+<%@ include file="/common/taglibs.jsp"%>
+<%@ page
+	import="org.lamsfoundation.lams.contentrepository.client.IToolContentHandler"%>
+<c:set var="formBean"
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
 <script type="text/javascript">
 <!-- Common Javascript functions for LAMS -->
@@ -58,77 +61,70 @@
 	<!-- Instructions Row -->
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left;">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.instruction"></fmt:message>
 			</div>
-			<html:textarea property="survey.onlineInstructions" rows="3" cols="80"></html:textarea>
+			<html:textarea property="survey.onlineInstructions" rows="3"
+				cols="75"></html:textarea>
 		</td>
 	</tr>
 	<tr>
 		<td>
 			<c:set var="fileTypeFlag"
-				value="<%=IToolContentHandler.TYPE_ONLINE %>" />
+				value="<%=IToolContentHandler.TYPE_ONLINE%>" />
 			<div id="onlinefileArea">
 				<%@ include file="parts/instructionfilelist.jsp"%>
 			</div>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name" style="text-align: left">
+			<div class="field-name">
 				<fmt:message key="label.authoring.online.file" />
 			</div>
+			<html:file property="onlineFile">
+				<fmt:message key="label.authoring.choosefile.button" />
+			</html:file>
+			<a href="#" onclick="javascript:doUploadOnline();" class="button">
+				<fmt:message key="label.authoring.upload.online.button" /> </a>
 		</td>
 	</tr>
+
 	<tr>
 		<td>
-			<html:file property="onlineFile">
-				<fmt:message key="label.authoring.choosefile.button" />
-			</html:file>
-			<a href="#" onclick="javascript:doUploadOnline();"
-				class="button"> <fmt:message
-					key="label.authoring.upload.online.button" /> </a>
+			<hr />
 		</td>
 	</tr>
-</table>
 
-<hr />
-
-<table>
 	<!-- Offline Instructions -->
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align: left;">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.instruction"></fmt:message>
 			</div>
 			<html:textarea property="survey.offlineInstructions" rows="3"
-				cols="80"></html:textarea>
+				cols="75"></html:textarea>
 		</td>
 	</tr>
 	<tr>
 		<td>
 			<c:set var="fileTypeFlag"
-				value="<%=IToolContentHandler.TYPE_OFFLINE %>" />
+				value="<%=IToolContentHandler.TYPE_OFFLINE%>" />
 			<div id="offlinefileArea">
 				<%@ include file="parts/instructionfilelist.jsp"%>
 			</div>
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<div class="field-name-alternative-color" style="text-align:left">
+			<div class="field-name-alternative-color">
 				<fmt:message key="label.authoring.offline.file" />
 			</div>
-		</td>
-	</tr>
-	<tr>
-		<td>
 			<html:file property="offlineFile">
 				<fmt:message key="label.authoring.choosefile.button" />
 			</html:file>
-			<a href="#" onclick="javascript:doUploadOffline();"
-				class="button"> <fmt:message
-					key="label.authoring.upload.offline.button" /> </a>
+			<a href="#" onclick="javascript:doUploadOffline();" class="button">
+				<fmt:message key="label.authoring.upload.offline.button" /> </a>
 		</td>
 	</tr>
 </table>
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v
diff -u -r1.36 -r1.37
--- lams_tool_vote/web/authoring/BasicContent.jsp	17 Oct 2006 20:29:42 -0000	1.36
+++ lams_tool_vote/web/authoring/BasicContent.jsp	18 Oct 2006 03:23:11 -0000	1.37
@@ -76,7 +76,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
 								<html:text property="title" style="width: 100%;"></html:text>
@@ -86,7 +86,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.instructions.col"></fmt:message>
 								</div>
 								<lams:FCKEditor id="instructions"
Index: lams_tool_vote/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	17 Oct 2006 20:29:42 -0000	1.12
+++ lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	18 Oct 2006 03:23:11 -0000	1.13
@@ -26,7 +26,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
 						  			<c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
@@ -36,7 +36,7 @@
 
 						<tr>
 							<td colspan="2">
-								<div class="field-name" style="text-align: left;">
+								<div class="field-name">
 									<fmt:message key="label.authoring.instructions.col"></fmt:message>
 								</div>
 						  			<c:out value="${voteGeneralAuthoringDTO.activityInstructions}" escapeXml="false"/> 																	
Index: lams_tool_vote/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_vote/web/authoring/InstructionsContent.jsp	17 Oct 2006 20:29:42 -0000	1.14
+++ lams_tool_vote/web/authoring/InstructionsContent.jsp	18 Oct 2006 03:23:11 -0000	1.15
@@ -26,7 +26,7 @@
 
 				<tr>
 					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.onlineInstructions.col"></fmt:message>
 						</div>
 						<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
@@ -68,7 +68,7 @@
 													                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
 													                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
 													                         	target="_self" styleClass="button">
-													                	<fmt:message key="button.delete" />
+													                	<bean:message key="button.delete" />
 													                </html:link> 
 													            </td>
 												           	</tr>
@@ -109,7 +109,7 @@
 
 				<tr>
 					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.offlineInstructions.col"></fmt:message>
 						</div>
 						<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
Index: lams_tool_vote/web/authoring/editNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/editNominationBox.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/authoring/editNominationBox.jsp	17 Oct 2006 20:29:42 -0000	1.4
+++ lams_tool_vote/web/authoring/editNominationBox.jsp	18 Oct 2006 03:23:11 -0000	1.5
@@ -49,7 +49,7 @@
 		
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.edit.nomination"></fmt:message>
 						</div>
 						
Index: lams_tool_vote/web/authoring/newNominationBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/newNominationBox.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/authoring/newNominationBox.jsp	17 Oct 2006 20:29:42 -0000	1.4
+++ lams_tool_vote/web/authoring/newNominationBox.jsp	18 Oct 2006 03:23:11 -0000	1.5
@@ -47,7 +47,7 @@
 		
 				<tr>
 					<td>
-						<div class="field-name" style="text-align: left;">
+						<div class="field-name">
 							<fmt:message key="label.add.new.nomination"></fmt:message>
 						</div>
 						<lams:FCKEditor id="newNomination"