Index: lams_tool_sbmt/web/monitoring/alluserlist.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/alluserlist.jsp	(.../alluserlist.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/alluserlist.jsp	(.../alluserlist.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -32,21 +32,27 @@
 				    
 	  				<tr>
 			  			<td class="formcontrol">
-			  			<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
-							<bean:message key="label.monitoring.viewAllMarks.button" />
-						</html:link>
-			  			</td>
-			  			<td class="formcontrol">
-			  			<html:link href="javascript:doSubmit('releaseMarks');" property="releaseMarks" styleClass="button">
-							<bean:message key="label.monitoring.releaseMarks.button" />
-						</html:link>
-			  			</td>
-			  			<td class="formcontrol">
-			  			<html:link href="javascript:doSubmit('downloadMarks');" property="downloadMarks" styleClass="button">
-							<bean:message key="label.monitoring.downloadMarks.button" />
-						</html:link>
-			  			</td>
-	  				</tr>
+			  				<table class="forms">
+			  					<tr>
+			  						<td class="formcontrol">
+						  			<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
+										<bean:message key="label.monitoring.viewAllMarks.button" />
+									</html:link>
+						  			</td>
+						  			<td class="formcontrol">
+						  			<html:link href="javascript:doSubmit('releaseMarks');" property="releaseMarks" styleClass="button">
+										<bean:message key="label.monitoring.releaseMarks.button" />
+									</html:link>
+						  			</td>
+						  			<td class="formcontrol">
+						  			<html:link href="javascript:doSubmit('downloadMarks');" property="downloadMarks" styleClass="button">
+										<bean:message key="label.monitoring.downloadMarks.button" />
+									</html:link>
+						  			</td>
+				  				</tr>
+							</table>
+						</td>
+					</tr>
 				</table>
 				<br><br>
 			</logic:iterate>
Index: lams_tool_sbmt/web/monitoring/basic.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/basic.jsp	(.../basic.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/basic.jsp	(.../basic.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -17,5 +17,12 @@
 					<lams:SetEditor id="Instructions" text="${authoring.instruction}"/>
 				</td>
 			</tr>
+			<tr>
+				<td colspan="2">
+					<html:link href="javascript:doSubmit('updateActivity');" property="Update" styleClass="button">
+								<bean:message key="label.monitoring.edit.activity.update"/>
+					</html:link>
+				</td>
+			</tr>
 		</table>
 	</div>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/editactivity.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -1,18 +1,4 @@
 <%@include file="../sharing/share.jsp" %>
 <%@ taglib uri="fck-editor" prefix="FCK"%>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-  	    <%@ include file="basic.jsp"%>
-  	   	<table>
-		 	<tr>
-		 		<!--<td>
-					<html:button property="cancel" onclick="javascript:history.back()">
-						<bean:message key="label.monitoring.edit.activity.cancel"/>
-					</html:button>
-					</td>-->
-					<td>
-					<html:link href="javascript:doSubmit('updateActivity');" property="Update" styleClass="button">
-						<bean:message key="label.monitoring.edit.activity.update"/>
-					</html:link>
-				</td>
-			</tr>
-		</table>
\ No newline at end of file
+<%@ include file="basic.jsp"%>
\ No newline at end of file
Index: lams_tool_sbmt/web/monitoring/marking.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/marking.jsp	(.../marking.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/marking.jsp	(.../marking.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -1,6 +1,6 @@
 <%@include file="../sharing/share.jsp" %>
 <%@ taglib uri="tags-logic" prefix="logic" %>
-				<table class="forms">					
+				<table border="0" cellpadding="2" cellspacing="2">					
 					<tr>
 			  			<td class="formcontrol">
 			  			<html:link href="javascript:doSubmit('viewAllMarks', 5);" property="viewAllMarks" styleClass="button">
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
diff -u -rd8b297d5eb77457f395486978967dcf78d7c8445 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision d8b297d5eb77457f395486978967dcf78d7c8445)
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -44,9 +44,16 @@
         	var tag = document.getElementById("currentTab");
 	    	tag.value = tabId;
 	    	// end optional tab controller stuff
-	    	selectTab(tabId);
+	    	if(active(tabId))
+	    		selectTab(tabId);
         } 
         
+        function active(tabId) {
+        	if(document.getElementById("tab" + tabId).className == "tab tabcentre_inactive")
+        		return false;
+        	return true;
+        }
+        
         function doSubmit(method, tabId) {
         	if(tabId != null)
         		document.SbmtMonitoringForm.currentTab.value=tabId;
@@ -73,7 +80,7 @@
 			<lams:Tab id="2" key="label.monitoring.heading.instructions"/>
 			<lams:Tab id="3" key="label.monitoring.heading.edit.activity"/>
 			<lams:Tab id="4" key="label.monitoring.heading.stats"/>
-			<lams:Tab id="5" key="label.monitoring.heading.marking"/>
+			<lams:Tab id="5" key="label.monitoring.heading.marking" inactive="true"/>
 		</lams:Tabs>
 	<!-- end tab buttons -->
 	<div class="tabbody">
Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/usermarkslist.jsp	(.../usermarkslist.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp	(.../usermarkslist.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -70,4 +70,11 @@
 		</tr>
 		</span>
 	</c:forEach>
+			<tr>
+				<td colspan="2">
+					<html:link href="javascript:doSubmit('unspecified', 1);" property="submit" styleClass="button">
+							<bean:message key="label.monitoring.finishedMarks.button" />
+					</html:link>
+				</td>
+			</tr>
 </table>			
Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp
===================================================================
diff -u -rb2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636 -rb8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4
--- lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision b2fc2abd5cca8d7c7ebe2acac93fd9d78ff1b636)
+++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp	(.../viewallmarks.jsp)	(revision b8c719fb5f6dcb92e5041e8bc2d28fddf4bd95a4)
@@ -4,7 +4,7 @@
 			<c:set var="filesUploaded" value="${user.value}"/>
 			<c:set var="first" value="true"/>
 			<c:forEach items="${filesUploaded}"  var ="details" >			
-				<span><p>			
+				<p>			
 					<c:if test="${first}">
 						<c:set var="first" value="false"/>
 					    <tr>
@@ -16,8 +16,7 @@
 				    </c:if>
 				<tr>
 					<td>File Path: </td>
-						<td>
-						</td><td><c:out value="${details.filePath}" /> 
+					<td><c:out value="${details.filePath}" /> 
 						<c:set var="viewURL">
 							<html:rewrite page="/download/?uuid=${details.uuID}&versionID=${details.versionID}&preferDownload=false"/>
 						</c:set>
@@ -30,7 +29,7 @@
 						<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
 									<fmt:message key="label.download"/>
 						</a>
-						</td>					
+					</td>					
 					
 				</tr>
 				<tr>
@@ -76,7 +75,13 @@
 							</html:link>
 					</td>
 				</tr>
-				</span>
 			</c:forEach>
 		</c:forEach>
+			<tr>
+				<td colspan="2">
+					<html:link href="javascript:doSubmit('unspecified', 1);" property="submit" styleClass="button">
+							<bean:message key="label.monitoring.finishedMarks.button" />
+					</html:link>
+				</td>
+			</tr>
 		</table>