diff --git a/templates/booking/_participant_form.html.twig b/templates/booking/_participant_form.html.twig
index 27e1eef..2930ba5 100644
--- a/templates/booking/_participant_form.html.twig
+++ b/templates/booking/_participant_form.html.twig
@@ -76,15 +76,6 @@
                 </div>
             {% endif %}
 
-            {# Body dimensions #}
-            {% if form.bodyDimensions is defined %}
-                <div class="grid grid-cols-2 gap-4">
-                    {{ form_row(form.bodyDimensions.height) }}
-                    {{ form_row(form.bodyDimensions.shoeSize) }}
-                    {{ form_row(form.bodyDimensions.weight) }}
-                </div>
-            {% endif %}
-
             {# Room assignment #}
             <div class="grid grid-cols-2 gap-4">
                 {% if form.assignedRoomId is defined %}
@@ -190,6 +181,16 @@
                         }, null) }}
                     </div>
 
+                    {% if form.bodyDimensions is defined %}
+                        <div class="grid gap-y-4">
+                            {{ form_row(form.bodyDimensions.height) }}
+                            {{ form_row(form.bodyDimensions.shoeSize) }}
+                            {{ form_row(form.bodyDimensions.weight) }}
+                        </div>
+                    {% else %}
+                        <div>{# empty slot to maintain grid layout #}</div>
+                    {% endif %}
+
                     <div class="col-span-2">
                         {# Insurance display for edit mode (read-only) #}
                         {% if bookingDto.mode == constant('App\\Form\\Model\\BookingDto::MODE_EDIT') and form.vars.data.participant.insurance %}