Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
diff -u -r992d0d544a920da849e7d1a6b3f2006f816f7d86 -r0a9205737ad38f2cde57c92fbee07f8d895aaf44
--- lams_tool_nb/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 992d0d544a920da849e7d1a6b3f2006f816f7d86)
+++ lams_tool_nb/web/authoring/instructions.jsp	(.../instructions.jsp)	(revision 0a9205737ad38f2cde57c92fbee07f8d895aaf44)
@@ -1,124 +1,119 @@
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ include file="/includes/taglibs.jsp"%>
 
-<!---------------------------Instructions Tab Content ------------------------>
-<table class="forms">
+<!-- Instructions Tab Content  -->
+
+<table>
 	<tr>
+		<td class="field-name">
+			<fmt:message key="instructions.onlineInstructions" />
+		</td>
+	</tr>
+	<tr>
 		<td>
-			<table width="65%" align="center">
-				<tr>
-					<td class="formlabel"><fmt:message key="instructions.onlineInstructions" /></td>
-					<td class="formcontrol">
-							<FCK:editor id="onlineInstructions" basePath="/lams/fckeditor/"
-								height="200"
-								width="85%">
-								<c:out value="${NbAuthoringForm.onlineInstructions}" escapeXml="false" />
-							</FCK:editor>
-					</td>
-				</tr>
-				
-				<tr>
-					<td class="formlabel">
-						<fmt:message key="instructions.uploadOnlineInstr" />
-					</td>
-					<td class="formcontrol">
-						<html:file property="onlineFile" /><html:submit property="method"><fmt:message key="button.upload" /></html:submit>
-											
-					</td>						
-				</tr>
-				<tr>
-					<td class="formlabel"><fmt:message key="instructions.offlineInstructions" /></td>
-					<td class="formcontrol">
-						<FCK:editor id="offlineInstructions" basePath="/lams/fckeditor/"
-								width="85%"
-								height="200">
-							<c:out value="${NbAuthoringForm.offlineInstructions}" escapeXml="false" />
-						</FCK:editor>
-					</td>
-				</tr>
-				<tr>
-					<td class="formlabel">
-						<fmt:message key="instructions.uploadOfflineInstr" />
-					</td>
-					<td class="formcontrol">
-						<html:file property="offlineFile" /><html:submit property="method"><fmt:message key="button.upload" /></html:submit>
-					</td>						
-				</tr>
-			
-			</table>
+			<FCK:editor id="onlineInstructions" basePath="/lams/fckeditor/" height="200" width="100%">
+				<c:out value="${NbAuthoringForm.onlineInstructions}" escapeXml="false" />
+			</FCK:editor>
 		</td>
 	</tr>
+
+	<tr>
+		<td class="field-name">
+			<fmt:message key="instructions.uploadOnlineInstr" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:file property="onlineFile" />
+			<html:submit property="method">
+				<fmt:message key="button.upload" />
+			</html:submit>
+
+		</td>
+	</tr>
 </table>
 
+<hr />
+
+<table>
+	<tr>
+		<td class="field-name-alternative-color">
+			<fmt:message key="instructions.offlineInstructions" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<FCK:editor id="offlineInstructions" basePath="/lams/fckeditor/" width="100%" height="200">
+				<c:out value="${NbAuthoringForm.offlineInstructions}" escapeXml="false" />
+			</FCK:editor>
+		</td>
+	</tr>
+	<tr>
+		<td class="field-name-alternative-color">
+			<fmt:message key="instructions.uploadOfflineInstr" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<html:file property="offlineFile" />
+			<html:submit property="method">
+				<fmt:message key="button.upload" />
+			</html:submit>
+		</td>
+	</tr>
+</table>
+
 <logic:present name="attachmentList">
-<bean:size id="count" name="attachmentList" />
-<logic:notEqual name="count" value="0">
+	<bean:size id="count" name="attachmentList" />
+	<logic:notEqual name="count" value="0">
+		<hr />
 
-	<h2><fmt:message key="label.attachments" /></h2>
-	<div id="datatablecontainer">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<h2>
+			<fmt:message key="label.attachments" />
+		</h2>
+
+		<table width="70%" align="left">
 			<tr>
-				<td>
-					<table width="70%" align="left">
-		            <tr>
-		                <td><fmt:message key="label.filename" /></td>
-		                <td><fmt:message key="label.type" /></td>
-		            	<td>&nbsp;</td>
-		            </tr>
-		            <logic:iterate name="attachmentList" id="attachment">
-		            	<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>
-			                	<c:choose>
-					            	<c:when test="${attachment.onlineFile}" >
-					                	<fmt:message key="instructions.type.online" />
-					               	</c:when>
-					                <c:otherwise>
-					                	<fmt:message key="instructions.type.offline" />
-					                </c:otherwise>
-				                </c:choose>
-				            </td>
-				            <td>
-					        	<table>
-						        	<tr>
-						            	<td>
-						                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
-						                   		<fmt:message key="link.view" />
-						                    </a>
-						               	</td>
-						                <td>
-							            	<html:link page="<%=download%>" styleClass="button">
-							                	<fmt:message key="link.download" />
-							                </html:link>
-						                </td>
-						                <td>
-							            	<html:link page="/authoring.do?method=Delete" 
-							                         	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" />
-							                </html:link> 
-							            </td>
-						           	</tr>
-					            </table>
-				           	</td>
-			   	     	</tr>
-		    	    </logic:iterate>
-					</table>
-			 	</td>
+				<th>
+					<fmt:message key="label.filename" />
+				</th>
+				<th>
+					<fmt:message key="label.type" />
+				</th>
+				<th>
+					&nbsp;
+				</th>
 			</tr>
-		</table>
-	</div>
-	
- </logic:notEqual>
- </logic:present>
+			<logic:iterate name="attachmentList" id="attachment">
+				<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>
+						<c:choose>
+							<c:when test="${attachment.onlineFile}">
+								<fmt:message key="instructions.type.online" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="instructions.type.offline" />
+							</c:otherwise>
+						</c:choose>
+					</td>
+					<td>
+						<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button"> <fmt:message key="link.view" /> </a>
+
+						<html:link page="<%=download%>" styleClass="button">
+							<fmt:message key="link.download" />
+						</html:link>
+						<html:link page="/authoring.do?method=Delete" 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" />
+						</html:link>
+					</td>
+				</tr>
+			</logic:iterate>
+		</table>
+	</logic:notEqual>
+</logic:present>