diff --git a/applications/templates/application.html b/applications/templates/application.html
index 433d3d90..36b0b89c 100644
--- a/applications/templates/application.html
+++ b/applications/templates/application.html
@@ -23,12 +23,19 @@
     </div>
     {% endif %}
     <div style="padding-left: 15px; padding-right: 15px">
+        <div class="alert alert-warning">
       {% if application.can_be_edit %}
-          <p>It is still possible to modify your application.</p>
-      {% else %}
-          <p>Your application has been reviewed already. Editing has been disabled to make sure all reviewers get the
-              same data. If you would like to change something important, please email us at {{ h_contact_email|urlize }}.</p>
-      {% endif %}
+      
+      
+          <p>
+              Be careful, you can only edit the application during <b style="text-decoration: underline;">2 hours</b> after applying
+            </p>
+            
+            {% else %}
+            <p>Your application has been reviewed already. Editing has been disabled to make sure all reviewers get the
+                same data. If you would like to change something important, please email us at {{ h_contact_email|urlize }}.</p>
+                {% endif %}
+        </div>
     </div>
     {% include 'include/application_form.html' %}
 
diff --git a/applications/templates/include/application_form.html b/applications/templates/include/application_form.html
index 6cb07df4..cce5e643 100644
--- a/applications/templates/include/application_form.html
+++ b/applications/templates/include/application_form.html
@@ -24,7 +24,7 @@
     </div>
 
     {% if not application or application.can_be_edit %}
-        <button class="btn btn-success btn-block" type="submit">{% if application %}Update application{% else %}
+        <button class="btn btn-success btn-block" type="submit" {% if application and not application.can_be_edit %} disabled {% endif %}>{% if application %}Update application{% else %}
             Submit application{% endif %}</button>
 
     {% endif %}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b4549e7b..9905b58e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,6 +5,8 @@ services:
         build: .
         ports:
             - "${MYHACKUPC_PORT}:8000"  # Map Gunicorn port
+        volumes:
+            - ./files:/code/files
         expose:
             - "${MYHACKUPC_PORT}"
         env_file: