Index: lams_tool_nb/web/m_EditActivity.jsp
===================================================================
diff -u -ra55d8876843fefe5bc02973de456ccc276d6a3df -r7b1ab9175f88a30e8bfca21fd81a96f00ce768cc
--- lams_tool_nb/web/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision a55d8876843fefe5bc02973de456ccc276d6a3df)
+++ lams_tool_nb/web/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 7b1ab9175f88a30e8bfca21fd81a96f00ce768cc)
@@ -1,4 +1,5 @@
 <h2><fmt:message key="titleHeading.editActivity"/></h2>
+<br>
 <div id="datatablecontainer">
 	<table width="100%" border="0" cellspacing="0" cellpadding="0">
 		<c:choose>
@@ -39,13 +40,14 @@
 			<!--	<html:link forward="forwardToAuthorPage" paramName="NbMonitoringForm" paramProperty="toolContentId" paramId="toolContentId" styleClass="button">
 					<fmt:message key="button.edit" />
 				</html:link> -->
-				<html:link forward="forwardToAuthorPage" name="NbMonitoringForm" property="parametersToAppend" styleClass="button">
+				<html:link forward="forwardToAuthorPage" name="NbMonitoringForm" property="parametersToAppend" styleClass="button" target="_blank">
 					<fmt:message key="button.edit" />
 				</html:link> 
 			</td>	
 		</tr>
 	</c:if>
 </table>
 </div>
+<br>
 <hr>
 
Index: lams_tool_nb/web/m_Instructions.jsp
===================================================================
diff -u -r489f4264f6860d74ce5795a9168b4aff164a6502 -r7b1ab9175f88a30e8bfca21fd81a96f00ce768cc
--- lams_tool_nb/web/m_Instructions.jsp	(.../m_Instructions.jsp)	(revision 489f4264f6860d74ce5795a9168b4aff164a6502)
+++ lams_tool_nb/web/m_Instructions.jsp	(.../m_Instructions.jsp)	(revision 7b1ab9175f88a30e8bfca21fd81a96f00ce768cc)
@@ -1,32 +1,8 @@
-
 <h2><fmt:message key="titleHeading.instructions"/></h2>
+<br>
 <div id="datatablecontainer">
 	<table width="50%" border="0" cellspacing="0" cellpadding="0">
-<!-- 	 <tr>
-	    <th scope="col">Online Instructions</th>
-	    <th scope="col">Offline Instructions </th>
-  	</tr>
-  	
-  		
 		<tr>
-			<td>
-			<c:out value="${sessionScope.onlineInstructions}" escapeXml="false"/>
-			</td>
-			<td>
-			<c:out value="${sessionScope.offlineInstructions}" escapeXml="false"/>
-			</td>
-		</tr>  -->
-	<!--	<tr>
-			<td>&nbsp;</td>
-			<td>&nbsp;</td>
-		</tr>
-		<tr>
-			<td align="left">
-				<c:out value="${sessionScope.offlineInstructions}" escapeXml="false"/>
-			</td>
-		</tr> -->
-		
-		<tr>
 			<td><fmt:message key="instructions.onlineInstructions"/></td>
 			<td><c:out value="${sessionScope.onlineInstructions}" escapeXml="false"/></td>
 		
@@ -42,5 +18,62 @@
 	</table>
 </div>
 
-<hr>
+<logic:present name="attachmentList">
+<bean:size id="count" name="attachmentList" />
+<logic:notEqual name="count" value="0">
+<br>
+	<div id="datatablecontainer">
+		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<th scope="col"><fmt:message key="label.attachments" /></th>
+			</tr>
+			<tr>
+				<td>
+					<table width="70%" align="left">
+		            <tr>
+		                <td><fmt:message key="label.filename" /></td>
+		                <td><fmt:message key="label.type" /></td>
+		            	<td>&nbsp;</td>
+		            </tr>
+		            <logic:iterate name="attachmentList" id="attachment">
+		            	<bean:define id="view">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=false</bean:define>
+						<bean:define id="download">/download/?uuid=<bean:write name="attachment" property="uuid"/>&preferDownload=true</bean:define>
+                        <bean:define id="uuid" name="attachment" property="uuid" />
+                        
+                        <tr>
+			                         	
+			            	<td><bean:write name="attachment" property="filename"/></td>
+			                <td>
+			                	<c:choose>
+					            	<c:when test="${attachment.onlineFile}" >
+					                	<fmt:message key="instructions.type.online" />
+					               	</c:when>
+					                <c:otherwise>
+					                	<fmt:message key="instructions.type.offline" />
+					                </c:otherwise>
+				                </c:choose>
+				            </td>
+				            <td>
+					        	<table>
+						        	<tr>
+						            	<td>
+						                	<a href='javascript:launchInstructionsPopup("<html:rewrite page='<%=view%>'/>")' class="button">
+						                   		<fmt:message key="link.view" />
+						                    </a>
+						               	</td>
+						                
+						           	</tr>
+					            </table>
+				           	</td>
+			   	     	</tr>
+		    	    </logic:iterate>
+					</table>
+			 	</td>
+			</tr>
+		</table>
+	</div>
 
+ </logic:notEqual>
+ </logic:present>
+ <br>
+	<hr>
Index: lams_tool_nb/web/m_Statistics.jsp
===================================================================
diff -u -rafdcd71e8101534954d0eae0e6015e9d52cd6217 -r7b1ab9175f88a30e8bfca21fd81a96f00ce768cc
--- lams_tool_nb/web/m_Statistics.jsp	(.../m_Statistics.jsp)	(revision afdcd71e8101534954d0eae0e6015e9d52cd6217)
+++ lams_tool_nb/web/m_Statistics.jsp	(.../m_Statistics.jsp)	(revision 7b1ab9175f88a30e8bfca21fd81a96f00ce768cc)
@@ -1,9 +1,7 @@
 <div id="datatablecontainer">
 <h2><fmt:message key="titleHeading.summary" /> </h2>
+<br>
 <table width="60%" border="0" cellspacing="0" cellpadding="0">
-	<tr>
-		<td>&nbsp;</td>
-	</tr>
 	<c:set var="groupCounter" scope="request" value="0"/>
 	<c:forEach var="group" items="${requestScope.groupStatsMap}">
 		<c:set var="groupCounter" scope="request" value="${groupCounter+1}"/>
@@ -17,7 +15,7 @@
 			<c:out value="${group.value}"/>
 			
 		</td>
-	<!-- 	<td align="left"></td> -->
+	
 	</tr>
 	</c:forEach>
 	<tr>
@@ -30,4 +28,5 @@
 	</tr>
 </table>
 </div>
+<br>
 <hr>
\ No newline at end of file
Index: lams_tool_nb/web/m_Summary.jsp
===================================================================
diff -u -r39cc1ef4aa81a0977f74e66f6424f672855900f5 -r7b1ab9175f88a30e8bfca21fd81a96f00ce768cc
--- lams_tool_nb/web/m_Summary.jsp	(.../m_Summary.jsp)	(revision 39cc1ef4aa81a0977f74e66f6424f672855900f5)
+++ lams_tool_nb/web/m_Summary.jsp	(.../m_Summary.jsp)	(revision 7b1ab9175f88a30e8bfca21fd81a96f00ce768cc)
@@ -1,5 +1,6 @@
 <div id="datatablecontainer">
 <h2><fmt:message key="titleHeading.summary" /> </h2>
+<br>
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td><fmt:message key="basic.title"/></td>
@@ -19,4 +20,5 @@
 	</tr>
 </table>
 </div>
+<br>
 <hr>
\ No newline at end of file