diff --git a/SNPedia/SnpApi.py b/SNPedia/SnpApi.py
index c9404ec..a25a2e7 100644
--- a/SNPedia/SnpApi.py
+++ b/SNPedia/SnpApi.py
@@ -28,9 +28,12 @@ def create_file():
     bytesIO.write(filecontents)
     bytesIO.seek(0)
 
-    return send_file(bytesIO,
-                     attachment_filename=filename,
-                     as_attachment=True)
+    return send_file(
+        bytesIO,
+        download_name=filename,
+        as_attachment=True,
+        mimetype="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    )
 
 
 @app.route('/images/<path:path>')
diff --git a/SNPedia/templates/snp_resource.html b/SNPedia/templates/snp_resource.html
index 3cc08b3..3a604b1 100644
--- a/SNPedia/templates/snp_resource.html
+++ b/SNPedia/templates/snp_resource.html
@@ -67,7 +67,8 @@
                 var grid1 = $("#grid").data("kendoGrid");
                 oldPageSize = grid1.dataSource.pageSize();
                 grid1.dataSource.pageSize(grid1.dataSource.data().length);
-                grid1.saveAsExcel()
+                grid1.saveAsExcel();
+                grid1.dataSource.pageSize(oldPageSize);
             };
 
             $(window).resize(function () {
@@ -86,19 +87,17 @@
             $(document).ready(function () {
 
                 $("#grid").kendoGrid({
-                    toolbar: [{
-                        name: 'exportExcel1',
-                        template: '#= exportExcel()#',
-                    },
-                    {
-                        name: 'lookupsnp',
-                        template: '#= snplookup()#'
-                    }
+                    toolbar: [
+                        { name: 'excel', text: 'Export to Excel' },
+                        {
+                            name: 'lookupsnp',
+                            template: '#= snplookup()#'
+                        }
                     ],
                     excel: {
-                        fileName: "SNP Report.xlsx",
+                        fileName: "SNP_Report.xlsx",
                         proxyURL: "/excel",
-                        filterable: true
+                        forceProxy: true
                     },
 
                     dataSource: {