diff --git a/assets/controllers/loading_controller.js b/assets/controllers/loading_controller.js
index 893d075..d7d1776 100644
--- a/assets/controllers/loading_controller.js
+++ b/assets/controllers/loading_controller.js
@@ -105,8 +105,4 @@ export default class extends Controller {
         this.isVisible = false
         this.indicatorTarget.classList.add(this.hiddenClass)
     }
-
-    toggle() {
-        this.indicatorTarget.classList.remove(this.hiddenClass)
-    }
 }
diff --git a/templates/account/index.html.twig b/templates/account/index.html.twig
index c34ed32..b3359ed 100644
--- a/templates/account/index.html.twig
+++ b/templates/account/index.html.twig
@@ -10,13 +10,13 @@
         <nav>
             <ul class="divide-y divide-primary-bg/40">
                 <li class="py-4">
-                    <a href="{{ path('app_bookings') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'toggle') }}>
+                    <a href="{{ path('app_bookings') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'show') }}>
                         <svg class="w-8 h-8 text-white group-hover:text-primary-light" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="128" y1="128" x2="216" y2="128" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="128" y1="64" x2="216" y2="64" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="128" y1="192" x2="216" y2="192" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="40 64 56 80 88 48" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="40 128 56 144 88 112" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="40 192 56 208 88 176" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                         <span class="text-xl uppercase text-white group-hover:text-primary-light">Meine Buchungen</span>
                     </a>
                 </li>
                 <li class="py-4">
-                    <a href="{{ path('app_personal_data') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'toggle') }}>
+                    <a href="{{ path('app_personal_data') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'show') }}>
                         <svg class="w-8 h-8 text-white group-hover:text-primary-light" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><path d="M160,224c3.67-13.8,16.6-24,32-24s28.33,10.2,32,24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><circle cx="192" cy="176" r="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M120,208H40a8,8,0,0,1-8-8V64a8,8,0,0,1,8-8H93.33a8,8,0,0,1,4.8,1.6l27.74,20.8a8,8,0,0,0,4.8,1.6H216a8,8,0,0,1,8,8v32" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                         <span class="text-xl uppercase text-white group-hover:text-primary-light">Meine Daten</span>
                     </a>
diff --git a/templates/account/personal_data.html.twig b/templates/account/personal_data.html.twig
index 4c256fd..b0188e6 100644
--- a/templates/account/personal_data.html.twig
+++ b/templates/account/personal_data.html.twig
@@ -38,7 +38,7 @@
                     Kontaktdaten
                 </h2>
                 {% include '_partials/_flashes.html.twig' %}
-                {{ form_start(personalDataForm, { 'attr': { 'data-action': 'loading#toggle' } }) }}
+                {{ form_start(personalDataForm, { 'attr': { 'data-action': 'loading#show' } }) }}
                 <div class="grid md:grid-cols-2 gap-x-8 gap-y-4 pb-4">
                     <div>
                         {{ form_row(personalDataForm.street, { 'label_attr': { 'class': 'text-white' } }) }}
diff --git a/templates/booking/_pagination.html.twig b/templates/booking/_pagination.html.twig
index 77ad883..c930d34 100644
--- a/templates/booking/_pagination.html.twig
+++ b/templates/booking/_pagination.html.twig
@@ -10,7 +10,7 @@
         <div class="pagination-item">
             {% if step < current_step %}
                 <a href="{{ path(step_routes[step]) }}"
-                   class="pagination-item__border" {{ stimulus_action('loading', 'toggle') }}>
+                   class="pagination-item__border" {{ stimulus_action('loading', 'show') }}>
                     <span class="pagination-item__inner bg-primary-bg text-gray-800">
                         {{ step }}
                     </span>
diff --git a/templates/booking/create/authenticate.html.twig b/templates/booking/create/authenticate.html.twig
index 94d1171..6d1e37a 100644
--- a/templates/booking/create/authenticate.html.twig
+++ b/templates/booking/create/authenticate.html.twig
@@ -39,7 +39,7 @@
                 {% endif %}
 
                 <div class="pb-4">
-                    <form action="{{ path('app_login') }}" method="post" {{ stimulus_action('loading', 'toggle') }}>
+                    <form action="{{ path('app_login') }}" method="post" {{ stimulus_action('loading', 'show') }}>
                         <div class="mb-4">
                             <label for="username" class="mb-1 font-semibold text-white">
                                 E-Mail:
diff --git a/templates/booking/create/step_1.html.twig b/templates/booking/create/step_1.html.twig
index 3d1bc86..5486f1e 100644
--- a/templates/booking/create/step_1.html.twig
+++ b/templates/booking/create/step_1.html.twig
@@ -95,7 +95,7 @@
                         class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10">
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </button>
-                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit')}} {{ stimulus_action('loading', 'toggle') }}>
+                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit')}} {{ stimulus_action('loading', 'show') }}>
                     Weiter zu Schritt 2
                 </button>
             </div>
diff --git a/templates/booking/create/step_2.html.twig b/templates/booking/create/step_2.html.twig
index d5f793d..2a6a081 100644
--- a/templates/booking/create/step_2.html.twig
+++ b/templates/booking/create/step_2.html.twig
@@ -70,7 +70,7 @@
                         class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10">
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </button>
-                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'toggle') }}>
+                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'show') }}>
                     Weiter zu Schritt 3
                 </button>
             </div>
diff --git a/templates/booking/create/step_2_participant.html.twig b/templates/booking/create/step_2_participant.html.twig
index c3912eb..8467d55 100644
--- a/templates/booking/create/step_2_participant.html.twig
+++ b/templates/booking/create/step_2_participant.html.twig
@@ -41,10 +41,10 @@
             <div class="flex justify-between">
                 <a href="{{ path('app_booking_create_step_2') }}"
                    class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10"
-                   {{ stimulus_action('loading', 'toggle') }}>
+                   {{ stimulus_action('loading', 'show') }}>
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </a>
-                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'toggle') }}>
+                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'show') }}>
                     Speichern
                 </button>
             </div>
diff --git a/templates/booking/create/step_3.html.twig b/templates/booking/create/step_3.html.twig
index 7683de0..6758a99 100644
--- a/templates/booking/create/step_3.html.twig
+++ b/templates/booking/create/step_3.html.twig
@@ -82,7 +82,7 @@
                         class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10">
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </button>
-                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'toggle') }}>
+                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'show') }}>
                     Weiter zu Schritt 4
                 </button>
             </div>
diff --git a/templates/booking/create/step_4.html.twig b/templates/booking/create/step_4.html.twig
index efd1dab..27e16a9 100644
--- a/templates/booking/create/step_4.html.twig
+++ b/templates/booking/create/step_4.html.twig
@@ -560,7 +560,7 @@
                         class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10">
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </button>
-                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'toggle') }}>
+                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'show') }}>
                     {% if bookingCreateDto.bookingStatus == 'A' %}
                         Anfragen
                     {% else %}
diff --git a/templates/booking/create/success.html.twig b/templates/booking/create/success.html.twig
index 5eecfdb..4ac6fe0 100644
--- a/templates/booking/create/success.html.twig
+++ b/templates/booking/create/success.html.twig
@@ -28,13 +28,13 @@
                 {# Authenticated user - show account-related actions #}
                 <ul class="divide-y divide-primary-bg/40">
                     <li class="py-4">
-                        <a href="{{ path('app_bookings') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'toggle') }}>
+                        <a href="{{ path('app_bookings') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'show') }}>
                             <svg class="w-8 h-8 text-white group-hover:text-primary-light" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="128" y1="128" x2="216" y2="128" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="128" y1="64" x2="216" y2="64" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="128" y1="192" x2="216" y2="192" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="40 64 56 80 88 48" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="40 128 56 144 88 112" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><polyline points="40 192 56 208 88 176" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                             <span class="text-xl uppercase text-white group-hover:text-primary-light">Meine Buchungen</span>
                         </a>
                     </li>
                     <li class="py-4">
-                        <a href="{{ path('app_personal_data') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'toggle') }}>
+                        <a href="{{ path('app_personal_data') }}" class="flex items-center space-x-2 group" {{ stimulus_action('loading', 'show') }}>
                             <svg class="w-8 h-8 text-white group-hover:text-primary-light" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><path d="M160,224c3.67-13.8,16.6-24,32-24s28.33,10.2,32,24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><circle cx="192" cy="176" r="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><path d="M120,208H40a8,8,0,0,1-8-8V64a8,8,0,0,1,8-8H93.33a8,8,0,0,1,4.8,1.6l27.74,20.8a8,8,0,0,0,4.8,1.6H216a8,8,0,0,1,8,8v32" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                             <span class="text-xl uppercase text-white group-hover:text-primary-light">Meine Daten</span>
                         </a>
diff --git a/templates/booking/edit/index.html.twig b/templates/booking/edit/index.html.twig
index 1fa6b04..1bff781 100644
--- a/templates/booking/edit/index.html.twig
+++ b/templates/booking/edit/index.html.twig
@@ -34,7 +34,7 @@
                         <button type="button"
                                 hx-post="{{ path('app_booking_edit_reload', {id: bookingData.id}) }}"
                                 hx-confirm="Alle nicht gespeicherten Änderungen gehen verloren. Fortfahren?"
-                                {{ stimulus_action('loading', 'toggle') }}
+                                {{ stimulus_action('loading', 'show') }}
                                 class="button button--small button--secondary">
                             Änderungen verwerfen
                         </button>
@@ -86,13 +86,13 @@
             <div class="flex justify-between">
                 <button type="button"
                         hx-post="{{ path('app_booking_edit_cancel', {id: bookingData.id}) }}"
-                        {{ stimulus_action('loading', 'toggle') }}
+                        {{ stimulus_action('loading', 'show') }}
                         class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10">
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </button>
                 {% if isDirty %}
                     <button type="submit"
-                            {{ stimulus_action('loading', 'toggle') }}
+                            {{ stimulus_action('loading', 'show') }}
                             {% if hasValidationErrors|default(false) %}
                                 disabled
                                 title="Bitte behebe zuerst alle Validierungsfehler"
diff --git a/templates/booking/edit/participant.html.twig b/templates/booking/edit/participant.html.twig
index d11aa26..0009533 100644
--- a/templates/booking/edit/participant.html.twig
+++ b/templates/booking/edit/participant.html.twig
@@ -38,11 +38,11 @@
             <div class="flex justify-between">
                 <a href="{{ path('app_booking_edit', {id: bookingDto.booking.id}) }}"
                    class="inline-flex items-center justify-center bg-gray-200 rounded-md w-10 h-10"
-                   {{ stimulus_action('loading', 'toggle') }}
+                   {{ stimulus_action('loading', 'show') }}
                    {{ qa_attribute('btn-cancel') }}>
                     <svg class="w-8 h-8" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><line x1="200" y1="56" x2="56" y2="200" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="200" y1="200" x2="56" y2="56" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
                 </a>
-                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'toggle') }}>
+                <button type="submit" class="button button--primary" {{ qa_attribute('btn-submit') }} {{ stimulus_action('loading', 'show') }}>
                     Speichern
                 </button>
             </div>
diff --git a/templates/booking/index.html.twig b/templates/booking/index.html.twig
index 42e093b..2a0dffd 100644
--- a/templates/booking/index.html.twig
+++ b/templates/booking/index.html.twig
@@ -13,7 +13,7 @@
         <div class="flex-1 overflow-y-auto p-4 lg:p-8 bg-primary-bg">
             {% include '_partials/_flashes.html.twig' %}
 
-            <div class="space-y-8">
+            <div class="space-y-8 pb-8">
                 {% for booking in bookings %}
                     <div class="grid md:grid-cols-2 gap-4 p-2 bg-white rounded-md">
                         <div class="flex items-start space-x-4">
@@ -74,7 +74,7 @@
                             <div class="flex space-x-2">
                                 {% if booking.editable %}
                                     <a href="{{ path('app_booking_edit', { 'id': booking.id }) }}"
-                                            {{ stimulus_action('loading', 'toggle') }}
+                                            {{ stimulus_action('loading', 'show') }}
                                        class="button button--primary button--small"
                                        title="Buchung bearbeiten">
                                         <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><path d="M92.69,216H48a8,8,0,0,1-8-8V163.31a8,8,0,0,1,2.34-5.65L165.66,34.34a8,8,0,0,1,11.31,0L221.66,79a8,8,0,0,1,0,11.31L98.34,213.66A8,8,0,0,1,92.69,216Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="136" y1="64" x2="192" y2="120" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="164" y1="92" x2="68" y2="188" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/><line x1="95.49" y1="215.49" x2="40.51" y2="160.51" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></svg>
@@ -100,6 +100,9 @@
                     </div>
                 {% endfor %}
             </div>
+            <a href="{{ path('app_account') }}" class="button button--secondary">
+                zurück
+            </a>
         </div>
     </div>
 {% endblock %}
diff --git a/templates/registration/index.html.twig b/templates/registration/index.html.twig
index e2a044e..7b304cb 100644
--- a/templates/registration/index.html.twig
+++ b/templates/registration/index.html.twig
@@ -10,7 +10,7 @@
             </h1>
             {% include '_partials/_flashes.html.twig' %}
             <div class="pb-4">
-                {{ form_start(form, { 'attr': { 'data-action': 'loading#toggle' } }) }}
+                {{ form_start(form, { 'attr': { 'data-action': 'loading#show' } }) }}
                 {{ form_row(form.firstName, { 'label_attr': { 'class': 'text-white' } }) }}
                 {{ form_row(form.name, { 'label_attr': { 'class': 'text-white' } }) }}
                 {{ form_row(form.email, { 'label_attr': { 'class': 'text-white' } }) }}
diff --git a/templates/reset_password/index.html.twig b/templates/reset_password/index.html.twig
index e996ad1..9f0496a 100644
--- a/templates/reset_password/index.html.twig
+++ b/templates/reset_password/index.html.twig
@@ -10,7 +10,7 @@
             </h1>
             {% include '_partials/_flashes.html.twig' %}
             <div class="pb-4">
-                {{ form_start(form, { 'attr': { 'data-action': 'loading#toggle' } }) }}
+                {{ form_start(form, { 'attr': { 'data-action': 'loading#show' } }) }}
                 {{ form_row(form.email, { 'label_attr': { 'class': 'text-white' } }) }}
                 <button type="submit" class="button button--primary">
                     Passwort zurücksetzen
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 896aa42..46471a1 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -11,7 +11,7 @@
                 {% include '_partials/_alert.html.twig' with { 'level': 'error', messages: [ error.messageKey|trans(error.messageData, 'security') ] } %}
             {% endif %}
             <div class="pb-4">
-                <form action="{{ path('app_login') }}" method="post" {{ stimulus_action('loading', 'toggle') }}>
+                <form action="{{ path('app_login') }}" method="post" {{ stimulus_action('loading', 'show') }}>
                     <div class="mb-4">
                         <label for="username" class="mb-1 font-semibold text-white">
                             E-Mail: