Index: lams_tool_forum/web/jsps/authoring/basic.jsp
===================================================================
diff -u -r8009bc74a70f2f56078998c51016483e0f5c0036 -rf65b5f298e398a7f7bb543ee1ebda35f0c982688
--- lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision 8009bc74a70f2f56078998c51016483e0f5c0036)
+++ lams_tool_forum/web/jsps/authoring/basic.jsp	(.../basic.jsp)	(revision f65b5f298e398a7f7bb543ee1ebda35f0c982688)
@@ -73,14 +73,12 @@
 </p>
 
 <p>
-
 	<iframe
 		onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
 		id="messageArea" name="messageArea"
 		style="width:0px;height:0px;border:0px;display:none" frameborder="no"
 		scrolling="no">
 	</iframe>
-
 </p>
 
 
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -r9ad7805407672e72dfc83fb0ba49ccafb0d43d6f -rf65b5f298e398a7f7bb543ee1ebda35f0c982688
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 9ad7805407672e72dfc83fb0ba49ccafb0d43d6f)
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision f65b5f298e398a7f7bb543ee1ebda35f0c982688)
@@ -20,179 +20,129 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
+<%@ include file="/common/taglibs.jsp"%>
 
-		<table class="forms">
+<table>
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name">
-							<fmt:message key="label.onlineInstructions.col"></fmt:message>
-						</div>
-						<html:textarea property="onlineInstructions" rows="3" cols="80"></html:textarea>
-					</td>
-				</tr>
-				
-				
-				<tr>
-				<td NOWRAP colspan=2 valign=top>
-				<table class="forms">
-					<tr><td align=center>
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.onlineInstructions.col"></fmt:message>
+			</div>
+			<html:textarea property="onlineInstructions" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
 
-							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td>
-										<table width="70%" align="left">
+	<tr>
+		<td>
+			<ul>
+				<c:forEach var="attachment"
+					items="${qaGeneralAuthoringDTO.attachmentList}">
+					<c:if test="${attachment.fileOnline == true }">
+						<li>
+							<bean:define id="view">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=false</bean:define>
+							<bean:define id="download">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=true</bean:define>
+							<bean:define id="uuid" name="attachment" property="uuid" />
 
-									<c:forEach var="attachment" items="${qaGeneralAuthoringDTO.attachmentList}">
-											<c:if test="${attachment.fileOnline == true }"> 			
-								            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
-												<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
-						                        <bean:define id="uuid" name="attachment" property="uuid" />
-						                        
-						                        <tr>
-									            	<td> <bean:write name="attachment" property="fileName"/>  </td>
-										            <td>
-											        	<table>
-												        	<tr>
-												            	<td>
-												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-												                   		<fmt:message key="link.view" />
-												                    </a>
-																	&nbsp&nbsp
-													            	<html:link page="<%=download%>" styleClass="button">
-													                	<fmt: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">
-													                	<bean:message key="link.delete" />
-													                </html:link> 
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-											</c:if> 											   	     	
-										</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
+							<bean:write name="attachment" property="fileName" />
+							<a
+								href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")'>
+								<fmt:message key="link.view" /> </a> &nbsp
+							<html:link page="<%=download%>">
+								<fmt:message key="link.download" />
+							</html:link>
+							&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">
+								<fmt:message key="link.delete" />
+							</html:link>
+						</li>
+					</c:if>
+				</c:forEach>
+			</ul>
+		</td>
+	</tr>
 
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.onlineFiles" />
+			</div>
 
+			<html:file property="theOnlineFile"></html:file>
+			<html:submit property="submitOnlineFile" styleClass="button"
+				onclick="submitMethod('addNewFile');">
+				<fmt:message key="label.upload" />
+			</html:submit>
+		</td>
+	</tr>
 
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
-				
-				
-				<tr> 
-					<td class="field-name"> 
-	          				<bean:message key="label.onlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOnlineFile"></html:file>
-					 	<html:submit property="submitOnlineFile" 
-                                     styleClass="linkbutton" 
-                                     onclick="submitMethod('addNewFile');">
-								<bean:message key="label.upload"/>
-						</html:submit>
-					</td> 
-				
-				</tr>
+	<tr>
+		<td>
+			<hr />
+		</td>
+	</tr>
 
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="label.offlineInstructions.col"></fmt:message>
+			</div>
+			<html:textarea property="offlineInstructions" rows="3" cols="75"></html:textarea>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<ul>
+				<c:forEach var="attachment"
+					items="${qaGeneralAuthoringDTO.attachmentList}">
+					<c:if test="${attachment.fileOnline == false}">
+						<li>
+							<bean:define id="view">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=false</bean:define>
+							<bean:define id="download">/download/?uuid=<bean:write
+									name="attachment" property="uuid" />&preferDownload=true</bean:define>
+							<bean:define id="uuid" name="attachment" property="uuid" />
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-						<div class="field-name">
-							<fmt:message key="label.offlineInstructions.col"></fmt:message>
-						</div>
-						<html:textarea property="offlineInstructions" rows="3" cols="80"></html:textarea>
-					</td>
-				</tr>
 
+							<bean:write name="attachment" property="fileName" />
 
-				<tr>
-					<td NOWRAP colspan=2 valign=top>
-				<table class="forms">
-					<tr><td align=center>
-							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td>
-										<table width="70%" align="left">
+							<a
+								href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")'>
+								<fmt:message key="link.view" /> </a> &nbsp&nbsp
+							<html:link page="<%=download%>">
+								<fmt: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">
+								<fmt:message key="link.delete" />
+							</html:link>
+						</li>
+					</c:if>
 
-									<c:forEach var="attachment" items="${qaGeneralAuthoringDTO.attachmentList}">
-		
-											<c:if test="${attachment.fileOnline == false}"> 			
-								            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
-												<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
-						                        <bean:define id="uuid" name="attachment" property="uuid" />
-						                        
-						                        <tr>
-									            	<td> <bean:write name="attachment" property="fileName"/>  </td>
-										            <td>
-											        	<table>
-												        	<tr>
-												            	<td>
-												                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-												                   		<bean:message key="link.view" />
-												                    </a>
-																	&nbsp&nbsp
-													            	<html:link page="<%=download%>" styleClass="button">
-													                	<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">
-													                	<bean:message key="link.delete" />
-													                </html:link> 
-													            </td>
-												           	</tr>
-											            </table>
-										           	</td>
-									   	     	</tr>
-										</c:if> 											   	     	
-											</c:forEach>
-										</table>
-								 	</td>
-								</tr>
-							</table>
-
-							 	</td>
-							</tr>
-				</table>
-					</td> 				
-				</tr>
-
-
-
-				<tr> 
-					<td class="field-name"> 
-          				<bean:message key="label.offlineFiles" />
-          			</td>
-          			<td NOWRAP> 
-						<html:file  property="theOfflineFile"></html:file>
-					 	<html:submit property="submitOfflineFile" 
-                                     styleClass="linkbutton" 
-                                     onclick="submitMethod('addNewFile');">
-								<bean:message key="label.upload"/>
-						</html:submit>
-					</td> 
-				</tr>          		
-			</table>	  	
-	
-
-
-	
-	
-
-
-
-
+				</c:forEach>
+			</ul>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<div class="field-name-alternative-color">
+				<fmt:message key="label.offlineFiles" />
+			</div>
+			<html:file property="theOfflineFile"></html:file>
+			<html:submit property="submitOfflineFile" styleClass="button"
+				onclick="submitMethod('addNewFile');">
+				<fmt:message key="label.upload" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
Index: lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp
===================================================================
diff -u -rb3f41153ea9815528aed7730b3760cc11f48bf75 -rf65b5f298e398a7f7bb543ee1ebda35f0c982688
--- lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp	(.../instructionfilelist.jsp)	(revision b3f41153ea9815528aed7730b3760cc11f48bf75)
+++ lams_tool_sbmt/web/authoring/parts/instructionfilelist.jsp	(.../instructionfilelist.jsp)	(revision f65b5f298e398a7f7bb543ee1ebda35f0c982688)
@@ -39,13 +39,15 @@
 						href="javascript:launchPopup('${viewURL}','offlinefile')">
 						<fmt:message key="label.view" />
 					</html:link>
+					&nbsp;
 					<c:set var="downloadURL">
 						<html:rewrite
 							page="/download/?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
 					</c:set>
 					<html:link href="${downloadURL}">
 						<fmt:message key="label.download" />
 					</html:link>
+					&nbsp;
 					<c:choose>
 						<c:when test="${fileTypeFlag==CONS_OFFLINE}">
 							<html:link href="#"
Index: lams_tool_scribe/web/images/down_disabled.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_scribe/web/images/up_disabled.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_scribe/web/pages/authoring/basic.jsp
===================================================================
diff -u -rea108166cbf662241ea73afea9274c8b9e7a6ef0 -rf65b5f298e398a7f7bb543ee1ebda35f0c982688
--- lams_tool_scribe/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision ea108166cbf662241ea73afea9274c8b9e7a6ef0)
+++ lams_tool_scribe/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision f65b5f298e398a7f7bb543ee1ebda35f0c982688)
@@ -58,27 +58,29 @@
 				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 		</td>
 	</tr>
-	<tr>
-		<td>
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.heading" />
-			</div>
-			<div id="itemListArea">
-				<%@ include file="parts/headingList.jsp"%>
-			</div>
-			<br />
-			<a
-				href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${formBean.sessionMapID}"/>');"
-				class="button-add-item"> <fmt:message
-					key="label.authoring.basic.heading.add" /> </a>
-		</td>
-	</tr>
 
+
 </table>
-			<iframe
-				onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-				id="iframeArea" name="iframeArea"
-				style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-				scrolling="no">
-			</iframe>
 
+<h2 class="spacer-left">
+	<fmt:message key="label.authoring.basic.heading" />
+</h2>
+
+<div id="itemListArea">
+	<%@ include file="parts/headingList.jsp"%>
+</div>
+
+<p class="small-space-bottom">
+<a
+	href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${formBean.sessionMapID}"/>');"
+	class="button-add-item"> <fmt:message
+		key="label.authoring.basic.heading.add" /> </a>
+</p>
+
+<iframe
+	onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+	id="iframeArea" name="iframeArea"
+	style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+	scrolling="no">
+</iframe>
+
Index: lams_tool_scribe/web/pages/authoring/parts/headingList.jsp
===================================================================
diff -u -rea108166cbf662241ea73afea9274c8b9e7a6ef0 -rf65b5f298e398a7f7bb543ee1ebda35f0c982688
--- lams_tool_scribe/web/pages/authoring/parts/headingList.jsp	(.../headingList.jsp)	(revision ea108166cbf662241ea73afea9274c8b9e7a6ef0)
+++ lams_tool_scribe/web/pages/authoring/parts/headingList.jsp	(.../headingList.jsp)	(revision f65b5f298e398a7f7bb543ee1ebda35f0c982688)
@@ -21,30 +21,41 @@
 				</div>
 			</td>
 
-			<td style="width: 10%">
+			<td width="10%">
+				<c:choose>
+					<c:when test="${index ne 0}">
+						<c:set var="moveUpURL">
+							<html:rewrite
+								page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=up" />
+						</c:set>
+						<img src="${tool}images/up.gif"
+							title="<fmt:message key="link.moveUp"/>"
+							onclick="showMessage('${moveUpURL}')"></img>
+					</c:when>
+					<c:otherwise>
+						<img src="${tool}images/up_disabled.gif"
+							title="<fmt:message key="link.moveUp"/>"></img>
+					</c:otherwise>
+				</c:choose>
 
-				<c:if test="${index ne 0}">
-					<c:set var="moveUpURL">
-						<html:rewrite
-							page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=up" />
-					</c:set>
-					<img src="${tool}images/up.gif"
-						title="<fmt:message key="link.moveUp"/>"
-						onclick="showMessage('${moveUpURL}')"></img>
-				</c:if>
-				
-				<c:if test="${index ne fn:length(sessionMap.headings)-1}">
-					<c:set var="moveDownURL">
-						<html:rewrite
-							page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=down" />
-					</c:set>
-					<img src="${tool}images/down.gif"
-						title="<fmt:message key="link.moveDown"/>"
-						onclick="showMessage('${moveDownURL}')"></img>
-				</c:if>
+				<c:choose>
+					<c:when test="${index ne fn:length(sessionMap.headings)-1}">
+						<c:set var="moveDownURL">
+							<html:rewrite
+								page="/authoring.do?dispatch=moveHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}&amp;direction=down" />
+						</c:set>
+						<img src="${tool}images/down.gif"
+							title="<fmt:message key="link.moveDown"/>"
+							onclick="showMessage('${moveDownURL}')"></img>
+					</c:when>
+					<c:otherwise>
+						<img src="${tool}images/down_disabled.gif"
+							title="<fmt:message key="link.moveDown"/>"></img>
+					</c:otherwise>
+				</c:choose>
 			</td>
 
-			<td style="width: 10%">
+			<td>
 				<c:set var="editURL">
 					<html:rewrite
 						page="/authoring.do?dispatch=loadHeadingForm&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}" />
@@ -54,7 +65,7 @@
 					onclick="showMessage('${editURL}')"></img>
 			</td>
 
-			<td style="width: 10%">
+			<td>
 				<c:set var="deleteURL">
 					<html:rewrite
 						page="/authoring.do?dispatch=deleteHeading&amp;sessionMapID=${sessionMapID}&amp;headingIndex=${index}" />