diff --git a/AKSubmission/templates/AKSubmission/akowner_create_update.html b/AKSubmission/templates/AKSubmission/akowner_create_update.html
index b8f7a402b2a7f9928d5f520475466884bc5258c2..34ba27ba2a6397a08528cd1059e1d4cc33079fcc 100644
--- a/AKSubmission/templates/AKSubmission/akowner_create_update.html
+++ b/AKSubmission/templates/AKSubmission/akowner_create_update.html
@@ -20,6 +20,9 @@
     <form method="POST" class="post-form">{% csrf_token %}
         {% bootstrap_form form %}
         {% buttons %}
+            <button type="submit" class="save btn btn-primary float-right">
+                {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+            </button>
             <button type="reset" class="btn btn-danger">
                 {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
             </button>
@@ -27,9 +30,6 @@
             <a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
                 {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
             </a>
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
-            </button>
         {% endbuttons %}
     </form>
 {% endblock %}
\ No newline at end of file
diff --git a/AKSubmission/templates/AKSubmission/akslot_add_update.html b/AKSubmission/templates/AKSubmission/akslot_add_update.html
index afcce8567e6021917ba7babf0bd12932891aff54..838267bf3adbb789ec4d49adef8f749172f3b4a7 100644
--- a/AKSubmission/templates/AKSubmission/akslot_add_update.html
+++ b/AKSubmission/templates/AKSubmission/akslot_add_update.html
@@ -22,6 +22,10 @@
     <form method="POST" class="post-form">{% csrf_token %}
         {% bootstrap_form form %}
         {% buttons %}
+            <button type="submit" class="save btn btn-primary float-right">
+                {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
+            </button>
+
             <button type="reset" class="btn btn-danger">
                 {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
             </button>
@@ -29,9 +33,6 @@
             <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
                 {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
             </a>
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Continue" %}
-            </button>
         {% endbuttons %}
     </form>
 {% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/akslot_delete.html b/AKSubmission/templates/AKSubmission/akslot_delete.html
index 2ae502dfcb057332aafcd69bd32787d3a2884bb2..b58654b38b94312ab978dfca6298c7cfd5f14f26 100644
--- a/AKSubmission/templates/AKSubmission/akslot_delete.html
+++ b/AKSubmission/templates/AKSubmission/akslot_delete.html
@@ -38,12 +38,13 @@
             </tbody>
         </table>
         {% buttons %}
-            <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
-                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
-            </a>
             <button type="submit" class="save btn btn-danger float-right" value="Confirm">
                 {% fa5_icon "check" 'fas' %} {% trans "Confirm" %}
             </button>
+
+            <a href="{% url 'submit:ak_detail' event_slug=event.slug pk=ak.pk %}" class="btn btn-secondary">
+                {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
+            </a>
         {% endbuttons %}
     </form>
 {% endblock %}
diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html
index 283e85258cd5fd239118d5e01ffcff08da7a5b6e..42626533c15b558a7312a52306c9ec7a13e2f0de 100644
--- a/AKSubmission/templates/AKSubmission/submit_new.html
+++ b/AKSubmission/templates/AKSubmission/submit_new.html
@@ -37,6 +37,10 @@
     <form method="POST" class="post-form">{% csrf_token %}
         {% bootstrap_form form %}
         {% buttons %}
+            <button type="submit" class="save btn btn-primary float-right">
+                {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
+            </button>
+
             <button type="reset" class="btn btn-danger">
                 {% fa5_icon "undo-alt" 'fas' %} {% trans "Reset Form" %}
             </button>
@@ -44,9 +48,6 @@
             <a href="{% url 'submit:submission_overview' event_slug=event.slug %}" class="btn btn-secondary">
                 {% fa5_icon "times" 'fas' %} {% trans "Cancel" %}
             </a>
-            <button type="submit" class="save btn btn-primary float-right">
-                {% fa5_icon "check" 'fas' %} {% trans "Submit" %}
-            </button>
         {% endbuttons %}
     </form>
 {% endblock %}