Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties
===================================================================
diff -u -rb13258b9e91d575819ca519cad88e35af9b266a7 -r064d6ed02741d003a9c2263d7966d7820f2ccaa9
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b13258b9e91d575819ca519cad88e35af9b266a7)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 064d6ed02741d003a9c2263d7966d7820f2ccaa9)
@@ -22,10 +22,10 @@
 
 label.filename=Filename
 label.type=Type
-label.view=View
-label.download=Download
-label.delete=Delete
 label.attachments=Attachments
+link.view=View
+link.download=Download
+link.delete=Delete
 
 # ========== Learner Page ==========
 message.defineLaterSet=Please wait for the teacher to complete the contents of this activity
Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rb13258b9e91d575819ca519cad88e35af9b266a7 -r064d6ed02741d003a9c2263d7966d7820f2ccaa9
--- lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b13258b9e91d575819ca519cad88e35af9b266a7)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 064d6ed02741d003a9c2263d7966d7820f2ccaa9)
@@ -126,6 +126,13 @@
         path=".error"
         scope="request"
       />
+      <exception
+        key="error.exception.NbApplication"
+        type="java.lang.NullPointerException"
+        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
+        path=".error"
+        scope="request"
+      />
       <forward
         name="basic"
         path=".nb_basic"
@@ -181,6 +188,13 @@
         path=".error"
         scope="request"
       />
+      <exception
+        key="error.exception.NbApplication"
+        type="java.lang.NullPointerException"
+        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
+        path=".error"
+        scope="request"
+      />
       <forward
         name="monitorPage"
         path=".monitoringContent"
@@ -225,6 +239,13 @@
         path=".error"
         scope="request"
       />
+      <exception
+        key="error.exception.NbApplication"
+        type="java.lang.NullPointerException"
+        handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler"
+        path=".error"
+        scope="request"
+      />
       <forward
         name="monitorPage"
         path=".monitoringContent"
Index: lams_tool_nb/web/a_Instructions.jsp
===================================================================
diff -u -rb4ad62e8759a5a7922a916501b9f9ccaf007c750 -r064d6ed02741d003a9c2263d7966d7820f2ccaa9
--- lams_tool_nb/web/a_Instructions.jsp	(.../a_Instructions.jsp)	(revision b4ad62e8759a5a7922a916501b9f9ccaf007c750)
+++ lams_tool_nb/web/a_Instructions.jsp	(.../a_Instructions.jsp)	(revision 064d6ed02741d003a9c2263d7966d7820f2ccaa9)
@@ -86,33 +86,52 @@
 		        	<bean:size id="count" name="attachmentList" />
 		                  <logic:notEqual name="count" value="0">
 		                  
-		                        <table align="center">
+		                   <!--     <table align="center">
 		                        <tr>
 		                          		<th scope="col"><fmt:message key="label.filename" /></th>
 		                          		<th scope="col"><fmt:message key="label.type" /></th>
 		                          		<th>&nbsp;</th>
 		                                
-		                        </tr>
-		                        <logic:iterate name="attachmentList" id="attachment">
+		                        </tr> -->
+		                        
+		                         <table width="70%" align="left">
 		                        <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>
-			                         		<fmt:message key="label.view" />
-			                         		<fmt:message key="label.download" />
-			                         		<fmt:message key="label.delete" />
-			                         </td>
+		                          		<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>
+				                         		<fmt:message key="link.view" />
+				                         		<fmt:message key="link.download" />
+				                         	<html:link page="/authoring.do?method=Delete" 
+				                         	paramId="uuid" paramName="attachment" paramProperty="uuid"
+				                         	onclick="javascript:return confirm('Are you sure you want to delete this file?')"
+				                         	target="_self">
+				                         			<fmt:message key="link.delete" />
+				                         		</html:link> 
+				                         		
+				                         </td>
+			                        </tr>
 		                        </logic:iterate>
 		                          </table>
 		                  
@@ -123,13 +142,15 @@
 		</tr>
 	</table>
 </div>
+<hr>
 
 <div id="datatablecontainer">
 <table width="100%" align="center">
-<tr>
-	<td align="center"><html:submit property="method"><fmt:message key="button.done"/></html:submit>
-	</td>
-</tr>
+	<tr><td>&nbsp;</td></tr>
+	<tr>
+		<td align="center"><html:submit property="method"><fmt:message key="button.done"/></html:submit>
+		</td>
+	</tr>
 </table>
 </div>
 				<html:hidden property="onlineInstructions" />