Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra2995a19919411d7882b6935f174b6427483049c -ra474e56b95d31ca6b549367c5adc8a99acf5ac5d
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a2995a19919411d7882b6935f174b6427483049c)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a474e56b95d31ca6b549367c5adc8a99acf5ac5d)
@@ -201,6 +201,6 @@
 label.waiting.for.leader.submit.notebook  =Time limit set by teacher is expired. Please wait until a group leader submits notebook.
 label.waiting.for.leader.submit.burning.questions  =Time limit set by teacher is expired. Please wait until a group leader submits burning questions.
 label.authoring.advanced.shuffle.items  =Shuffle questions
+label.summary.downloaded=Excel file downloaded.
 
-
 #======= End labels: Exported 195 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
diff -u -r7e8d2e658c8363cb1878c6f9270b5e1f64c3afac -ra474e56b95d31ca6b549367c5adc8a99acf5ac5d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7e8d2e658c8363cb1878c6f9270b5e1f64c3afac)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision a474e56b95d31ca6b549367c5adc8a99acf5ac5d)
@@ -33,6 +33,7 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -255,6 +256,12 @@
 	response.setContentType("application/x-download");
 	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
 
+	// 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);
+
 	// Code to generate file and write file contents to response
 	ServletOutputStream out = response.getOutputStream();
 	ExcelUtil.createExcel(out, dataToExport, null, false);
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r9e9c0664745d48fdd504952bb279e5b840675758 -ra474e56b95d31ca6b549367c5adc8a99acf5ac5d
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 9e9c0664745d48fdd504952bb279e5b840675758)
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision a474e56b95d31ca6b549367c5adc8a99acf5ac5d)
@@ -25,8 +25,11 @@
 	<script type="text/javascript" src="${lams}includes/javascript/thickbox.js"></script>
 	<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>
+ 
 	 <script>
 			var initialTabId = "${initialTabId}";
 
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -ra474e56b95d31ca6b549367c5adc8a99acf5ac5d
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c6ad8493ef2064430e8783b28258cc9f223a3844)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision a474e56b95d31ca6b549367c5adc8a99acf5ac5d)
@@ -215,7 +215,8 @@
 	});
 	
 	function exportExcel(){
-		location.href = "<c:url value='/monitoring/exportExcel.do'/>?sessionMapID=${sessionMapID}&reqID=" + (new Date()).getTime();
+		var url = "<c:url value='/monitoring/exportExcel.do'/>?sessionMapID=${sessionMapID}&reqID=" + (new Date()).getTime();
+		return downloadFile(url, 'messageArea_Busy', '<fmt:message key="label.summary.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
 	};
 	
 	// pass settings to monitorToolSummaryAdvanced.js
@@ -233,9 +234,12 @@
 </script>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-	<html:link href="javascript:exportExcel();" styleClass="btn btn-default pull-right">
-		<fmt:message key="label.export.excel" />
-	</html:link>
+	<c:if test="${not empty summaryList}">
+		<button onclick="return exportExcel();" class="btn btn-default btn-sm btn-disable-on-submit pull-right">
+			<i class="fa fa-download" aria-hidden="true"></i> 
+			<fmt:message key="label.export.excel" />
+		</button>
+	</c:if>
 
 	<div class="panel">
 		<h4>
@@ -251,6 +255,9 @@
 			</lams:Alert>
 		</c:if>
 	
+		<lams:WaitingSpinner id="messageArea_Busy"></lams:WaitingSpinner>
+		<div class="voffset5 help-block" id="messageArea"></div>
+	
 	</div>
 
 	<div class="form-group">