Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.34.2.16 -r1.34.2.17
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	2 Mar 2017 07:27:26 -0000	1.34.2.16
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	8 Mar 2017 03:58:51 -0000	1.34.2.17
@@ -302,3 +302,4 @@
 
 
 #======= End labels: Exported 293 labels for en AU =====
+label.summary.downloaded=Summary downloaded
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v
diff -u -r1.25.2.9 -r1.25.2.10
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	16 Dec 2016 09:26:37 -0000	1.25.2.9
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	8 Mar 2017 03:58:51 -0000	1.25.2.10
@@ -35,6 +35,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;
@@ -560,6 +561,12 @@
 	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
 	log.debug("Exporting assessment to a spreadsheet: " + assessment.getContentId());
 
+	// 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);
+
 	ServletOutputStream out = response.getOutputStream();
 	ExcelUtil.createExcel(out, dataToExport, service.getMessage("label.export.exported.on"), true);
 
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.11.2.7 -r1.11.2.8
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	13 Dec 2016 22:40:24 -0000	1.11.2.7
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	8 Mar 2017 03:58:51 -0000	1.11.2.8
@@ -38,6 +38,10 @@
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script> 
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+ 		
+ 		<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
+ 		<script type="text/javascript" src="${lams}includes/javascript/download.js"></script>
+ 		
 		<script>        
 		    function doSelectTab(tabId) {
 			   	// end optional tab controller stuff
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.25.2.8 -r1.25.2.9
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	11 Dec 2016 03:08:09 -0000	1.25.2.8
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	8 Mar 2017 03:58:51 -0000	1.25.2.9
@@ -167,8 +167,9 @@
 	    var reqIDVar = new Date();
 		var param = "?sessionMapID=${sessionMapID}&reqID="+reqIDVar.getTime();
 		url = url + param;
-		location.href=url;
+		return downloadFile(url, 'messageArea_Busy', '<fmt:message key="label.summary.downloaded"/>', 'messageArea', 'btn-disable-on-submit');
 	};
+	
 </script>
 
 <div class="panel">
@@ -185,16 +186,25 @@
 			<fmt:message key="message.monitoring.summary.no.session" />
 		</lams:Alert>
 	</c:if>
+
+	<lams:WaitingSpinner id="messageArea_Busy"></lams:WaitingSpinner>
+	<div class="voffset5 help-block" id="messageArea"></div>
+			
 </div>
 
 <c:if test="${not empty sessionDtos}">
 	
+	<button onclick="return exportSummary();" 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.monitoring.summary.export.summary" />
+	</button>
+			
 	<h5><fmt:message key="label.monitoring.summary.summary" /></h5>
 	
 	<div class="comments">
 		<fmt:message key="label.monitoring.summary.double.click" />
 	</div>
-			
+
 	<div id="masterDetailArea" class="voffset10">
 		<%@ include file="parts/masterDetailLoadUp.jsp"%>
 	</div>
@@ -237,11 +247,7 @@
 	<c:if test="${sessionMap.isGroupedActivity}">
 		</div> <!--  end panel group -->
 	</c:if>
-		
-	<html:link href="javascript:exportSummary();" property="exportExcel" styleClass="btn btn-default btn-xs pull-right">
-		<fmt:message key="label.monitoring.summary.export.summary" />
-	</html:link>
-		
+
 	<!-- Dropdown menu for choosing a question type -->	
 	<h5><fmt:message key="label.monitoring.summary.report.by.question" /></h5>