diff --git a/templates/booking/create_step_2.html.twig b/templates/booking/create_step_2.html.twig
index 3c67349..f18e88f 100644
--- a/templates/booking/create_step_2.html.twig
+++ b/templates/booking/create_step_2.html.twig
@@ -1,5 +1,55 @@
 {% extends 'layout.html.twig' %}
 
+{# Local form theme override for consistent fieldset rendering #}
+{% use 'forms.html.twig' %}
+
+{% block form_row %}
+    {%- if form.vars.expanded is defined and form.vars.expanded -%}
+        {# Expanded forms get fieldset wrapper #}
+        <fieldset class="mb-1">
+            <legend class="font-semibold mb-1">
+                {{- form.vars.label -}}
+            </legend>
+            {{- form_widget(form, {
+                'attr': attr|default({})
+            }) -}}
+            {{- form_errors(form) -}}
+            {{- form_help(form) -}}
+        </fieldset>
+    {%- else -%}
+        {{- parent() -}}
+    {%- endif -%}
+{% endblock %}
+
+{% import _self as macros %}
+
+{# Macro to render a field or placeholder with consistent fieldset structure #}
+{% macro service_field(participant, fieldName, label, options = {}) %}
+    {% if participant[fieldName] is defined %}
+        {{ form_row(participant[fieldName], options) }}
+    {% else %}
+        <fieldset class="mb-1">
+            <legend class="font-semibold mb-1">{{ label }}</legend>
+            <div class="text-sm text-gray-500">Nicht wählbar</div>
+        </fieldset>
+    {% endif %}
+{% endmacro %}
+
+{# Specialized macro for checkbox fields (like rental insurance) that need manual fieldset wrapping #}
+{% macro checkbox_field(participant, fieldName, label, options = {}) %}
+    {% if participant[fieldName] is defined %}
+        <fieldset class="mb-1">
+            <legend class="font-semibold mb-1">{{ label }}</legend>
+            {{ form_row(participant[fieldName], options) }}
+        </fieldset>
+    {% else %}
+        <fieldset class="mb-1">
+            <legend class="font-semibold mb-1">{{ label }}</legend>
+            <div class="text-sm text-gray-500">Nicht wählbar</div>
+        </fieldset>
+    {% endif %}
+{% endmacro %}
+
 {% block content %}
     {% include '_partials/_flashes.html.twig' %}
     <h1>Neue Buchung</h1>
@@ -86,102 +136,61 @@
                                     {% endif %}
 
                                     <div class="grid grid-cols-2 gap-4">
-                                        {% if participant.skiPass is defined %}
-                                            {{ form_row(participant.skiPass, {
-                                                'attr': {
-                                                    'hx-trigger': 'change',
-                                                    'hx-post': path('app_booking_create_step_2_refresh'),
-                                                    'hx-swap': 'none'
-                                                }
-                                            }) }}
-                                        {% else %}
-                                            <div>
-                                                Skipass nicht wählbar
-                                            </div>
-                                        {% endif %}
-                                        {% if participant.courses is defined %}
-                                            {{ form_row(participant.courses, {
-                                                'attr': {
-                                                    'hx-trigger': 'change',
-                                                    'hx-post': path('app_booking_create_step_2_refresh'),
-                                                    'hx-swap': 'none'
-                                                }
-                                            }) }}
-                                        {% else %}
-                                            <div>
-                                                Kurse nicht wählbar
-                                            </div>
-                                        {% endif %}
-                                        {% if participant.additionalServices is defined %}
-                                            {{ form_row(participant.additionalServices, {
-                                                'attr': {
-                                                    'hx-trigger': 'change',
-                                                    'hx-post': path('app_booking_create_step_2_refresh'),
-                                                    'hx-swap': 'none'
-                                                }
-                                            }) }}
-                                        {% else %}
-                                            <div>
-                                                Zusatzleistungen nicht wählbar
-                                            </div>
-                                        {% endif %}
-                                        {% if participant.rentals is defined %}
-                                            {{ form_row(participant.rentals, {
-                                                'attr': {
-                                                    'hx-trigger': 'change',
-                                                    'hx-post': path('app_booking_create_step_2_refresh'),
-                                                    'hx-swap': 'none'
-                                                }
-                                            }) }}
-                                        {% else %}
-                                            <div>
-                                                Leihmaterial nicht wählbar
-                                            </div>
-                                        {% endif %}
-                                        {% if participant.rentalInsurance is defined %}
-                                            <fieldset>
-                                                <legend class="font-semibold mb-1">
-                                                    Leihmaterial-Versicherung
-                                                </legend>
-                                                {{ form_row(participant.rentalInsurance, {
-                                                    'attr': {
-                                                        'hx-trigger': 'change',
-                                                        'hx-post': path('app_booking_create_step_2_refresh'),
-                                                        'hx-swap': 'none'
-                                                    }
-                                                }) }}
-                                            </fieldset>
-                                        {% else %}
-                                            <div>
-                                                Leihmat.-Versicherung nicht wählbar
-                                            </div>
-                                        {% endif %}
-                                        {% if participant.board is defined %}
-                                            {{ form_row(participant.board, {
-                                                'attr': {
-                                                    'hx-trigger': 'change',
-                                                    'hx-post': path('app_booking_create_step_2_refresh'),
-                                                    'hx-swap': 'none'
-                                                }
-                                            }) }}
-                                        {% else %}
-                                            <div>
-                                                Verpflegung nicht wählbar
-                                            </div>
-                                        {% endif %}
-                                        {% if participant.insurance is defined %}
-                                            {{ form_row(participant.insurance, {
-                                                'attr': {
-                                                    'hx-trigger': 'change',
-                                                    'hx-post': path('app_booking_create_step_2_refresh'),
-                                                    'hx-swap': 'none'
-                                                }
-                                            }) }}
-                                        {% else %}
-                                            <div>
-                                                Versicherung nicht wählbar
-                                            </div>
-                                        {% endif %}
+                                        {{ _self.service_field(participant, 'skiPass', 'Skipass', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
+                                        
+                                        {{ _self.service_field(participant, 'courses', 'Kurse', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
+                                        
+                                        {{ _self.service_field(participant, 'additionalServices', 'Zusatzleistungen', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
+                                        
+                                        {{ _self.service_field(participant, 'rentals', 'Leihmaterial', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
+                                        
+                                        {{ _self.checkbox_field(participant, 'rentalInsurance', 'Leihmaterial-Versicherung', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
+                                        
+                                        {{ _self.service_field(participant, 'board', 'Verpflegung', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
+                                        
+                                        {{ _self.service_field(participant, 'insurance', 'Reiseversicherung', {
+                                            'attr': {
+                                                'hx-trigger': 'change',
+                                                'hx-post': path('app_booking_create_step_2_refresh'),
+                                                'hx-swap': 'none'
+                                            }
+                                        }) }}
                                     </div>
 
                                     {# Transportation Services Section #}