Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r87c692e036174fdb50aad4527a7ea5412e38a64d -r7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 87c692e036174fdb50aad4527a7ea5412e38a64d)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f)
@@ -201,6 +201,6 @@
 label.tool.output.has.been.changed  =Tool output has changed
 label.operation.failed  =Operation failed
 answers.submitted.none  =Select at least one answer for each of the questions.
+label.summary.downloaded=Marks file downloaded.
 
-
 #======= End labels: Exported 195 labels for en AU =====
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
diff -u -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac -r7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f)
@@ -32,6 +32,7 @@
 import java.util.TreeMap;
 
 import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -209,6 +210,12 @@
 	    return mapping.findForward("error");
 	}
 
+	// set cookie that will tell JS script that export has been finished
+	String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue");
+	Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue);
+	fileDownloadTokenCookie.setPath("/");
+	response.addCookie(fileDownloadTokenCookie);
+
 	// construct download file response header
 	OutputStream out = response.getOutputStream();
 	String fileName = "lams_mcq.xls";
Index: lams_tool_lamc/web/common/monitoringheader.jsp
===================================================================
diff -u -rd28a91914e8858e0fbc045fc9313e3b50a309c45 -r7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f
--- lams_tool_lamc/web/common/monitoringheader.jsp	(.../monitoringheader.jsp)	(revision d28a91914e8858e0fbc045fc9313e3b50a309c45)
+++ lams_tool_lamc/web/common/monitoringheader.jsp	(.../monitoringheader.jsp)	(revision 7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f)
@@ -20,4 +20,8 @@
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 
+<!--  File Download -->
+<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/download.js"></script>
 
+
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -r7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f)
@@ -36,24 +36,20 @@
         	document.McMonitoringForm.submit();
         }
 
-		function submitMonitoringMethod(actionMethod) {
-			document.McMonitoringForm.dispatch.value=actionMethod; 
-			document.McMonitoringForm.submit();
+		function downloadMarks() {
+			var url = "<c:url value='/monitoring.do'/>";
+		    var reqIDVar = new Date();
+			var param = "?validate=false&dispatch=downloadMarks&toolContentID=${mcGeneralMonitoringDTO.toolContentID}&reqID="+reqIDVar.getTime();
+			url = url + param;
+
+			return downloadFile(url, 'message-area-busy', '<fmt:message key="label.summary.downloaded"/>', 'message-area', 'btn-disable-on-submit');
 		}
 		
-		function submitMethod(actionMethod) {
-			submitMonitoringMethod(actionMethod);
-		}
-		
-		function submitMonitoringMethod(actionMethod) {
+		function submitChangeDisplayAnswers(displayAnswers, actionMethod) {
+			document.McMonitoringForm.displayAnswers.value=displayAnswers; 
 			document.McMonitoringForm.dispatch.value=actionMethod; 
 			document.McMonitoringForm.submit();
 		}
-		
-		function submitChangeDisplayAnswers(displayAnswers, actionMethod) {
-			document.McMonitoringForm.displayAnswers.value=displayAnswers; 
-			submitMonitoringMethod(actionMethod);
-		}
 	
 	</script>
 	
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 7d03e2ea6fe79a84b7754c4ebed98e4e22cf489f)
@@ -192,7 +192,7 @@
 	</c:if>
 	
 	<!--For release marks feature-->
-	<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
+	<lams:WaitingSpinner id="message-area-busy"></lams:WaitingSpinner>
 	<div id="message-area"></div>
 
 </div>
@@ -201,9 +201,10 @@
 
 
 <c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
-	<html:link href="#" onclick="javascript:submitMonitoringMethod('downloadMarks');" styleClass="btn btn-default btn-xs pull-right">
+	<button onclick="return downloadMarks()" class="btn btn-default btn-xs btn-disable-on-submit pull-right">
+		<i class="fa fa-download" aria-hidden="true"></i> 
 		<fmt:message key="label.monitoring.downloadMarks.button" />
-	</html:link>
+	</button>
 
 	<h4>    
 		<fmt:message key="label.studentMarks"/>