diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py
index c601079366..10ff9fa884 100644
--- a/src/pretix/control/forms/filter.py
+++ b/src/pretix/control/forms/filter.py
@@ -1008,7 +1008,7 @@ class GiftCardFilterForm(FilterForm):
         required=False
     )
     state = forms.ChoiceField(
-        label=_('Empty'),
+        label=_('Status'),
         choices=(
             ('', _('All')),
             ('empty', _('Empty')),
diff --git a/src/pretix/control/templates/pretixcontrol/checkin/checkins.html b/src/pretix/control/templates/pretixcontrol/checkin/checkins.html
index c9cd9b9730..c9514849ce 100644
--- a/src/pretix/control/templates/pretixcontrol/checkin/checkins.html
+++ b/src/pretix/control/templates/pretixcontrol/checkin/checkins.html
@@ -4,40 +4,45 @@
 {% block title %}{% trans "Check-in history" %}{% endblock %}
 {% block inside %}
     <h1>{% trans "Check-in history" %}</h1>
-    <form class="" action="" method="get">
-        <div class="row filter-form">
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.checkin_list layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
+        </div>
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.checkin_list %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.type %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.device %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.datetime_from %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.datetime_until %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.gate %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.itemvar %}
+                </div>
             </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.status layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.type layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.device layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.datetime_from layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.datetime_until layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.gate layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.itemvar layout='inline' %}
-            </div>
-            <div class="col-md-2 col-xs-6">
-                <button class="btn btn-block btn-primary" type="submit">
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
                     <span class="fa fa-filter"></span>
-                    <span class="hidden-md">{% trans "Filter" %}</span>
+                    {% trans "Filter" %}
                 </button>
             </div>
-        </div>
-    </form>
+        </form>
+    </div>
     {% if checkins|length == 0 %}
         <div class="empty-collection">
             <p>
diff --git a/src/pretix/control/templates/pretixcontrol/checkin/index.html b/src/pretix/control/templates/pretixcontrol/checkin/index.html
index 5c3a973e4d..7cb5f34691 100644
--- a/src/pretix/control/templates/pretixcontrol/checkin/index.html
+++ b/src/pretix/control/templates/pretixcontrol/checkin/index.html
@@ -27,25 +27,30 @@
             {% trans "CSV" %}
         </a>
     </h1>
-    <form class="row filter-form" action="" method="get">
-        <div class="col-md-4 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.user layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
         </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.status layout='inline' %}
-        </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.item layout='inline' %}
-        </div>
-        <div class="col-md-2 col-sm-6 col-xs-12">
-            <button class="btn btn-primary btn-block" type="submit">
-                <span class="fa fa-filter"></span>
-                <span class="hidden-md">
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-6 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.user %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.item %}
+                </div>
+            </div>
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
+                    <span class="fa fa-filter"></span>
                     {% trans "Filter" %}
-                </span>
-            </button>
-        </div>
-    </form>
+                </button>
+            </div>
+        </form>
+    </div>
     {% if entries|length == 0 %}
         <div class="empty-collection">
             <p>
diff --git a/src/pretix/control/templates/pretixcontrol/events/index.html b/src/pretix/control/templates/pretixcontrol/events/index.html
index 09156466a2..95d4f8446a 100644
--- a/src/pretix/control/templates/pretixcontrol/events/index.html
+++ b/src/pretix/control/templates/pretixcontrol/events/index.html
@@ -24,32 +24,30 @@
             <div class="panel-heading">
                 <h3 class="panel-title">{% trans "Filter" %}</h3>
             </div>
-            <div class="panel-body">
-                <form class="" action="" method="get">
-                    <div class="row filter-form">
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.query layout='inline' %}
-                        </div>
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.status layout='inline' %}
-                        </div>
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.organizer layout='inline' %}
-                        </div>
-                        {% for mf in meta_fields %}
-                            <div class="col-md-3 col-sm-6 col-xs-12">
-                                {% bootstrap_field mf layout='inline' %}
-                            </div>
-                        {% endfor %}
+            <form class="panel-body filter-form" action="" method="get">
+                <div class="row">
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.query %}
                     </div>
-                    <div class="text-right">
-                        <button class="btn btn-primary" type="submit">
-                            <span class="fa fa-filter"></span>
-                            <span class="hidden-md">{% trans "Filter" %}</span>
-                        </button>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.status %}
                     </div>
-                </form>
-            </div>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.organizer %}
+                    </div>
+                    {% for mf in meta_fields %}
+                        <div class="col-md-3 col-sm-6 col-xs-12">
+                            {% bootstrap_field mf %}
+                        </div>
+                    {% endfor %}
+                </div>
+                <div class="text-right">
+                    <button class="btn btn-primary btn-lg" type="submit">
+                        <span class="fa fa-filter"></span>
+                        {% trans "Filter" %}
+                    </button>
+                </div>
+            </form>
         </div>
         <p>
             <a href="{% url "control:events.add" %}" class="btn btn-default">
diff --git a/src/pretix/control/templates/pretixcontrol/orders/index.html b/src/pretix/control/templates/pretixcontrol/orders/index.html
index 0685f789dc..ff45418c7b 100644
--- a/src/pretix/control/templates/pretixcontrol/orders/index.html
+++ b/src/pretix/control/templates/pretixcontrol/orders/index.html
@@ -39,50 +39,56 @@
                 </a>
             </p>
         {% else %}
-            <div class="row filter-form">
-                <form class="col-md-2 col-xs-12"
-                        action="{% url "control:event.orders.go" event=request.event.slug organizer=request.event.organizer.slug %}">
-                    <div class="input-group">
-                        <input type="text" name="code" class="form-control" placeholder="{% trans "Order code" %}" autofocus>
-                        <span class="input-group-btn">
+            <form class="form-inline"
+                    action="{% url "control:event.orders.go" event=request.event.slug organizer=request.event.organizer.slug %}">
+                <p class="input-group">
+                    <input type="text" name="code" class="form-control" placeholder="{% trans "Order code" %}" autofocus>
+                    <span class="input-group-btn">
                             <button class="btn btn-primary" type="submit">{% trans "Go!" %}</button>
                         </span>
-                    </div>
-                </form>
-                <form class="" action="" method="get">
-                    <div class="col-md-2 col-xs-6">
-                        {% bootstrap_field filter_form.status layout='inline' %}
-                    </div>
-                    {% if request.event.has_subevents %}
-                        <div class="col-md-1 col-xs-6">
-                            {% bootstrap_field filter_form.item layout='inline' %}
+                </p>
+            </form>
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        {% trans "Filter" %}
+                    </h3>
+                </div>
+                <form class="panel-body filter-form" action="" method="get">
+                    <div class="row">
+                        <div class="col-md-3 col-xs-6">
+                            {% bootstrap_field filter_form.query %}
                         </div>
                         <div class="col-md-2 col-xs-6">
-                            {% bootstrap_field filter_form.subevent layout='inline' %}
+                            {% bootstrap_field filter_form.status %}
                         </div>
-                        <div class="col-md-1 col-xs-6">
-                            {% bootstrap_field filter_form.provider layout='inline' %}
-                        </div>
-                    {% else %}
-                        <div class="col-md-2 col-xs-6">
-                            {% bootstrap_field filter_form.item layout='inline' %}
-                        </div>
-                        <div class="col-md-2 col-xs-6">
-                            {% bootstrap_field filter_form.provider layout='inline' %}
-                        </div>
-                    {% endif %}
-                    <div class="col-md-2 col-xs-6">
-                        {% bootstrap_field filter_form.query layout='inline' %}
+                        {% if request.event.has_subevents %}
+                            <div class="col-md-2 col-xs-6">
+                                {% bootstrap_field filter_form.item %}
+                            </div>
+                            <div class="col-md-3 col-xs-6">
+                                {% bootstrap_field filter_form.subevent %}
+                            </div>
+                            <div class="col-md-2 col-xs-6">
+                                {% bootstrap_field filter_form.provider %}
+                            </div>
+                        {% else %}
+                            <div class="col-md-4 col-xs-6">
+                                {% bootstrap_field filter_form.item %}
+                            </div>
+                            <div class="col-md-3 col-xs-6">
+                                {% bootstrap_field filter_form.provider %}
+                            </div>
+                        {% endif %}
                     </div>
-                    <div class="col-md-1 col-xs-6">
-                        <button class="btn btn-primary btn-block" type="submit">
-                            <span class="fa fa-filter"></span>
-                        </button>
-                    </div>
-                    <div class="col-md-1 col-xs-6">
-                        <a href="{% url "control:event.orders.search" event=request.event.slug organizer=request.event.organizer.slug %}" class="btn btn-default btn-block" type="submit" data-toggle="tooltip" title="{% trans "Advanced search" %}">
-                            <span class="fa fa-cog"></span>
+                    <div class="text-right flip">
+                        <a href="{% url "control:event.orders.search" event=request.event.slug organizer=request.event.organizer.slug %}" class="btn btn-default btn-lg">
+                            {% trans "Advanced search" %}
                         </a>
+                        <button class="btn btn-primary btn-lg" type="submit">
+                            <span class="fa fa-filter"></span>
+                            {% trans "Filter" %}
+                        </button>
                     </div>
                 </form>
             </div>
diff --git a/src/pretix/control/templates/pretixcontrol/orders/refunds.html b/src/pretix/control/templates/pretixcontrol/orders/refunds.html
index 275ef88363..94d8af5cef 100644
--- a/src/pretix/control/templates/pretixcontrol/orders/refunds.html
+++ b/src/pretix/control/templates/pretixcontrol/orders/refunds.html
@@ -7,20 +7,23 @@
 {% block title %}{% trans "Refunds" %}{% endblock %}
 {% block content %}
     <h1>{% trans "Refunds" %}</h1>
-    <div class="row filter-form">
-        <form class="" action="" method="get">
-            <div class="col-md-5 col-xs-6">
-                {% bootstrap_field filter_form.status layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
+        </div>
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-6 col-xs-6">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-6 col-xs-6">
+                    {% bootstrap_field filter_form.provider %}
+                </div>
             </div>
-            <div class="col-md-5 col-xs-6">
-                {% bootstrap_field filter_form.provider layout='inline' %}
-            </div>
-            <div class="col-md-2 col-xs-12">
-                <button class="btn btn-primary btn-block" type="submit">
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
                     <span class="fa fa-filter"></span>
-                    <span class="hidden-md">
-                            {% trans "Filter" %}
-                        </span>
+                    {% trans "Filter" %}
                 </button>
             </div>
         </form>
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/customers.html b/src/pretix/control/templates/pretixcontrol/organizers/customers.html
index 3ebe36a6c2..b6c2e81600 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/customers.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/customers.html
@@ -17,25 +17,30 @@
             </p>
         </div>
     {% else %}
-        <form class="row filter-form" action="" method="get">
-            <div class="col-md-4 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.query layout='inline' %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">{% trans "Filter" %}</h3>
             </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.status layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.memberships layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                <button class="btn btn-primary btn-block" type="submit">
-                    <span class="fa fa-filter"></span>
-                    <span class="hidden-md">
-                    {% trans "Filter" %}
-                </span>
-                </button>
-            </div>
-        </form>
+            <form class="panel-body filter-form" action="" method="get">
+                <div class="row">
+                    <div class="col-md-6 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.query layout='inline' %}
+                    </div>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.status layout='inline' %}
+                    </div>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.memberships layout='inline' %}
+                    </div>
+                </div>
+                <div class="text-right">
+                    <button class="btn btn-primary btn-lg" type="submit">
+                        <span class="fa fa-filter"></span>
+                        {% trans "Filter" %}
+                    </button>
+                </div>
+            </form>
+        </div>
         <div class="table-responsive">
             <table class="table table-condensed table-hover">
                 <thead>
@@ -72,7 +77,7 @@
                         <td>{{ c.name }}</td>
                         <td class="text-right">
                             <a href="{% url "control:organizer.customer" organizer=request.organizer.slug customer=c.identifier %}"
-                               class="btn btn-default btn-sm" data-toggle="tooltip" title="{% trans "Details" %}">
+                                    class="btn btn-default btn-sm" data-toggle="tooltip" title="{% trans "Details" %}">
                                 <i class="fa fa-eye"></i>
                             </a>
                         </td>
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/detail.html b/src/pretix/control/templates/pretixcontrol/organizers/detail.html
index fa83742913..9195982355 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/detail.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/detail.html
@@ -5,15 +5,15 @@
     <h1>
         {% blocktrans with name=request.organizer.name %}Organizer: {{ name }}{% endblocktrans %}
     </h1>
-    {% if "can_create_events" in request.orgapermset %}
-        <p>
-            <a href="{% url "control:events.add" %}?organizer={{ request.organizer.slug }}" class="btn btn-primary">
-                <span class="fa fa-plus"></span>
-                {% trans "Create a new event" %}
-            </a>
-        </p>
-    {% endif %}
     {% if events|length == 0 and not filter_form.filtered %}
+        {% if "can_create_events" in request.orgapermset %}
+            <p>
+                <a href="{% url "control:events.add" %}?organizer={{ request.organizer.slug }}" class="btn btn-primary">
+                    <span class="fa fa-plus"></span>
+                    {% trans "Create a new event" %}
+                </a>
+            </p>
+        {% endif %}
         <p>
             <em>{% trans "You currently do not have access to any events." %}</em>
         </p>
@@ -22,30 +22,36 @@
             <div class="panel-heading">
                 <h3 class="panel-title">{% trans "Filter" %}</h3>
             </div>
-            <div class="panel-body">
-                <form class="" action="" method="get">
-                    <div class="row filter-form">
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.query layout='inline' %}
-                        </div>
-                        <div class="col-md-3 col-sm-6 col-xs-12">
-                            {% bootstrap_field filter_form.status layout='inline' %}
-                        </div>
-                        {% for mf in meta_fields %}
-                            <div class="col-md-3 col-sm-6 col-xs-12">
-                                {% bootstrap_field mf layout='inline' %}
-                            </div>
-                        {% endfor %}
+            <form class="panel-body filter-form" action="" method="get">
+                <div class="row">
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.query %}
                     </div>
-                    <div class="text-right">
-                        <button class="btn btn-primary" type="submit">
-                            <span class="fa fa-filter"></span>
-                            <span class="hidden-md">{% trans "Filter" %}</span>
-                        </button>
+                    <div class="col-md-3 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.status %}
                     </div>
-                </form>
-            </div>
+                    {% for mf in meta_fields %}
+                        <div class="col-md-3 col-sm-6 col-xs-12">
+                            {% bootstrap_field mf %}
+                        </div>
+                    {% endfor %}
+                </div>
+                <div class="text-right">
+                    <button class="btn btn-primary btn-lg" type="submit">
+                        <span class="fa fa-filter"></span>
+                        {% trans "Filter" %}
+                    </button>
+                </div>
+            </form>
         </div>
+        {% if "can_create_events" in request.orgapermset %}
+            <p>
+                <a href="{% url "control:events.add" %}?organizer={{ request.organizer.slug }}" class="btn btn-primary">
+                    <span class="fa fa-plus"></span>
+                    {% trans "Create a new event" %}
+                </a>
+            </p>
+        {% endif %}
         <table class="table table-condensed table-hover">
             <thead>
             <tr>
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/giftcards.html b/src/pretix/control/templates/pretixcontrol/organizers/giftcards.html
index f4addac577..1daa0c664a 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/giftcards.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/giftcards.html
@@ -21,25 +21,30 @@
             </a>
         </div>
     {% else %}
-        <form class="row filter-form" action="" method="get">
-            <div class="col-md-4 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.query layout='inline' %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">{% trans "Filter" %}</h3>
             </div>
-            <div class="col-md-3 col-sm-6 col-xs-6">
-                {% bootstrap_field filter_form.testmode layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-6">
-                {% bootstrap_field filter_form.state layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                <button class="btn btn-primary btn-block" type="submit">
-                    <span class="fa fa-filter"></span>
-                    <span class="hidden-md">
-                    {% trans "Filter" %}
-                </span>
-                </button>
-            </div>
-        </form>
+            <form class="panel-body filter-form" action="" method="get">
+                <div class="row">
+                    <div class="col-md-6 col-sm-6 col-xs-12">
+                        {% bootstrap_field filter_form.query %}
+                    </div>
+                    <div class="col-md-3 col-sm-6 col-xs-6">
+                        {% bootstrap_field filter_form.testmode %}
+                    </div>
+                    <div class="col-md-3 col-sm-6 col-xs-6">
+                        {% bootstrap_field filter_form.state %}
+                    </div>
+                </div>
+                <div class="text-right">
+                    <button class="btn btn-primary btn-lg" type="submit">
+                        <span class="fa fa-filter"></span>
+                        {% trans "Filter" %}
+                    </button>
+                </div>
+            </form>
+        </div>
         <p>
             <a href="{% url "control:organizer.giftcard.add" organizer=request.organizer.slug %}"
                     class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Manually issue a gift card" %}</a>
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/index.html b/src/pretix/control/templates/pretixcontrol/organizers/index.html
index 4f9bfb4923..0660d1fc62 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/index.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/index.html
@@ -6,20 +6,27 @@
 {% block title %}{% trans "Organizers" %}{% endblock %}
 {% block content %}
 	<h1>{% trans "Organizers" %}</h1>
-	<p>{% trans "The list below shows all organizer accounts you have administrative access to." %}</p>
-    <form class="row filter-form" action="" method="get">
-        <div class="col-md-10 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.query layout='inline' %}
+    <p>{% trans "The list below shows all organizer accounts you have administrative access to." %}</p>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">
+                {% trans "Filter" %}
+            </h3>
         </div>
-        <div class="col-md-2 col-sm-6 col-xs-12">
-            <button class="btn btn-primary btn-block" type="submit">
-                <span class="fa fa-filter"></span>
-                <span class="hidden-md">
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-12 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.query layout='inline' %}
+                </div>
+            </div>
+            <div class="text-right flip">
+                <button class="btn btn-primary btn-lg" type="submit">
+                    <span class="fa fa-filter"></span>
                     {% trans "Filter" %}
-                </span>
-            </button>
-        </div>
-    </form>
+                </button>
+            </div>
+        </form>
+    </div>
     {% if staff_session %}
         <p>
             <a href="{% url "control:organizers.add" %}" class="btn btn-default">
diff --git a/src/pretix/control/templates/pretixcontrol/organizers/teams.html b/src/pretix/control/templates/pretixcontrol/organizers/teams.html
index 4ed5a3ce3f..c7bea617c9 100644
--- a/src/pretix/control/templates/pretixcontrol/organizers/teams.html
+++ b/src/pretix/control/templates/pretixcontrol/organizers/teams.html
@@ -7,19 +7,24 @@
     <p>
         {% trans "The list below shows all teams that exist within this organizer." %}
     </p>
-    <form class="row filter-form" action="" method="get">
-        <div class="col-md-10 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.query layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
         </div>
-        <div class="col-md-2 col-sm-6 col-xs-12">
-            <button class="btn btn-primary btn-block" type="submit">
-                <span class="fa fa-filter"></span>
-                <span class="hidden-md">
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-xs-12">
+                    {% bootstrap_field filter_form.query layout='inline' %}
+                </div>
+            </div>
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
+                    <span class="fa fa-filter"></span>
                     {% trans "Filter" %}
-                </span>
-            </button>
-        </div>
-    </form>
+                </button>
+            </div>
+        </form>
+    </div>
     <a href="{% url "control:organizer.team.add" organizer=request.organizer.slug %}" class="btn btn-default">
         <span class="fa fa-plus"></span>
         {% trans "Create a new team" %}
diff --git a/src/pretix/control/templates/pretixcontrol/search/orders.html b/src/pretix/control/templates/pretixcontrol/search/orders.html
index 13bf6f9855..e6f297fa8d 100644
--- a/src/pretix/control/templates/pretixcontrol/search/orders.html
+++ b/src/pretix/control/templates/pretixcontrol/search/orders.html
@@ -7,33 +7,40 @@
 {% block title %}{% trans "Order search" %}{% endblock %}
 {% block content %}
     <h1>{% trans "Order search" %}</h1>
-    <form class="" action="" method="get">
-        <div class="row filter-form">
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.query layout='inline' %}
-            </div>
-            <div class="col-md-2 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.status layout='inline' %}
-            </div>
-            <div class="col-md-3 col-sm-6 col-xs-12">
-                {% bootstrap_field filter_form.organizer layout='inline' %}
-            </div>
-            <div class="col-md-2 col-xs-6">
-                {% bootstrap_field filter_form.provider layout='inline' %}
-            </div>
-            {% for mf in meta_fields %}
-                <div class="col-md-2 col-sm-6 col-xs-12">
-                    {% bootstrap_field mf layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">
+                {% trans "Filter" %}
+            </h3>
+        </div>
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.query %}
                 </div>
-            {% endfor %}
-        </div>
-        <div class="text-right">
-            <button class="btn btn-primary" type="submit">
-                <span class="fa fa-filter"></span>
-                <span class="hidden-md">{% trans "Filter" %}</span>
-            </button>
-        </div>
-    </form>
+                <div class="col-md-2 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.organizer %}
+                </div>
+                <div class="col-md-2 col-xs-6">
+                    {% bootstrap_field filter_form.provider %}
+                </div>
+                {% for mf in meta_fields %}
+                    <div class="col-md-2 col-sm-6 col-xs-12">
+                        {% bootstrap_field mf %}
+                    </div>
+                {% endfor %}
+            </div>
+            <div class="text-right flip">
+                <button class="btn btn-primary btn-lg" type="submit">
+                    <span class="fa fa-filter"></span>
+                    {% trans "Filter" %}
+                </button>
+            </div>
+        </form>
+    </div>
     <div class="table-responsive">
         <table class="table table-condensed table-hover">
             <thead>
diff --git a/src/pretix/control/templates/pretixcontrol/subevents/index.html b/src/pretix/control/templates/pretixcontrol/subevents/index.html
index 1a6a835ce0..551469e2fc 100644
--- a/src/pretix/control/templates/pretixcontrol/subevents/index.html
+++ b/src/pretix/control/templates/pretixcontrol/subevents/index.html
@@ -55,9 +55,7 @@
                 <div class="text-right flip">
                     <button class="btn btn-primary btn-lg" type="submit">
                         <span class="fa fa-filter"></span>
-                        <span class="hidden-md">
-                    {% trans "Filter" %}
-                </span>
+                        {% trans "Filter" %}
                     </button>
                 </div>
             </form>
diff --git a/src/pretix/control/templates/pretixcontrol/users/index.html b/src/pretix/control/templates/pretixcontrol/users/index.html
index 72508a6b70..dd431c4652 100644
--- a/src/pretix/control/templates/pretixcontrol/users/index.html
+++ b/src/pretix/control/templates/pretixcontrol/users/index.html
@@ -5,25 +5,30 @@
 {% block title %}{% trans "Users" %}{% endblock %}
 {% block content %}
     <h1>{% trans "Users" %}</h1>
-    <form class="row filter-form" action="" method="get">
-        <div class="col-md-4 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.query layout='inline' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
         </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.status layout='inline' %}
-        </div>
-        <div class="col-md-3 col-sm-6 col-xs-12">
-            {% bootstrap_field filter_form.superuser layout='inline' %}
-        </div>
-        <div class="col-md-2 col-sm-6 col-xs-12">
-            <button class="btn btn-primary btn-block" type="submit">
-                <span class="fa fa-filter"></span>
-                <span class="hidden-md">
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-md-6 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.query %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.status %}
+                </div>
+                <div class="col-md-3 col-sm-6 col-xs-12">
+                    {% bootstrap_field filter_form.superuser %}
+                </div>
+            </div>
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
+                    <span class="fa fa-filter"></span>
                     {% trans "Filter" %}
-                </span>
-            </button>
-        </div>
-    </form>
+                </button>
+            </div>
+        </form>
+    </div>
     <p>
         <a href="{% url "control:users.add" %}" class="btn btn-default">
             <span class="fa fa-plus"></span>
diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/index.html b/src/pretix/control/templates/pretixcontrol/vouchers/index.html
index 5ef613e4a4..94d80c2782 100644
--- a/src/pretix/control/templates/pretixcontrol/vouchers/index.html
+++ b/src/pretix/control/templates/pretixcontrol/vouchers/index.html
@@ -12,47 +12,50 @@
             reserve some quota for your very special guests.
         {% endblocktrans %}
     </p>
-    <div class="row filter-form">
-        <form class="col-lg-2 col-sm-6 col-xs-6"
-              action="{% url "control:event.vouchers.go" event=request.event.slug organizer=request.event.organizer.slug %}">
-            <div class="input-group">
-                <input type="text" name="code" class="form-control" placeholder="{% trans "Voucher code" %}" autofocus>
-                <span class="input-group-btn">
+    <form class="form-inline"
+            action="{% url "control:event.vouchers.go" event=request.event.slug organizer=request.event.organizer.slug %}">
+        <p class="input-group">
+            <input type="text" name="code" class="form-control" placeholder="{% trans "Voucher code" %}" autofocus>
+            <span class="input-group-btn">
                     <button class="btn btn-primary" type="submit">{% trans "Go!" %}</button>
                 </span>
-            </div>
-        </form>
-        <form class="" action="" method="get">
-            <div class="col-lg-2 col-sm-3 col-xs-6">
-                {% bootstrap_field filter_form.search layout='inline' %}
-            </div>
-            <div class="col-lg-1 col-sm-3 col-xs-6">
-                {% bootstrap_field filter_form.tag layout='inline' %}
-            </div>
-            {% if request.event.has_subevents %}
-                <div class="col-lg-1 col-sm-3 col-xs-6">
-                    {% bootstrap_field filter_form.status layout='inline' %}
+        </p>
+    </form>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h3 class="panel-title">{% trans "Filter" %}</h3>
+        </div>
+        <form class="panel-body filter-form" action="" method="get">
+            <div class="row">
+                <div class="col-lg-2 col-sm-6 col-xs-6">
+                    {% bootstrap_field filter_form.search %}
                 </div>
-                <div class="col-lg-2 col-sm-3 col-xs-6">
-                    {% bootstrap_field filter_form.subevent layout='inline' %}
+                {% if request.event.has_subevents %}
+                    <div class="col-lg-2 col-sm-6 col-xs-6">
+                        {% bootstrap_field filter_form.tag %}
+                    </div>
+                    <div class="col-lg-2 col-sm-6 col-xs-6">
+                        {% bootstrap_field filter_form.subevent %}
+                    </div>
+                {% else %}
+                    <div class="col-lg-4 col-sm-6 col-xs-6">
+                        {% bootstrap_field filter_form.tag %}
+                    </div>
+                {% endif %}
+                <div class="col-lg-2 col-sm-6 col-xs-6">
+                    {% bootstrap_field filter_form.status %}
                 </div>
-            {% else %}
-                <div class="col-lg-3 col-sm-6 col-xs-6">
-                    {% bootstrap_field filter_form.status layout='inline' %}
+                <div class="col-lg-2 col-sm-6 col-xs-6">
+                    {% bootstrap_field filter_form.itemvar %}
+                </div>
+                <div class="col-lg-2 col-sm-6 col-xs-6">
+                    {% bootstrap_field filter_form.qm %}
                 </div>
-            {% endif %}
-            <div class="col-lg-2 col-sm-6 col-xs-6">
-                {% bootstrap_field filter_form.itemvar layout='inline' %}
             </div>
-            <div class="col-lg-1 col-sm-6 col-xs-6">
-                {% bootstrap_field filter_form.qm layout='inline' %}
-            </div>
-            <div class="col-lg-1 col-sm-6 col-xs-6">
-                <button class="btn btn-primary btn-block" type="submit">
+            <div class="text-right">
+                <button class="btn btn-primary btn-lg" type="submit">
                     <span class="fa fa-filter"></span>
-                    <span class="hidden-md">
-                            {% trans "Filter" %}
-                        </span>
+                    {% trans "Filter" %}
                 </button>
             </div>
         </form>