Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -rf6991bff0a6a158b9432f338079cc3fc650dd389 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision f6991bff0a6a158b9432f338079cc3fc650dd389)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties	(.../McResources.properties)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -36,6 +36,9 @@
 label.redo.questions					=Redo Questions
 label.view.summary						=View Summary
 label.view.answers						=View Answers
+label.view								=View
+label.download							=Download
+label.delete							=Delete
 label.finished							=Finished
 label.attempt							=Attempt  					
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -rf6991bff0a6a158b9432f338079cc3fc650dd389 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision f6991bff0a6a158b9432f338079cc3fc650dd389)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -1759,6 +1759,36 @@
     }
     
     
+    public static List removeFileItem(List listFilesMetaData, String uuid)
+    {
+    	McAttachmentDTO deletableAttachmentDTO=null;
+    	
+    	Iterator itList = listFilesMetaData.iterator();
+    	int mainIndex=0;
+    	while (itList.hasNext())
+        {
+    		mainIndex++;
+    		McAttachmentDTO currentAttachmentDTO=(McAttachmentDTO) itList.next();
+    		logger.debug("currentAttachmentDTO :" + currentAttachmentDTO);
+    		logger.debug("currentAttachmentDTO uuid :" + currentAttachmentDTO.getUuid());
+    		
+    		if (currentAttachmentDTO.getUuid().equals(uuid))
+			{
+    			logger.debug("equal uuid found uuid :" + uuid);
+    			deletableAttachmentDTO=currentAttachmentDTO;
+    			break;
+			}
+        }
+    	
+    	logger.debug("equal uuid found at index :" + mainIndex);
+    	logger.debug("deletable attachment is:" + deletableAttachmentDTO);
+    	
+    	listFilesMetaData.remove(deletableAttachmentDTO);
+    	logger.debug("listOfflineFilesMetaData after remove:" + listFilesMetaData);
+    	
+    	return listFilesMetaData;
+    }
+    
     public static void persistFilesMetaData(HttpServletRequest request, boolean isOfflineFile, McContent mcContent)
     {
     	IMcService mcService =McUtils.getToolService(request);
@@ -1801,14 +1831,34 @@
     }
     
     
+    public static List extractFileNames(List listFilesMetaData)
+    {
+    	Iterator itList = listFilesMetaData.iterator();
+    	LinkedList listFilenames= new LinkedList();
+    	
+        while (itList.hasNext())
+        {
+        	McAttachmentDTO mcAttachmentDTO=(McAttachmentDTO)itList.next();
+        	String filename=mcAttachmentDTO.getFilename();
+        	logger.debug("extracted filename: " + filename);
+        	listFilenames.add(filename);
+        }
+    	logger.debug("final extracted listFilenames: " + listFilenames);
+    	return listFilenames;
+    }
+    
+    
     public static void removeRedundantOfflineFileItems(HttpServletRequest request, McContent mcContent)
     {
     	IMcService mcService =McUtils.getToolService(request);
     	
     	List allOfflineFilenames=mcService.retrieveMcUploadedOfflineFilesName(mcContent.getUid());
     	logger.debug("allOfflineFilenames:" + allOfflineFilenames);
     	
-    	List listUploadedOfflineFileNames=(List)request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
+    	List listOfflineFilesMetaData =(List)request.getSession().getAttribute(LIST_OFFLINEFILES_METADATA);
+ 		logger.debug("listOfflineFilesMetaData:" + listOfflineFilesMetaData);
+ 		
+ 		List listUploadedOfflineFileNames=extractFileNames(listOfflineFilesMetaData);
 		logger.debug("listUploadedOfflineFileNames:" + listUploadedOfflineFileNames);
     	
 		boolean matchFound=false;
@@ -1852,9 +1902,13 @@
     	List allOnlineFilenames=mcService.retrieveMcUploadedOnlineFilesName(mcContent.getUid());
     	logger.debug("allOnlineFilenames:" + allOnlineFilenames);
     	
-    	List listUploadedOnlineFileNames=(List)request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
+    	List listOnlineFilesMetaData =(List)request.getSession().getAttribute(LIST_ONLINEFILES_METADATA);
+ 		logger.debug("listOnlineFilesMetaData:" + listOnlineFilesMetaData);
+ 		
+ 		List listUploadedOnlineFileNames=extractFileNames(listOnlineFilesMetaData);
 		logger.debug("listUploadedOnlineFileNames:" + listUploadedOnlineFileNames);
     	
+    	
 		boolean matchFound=false;
     	Iterator itAllOnlineFiles = allOnlineFilenames.iterator();
         while (itAllOnlineFiles.hasNext())
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rf6991bff0a6a158b9432f338079cc3fc650dd389 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision f6991bff0a6a158b9432f338079cc3fc650dd389)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -1463,8 +1463,8 @@
 
 
     /**
-     * prepares data to view the contents of uploaded files
-     * viewFileItem(ActionMapping mapping,
+     * removes offline file data 
+     * deleteFileItem(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response)
@@ -1474,136 +1474,41 @@
      * @param mapping
      * @return ActionForward
      */
-    public ActionForward viewFileItem(ActionMapping mapping,
+    public ActionForward deleteOfflineFile(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
 
     {
-    	logger.debug("dispatching viewFileItem...");
+    	logger.debug("dispatching deleteOfflineFile...");
     	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	
 	 	AuthoringUtil.readData(request, mcAuthoringForm);
 	 	
-    	String userAction="viewFileItem";
- 		request.setAttribute(USER_ACTION, userAction);
- 		logger.debug("userAction:" + userAction);
- 		
- 		String filename= request.getParameter("fileItem");
- 		logger.debug("filename:" + filename);
- 		
- 		String uuid=mcService.getFileUuid(filename);
- 		logger.debug("uuid:" + uuid);
- 		
- 		if (uuid == null)
- 		{
- 			ActionMessages errors= new ActionMessages();
-    		errors= new ActionMessages();
-			errors.add(Globals.ERROR_KEY,new ActionMessage("error.file.notPersisted"));
-			saveErrors(request,errors);
-			mcAuthoringForm.resetUserAction();
-			persistError(request,"error.file.notPersisted");
-			
-			request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(2));
-	 		logger.debug("setting EDIT_OPTIONS_MODE :" + 2);
-			return (mapping.findForward(LOAD_QUESTIONS));
- 		}
- 		
- 		InputStream fileInputStream=mcService.downloadFile(new Long(uuid), null);
- 		logger.debug("fileInputStream:" + fileInputStream);
- 		
- 		DataInputStream dis = new DataInputStream(fileInputStream);
- 		logger.debug("dis:" + dis);
- 		
- 		String allFileText="";
- 		try 
-		{
- 			String input="";
- 			while ((input = dis.readLine()) != null) 
- 			{
- 				logger.debug("input:" + input);
- 				allFileText = allFileText + input + "\r\n";
- 			}    
- 		} catch (EOFException e) {
- 			logger.debug("error reading the file :" + e);
- 			logger.debug("error msg reading the file :" + e.getMessage());
- 		}
-    	catch (IOException e) {
-			logger.debug("error reading the file :" + e);
-			logger.debug("error msg reading the file :" + e.getMessage());
-		}
- 		
- 		logger.debug("allFileText:" + allFileText);
- 		request.getSession().setAttribute(FILE_CONTENT, allFileText);
- 		
- 		request.setAttribute(FILE_CONTENT_READY, new Integer(1));
- 		logger.debug("set FILE_CONTENT_READY to 1");
- 		
- 		request.getSession().setAttribute(FILE_NAME, filename);
- 		
- 		mcAuthoringForm.resetUserAction();
- 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
- 		logger.debug("setting EDIT_OPTIONS_MODE :" + 0);
-   	    return (mapping.findForward(LOAD_QUESTIONS));
-    }
-    
+	 	String userAction="deleteOfflineFile";
+    	request.setAttribute(USER_ACTION, userAction);
+    	logger.debug("userAction:" + userAction);
 
-    /**
-     * removes file data 
-     * deleteFileItem(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response)
-     * 
-     * @param request
-     * @param form
-     * @param mapping
-     * @return ActionForward
-     */
-    public ActionForward deleteFileItem(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException
-
-    {
-    	logger.debug("dispatching deleteFileItem...");
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-	 	IMcService mcService =McUtils.getToolService(request);
+	 	String uuid =mcAuthoringForm.getUuid();
+	 	logger.debug("uuid:" + uuid);
 	 	
-	 	AuthoringUtil.readData(request, mcAuthoringForm);
+	 	List listOfflineFilesMetaData =(List)request.getSession().getAttribute(LIST_OFFLINEFILES_METADATA);
+ 		logger.debug("listOfflineFilesMetaData:" + listOfflineFilesMetaData);
+ 		listOfflineFilesMetaData=AuthoringUtil.removeFileItem(listOfflineFilesMetaData, uuid);
+ 		logger.debug("listOfflineFilesMetaData after remove:" + listOfflineFilesMetaData);
+ 		request.getSession().setAttribute(LIST_OFFLINEFILES_METADATA, listOfflineFilesMetaData);
 	 	
-    	String userAction="deleteFileItem";
- 		request.setAttribute(USER_ACTION, userAction);
- 		logger.debug("userAction:" + userAction);
- 		
- 		String filename= request.getParameter("fileItem");
- 		logger.debug("filename:" + filename);
- 		
- 		String offlineFile= request.getParameter("offlineFile");
- 		logger.debug("offlineFile:" + offlineFile);
- 		
- 		logger.debug("start removing file:" + filename + " it is an:" + offlineFile);
- 		
- 		if (!filename.equals(""))
- 		{
- 			AuthoringUtil.removeFileItem(request, filename, offlineFile);
- 	 		logger.debug("done removing offline file");	
- 		}
- 		
- 		mcAuthoringForm.resetUserAction();
- 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
- 		logger.debug("setting EDIT_OPTIONS_MODE :" + 0);
-   	    return (mapping.findForward(LOAD_QUESTIONS));
+        mcAuthoringForm.resetUserAction();
+        return (mapping.findForward(LOAD_QUESTIONS));
+    	
     }
 
-    
-    
+
     /**
-     * moves from Advanced Tab to Basic Tab
-     * doneAdvancedTab(ActionMapping mapping,
+     * removes online file data 
+     * deleteFileItem(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response)
@@ -1613,60 +1518,38 @@
      * @param mapping
      * @return ActionForward
      */
-    public ActionForward doneAdvancedTab(ActionMapping mapping,
+    public ActionForward deleteOnlineFile(ActionMapping mapping,
             ActionForm form,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException,
                                          ServletException
+
     {
-    	logger.debug("dispatching doneAdvancedTab...");
+    	logger.debug("dispatching deleteOnlineFile...");
     	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	
 	 	AuthoringUtil.readData(request, mcAuthoringForm);
-
-        String userAction="advancedTabDone";
+	 	
+	 	String userAction="deleteOnlineFile";
     	request.setAttribute(USER_ACTION, userAction);
     	logger.debug("userAction:" + userAction);
-    	
-    	mcAuthoringForm.resetUserAction();
-        return (mapping.findForward(LOAD_QUESTIONS));
-    }
-    
-    
-    /**
-     * moves from Instructions Tab to Basic Tab
-     * doneInstructionsTab(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response)
-     * 
-     * @param request
-     * @param form
-     * @param mapping
-     * @return ActionForward
-     */
-    public ActionForward doneInstructionsTab(ActionMapping mapping,
-            ActionForm form,
-            HttpServletRequest request,
-            HttpServletResponse response) throws IOException,
-                                         ServletException
-    {
-    	logger.debug("dispatching doneInstructionsTab...");
-    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
-	 	IMcService mcService =McUtils.getToolService(request);
+
+	 	String uuid =mcAuthoringForm.getUuid();
+	 	logger.debug("uuid:" + uuid);
 	 	
-	 	AuthoringUtil.readData(request, mcAuthoringForm);
+	 	List listOnlineFilesMetaData =(List)request.getSession().getAttribute(LIST_ONLINEFILES_METADATA);
+ 		logger.debug("listOnlineFilesMetaData:" + listOnlineFilesMetaData);
+ 		listOnlineFilesMetaData=AuthoringUtil.removeFileItem(listOnlineFilesMetaData, uuid);
+ 		logger.debug("listOnlineFilesMetaData after remove:" + listOnlineFilesMetaData);
+ 		request.getSession().setAttribute(LIST_ONLINEFILES_METADATA, listOnlineFilesMetaData);
 	 	
-		String userAction="dispinstructionsTabDone";
-		request.setAttribute(USER_ACTION, userAction);
-		logger.debug("userAction:" + userAction);
-		mcAuthoringForm.resetUserAction();
-	    return (mapping.findForward(LOAD_QUESTIONS));
+        mcAuthoringForm.resetUserAction();
+        return (mapping.findForward(LOAD_QUESTIONS));
     }
 
-
-    /**
+    
+     /**
      * adds the offline file information in the content repository.
      * submitOfflineFiles(ActionMapping mapping,
             ActionForm form,
@@ -1787,6 +1670,71 @@
     }
     
     
+    /**
+     * moves from Advanced Tab to Basic Tab
+     * doneAdvancedTab(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response)
+     * 
+     * @param request
+     * @param form
+     * @param mapping
+     * @return ActionForward
+     */
+    public ActionForward doneAdvancedTab(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException
+    {
+    	logger.debug("dispatching doneAdvancedTab...");
+    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+	 	IMcService mcService =McUtils.getToolService(request);
+	 	
+	 	AuthoringUtil.readData(request, mcAuthoringForm);
+
+        String userAction="advancedTabDone";
+    	request.setAttribute(USER_ACTION, userAction);
+    	logger.debug("userAction:" + userAction);
+    	
+    	mcAuthoringForm.resetUserAction();
+        return (mapping.findForward(LOAD_QUESTIONS));
+    }
+    
+    
+    /**
+     * moves from Instructions Tab to Basic Tab
+     * doneInstructionsTab(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response)
+     * 
+     * @param request
+     * @param form
+     * @param mapping
+     * @return ActionForward
+     */
+    public ActionForward doneInstructionsTab(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException
+    {
+    	logger.debug("dispatching doneInstructionsTab...");
+    	McAuthoringForm mcAuthoringForm = (McAuthoringForm) form;
+	 	IMcService mcService =McUtils.getToolService(request);
+	 	
+	 	AuthoringUtil.readData(request, mcAuthoringForm);
+	 	
+		String userAction="dispinstructionsTabDone";
+		request.setAttribute(USER_ACTION, userAction);
+		logger.debug("userAction:" + userAction);
+		mcAuthoringForm.resetUserAction();
+	    return (mapping.findForward(LOAD_QUESTIONS));
+    }
+
+    
 	/**
      * ensures that the weight valued entered are valid
      * validateQuestionWeights(HttpServletRequest request, McAuthoringForm mcAuthoringForm)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -ra94de5ff6e0fa1bf65e068d94c81ccdd232c06df -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision a94de5ff6e0fa1bf65e068d94c81ccdd232c06df)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -23,6 +23,8 @@
 	protected String removeOptionContent;
 	
 	protected String fileItem;
+	protected String uuid;
+	
 	protected FormFile receivedFile;
 	protected String offlineFile;
 	
@@ -113,6 +115,7 @@
 		this.removeOptionContent=null;
 		
 		this.fileItem=null;
+		this.uuid=null;
 		this.receivedFile=null;
 		
 		this.addContent=null;
@@ -741,4 +744,16 @@
 	public void setOfflineFile(String offlineFile) {
 		this.offlineFile = offlineFile;
 	}
+	/**
+	 * @return Returns the uuid.
+	 */
+	public String getUuid() {
+		return uuid;
+	}
+	/**
+	 * @param uuid The uuid to set.
+	 */
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
 }
Index: lams_tool_lamc/web/AdvancedContent.jsp
===================================================================
diff -u -rb7285ac977222460053f4293718569503f17fe1e -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision b7285ac977222460053f4293718569503f17fe1e)
+++ lams_tool_lamc/web/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -7,10 +7,10 @@
 
 			<table class="forms">
 				<tr>
-	      			<td class="formlabel" valign=top>
+	      			<td NOWRAP class="formlabel" valign=top>
 		      			<bean:message key="radiobox.sln"/>:
 					</td>
-					<td valign=top>
+					<td NOWRAP valign=top>
 						<html:radio property="sln"  value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
@@ -22,10 +22,10 @@
 		         </tr>
 		         
    				<tr>
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
 		      			<bean:message key="radiobox.onepq"/>:		      			
 					</td>
-					<td valign=top>
+					<td NOWRAP valign=top>
 						<html:radio property="questionsSequenced" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
@@ -37,10 +37,10 @@
 		        </tr>
 		         
 		         <tr>
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
 		      			<bean:message key="radiobox.retries"/>:		      			
 					</td>
-					<td valign=top>
+					<td NOWRAP valign=top>
 						<html:radio property="retries" value="ON">
 						 <bean:message key="option.on"/>
 						</html:radio>
@@ -53,37 +53,37 @@
 				</tr>	      			
 		        
 		         <tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
 				 			<bean:message key="label.report.title"/>: 
 				 	</td>
-	  				<td class="formcontrol" valign=top>
+	  				<td NOWRAP class="formcontrol" valign=top>
 						<FCK:editor id="richTextReportTitle" basePath="/lams/fckeditor/">
 							  <c:out value="${sessionScope.richTextReportTitle}" escapeXml="false" />						  
 						</FCK:editor>
 					</td> 
 			  	</tr>
 			  	
 			  	<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
 			 			<bean:message key="label.report.endLearningMessage"/>: 
 			 		</td>
-	  				<td class="formcontrol">
+	  				<td NOWRAP class="formcontrol">
 						<FCK:editor id="richTextEndLearningMsg" basePath="/lams/fckeditor/">
 							  <c:out value="${sessionScope.richTextEndLearningMsg}" escapeXml="false" />						  
 						</FCK:editor>
 					</td> 
 			  	</tr>
 			  	
 		  		<tr>
- 				 	<td colspan=2 align=center valign=top>								
+ 				 	<td NOWRAP colspan=2 align=center valign=top>								
 						&nbsp&nbsp
 				  	</td>
 				</tr>
 				<tr>
-				 	<td valign=top>								
+				 	<td NOWRAP valign=top>								
 						&nbsp&nbsp
 				  	</td>
-					 <td valign=top> 
+					 <td NOWRAP valign=top> 
 						 <html:submit onclick="javascript:submitMethod('doneAdvancedTab');" >
 							<bean:message key="button.done"/>
 						</html:submit>
Index: lams_tool_lamc/web/BasicContent.jsp
===================================================================
diff -u -r885c702d472ffd26ddc8c506553a2e053bd2d175 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 885c702d472ffd26ddc8c506553a2e053bd2d175)
+++ lams_tool_lamc/web/BasicContent.jsp	(.../BasicContent.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -19,34 +19,34 @@
 					<table class="forms">
 					
  						<tr> 
-					 		<td class="formlabel" valign=top> <bean:message key="label.authoring.title"/>: </td>
-							<td class="formcontrol" valign=top>
+					 		<td NOWRAP class="formlabel" valign=top> <bean:message key="label.authoring.title"/>: </td>
+							<td NOWRAP class="formcontrol" valign=top>
 								<FCK:editor id="richTextTitle" basePath="/lams/fckeditor/">
 									  <c:out value="${sessionScope.richTextTitle}" escapeXml="false" />						  
 								</FCK:editor>
 							</td> 
 					  	</tr>
 					  	
 					  	<tr> 
-					 		<td class="formlabel" valign=top> <bean:message key="label.authoring.instructions"/>: </td>
-							<td class="formcontrol" valign=top>
+					 		<td NOWRAP class="formlabel" valign=top> <bean:message key="label.authoring.instructions"/>: </td>
+							<td NOWRAP class="formcontrol" valign=top>
 								<FCK:editor id="richTextInstructions" basePath="/lams/fckeditor/">
 									  <c:out value="${sessionScope.richTextInstructions}" escapeXml="false" />						  
 								</FCK:editor>
 							</td>
 						</tr>
 				
 					<tr>
-					 	<td colspan=2 align=center valign=top>								
+					 	<td NOWRAP colspan=2 align=center valign=top>								
 
 					  	</td>
 					</tr>
 				
-					<tr> <td colspan=2 align=center valign=top>
+					<tr> <td NOWRAP colspan=2 align=center valign=top>
 				
 					<table align="center" border="1" summary="layout and Content" width="55%">
 					     <tr>
-								  	<td bgcolor="#A8C7DE" colspan=5 class="input" valign=top align=left>
+								  	<td NOWRAP bgcolor="#A8C7DE" colspan=5 class="input" valign=top align=left>
 									  	 <font size=2> <b> <bean:message key="label.mc.questions"/> </b> </font>
 								  	</td>
 						 </tr>					
@@ -56,14 +56,14 @@
 							<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 							
 							  <tr>
-							  	<td bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <c:out value="Question ${queIndex}"/> : </b>  </font> </td>
+							  	<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <c:out value="Question ${queIndex}"/> : </b>  </font> </td>
 							  	
-						  		<td bgcolor="#EEEEEE" class="input" valign=top width=50> 
+						  		<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top width=50> 
 						  			<input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>"
 							  		size="50" maxlength="255" >
 							  	</td>
 
-							  	<td bgcolor="#EEEEEE" class="input"  align=center valign=top>			
+							  	<td NOWRAP bgcolor="#EEEEEE" class="input"  align=center valign=top>			
 							 		<c:if test="${sessionScope.queIndex == 1}"> 		
 	   								    <img src="images/down.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','moveQuestionDown');">
 	   								</c:if> 			
@@ -78,7 +78,7 @@
 									</c:if> 	           								 
                                 </td>
 
-                                    <td bgcolor="#EEEEEE" class="input" align=left valign=top>										  	
+                                    <td NOWRAP bgcolor="#EEEEEE" class="input" align=left valign=top>										  	
 										<c:forEach var="weightsEntry" items="${sessionScope.mapWeights}">                                            
 												<c:if test="${questionEntry.key == weightsEntry.key}"> 			
 											  			<input type="text" name="questionWeight<c:out value="${queIndex}"/>" value="<c:out value="${weightsEntry.value}"/>"
@@ -88,15 +88,15 @@
 										</c:forEach>
                                     </td>
 																					
-                                   <td bgcolor="#EEEEEE" class="input" valign=top>								
+                                   <td NOWRAP bgcolor="#EEEEEE" class="input" valign=top>								
 										<img src="images/edit.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','editOptions');">	
 										<img src="images/delete.gif" align=left onclick="javascript:submitModifyQuestion('<c:out value="${queIndex}"/>','removeQuestion');">	
 								  	</td>
 							  </tr>
 						</c:forEach>
 						
 						 <tr>
-							  	<td bgcolor="#EEEEEE" colspan=5 class="input" valign=top align=right>
+							  	<td NOWRAP bgcolor="#EEEEEE" colspan=5 class="input" valign=top align=right>
 									<html:submit styleClass="a.button" onclick="javascript:submitMethod('addNewQuestion');">
 										<bean:message key="label.add.question"/>
 									</html:submit>	 				 		  										  		
@@ -113,36 +113,33 @@
 					</tr>		
 					
 					<tr>
-					  	<td class="formlabel" valign=top><bean:message key="radiobox.passmark"/>: </td>
-						<td class="input" valign=top> 
+					  	<td NOWRAP class="formlabel" valign=top><bean:message key="radiobox.passmark"/>: </td>
+						<td NOWRAP class="input" valign=top> 
 							  <html:text property="passmark"  size="3" maxlength="3"/>							
 						</td>
-						<td valign=top> </td> 
-						<td valign=top> </td>
+						<td NOWRAP valign=top> </td> 
+						<td NOWRAP valign=top> </td>
 					</tr>
 					
 					<tr>
-	 				 	<td colspan=5 align=center valign=top>
-
+	 				 	<td NOWRAP colspan=5 align=center valign=top>
 					  	</td>
 					</tr>
 						
 					<tr>
-	 				 	<td colspan=5 align=center valign=top>								
-
+	 				 	<td NOWRAP colspan=5 align=center valign=top>								
 					  	</td>
 					</tr>
 
 	 				 <tr>
- 						<td valign=top> </td> 
-						<td class="input" colspan=3 align=left valign=top>								
+ 						<td NOWRAP valign=top> </td> 
+						<td NOWRAP class="input" colspan=3 align=left valign=top>								
 							<html:submit onclick="javascript:submitMethod('submitQuestions');" styleClass="a.button">
 								<bean:message key="button.submit"/>
 							</html:submit>	 				 		  					
 												  		
 		 			  	</td>
-						<td valign=top> </td> 
-						<td valign=top> </td>
+						<td NOWRAP valign=top> </td> 
+						<td NOWRAP valign=top> </td>
 					</tr>
-	 				 
 	 				</table> 	 
Index: lams_tool_lamc/web/CombinedAnswersContent.jsp
===================================================================
diff -u -r80a1f85da1de7f647aeee20ecbeffd25e4173573 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 80a1f85da1de7f647aeee20ecbeffd25e4173573)
+++ lams_tool_lamc/web/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -7,31 +7,31 @@
 	<!--options content goes here-->
 				<table align=center bgcolor="#FFFFFF">
 					  <tr>
-					  	<td align=left class="input" valign=top bgColor="#333366" colspan=2> 
+					  	<td NOWRAP align=left class="input" valign=top bgColor="#333366" colspan=2> 
 						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> </font>
 					  	</td>
 					  </tr>
 					  
 
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
 					  <tr>
-					  	<td align=center class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
 						  	<font size=3> <b>  <bean:message key="label.withRetries"/> </b> </font>
 					  	</td>
 					  </tr>
 					</c:if> 			
 				
 					<c:if test="${sessionScope.isRetries == 'false'}"> 		
 					  <tr>
-					  	<td align=center class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=center class="input" valign=top colspan=2> 
 						  	<font size=3> <b>  <bean:message key="label.withoutRetries"/> </b> </font>
 					  	</td>
 					  </tr>
 					</c:if> 			
 
 			 		<c:if test="${sessionScope.isRetries == 'true' && sessionScope.passMark > 0}"> 		
 					  <tr>
-					  	<td align=left class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=left class="input" valign=top colspan=2> 
 						  	<font size=2> <b>  <bean:message key="label.learner.message"/> (<c:out value="${sessionScope.passMark}"/><bean:message key="label.percent"/> ) 
 						  	</b> </font>
 					  	</td>
@@ -42,7 +42,7 @@
 					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 					<c:set var="mainQueIndex" scope="session" value="${mainQueIndex +1}"/>
 						  <tr>
-						  	<td align=left class="input" valign=top bgColor="#999966" colspan=2> 
+						  	<td NOWRAP align=left class="input" valign=top bgColor="#999966" colspan=2> 
 							  	<font color="#FFFFFF"> 
 							  		<c:out value="${questionEntry.value}"/> 
 							  	</font> 
@@ -51,7 +51,7 @@
 
 								  								  
 						  <tr>						 
-							<td align=left>
+							<td NOWRAP align=left>
 							<table align=left>
 			  		  	 		<c:set var="queIndex" scope="session" value="0"/>
 								<c:forEach var="mainEntry" items="${sessionScope.mapGeneralOptionsContent}">
@@ -69,7 +69,7 @@
 																<c:if test="${subEntry.key == selectedSubEntry.key}"> 		
 									  							
 																	<tr> 
-																		<td align=left class="input" valign=top> 
+																		<td NOWRAP align=left class="input" valign=top> 
 																			<input type="checkbox" 
 																			name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
 																			onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
@@ -87,7 +87,7 @@
 																			}
 																			document.forms[0].submit();" CHECKED> 
 																		</td> 
-																		<td align=left class="input" valign=top> 
+																		<td NOWRAP align=left class="input" valign=top> 
 																			<font color="#CCCC99"> 	<c:out value="${subEntry.value}"/> </font>
 																		</td>
 																	</tr>	
@@ -101,7 +101,7 @@
 
 												<c:if test="${requestScope.checkedOptionFound == 0}"> 		
 																	<tr> 
-																		<td align=left class="input" valign=top> 
+																		<td NOWRAP align=left class="input" valign=top> 
 																			<input type="checkbox" 
 																			name=optionCheckBox<c:out value="${sessionScope.queIndex}"/>-<c:out value="${subEntry.key}"/>
 																			onclick="javascript:document.forms[0].optionCheckBoxSelected.value=1; 
@@ -119,7 +119,7 @@
 																			}
 																			document.forms[0].submit();"> 
 																		</td> 
-																		<td align=left class="input" valign=top> 
+																		<td NOWRAP align=left class="input" valign=top> 
 																			<font color="#CCCC99"> <c:out value="${subEntry.value}"/> </font>
 																		</td>
 																	</tr>	
@@ -139,13 +139,13 @@
 						<html:hidden property="optionIndex"/>
 						<html:hidden property="optionValue"/>						
 						<html:hidden property="checked"/>
-				 		<td colspan=2 class="input" valign=top> 
+				 		<td NOWRAP colspan=2 class="input" valign=top> 
 				 		&nbsp
 				 		</td>
 			  	   </tr>
 			  	   
 	  	   		  <tr>
-				  	<td colspan=2 align=right class="input" valign=top> 
+				  	<td NOWRAP colspan=2 align=right class="input" valign=top> 
 			  			<html:submit property="continueOptionsCombined" styleClass="a.button">
 							<bean:message key="button.continue"/>
 						</html:submit>	 				 		  					
Index: lams_tool_lamc/web/IndividualLearnerResults.jsp
===================================================================
diff -u -rb7285ac977222460053f4293718569503f17fe1e -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision b7285ac977222460053f4293718569503f17fe1e)
+++ lams_tool_lamc/web/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -7,30 +7,30 @@
 		<html:form  action="/learning?method=displayMc&validate=false" method="POST" target="_self">
 				<table align=center bgcolor="#FFFFFF">
 					  <tr>
-					  	<td align=left class="input" valign=top bgColor="#333366" colspan=2> 
+					  	<td NOWRAP align=left class="input" valign=top bgColor="#333366" colspan=2> 
 						  	<font size=2 color="#FFFFFF"> <b>  <bean:message key="label.assessment"/> </b> </font>
 					  	</td>
 					  </tr>
 				
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 		
 						  <tr>
-						  	<td align=center class="input" valign=top colspan=2> 
+						  	<td NOWRAP align=center class="input" valign=top colspan=2> 
 							  	<font size=3> <b>  <bean:message key="label.individual.results.withRetries"/> </b> </font>
 						  	</td>
 						  </tr>
   					</c:if> 			
 
 					<c:if test="${sessionScope.isRetries != 'true'}"> 							  
 						  <tr>
-						  	<td align=center class="input" valign=top colspan=2> 
+						  	<td NOWRAP align=center class="input" valign=top colspan=2> 
 							  	<font size=3> <b>  <bean:message key="label.individual.results.withoutRetries"/> </b> </font>
 						  	</td>
 						  </tr>
 					</c:if> 			
 
 
 					  <tr>
-					  	<td align=right class="input" valign=top colspan=2> 
+					  	<td NOWRAP align=right class="input" valign=top colspan=2> 
 						  	<font size=2 color="#000000"> <b>  <bean:message key="label.mark"/>  
 						  	<c:out value="${sessionScope.learnerMark}"/>  &nbsp
 							<bean:message key="label.outof"/> &nbsp
@@ -40,14 +40,14 @@
 					  </tr>	
 
 					<tr>
-						<td align=right class="input" valign=top colspan=2> 
+						<td NOWRAP align=right class="input" valign=top colspan=2> 
 							<hr>
 						</td> 
 					</tr>
 					
 					<c:if test="${sessionScope.userPassed != 'true'}">
 						 <tr>
-						  	<td align=left class="input" valign=top colspan=2> 
+						  	<td NOWRAP align=left class="input" valign=top colspan=2> 
 							  	<font size=2 color="#FF0000"> <b>  <bean:message key="label.mustGet"/> &nbsp
 							  	<c:out value="${sessionScope.learnerMarkAtLeast}"/>  &nbsp
 								<bean:message key="label.outof"/> &nbsp
@@ -63,7 +63,7 @@
 					<c:forEach var="questionEntry" items="${sessionScope.mapQuestionContentLearner}">
 					<c:set var="mainQueIndex" scope="session" value="${mainQueIndex +1}"/>
 						  <tr>
-						  	<td align=left class="input" valign=top bgColor="#999966" colspan=2> 
+						  	<td NOWRAP align=left class="input" valign=top bgColor="#999966" colspan=2> 
 							  	<font color="#FFFFFF"> 
 							  		<c:out value="${questionEntry.value}"/> 
 							  	</font> 
@@ -72,37 +72,37 @@
 
 								  								  
 						  <tr>						 
-							<td align=left>
+							<td NOWRAP align=left>
 							<table align=left>
 			  		  	 		<c:set var="queIndex" scope="session" value="0"/>
 								<c:forEach var="mainEntry" items="${sessionScope.mapGeneralOptionsContent}">
 									<c:set var="queIndex" scope="session" value="${queIndex +1}"/>
 										<c:if test="${sessionScope.mainQueIndex == sessionScope.queIndex}"> 		
 									  		<c:forEach var="subEntry" items="${mainEntry.value}">
 				  								<tr> 
-													<td align=left class="input" valign=top> 
+													<td NOWRAP align=left class="input" valign=top> 
 					   								    <img src="images/dot.jpg" align=left> &nbsp
 														<font size=2 color="#669966">	<c:out value="${subEntry.value}"/> </font>					   								    
 													</td> 
 												</tr>	
 											</c:forEach>
 
 												<tr>												
-												<td colspan=2 align=left class="input" valign=top> 
+												<td NOWRAP colspan=2 align=left class="input" valign=top> 
 				   								    <bean:message key="label.you.answered"/>
 												</td> 
 												</tr>
 												
 												<tr>
-													<td  align=left class="input" valign=top> 											
+													<td NOWRAP align=left class="input" valign=top> 											
 														<table align=left>
 													  		<c:forEach var="subEntry" items="${mainEntry.value}">
 						  											<c:forEach var="selectedMainEntry" items="${sessionScope.mapGeneralCheckedOptionsContent}">
 																				<c:if test="${selectedMainEntry.key == sessionScope.queIndex}"> 		
 																			  		<c:forEach var="selectedSubEntry" items="${selectedMainEntry.value}">
 																						<c:if test="${subEntry.key == selectedSubEntry.key}"> 		
 																								<tr> 
-																									<td align=left class="input" valign=top> 
+																									<td NOWRAP align=left class="input" valign=top> 
 																										<b> <c:out value="${subEntry.value}"/> </b>
 																									</td> 
 																								</tr>
@@ -115,7 +115,7 @@
 														</table>
 													</td>
 
-													<td  align=right class="input" valign=top> 											
+													<td NOWRAP align=right class="input" valign=top> 											
 														<c:forEach var="mainEntry" items="${sessionScope.mapLearnerAssessmentResults}">
 																<c:if test="${mainEntry.key == sessionScope.queIndex}"> 		
 																	<c:if test="${mainEntry.value == 'true'}"> 		
@@ -139,7 +139,7 @@
 												</tr>
 
 												<tr>
-												<td bgcolor="#CCCC99" colspan=2 align=left class="input" valign=top> 											
+												<td NOWRAP bgcolor="#CCCC99" colspan=2 align=left class="input" valign=top> 											
 													<c:forEach var="mainEntry" items="${sessionScope.mapLearnerAssessmentResults}">
 															<c:if test="${mainEntry.key == sessionScope.queIndex}"> 		
 																<c:if test="${mainEntry.value == 'true'}"> 		
@@ -170,7 +170,7 @@
 					</c:forEach>
 
 			  	   	<tr> 
-				 		<td colspan=2 class="input" valign=top> 
+				 		<td NOWRAP colspan=2 class="input" valign=top> 
 				 		&nbsp
 				 		</td>
 			  	   </tr>
@@ -179,7 +179,7 @@
 
 			 		<c:if test="${sessionScope.isRetries == 'true'}"> 					  	   
 		  	   		  <tr>
-					  	<td colspan=2 align=center class="input" valign=top> 
+					  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
 				  			<html:submit property="redoQuestions" styleClass="a.button">
 								<bean:message key="label.redo.questions"/>
 							</html:submit>	 		
@@ -199,7 +199,7 @@
 
 					<c:if test="${sessionScope.isRetries != 'true'}"> 							  
 		  	   		  <tr>
-		  	   		    <td colspan=2 align=right class="input" valign=top>
+		  	   		    <td NOWRAP colspan=2 align=right class="input" valign=top>
 			  	   		  	<c:if test="${sessionScope.userPassed == 'true'}">
 						  	   <html:submit property="learnerFinished" styleClass="a.button">
 											<bean:message key="label.finished"/>
Index: lams_tool_lamc/web/InstructionsContent.jsp
===================================================================
diff -u -rf6991bff0a6a158b9432f338079cc3fc650dd389 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision f6991bff0a6a158b9432f338079cc3fc650dd389)
+++ lams_tool_lamc/web/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -8,37 +8,28 @@
 <script language="JavaScript" type="text/JavaScript">
 <!--
 
-// view a particular item in a file
-// questionIndexValue: index of question affected
-// actionMethod: name of the method to be called in the DispatchAction
-function viewFileItem(fileItemValue, actionMethod) {
-	document.McAuthoringForm.fileItem.value=fileItemValue; 
+function submitDeleteFile(uuid, actionMethod) {
+	document.McAuthoringForm.uuid.value=uuid; 
 	submitMethod(actionMethod);
 }
 
-function deleteFileItem(fileItemValue, actionMethod, offlineFile) {
-	document.McAuthoringForm.fileItem.value=fileItemValue; 
-	document.McAuthoringForm.offlineFile.value=offlineFile; 
-	submitMethod(actionMethod);
-}
-
 //-->     
 </script>
 
 				<table class="forms">
 				<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
           				<bean:message key="label.offlineInstructions" />:
           			</td>
-					<td colspan=3 class="formcontrol" valign=top>
+					<td NOWRAP colspan=3 class="formcontrol" valign=top>
 					<FCK:editor id="richTextOfflineInstructions" basePath="/lams/fckeditor/">
 						  <c:out value="${richTextOfflineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
 				</tr>
 
 				<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
           				<bean:message key="label.offlineFiles" />
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
@@ -50,38 +41,53 @@
 
 				</tr>
 				<tr> 
-					<td align="right" valign=top>
+					<td NOWRAP align="right" valign=top>
           				<bean:message key="label.uploadedOfflineFiles" />
           			</td>
-					<td colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=3 align=left valign=top width="100%">
 						<table align="left" border="1">
-									<c:forEach var='item' items='${sessionScope.listUploadedOfflineFileNames}'>
-									<tr>
-								         <td valign=top><font size=2> <b> <c:out value='${item}'/> </b> </font> </td>
-								      	<td valign=top>
-								      		<img src="images/edit.gif" align=left onclick="javascript:viewFileItem('<c:out value="${item}"/>','viewFileItem');">
-								      	</td>
-							      	  	<td valign=top>
-								      		<img src="images/delete.gif" align=left onclick="javascript:deleteFileItem('<c:out value="${item}"/>','deleteFileItem', '1');">	  										  		
-								      	</td>
-								     </tr> 	
+									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
+											<tr>
+												<td NOWRAP valign=top>
+													<c:out value="${file.filename}"/>
+												</td>
+												<td NOWRAP valign=top>
+													<c:set var="viewURL">
+														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
+													</c:set>
+													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+														<bean:message key="label.view"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top>
+													<c:set var="downloadURL">
+															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
+													</c:set>
+													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+														<bean:message key="label.download"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top> 
+													<img src="images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOfflineFile');">													
+												</td>
+											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
           		<tr> 
-					<td align="right" valign=top>
+					<td NOWRAP align="right" valign=top>
           				<bean:message key="label.onlineInstructions" />
           			</td>
-					<td colspan=3 class="formcontrol" valign=top>
+					<td NOWRAP colspan=3 class="formcontrol" valign=top>
 					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckeditor/">
 						  <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
 				</tr>
 				
 				<tr> 
-					<td class="formlabel" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
           				<bean:message key="label.onlineFiles" />
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
@@ -93,67 +99,83 @@
 				</tr>
 
 				<tr>
-					<td align="right" valign=top>
+					<td NOWRAP align="right" valign=top>
           				<bean:message key="label.uploadedOnlineFiles" />
           			</td>
           			
-					<td colspan=3 align=left valign=top width="100%">
+					<td NOWRAP colspan=3 align=left valign=top width="100%">
 						<table align="left" border="1">
-									<c:forEach var='item' items='${sessionScope.listUploadedOnlineFileNames}'>
-										<tr>									
-									         <td valign=top><font size=2> <b> <c:out value='${item}'/> </b> </font> </td>
-									      	<td valign=top>
-									      		<img src="images/edit.gif" align=left onclick="javascript:viewFileItem('<c:out value="${item}"/>','viewFileItem');">	  										  		
-									      	</td>
-									      	<td valign=top>
-									      		<img src="images/delete.gif" align=left onclick="javascript:deleteFileItem('<c:out value="${item}"/>','deleteFileItem', '0');">	  										  		
-									      	</td>
-					         			</tr>								      	
+									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
+											<tr>
+												<td NOWRAP valign=top>
+													<c:out value="${file.filename}"/>
+												</td>
+												<td NOWRAP valign=top>
+													<c:set var="viewURL">
+														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
+													</c:set>
+													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
+														<bean:message key="label.view"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top>
+													<c:set var="downloadURL">
+															<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=true"/>
+													</c:set>
+													<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
+														<bean:message key="label.download"/>
+													</a>
+												</td>
+												<td NOWRAP valign=top> 
+													<img src="images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');">													
+												</td>
+											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
 
 				<html:hidden property="fileItem"/>
 				<html:hidden property="offlineFile"/>				
-
+				<html:hidden property="uuid"/>				
+				
 		  		<tr>
- 				 	<td colspan=4 align=center valign=top>								
+ 				 	<td NOWRAP colspan=4 align=center valign=top>								
 						&nbsp
 				  	</td>
 				</tr>
  				 
  				 <tr>
-				 	<td valign=top>								
+				 	<td NOWRAP valign=top>								
 				  	</td>
-					 <td colspan=3 valign=top> 
+					 <td NOWRAP colspan=3 valign=top> 
 						 <html:submit onclick="javascript:submitMethod('doneInstructionsTab');">
 							<bean:message key="button.done"/>
 						</html:submit>
 					</td> 
  				 </tr>
  				 
  				 <tr>
- 				 	<td colspan=4 align=center valign=top>								
+ 				 	<td NOWRAP colspan=4 align=center valign=top>								
 						&nbsp
 				  	</td>
 				</tr>
 				
 				<c:if test="${requestScope.fileContentReady == 1}"> 			
 					<tr>
-						<td align="right" valign=top>
+						<td NOWRAP align="right" valign=top>
 	          				 <bean:message key="label.fileContent" /> : 
 	          			</td>
 					
-	 				 	<td colspan=3 align=left valign=top>								
+	 				 	<td NOWRAP colspan=3 align=left valign=top>								
 	 				 		<table>
 	 				 			<tr> 
-	 				 				<td align=center> <font size=2> <b>
+	 				 				<td NOWRAP align=center> <font size=2> <b>
 	 				 					 <c:out value="${sessionScope.fileName}"/>  
 	 				 				</b> </font> </td>
 				 				 </tr>
 				 				 <tr>
-			 				 		<td> <textarea ROWS=20 COLS=80><c:out value="${sessionScope.fileContent}"/> </textarea> </td>				 				 
+			 				 		<td NOWRAP> <textarea ROWS=20 COLS=80><c:out value="${sessionScope.fileContent}"/> </textarea> </td>				 				 
 				 				 </tr>
 	 				 		</table>
 					  	</td>
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -ra94de5ff6e0fa1bf65e068d94c81ccdd232c06df -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a94de5ff6e0fa1bf65e068d94c81ccdd232c06df)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -87,13 +87,11 @@
         redirect="true"
       />
       
-      
       <forward
         name="editOptsContent"
         path=".editOptsContent"
         redirect="true"
       />
-      
     </action>
     
    <!--Learning Starter  -->
Index: lams_tool_lamc/web/authoringMaincontent.jsp
===================================================================
diff -u -raba443e2b63edbcb50c172615f2c323b3ee048b3 -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision aba443e2b63edbcb50c172615f2c323b3ee048b3)
+++ lams_tool_lamc/web/authoringMaincontent.jsp	(.../authoringMaincontent.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -115,7 +115,7 @@
 		<h2><bean:message key="label.authoring.mc.basic"/></h2>
 			<table align=center> 	  
 			<tr>   
-			<td class=error>
+			<td NOWRAP class=error>
 				<%@ include file="errorbox.jsp" %> <!-- show any error messages here -->
 			</td>
 			</tr> 
@@ -139,7 +139,7 @@
 	
 		<table align=center> 	  
 		<tr>   
-		<td class=error>
+		<td NOWRAP class=error>
 			<%@ include file="errorbox.jsp" %> <!-- show any error messages here -->
 		</td>
 		</tr> 
@@ -156,7 +156,7 @@
 
 		<table align=center> 	  
 		<tr>   
-		<td class=error>
+		<td NOWRAP class=error>
 			<%@ include file="errorbox.jsp" %> <!-- show any error messages here -->
 		</td>
 		</tr> 
Index: lams_tool_lamc/web/errorList.jsp
===================================================================
diff -u -re6a6fd9fc56102261bd0a7b65ad6b41eb19105bc -r32fc4979f5d351d85b0b1d751810fe1433ee0fcc
--- lams_tool_lamc/web/errorList.jsp	(.../errorList.jsp)	(revision e6a6fd9fc56102261bd0a7b65ad6b41eb19105bc)
+++ lams_tool_lamc/web/errorList.jsp	(.../errorList.jsp)	(revision 32fc4979f5d351d85b0b1d751810fe1433ee0fcc)
@@ -27,7 +27,7 @@
 
 
 	<table align="center" border="0" width="100%">
-	<tr> <td align=center>
+	<tr> <td NOWRAP align=center>
 		    <img src="images/error.jpg" align="left" width=20 height=20> </img> 
 				<bean:message key="error.default.content.notSetup"/>			    
 	</td> </tr>