Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -28,7 +28,6 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-		<td class="field-name">							
 			<table class="forms">
 				<tr>
 					<td class="field-name">							
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -re48a67de27af42221ddce80419f05c1be4680430 -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision e48a67de27af42221ddce80419f05c1be4680430)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -166,10 +166,10 @@
 		</html:form>		
 	</div>
 
-	<div id="footer"></div>
-		<lams:HTMLEditor />
-	</div>
+<div id="footer"></div>
+<lams:HTMLEditor />
 
+</div>
 
 </body>
 </html:html>
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -27,8 +27,9 @@
 <%@ taglib uri="fck-editor" prefix="FCK" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-		           <h2> <b> <bean:message key="label.authoring.qa.basic"/> </b></h2>
-					<table class="forms">
+		           <h2>  <bean:message key="label.authoring.qa.basic"/> </h2>
+		           
+			    	<table align=center> 	  
 						<tr>   
 						<td NOWRAP class=error>
 							<c:if test="${sessionScope.sbmtSuccess == 1}"> 			
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -19,23 +19,73 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ taglib uri="tags-bean" prefix="bean"%> 
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="fck-editor" prefix="FCK" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ include file="/common/taglibs.jsp" %>
 
-
 		<table class="forms">
-
           		<tr> 
-					<td colspan=2 NOWRAP> 
+					<td NOWRAP colspan=2 valign=top>
 						<lams:SetEditor id="onlineInstructions" text="${QaAuthoringForm.onlineInstructions}" small="true" key="label.onlineInstructions.col"/>								
 					</td> 
 				</tr>
 				
+				<tr>
+					<td NOWRAP colspan=2 valign=top>
+				<table class="forms">
+					<tr><td align=center>
+					<logic:present name="attachmentList">
+					<bean:size id="count" name="attachmentList" />
+					<logic:notEqual name="count" value="0">
+							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td>
+										<table width="70%" align="left">
+
+							            <logic:iterate name="attachmentList" id="attachment">
+											<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">
+												                   		<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" 
+													                         	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> 											   	     	
+							    	    </logic:iterate>
+										</table>
+								 	</td>
+								</tr>
+							</table>
+					 </logic:notEqual>
+					 </logic:present>
+							 	</td>
+							</tr>
+				</table>
+					</td> 				
+				</tr>
+				
+				
 				<tr> 
 					<td class="field-name"> <b>
 	          				<bean:message key="label.onlineFiles" />
@@ -57,6 +107,66 @@
 					</td> 
 				</tr>
 
+
+				<tr>
+					<td NOWRAP colspan=2 valign=top>
+				<table class="forms">
+					<tr><td align=center>
+					<logic:present name="attachmentList">
+					<bean:size id="count" name="attachmentList" />
+					<logic:notEqual name="count" value="0">
+							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td>
+										<table width="70%" align="left">
+
+							            <logic:iterate name="attachmentList" id="attachment">
+											<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" 
+													                         	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> 											   	     	
+							    	    </logic:iterate>
+										</table>
+								 	</td>
+								</tr>
+							</table>
+					 </logic:notEqual>
+					 </logic:present>
+							 	</td>
+							</tr>
+				</table>
+					</td> 				
+				</tr>
+
+
+
 				<tr> 
 					<td class="field-name"> <b>
           				<bean:message key="label.offlineFiles" />
@@ -73,73 +183,10 @@
 				</tr>          		
 			</table>	  	
 	
+
+
 	
-<table class="forms">
-<tr><td align=center>
-<logic:present name="attachmentList">
-<bean:size id="count" name="attachmentList" />
-<logic:notEqual name="count" value="0">
-		<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td>
-					<table width="70%" align="left">
-		            <tr>
-		                <td NOWRAP  valign=top> <b><bean:message key="label.filename" /> </b>  </td>
-		                <td NOWRAP  valign=top> <b> <bean:message key="label.type" /></b> </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.fileOnline}" >
-					                	<bean:message key="instructions.type.online" />
-					               	</c:when>
-					                <c:otherwise>
-					                	<bean:message key="instructions.type.offline" />
-					                </c:otherwise>
-				                </c:choose>
-				            </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" 
-							                         	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>
-		    	    </logic:iterate>
-					</table>
-			 	</td>
-			</tr>
-		</table>
- </logic:notEqual>
- </logic:present>
-		 	</td>
-		</tr>
-	</table>
-		
+	
 
 
 
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -27,11 +27,9 @@
 <html:html locale="true">
 <head>
 	<title> <bean:message key="label.learning.qa"/> </title>
-
 	<%@ include file="/common/header.jsp"%>
 	<%@ include file="/common/fckeditorheader.jsp"%>
 
-	
 	<script language="JavaScript" type="text/JavaScript">
 		function submitLearningMethod(actionMethod) 
 		{
@@ -44,6 +42,8 @@
 			submitLearningMethod(actionMethod);
 		}
 	</script>	
+
+
 </head>
 <body>
 
Index: lams_tool_laqa/web/monitoring/Instructions.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -19,96 +19,143 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ include file="/common/taglibs.jsp" %>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
 
+
 		<table class="forms">
-			<tr>
-				<td NOWRAP valign=top>
-	  				<b>  <bean:message key="label.onlineInstructions.col" /> </b>
-	  			</td>
-				<td NOWRAP valign=top>
-					  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	
-				</td> 
-			</tr>
-		
-			<tr>
-				<td colspan=2> &nbsp </td>
-			</tr>
+          		<tr> 
+					<td NOWRAP colspan=2 valign=top>
+						<c:out value="${QaAuthoringForm.onlineInstructions}" escapeXml="false" />						
+					</td> 
+				</tr>
+				
+				
+				<tr>
+					<td NOWRAP colspan=2 valign=top>
+				<table class="forms">
+					<tr><td align=center>
+					<logic:present name="attachmentList">
+					<bean:size id="count" name="attachmentList" />
+					<logic:notEqual name="count" value="0">
+							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td>
+										<table width="70%" align="left">
 
-		
-			<tr> 
-				<td NOWRAP valign=top>
-	  				<b>  <bean:message key="label.offlineInstructions.col" />  </b>
-	  			</td>
-				<td NOWRAP valign=top>
-					  <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />	
-				</td> 
-			</tr>
-		</table>
+							            <logic:iterate name="attachmentList" id="attachment">
+											<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">
+												                   		<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" 
+													                         	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> 											   	     	
+							    	    </logic:iterate>
+										</table>
+								 	</td>
+								</tr>
+							</table>
+					 </logic:notEqual>
+					 </logic:present>
+							 	</td>
+							</tr>
+				</table>
+					</td> 				
+				</tr>
+				
 
-		
-		
-<table class="forms"> 	  
-<tr><td align=center>
-<logic:present name="attachmentList">
-<bean:size id="count" name="attachmentList" />
-<logic:notEqual name="count" value="0">
+				<tr> 
+					<td colspan=2 NOWRAP> 
+						<c:out value="${QaAuthoringForm.offlineInstructions}" escapeXml="false" />												
+					</td> 
+				</tr>
 
-		<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
-			<tr>
-				<td>
-					<table width="70%" align="left">
-		            <tr>
-		                <td NOWRAP  valign=top> <b><bean:message key="label.filename" /> </b>  </td>
-		                <td NOWRAP  valign=top> <b> <bean:message key="label.type" /></b>  </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.fileOnline}" >
-					                	<bean:message key="instructions.type.online" />
-					               	</c:when>
-					                <c:otherwise>
-					                	<bean:message key="instructions.type.offline" />
-					                </c:otherwise>
-				                </c:choose>
-				            </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>
-						                </td>
-						           	</tr>
-					            </table>
-				           	</td>
-			   	     	</tr>
-		    	    </logic:iterate>
-					</table>
-			 	</td>
-			</tr>
-		</table>
- </logic:notEqual>
- </logic:present>
-		 	</td>
-		</tr>
-	</table>
-		
 
+				<tr>
+					<td NOWRAP colspan=2 valign=top>
+				<table class="forms">
+					<tr><td align=center>
+					<logic:present name="attachmentList">
+					<bean:size id="count" name="attachmentList" />
+					<logic:notEqual name="count" value="0">
+							<table  width="100%" align=center  border="0" cellspacing="0" cellpadding="0">
+								<tr>
+									<td>
+										<table width="70%" align="left">
 
+							            <logic:iterate name="attachmentList" id="attachment">
+											<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" 
+													                         	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> 											   	     	
+							    	    </logic:iterate>
+										</table>
+								 	</td>
+								</tr>
+							</table>
+					 </logic:notEqual>
+					 </logic:present>
+							 	</td>
+							</tr>
+				</table>
+					</td> 				
+				</tr>
 
-
-		
\ No newline at end of file
+			</table>	  	
Index: lams_tool_laqa/web/monitoring/Stats.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -23,7 +23,7 @@
 
 		<table class="forms">
 						<tr> 
-							<td NOWRAP valign=top>
+						<td NOWRAP valign=top>
 				  				<b> <bean:message key="count.total.user" /> </b>
 				  			</td>
 							<td NOWRAP valign=top>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r8f690879a75ab70b6948682ae6d5c3400dcc3dad -rae31667a6e242fce19d51a36312269d1a7ccd1c3
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 8f690879a75ab70b6948682ae6d5c3400dcc3dad)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision ae31667a6e242fce19d51a36312269d1a7ccd1c3)
@@ -40,7 +40,7 @@
 
 				<c:if test="${(requestLearningReport != 'true')}"> 	
 						<tr> 
-							<td NOWRAP class="formlabel" valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
+							<td NOWRAP  valign=top align=center> <b> <bean:message key="label.selectGroup"/> </b>
 									<select name="monitoredToolSessionId" onchange="javascript:submitSession(this.value,'submitSession');">
 									<c:forEach var="toolSessionName" items="${sessionScope.summaryToolSessions}">
 										<c:forEach var="toolSessionId" items="${sessionScope.summaryToolSessionsId}">
@@ -84,7 +84,7 @@
 						</tr>	
 						
 						<tr> 
-							<td NOWRAP class="formlabel" valign=top>
+							<td NOWRAP valign=top>
 								<table align=center>
 									<tr> 
 										 <td NOWRAP valign=top> <b>  <bean:message key="label.user"/>  </b> </td>