diff --git a/src/main.rs b/src/main.rs
index 4dc1a7a..8fbd633 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,8 +10,8 @@ use rocket::Request;
 use rocket_dyn_templates::{context, Template};
 
 enum MyResponse {
-    Redirect(Redirect),
-    Template(Template),
+    Redirect(Box<Redirect>),
+    Template(Box<Template>),
 }
 
 impl<'r, 'o: 'r> Responder<'r, 'o> for MyResponse {
@@ -30,7 +30,7 @@ impl<'r, 'o: 'r> Responder<'r, 'o> for MyResponse {
 #[get("/download/<url>")]
 async fn download(url: &str) -> MyResponse {
     if !url.starts_with("https://www.studydrive.net/") {
-        return MyResponse::Redirect(Redirect::to("/not_found"));
+        return MyResponse::Redirect(Box::new(Redirect::to("/not_found")));
     }
 
     let doc_id = url
@@ -55,7 +55,10 @@ async fn download(url: &str) -> MyResponse {
             "https://cdn.studydrive.net/d/prod/documents/{}/original/{}.{}?token={}",
             doc_id, doc_id, ending, token
         );
-        return MyResponse::Template(Template::render("download", context! { url: url }));
+        return MyResponse::Template(Box::new(Template::render(
+            "download",
+            context! { url: url, name: name},
+        )));
     }
     let name = data["filename"].as_str().unwrap();
     let ending = name.split('.').last().unwrap();
@@ -66,7 +69,10 @@ async fn download(url: &str) -> MyResponse {
         "https://cdn.studydrive.net/d/prod/documents/{}/original/{}.{}?token={}",
         doc_id, doc_id, ending, token
     );
-    return MyResponse::Template(Template::render("download", context! { url: url }));
+    MyResponse::Template(Box::new(Template::render(
+        "download",
+        context! { url: url, name: name },
+    )))
 }
 
 async fn get_token() -> Result<String, Box<dyn std::error::Error>> {
diff --git a/templates/download.tera b/templates/download.tera
index f05ab9f..e78735f 100644
--- a/templates/download.tera
+++ b/templates/download.tera
@@ -21,14 +21,30 @@
             </div>
             <div class="row">
                 <div class="col text-center">
-                    <button class="btn btn-primary" onclick="window.location.href = '{{ url }}'">Click here to download</button>
+                    <a href="{{ url }}"id="download">
+                        <button class="btn btn-primary">Click here if nothing happens</button>
+                    </a>
                 </div>
             </div>
         </div>
         <script>
+            fetch("https://corsproxy.io/?"+encodeURI("{{ url }}"))
+                .then(response => response.blob())
+                .then(blob => {
+            let url = window.URL.createObjectURL(blob);
+            let a = document.createElement("a");
+            a.href = url;
+            a.download = "{{ name }}";
+            document.body.appendChild(a);
+            
             setTimeout(function() {
-                window.location.href = "{{ url }}";
-            }, 2000);
+                a.click();
+                a.remove();
+                document.querySelector("h1").textContent = "Download of file {{ name }} successful!";
+                document.getElementById("download").remove();
+            }, 1000);
+            })
+            .catch(error => console.error(error));
         </script>
   </body>
 </html>