diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index 2278cc07..3b75ac7f 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -59,6 +59,11 @@
                     %buttons%
                 </div>
             </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <input class="btn btn-primary" type="submit" style="width:100%; margin: 1em 0" value="%filter%">
+                </div>
+            </div>
         </div>
         <div class="col-md-6">
             <button class="btn btn-info btn-sm" style="margin-top: 20px; margin-bottom:10px" type="button"
@@ -68,18 +73,22 @@
             >
                 collapse/show filters
             </button>
-            <div class="collapse in row" id="collapseRoomSelect">
-                <div class="col-xs-4 col-xxs-12">%room_select%</div>
-                <div class="col-xs-4 col-xxs-12">%type_select%</div>
-                <div class="col-xs-4 col-xxs-12">%filled_select%</div>
+            <div class="collapse in" id="collapseRoomSelect">
+                <div class="row">
+                    <div class="col-xs-4 col-xxs-12">%room_select%</div>
+                    <div class="col-xs-4 col-xxs-12">%type_select%</div>
+                    <div class="col-xs-4 col-xxs-12">%filled_select%</div>
+                </div>
+                <div class="row">
+                    <div class="col-md-12" style="margin: 1em 0">
+                        <p>%task_notice%</p>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-md-12">
-            <div><p>%task_notice%</p></div>
-            <input class="btn btn-primary" type="submit" style="width:75%; margin-bottom: 20px" value="%filter%">
-        </div>
-    </div>
 </form>
-%shifts_table% %ical_text%
+
+%shifts_table%
+
+%ical_text%