Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.30.2.9 -r1.30.2.10
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	13 Dec 2016 14:33:32 -0000	1.30.2.9
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	8 Mar 2017 13:02:22 -0000	1.30.2.10
@@ -182,6 +182,6 @@
 label.survey.options  =Options
 label.activity.completion  =End of activity
 label.notifications  =Notifications
+label.summary.downloaded=Report Downloaded
 
-
 #======= End labels: Exported 177 labels for en AU =====
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v
diff -u -r1.23.2.8 -r1.23.2.9
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	16 Dec 2016 09:26:48 -0000	1.23.2.8
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	8 Mar 2017 13:02:22 -0000	1.23.2.9
@@ -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;
@@ -484,6 +485,12 @@
 		}
 	    }
 
+	    // 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);
+
 	    String fileName = "lams_survey_" + toolSessionID + ".xlsx";
 	    response.setContentType("application/x-download");
 	    response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
Index: lams_tool_survey/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.11.2.3 -r1.11.2.4
--- lams_tool_survey/web/pages/monitoring/monitoring.jsp	13 Dec 2016 22:55:30 -0000	1.11.2.3
+++ lams_tool_survey/web/pages/monitoring/monitoring.jsp	8 Mar 2017 13:02:22 -0000	1.11.2.4
@@ -19,6 +19,10 @@
 	<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 type="text/javascript">
 	//pass settings to monitorToolSummaryAdvanced.js
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/summary.jsp,v
diff -u -r1.18.2.10 -r1.18.2.11
--- lams_tool_survey/web/pages/monitoring/summary.jsp	19 Nov 2016 23:32:28 -0000	1.18.2.10
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	8 Mar 2017 13:02:22 -0000	1.18.2.11
@@ -14,7 +14,7 @@
 	    var reqIDVar = new Date();
 		var param = "?toolSessionID=" + sessionId +"&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>
 
@@ -32,6 +32,8 @@
 		</lams:Alert>
 	</c:if>
 	
+	<lams:WaitingSpinner id="messageArea_Busy"></lams:WaitingSpinner>
+	<div class="voffset5 help-block" id="messageArea"></div>
 
 </div>
 
@@ -48,13 +50,14 @@
 		<c:set var="sessionButtons">
 			<c:if test="${sessionMap.survey.reflectOnActivity}">
 				<c:set var="listReflections"><c:url value="/pages/monitoring/listreflections.jsp?toolSessionID=${surveySession.sessionId}"/></c:set>
-				<html:link href="javascript:launchPopup('${listReflections}')" styleClass="btn btn-default ${sessionButtonSize}">
+				<button onclick="launchPopup('${listReflections}');return false;" class="btn btn-default btn-disable-on-submit ${sessionButtonSize}">
 					<fmt:message key="page.title.monitoring.view.reflection" />
-				</html:link>
+				</button>
 			</c:if>	
-			<html:link href="javascript:exportSurvey(${surveySession.sessionId});" property="exportExcel" styleClass="btn btn-default ${sessionButtonSize} loffset5">
+			<button onclick="return exportSurvey(${surveySession.sessionId});" property="exportExcel" class="btn btn-default btn-disable-on-submit ${sessionButtonSize} loffset5">
+				<i class="fa fa-download" aria-hidden="true"></i>
 				<fmt:message key="label.monitoring.button.export.excel" />
-			</html:link>
+			</button>
 		</c:set>
 
 		<c:choose>