diff --git a/components/eventform/default.htm b/components/eventform/default.htm
index 9ee4743..7a70b44 100644
--- a/components/eventform/default.htm
+++ b/components/eventform/default.htm
@@ -155,7 +155,7 @@
                             {{ form.field(_context, 'phone', 'Telefonnummer', true, 'tel') }}
                             {{ form.field(_context, 'email', 'E-Mail-Adresse', true, 'email') }}
                         </div>
-                        {% partial __SELF__.alias ~ '::navigation' %}
+                        {% partial __SELF__.alias ~ '::navigation' first="1" %}
                     </div>
 
                     <div class="{{gliderElClass}}">
@@ -196,7 +196,7 @@
                             {{ form.textarea(_context, 'misc', 'Sonstige Anmerkungen', false) }}
                             {{ form.yesno(_context, 'foto', 'Ich akzeptiere, dass vor Ort Foto-und Videoaufnahmen von mir gemacht werden dürfen.', false) }}
                         </div>
-                        {% partial __SELF__.alias ~ '::navigation' %}
+                        {% partial __SELF__.alias ~ '::navigation' last="1" %}
                     </div>
                 </div>
             </div>
diff --git a/components/eventform/navigation.htm b/components/eventform/navigation.htm
index 4e44c00..32037a2 100644
--- a/components/eventform/navigation.htm
+++ b/components/eventform/navigation.htm
@@ -1,9 +1,14 @@
-<div class="flex mt-10 justify-evenly">
-    <div class="bg-primary hover:bg-emerald-600 px-4 py-2 shadow text-teal-200 leading-none  rounded-lg" @click.prevent="onPrevButtonClick" :class="{'invisible': meta.active === 0}">
+<div class="flex flex-col md:flex-row mt-10 justify-start md:justify-evenly">
+    {% if not first %}
+    <div class="bg-primary hover:bg-emerald-600 px-4 py-2 shadow text-teal-200 leading-none  rounded-lg" @click.prevent="onPrevButtonClick">
         Zurück
     </div>
-    <div class="bg-primary hover:bg-emerald-600 px-4 py-2 shadow text-teal-200 leading-none  rounded-lg" @click.prevent="onNextButtonClick" x-show="meta.active != meta.slides.length-1">
+    {% endif %}
+    {% if not last %}
+    <div class="bg-primary hover:bg-emerald-600 px-4 py-2 shadow text-teal-200 leading-none  rounded-lg" @click.prevent="onNextButtonClick">
         Weiter
     </div>
-    <button type="submit" class="bg-primary hover:bg-emerald-600 px-4 py-2 shadow text-teal-200 leading-none  rounded-lg" x-show="meta.active == meta.slides.length-1">{% if p %} Anmeldung aktualisieren {% else %} Anmeldung absenden {% endif %}</button>
+    {% else %}
+    <button type="submit" class="bg-primary hover:bg-emerald-600 px-4 py-2 shadow text-teal-200 leading-none  rounded-lg">{% if p %} Anmeldung aktualisieren {% else %} Anmeldung absenden {% endif %}</button>
+    {% endif %}
 </div>