diff --git a/templates/booking/_participant_form.html.twig b/templates/booking/_participant_form.html.twig
index feaa7d8..325d933 100644
--- a/templates/booking/_participant_form.html.twig
+++ b/templates/booking/_participant_form.html.twig
@@ -243,57 +243,51 @@
                 <div class="mt-6 border-t pt-4">
                     <h3 class="font-semibold text-lg mb-4">Anreise</h3>
                     <div class="grid grid-cols-2 gap-4">
-                        <div>
-                            {% if form.transportationOutbound is defined %}
-                                {{ form_row(form.transportationOutbound, {
+                        {% if form.transportationOutbound is defined %}
+                            {{ form_row(form.transportationOutbound, {
+                                'attr': {
+                                    'hx-trigger': 'change',
+                                    'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
+                                    'hx-target': '#main-content', 'hx-swap': 'innerHTML'
+                                }
+                            }) }}
+                        {% endif %}
+                        {% if form.transportationInbound is defined %}
+                            {{ form_row(form.transportationInbound, {
+                                'attr': {
+                                    'hx-trigger': 'change',
+                                    'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
+                                    'hx-target': '#main-content', 'hx-swap': 'innerHTML'
+                                }
+                            }) }}
+                        {% endif %}
+                        {% if form.pickup is defined %}
+                            <div class="col-span-2 mt-4">
+                                {{ form_row(form.pickup, {
                                     'attr': {
                                         'hx-trigger': 'change',
                                         'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
                                         'hx-target': '#main-content', 'hx-swap': 'innerHTML'
                                     }
                                 }) }}
-                            {% endif %}
-                            {% if form.pickup is defined or form.parking is defined or form.licensePlate is defined %}
-                                {% if form.pickup is defined %}
-                                    <div class="mt-4">
-                                        {{ form_row(form.pickup, {
-                                            'attr': {
-                                                'hx-trigger': 'change',
-                                                'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
-                                                'hx-target': '#main-content', 'hx-swap': 'innerHTML'
-                                            }
-                                        }) }}
-                                    </div>
-                                {% endif %}
-                                {% if form.parking is defined %}
-                                    <div class="mt-4">
-                                        {{ form_row(form.parking, {
-                                            'attr': {
-                                                'hx-trigger': 'change',
-                                                'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
-                                                'hx-target': '#main-content', 'hx-swap': 'innerHTML'
-                                            }
-                                        }) }}
-                                    </div>
-                                {% endif %}
-                                {% if form.licensePlate is defined %}
-                                    <div class="mt-4">
-                                        {{ form_row(form.licensePlate) }}
-                                    </div>
-                                {% endif %}
-                            {% endif %}
-                        </div>
-                        <div>
-                            {% if form.transportationInbound is defined %}
-                                {{ form_row(form.transportationInbound, {
+                            </div>
+                        {% endif %}
+                        {% if form.parking is defined %}
+                            <div class="mt-4">
+                                {{ form_row(form.parking, {
                                     'attr': {
                                         'hx-trigger': 'change',
                                         'hx-post': path(refreshRouteName, refreshRouteParams|default({index: participantIndex})),
                                         'hx-target': '#main-content', 'hx-swap': 'innerHTML'
                                     }
                                 }) }}
-                            {% endif %}
-                        </div>
+                            </div>
+                        {% endif %}
+                        {% if form.licensePlate is defined %}
+                            <div class="mt-4">
+                                {{ form_row(form.licensePlate) }}
+                            </div>
+                        {% endif %}
                     </div>
                 </div>
             {% endif %}