diff --git a/shiftregister/fallback/templates/my_fallback_shifts.html b/shiftregister/fallback/templates/my_fallback_shifts.html
index 915dff4..4bc82ca 100644
--- a/shiftregister/fallback/templates/my_fallback_shifts.html
+++ b/shiftregister/fallback/templates/my_fallback_shifts.html
@@ -14,26 +14,35 @@
     <h4 class="subtitle">Schicht übernehmen</h4>
     <form method="POST">
         {% csrf_token %}
-        <div class="field has-addons">
-            <div class="control">
-                {{ trade_form.assignment_id }}
-            </div>
-            <div class="control">
-                {{ trade_form.pin }}
-            </div>
-            <div class="control">
-                <button type="submit" name="take_shift" class="button is-info">Übernehmen/Entfernen</button>
-            </div>
-        </div>
-        {% if form.errors %}
-        <div class="field">
-            {% for field in trade_form %}
-                {% for error in field.errors %}
+        <div class="field is-horizontal">
+            <div class="field-body">
+                <div class="field">
+{% with trade_form.assignment_id as field %}
+                    <div class="control">
+                        {{ field }}
+                    </div>
+{% for error in field.errors %}
                     <p class="help is-danger">{{ error }}</p>
-                {% endfor %}
-            {% endfor %}
+{% endfor %}
+{% endwith %}
+                </div>
+                <div class="field">
+{% with trade_form.pin as field %}
+                    <div class="control">
+                        {{ field }}
+                    </div>
+{% for error in field.errors %}
+                    <p class="help is-danger">{{ error }}</p>
+{% endfor %}
+{% endwith %}
+                </div>
+                <div class="field">
+                    <div class="control">
+                        <button type="submit" name="take_shift" class="button is-info">Übernehmen/Entfernen</button>
+                    </div>
+                </div>
+            </div>
         </div>
-        {% endif %}
     </form>
 </div>