Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
===================================================================
diff -u -rc9531327d15636b54f293077ee1cd9f60195381b -r391557c1cca07365383bedeb438f9306c74938c9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision 391557c1cca07365383bedeb438f9306c74938c9)
@@ -55,12 +55,17 @@
 	
 	public McContent findMcContentById(Long mcContentId)
 	{
+	    logger.debug("doing findMcContentById" + mcContentId);
 		String query = "from McContent as mc where mc.mcContentId = ?";
+		logger.debug("query: " + query);
 	    HibernateTemplate templ = this.getHibernateTemplate();
-		List list = getSession().createQuery(query)
-			.setLong(0,mcContentId.longValue())
-			.list();
+
+		List list = getSession().createQuery(FIND_MC_CONTENT)
+		.setLong(0,mcContentId.longValue())
+		.list();
 		
+		logger.debug("list: " + list);
+		
 		if(list != null && list.size() > 0){
 			McContent mc = (McContent) list.get(0);
 			return mc;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r2e1913a4770c9bc154693d8c35f6e7a6b6e0e3fd -r391557c1cca07365383bedeb438f9306c74938c9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 2e1913a4770c9bc154693d8c35f6e7a6b6e0e3fd)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 391557c1cca07365383bedeb438f9306c74938c9)
@@ -326,6 +326,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
     	return (mapping.findForward(destination));	
 	}
     
@@ -449,6 +450,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
     	
 		McUtils.debugMaps(request);
+		logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 		return (mapping.findForward(destination));
     }
 
@@ -820,6 +822,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
     	
 		McUtils.debugMaps(request);
+		logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
     	return (mapping.findForward(destination));
     }
 
@@ -958,6 +961,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 		return (mapping.findForward(destination));
     }
     
@@ -1085,6 +1089,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 		return (mapping.findForward(destination));
     }
     
@@ -1215,6 +1220,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
         return (mapping.findForward(destination));	
     }
     
@@ -1347,6 +1353,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 	    return (mapping.findForward(destination));
     }
     
@@ -1518,6 +1525,7 @@
 		request.getSession().setAttribute(MAP_GENERAL_SELECTED_OPTIONS_CONTENT, mapGeneralSelectedOptionsContent);
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 		return (mapping.findForward(destination));
     }
 
@@ -1572,6 +1580,7 @@
 		logger.debug("setting  EDIT_OPTIONS_MODE to 0");
     	
 		McUtils.debugMaps(request);
+		logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 		return (mapping.findForward(destination));
     }
     
@@ -2070,6 +2079,7 @@
 		if (destination.equals(LOAD_MONITORING_CONTENT))
 		{
 			request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER);
+			mcAuthoringForm.setActiveModule(DEFINE_LATER);
 			request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false));	
 		}
     	
@@ -2078,6 +2088,8 @@
 		//because button (and javascript) will display in LamsTag tab, so put it into session instead of request
 		//it will be remove immediately in clearSessionAction.
         request.getSession().setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE);
+        
+        logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 		return (mapping.findForward(destination));
     }
 
@@ -2129,6 +2141,7 @@
         mcAuthoringForm.resetUserAction();
         
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
         return (mapping.findForward(destination));
     	
     }
@@ -2181,6 +2194,7 @@
         mcAuthoringForm.resetUserAction();
         
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
         return (mapping.findForward(destination));
     }
 
@@ -2255,6 +2269,7 @@
  		logger.debug("setting EDIT_OPTIONS_MODE :" + 0);
  		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
    	    return (mapping.findForward(destination));    
     }
     
@@ -2327,6 +2342,7 @@
  		logger.debug("setting ` :" + 0);
     	
  		McUtils.debugMaps(request);
+ 		logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
    	    return (mapping.findForward(destination));
     }
     
@@ -2368,6 +2384,7 @@
         mcAuthoringForm.resetUserAction();
         
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
         return (mapping.findForward(destination));
     }
     
@@ -2409,6 +2426,7 @@
 		mcAuthoringForm.resetUserAction();
 		
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 	    return (mapping.findForward(destination));
     }
 
@@ -2456,6 +2474,7 @@
 		
 		/* Check this: find out where to forward to*/
     	McUtils.debugMaps(request);
+    	logger.debug("final EDIT_OPTIONS_MODE: " + request.getSession().getAttribute(EDIT_OPTIONS_MODE));
 	    return (mapping.findForward(AUTHORING_STARTER));
     }
     
Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp
===================================================================
diff -u -r2e1913a4770c9bc154693d8c35f6e7a6b6e0e3fd -r391557c1cca07365383bedeb438f9306c74938c9
--- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 2e1913a4770c9bc154693d8c35f6e7a6b6e0e3fd)
+++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp	(.../AuthoringMaincontent.jsp)	(revision 391557c1cca07365383bedeb438f9306c74938c9)
@@ -54,9 +54,76 @@
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<lams:headItems/>
 		<title><fmt:message key="activity.title" /></title>
-	
+
+		<c:if test="${sessionScope.activeModule != 'defineLater'}"> 			
+			<script language="JavaScript" type="text/JavaScript">
+		        function init(){
+		            initTabSize(3);
+		            
+		            var tag = document.getElementById("currentTab");
+			    	if(tag.value != "")
+			    		selectTab(tag.value);
+		            else
+		                selectTab(1); //select the default tab;
+		            
+		            initEditor("richTextTitle");
+		            initEditor("richTextInstructions");
+		            initEditor("richTextReportTitle");            
+		            initEditor("richTextEndLearningMsg");                        
+		            initEditor("richTextOfflineInstructions");                                    
+		            initEditor("richTextOnlineInstructions");                                                
+		            initEditor("richTextIncorrectFeedback");                                                
+		            initEditor("richTextCorrectFeedback");                                                            
+			   }     
+			</script>
+		</c:if> 
+
+		<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
+			   (sessionScope.defineLaterInEditMode == 'true') &&  
+			   (sessionScope.editOptionsMode != 1)   			
+			  }"> 			
+			<script language="JavaScript" type="text/JavaScript">
+		        function init(){
+		        
+		            initTabSize(1);
+		            
+		            var tag = document.getElementById("currentTab");
+			    	if(tag.value != "")
+			    		selectTab(tag.value);
+		            else
+		                selectTab(1); //select the default tab;
+		            
+		            initEditor("richTextTitle");
+		            initEditor("richTextInstructions");
+			   }     
+			</script>
+		</c:if> 
+
+		<c:if test="${ (sessionScope.activeModule == 'defineLater') &&  
+			   (sessionScope.defineLaterInEditMode == 'true') &&  
+			   (sessionScope.editOptionsMode == 1)   			   
+			  }"> 			
+			<script language="JavaScript" type="text/JavaScript">
+			  function init(){
+		        
+		            initTabSize(1);
+		            
+		            var tag = document.getElementById("currentTab");
+			    	if(tag.value != "")
+			    		selectTab(tag.value);
+		            else
+		                selectTab(1); //select the default tab;
+		            
+		            initEditor("richTextIncorrectFeedback");                                                
+		            initEditor("richTextCorrectFeedback");                                                            
+			   }     
+			</script>
+		</c:if> 
+
  	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
 	<script language="JavaScript" type="text/JavaScript">
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
 
 		function submitModifyQuestion(questionIndexValue, actionMethod) 
 		{
@@ -87,29 +154,6 @@
 		  else if (innerWidth!=document.MM_pgW || innerHeight!=document.MM_pgH) location.reload();
 		}
 
-    	var imgRoot="${lams}images/";
-	    var themeName="aqua";
-        
-        function init(){
-        
-            initTabSize(3);
-            
-            var tag = document.getElementById("currentTab");
-	    	if(tag.value != "")
-	    		selectTab(tag.value);
-            else
-                selectTab(1); //select the default tab;
-            
-            initEditor("richTextTitle");
-            initEditor("richTextInstructions");
-            initEditor("richTextReportTitle");            
-            initEditor("richTextEndLearningMsg");                        
-            initEditor("richTextOfflineInstructions");                                    
-            initEditor("richTextOnlineInstructions");                                                
-            initEditor("richTextIncorrectFeedback");                                                
-            initEditor("richTextCorrectFeedback");                                                            
-	   }     
-        
         function doSelectTab(tabId) {
         	// start optional tab controller stuff
         	var tag = document.getElementById("currentTab");
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r7c258915bf9d46f8fe8dd192a2b1a77c024d1cad -r391557c1cca07365383bedeb438f9306c74938c9
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7c258915bf9d46f8fe8dd192a2b1a77c024d1cad)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 391557c1cca07365383bedeb438f9306c74938c9)
@@ -31,6 +31,7 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
+
 				<c:if test="${sessionScope.activeModule != 'defineLater'}"> 			
 					<h2><font size=2> <bean:message key="label.authoring.mc.basic"/> </font> </h2>	
 				</c:if> 				
Index: lams_tool_lamc/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r391557c1cca07365383bedeb438f9306c74938c9
--- lams_tool_lamc/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_lamc/web/authoring/InstructionsContent.jsp	(.../InstructionsContent.jsp)	(revision 391557c1cca07365383bedeb438f9306c74938c9)
@@ -38,42 +38,44 @@
 				</table>
 
 				<table class="forms">
+
 				<tr> 
-					<td NOWRAP class="formlabel" valign=top>
+					<td NOWRAP align="right" valign=top>
 						<font size=2>
-    	      				<b> <bean:message key="label.offlineInstructions" />: <b>
+    	      				<b> <bean:message key="label.onlineInstructions" /> </b>
     	      			</font>
           			</td>
 					<td NOWRAP colspan=3 valign=top>
-						<lams:SetEditor id="richTextOfflineInstructions" text="${richTextOfflineInstructions}" small="true"/>																			
+						<lams:SetEditor id="richTextOnlineInstructions" text="${sessionScope.richTextOnlineInstructions}" small="true"/>					
 					</td> 
 				</tr>
 				
 				<tr> 
 					<td NOWRAP class="formlabel" valign=top>
 						<font size=2>
-							<b> <bean:message key="label.offlineFiles" /> <b>
-						</font>
+    	      				<b> <bean:message key="label.onlineFiles" /> </b>
+    	      			</font>
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
 	          			<font size=2>
-							<html:file  property="theOfflineFile"></html:file>
-						 	<html:submit onclick="javascript:submitMethod('submitOfflineFiles');" styleClass="buttonLeft">
+							<html:file  property="theOnlineFile"></html:file>
+						 	<html:submit onclick="javascript:submitMethod('submitOnlineFiles');" styleClass="buttonLeft">
 								 <bean:message key="button.upload"/> 
 							</html:submit>
 						</font>
 					</td> 
-
 				</tr>
-				<tr> 
+
+				<tr>
 					<td NOWRAP align="right" valign=top>
-						<font size=2>
-    	      				<b> <bean:message key="label.uploadedOfflineFiles" /> </b>
-    	      			</font>
+	          			<font size=2>
+		      				<b> <bean:message key="label.uploadedOnlineFiles" /> </b>
+	      				</font>
           			</td>
+          			
 					<td NOWRAP colspan=3 align=left valign=top width="100%">
 						<table align="left" border="1">
-									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
+									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
 													<font size=2> <c:out value="${file.filename}"/> </font>
@@ -83,7 +85,7 @@
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-														<font size=2> <bean:message key="label.view"/> </font>
+														 <font size=2>	<bean:message key="label.view"/> </font>
 													</a>
 												</td>
 												<td NOWRAP valign=top>
@@ -95,51 +97,51 @@
 													</a>
 												</td>
 												<td NOWRAP valign=top> 
-													 <font size=2>	<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOfflineFile');"> </font>													
+													<font size=2> <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> </font>	
 												</td>
 											</tr>
 				         			</c:forEach>
 	         			</table>
 					</td> 
 				</tr>
-
+				
+				
 				<tr> 
-					<td NOWRAP align="right" valign=top>
+					<td NOWRAP class="formlabel" valign=top>
 						<font size=2>
-    	      				<b> <bean:message key="label.onlineInstructions" /> </b>
+    	      				<b> <bean:message key="label.offlineInstructions" />: <b>
     	      			</font>
           			</td>
 					<td NOWRAP colspan=3 valign=top>
-						<lams:SetEditor id="richTextOnlineInstructions" text="${sessionScope.richTextOnlineInstructions}" small="true"/>					
+						<lams:SetEditor id="richTextOfflineInstructions" text="${richTextOfflineInstructions}" small="true"/>																			
 					</td> 
 				</tr>
 				
 				<tr> 
 					<td NOWRAP class="formlabel" valign=top>
 						<font size=2>
-    	      				<b> <bean:message key="label.onlineFiles" /> </b>
-    	      			</font>
+							<b> <bean:message key="label.offlineFiles" /> <b>
+						</font>
           			</td>
           			<td colspan=3 NOWRAP valign=top> 
 	          			<font size=2>
-							<html:file  property="theOnlineFile"></html:file>
-						 	<html:submit onclick="javascript:submitMethod('submitOnlineFiles');" styleClass="buttonLeft">
+							<html:file  property="theOfflineFile"></html:file>
+						 	<html:submit onclick="javascript:submitMethod('submitOfflineFiles');" styleClass="buttonLeft">
 								 <bean:message key="button.upload"/> 
 							</html:submit>
 						</font>
 					</td> 
-				</tr>
 
-				<tr>
+				</tr>
+				<tr> 
 					<td NOWRAP align="right" valign=top>
-	          			<font size=2>
-		      				<b> <bean:message key="label.uploadedOnlineFiles" /> </b>
-	      				</font>
+						<font size=2>
+    	      				<b> <bean:message key="label.uploadedOfflineFiles" /> </b>
+    	      			</font>
           			</td>
-          			
 					<td NOWRAP colspan=3 align=left valign=top width="100%">
 						<table align="left" border="1">
-									<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
+									<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
 											<tr>
 												<td NOWRAP valign=top>
 													<font size=2> <c:out value="${file.filename}"/> </font>
@@ -149,7 +151,7 @@
 														<html:rewrite page="/download/?uuid=${file.uuid}&preferDownload=false"/>
 													</c:set>
 													<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-														 <font size=2>	<bean:message key="label.view"/> </font>
+														<font size=2> <bean:message key="label.view"/> </font>
 													</a>
 												</td>
 												<td NOWRAP valign=top>
@@ -161,7 +163,7 @@
 													</a>
 												</td>
 												<td NOWRAP valign=top> 
-													<font size=2> <img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOnlineFile');"> </font>	
+													 <font size=2>	<img src="<c:out value="${tool}"/>images/delete.gif" align=left onclick="javascript:submitDeleteFile('<c:out value="${file.uuid}"/>','deleteOfflineFile');"> </font>													
 												</td>
 											</tr>
 				         			</c:forEach>
Index: lams_tool_lamc/web/monitoring/Instructions.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -r391557c1cca07365383bedeb438f9306c74938c9
--- lams_tool_lamc/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_lamc/web/monitoring/Instructions.jsp	(.../Instructions.jsp)	(revision 391557c1cca07365383bedeb438f9306c74938c9)
@@ -36,27 +36,101 @@
 			<tr>
 				<td>
 					<table align="center">
+						<tr>
+							<td colspan=2> &nbsp&nbsp&nbsp </td>
+						</tr>
+				
 						<tr> 
 							<td NOWRAP valign=top>
-				  				<b> <font size=2> <bean:message key="label.offlineInstructions.col" /> </font> </b>
+				  				<b> <font size=2> <bean:message key="label.onlineInstructions.col" /> </font></b>
 				  			</td>
 							<td NOWRAP valign=top>
-								  <font size=2> <c:out value="${richTextOfflineInstructions}" escapeXml="false" />	</font>					  
+								  <font size=2> <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	</font>					  
 							</td> 
 						</tr>
 						
+						
 						<tr>
-							<td colspan=2> &nbsp&nbsp&nbsp </td>
+							<td NOWRAP align="right" valign=top>
+			          			<font size=2>
+				      				<b> <bean:message key="label.uploadedOnlineFiles" /> </b>
+			      				</font>
+		          			</td>
+		          			
+							<td NOWRAP colspan=2 align=left valign=top width="100%">
+								<table align="left" border="1">
+											<c:forEach var='file' items='${sessionScope.listOnlineFilesMetadata}'>
+													<tr>
+														<td NOWRAP valign=top>
+															<font size=2> <c:out value="${file.filename}"/> </font>
+														</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'/>')">
+																 <font size=2>	<bean:message key="label.view"/> </font>
+															</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'/>">
+																<font size=2> <bean:message key="label.download"/> </font>
+															</a>
+														</td>
+													</tr>
+						         			</c:forEach>
+			         			</table>
+							</td> 
 						</tr>
-				
+						
 						<tr> 
 							<td NOWRAP valign=top>
-				  				<b> <font size=2> <bean:message key="label.onlineInstructions.col" /> </font></b>
+				  				<b> <font size=2> <bean:message key="label.offlineInstructions.col" /> </font> </b>
 				  			</td>
 							<td NOWRAP valign=top>
-								  <font size=2> <c:out value="${sessionScope.richTextOnlineInstructions}" escapeXml="false" />	</font>					  
+								  <font size=2> <c:out value="${richTextOfflineInstructions}" escapeXml="false" />	</font>					  
 							</td> 
 						</tr>
+						
+
+						<tr> 
+							<td NOWRAP align="right" valign=top>
+								<font size=2>
+		    	      				<b> <bean:message key="label.uploadedOfflineFiles" /> </b>
+		    	      			</font>
+		          			</td>
+							<td NOWRAP colspan=2 align=left valign=top width="100%">
+								<table align="left" border="1">
+											<c:forEach var='file' items='${sessionScope.listOfflineFilesMetadata}'>
+													<tr>
+														<td NOWRAP valign=top>
+															<font size=2> <c:out value="${file.filename}"/> </font>
+														</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'/>')">
+																<font size=2> <bean:message key="label.view"/> </font>
+															</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'/>">
+																<font size=2> <bean:message key="label.download"/> </font>
+															</a>
+														</td>
+													</tr>
+						         			</c:forEach>
+			         			</table>
+							</td> 
+						</tr>
+						
 					</table>
 				</td>
 			</tr>