From 0daded8af5167074431a2a54105bbff23d4475a0 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sun, 8 Jul 2018 23:55:26 +0200
Subject: [PATCH] Item-related templates

---
 .../templates/pretixcontrol/event/base.html   |   2 +-
 .../templates/pretixcontrol/event/delete.html | 126 ++++++------
 .../templates/pretixcontrol/event/index.html  |  25 +--
 .../pretixcontrol/event/invoicing.html        |  59 +++---
 .../templates/pretixcontrol/event/mail.html   |   2 +-
 .../pretixcontrol/event/payment.html          |  10 +-
 .../pretixcontrol/event/payment_provider.html |  55 +++---
 .../pretixcontrol/event/tax_delete.html       |  41 ++--
 .../pretixcontrol/event/tax_edit.html         |  33 ++--
 .../pretixcontrol/event/tax_index.html        |  96 +++++-----
 .../templates/pretixcontrol/event/widget.html | 128 +++++++------
 .../templates/pretixcontrol/item/addons.html  |  26 +--
 .../templates/pretixcontrol/item/base.html    |  53 +++---
 .../templates/pretixcontrol/item/create.html  |  61 +++---
 .../templates/pretixcontrol/item/index.html   |  96 ++++++----
 .../pretixcontrol/items/categories.html       | 107 ++++++-----
 .../pretixcontrol/items/category.html         |  35 ++--
 .../pretixcontrol/items/category_delete.html  |  37 ++--
 .../templates/pretixcontrol/items/index.html  | 179 +++++++++---------
 .../pretixcontrol/items/question.html         | 162 +++++++++-------
 .../pretixcontrol/items/question_delete.html  |  51 +++--
 .../pretixcontrol/items/question_edit.html    | 162 ++++++++--------
 .../pretixcontrol/items/questions.html        | 149 ++++++++-------
 .../templates/pretixcontrol/items/quota.html  | 107 ++++++-----
 .../pretixcontrol/items/quota_delete.html     |  51 +++--
 .../pretixcontrol/items/quota_edit.html       |  61 +++---
 .../templates/pretixcontrol/items/quotas.html | 155 ++++++++-------
 .../templates/pretixcontrol/pagination.html   |  59 +++---
 .../pretixcontrol/shredder/download.html      |  83 ++++----
 .../pretixcontrol/shredder/index.html         |  74 ++++----
 src/pretix/static/pretixbase/scss/_theme.scss |  12 ++
 .../static/pretixcontrol/scss/_dashboard.scss |  10 +-
 .../static/pretixcontrol/scss/_forms.scss     |   5 +
 .../static/pretixcontrol/scss/main.scss       |  23 ++-
 34 files changed, 1314 insertions(+), 1021 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/event/base.html b/src/pretix/control/templates/pretixcontrol/event/base.html
index dae2dc08c..672c3110b 100644
--- a/src/pretix/control/templates/pretixcontrol/event/base.html
+++ b/src/pretix/control/templates/pretixcontrol/event/base.html
@@ -31,7 +31,7 @@
                     </li>
                     <li>
                         <a href="{% url 'control:event.settings.payment' organizer=request.event.organizer.slug event=request.event.slug %}"
-                           {% if "event.settings.payment" == url_name %}class="active"{% endif %}>
+                           {% if "event.settings.payment" in url_name %}class="active"{% endif %}>
                             {% trans "Payment" %}
                         </a>
                     </li>
diff --git a/src/pretix/control/templates/pretixcontrol/event/delete.html b/src/pretix/control/templates/pretixcontrol/event/delete.html
index cd6f09c71..095f913cd 100644
--- a/src/pretix/control/templates/pretixcontrol/event/delete.html
+++ b/src/pretix/control/templates/pretixcontrol/event/delete.html
@@ -2,81 +2,89 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% block content %}
-    <h1>{% trans "Delete event" %}</h1>
-    {% if request.event.allow_delete %}
-        {% bootstrap_form_errors form layout="inline" %}
-        <p>
-            {% blocktrans trimmed %}
-                This operation will destroy your event including all configuration, products, quotas, questions,
-                vouchers, lists, etc.
-            {% endblocktrans %}
-        </p>
-        <p><strong>
-            {% blocktrans trimmed %}
-                This operation is irreversible and there is no way to bring your data back.
-            {% endblocktrans %}
-        </strong></p>
-        <form action="" method="post">
-            {% csrf_token %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h2 class="panel-title">{% trans "Delete event" %}</h2>
+        </div>
+        <div class="panel-body">
+        {% if request.event.allow_delete %}
+            {% bootstrap_form_errors form layout="inline" %}
             <p>
-                {% blocktrans trimmed with slug=request.event.slug %}
-                    To confirm you really want this, please type out the event's short name ("{{ slug }}") here:
+                {% blocktrans trimmed %}
+                    This operation will destroy your event including all configuration, products, quotas, questions,
+                    vouchers, lists, etc.
                 {% endblocktrans %}
             </p>
-            {% bootstrap_field form.slug layout="inline" %}
-            <p>
-                {% blocktrans trimmed with slug=request.event.slug %}
-                    Also, to make sure it's really you, please enter your user password here:
+            <p><strong>
+                {% blocktrans trimmed %}
+                    This operation is irreversible and there is no way to bring your data back.
                 {% endblocktrans %}
-            </p>
-            {% bootstrap_field form.user_pw layout="inline" %}
-
-            <div class="form-group submit-group">
-                <button type="submit" class="btn btn-danger btn-save">
-                    {% trans "Delete" %}
-                </button>
-            </div>
-        </form>
-    {% else %}
-        <p>
-            {% trans "Your event can not be deleted as it already contains orders." %}
-        </p>
-        <p>
-            {% blocktrans trimmed %}
-                pretix does not allow deleting orders once they have been placed in order to be audit-proof and
-                trustable by financial authorities.
-            {% endblocktrans %}
-        </p>
-        {% if request.event.live %}
-            <p>
-                {% trans "You can instead take your shop offline. This will hide it from everyone except from the organizer teams you configured to have access to the event." %}
-            </p>
-            <form action="{% url "control:event.live" event=request.event.slug organizer=request.organizer.slug %}"
-                    method="post">
+            </strong></p>
+            <form action="" method="post">
                 {% csrf_token %}
-                <input type="hidden" name="live" value="false">
+                <p>
+                    {% blocktrans trimmed with slug=request.event.slug %}
+                        To confirm you really want this, please type out the event's short name ("{{ slug }}") here:
+                    {% endblocktrans %}
+                </p>
+                {% bootstrap_field form.slug layout="inline" %}
+                <p>
+                    {% blocktrans trimmed with slug=request.event.slug %}
+                        Also, to make sure it's really you, please enter your user password here:
+                    {% endblocktrans %}
+                </p>
+                {% bootstrap_field form.user_pw layout="inline" %}
 
                 <div class="form-group submit-group">
-                    <a href="{% url "control:event.shredder.start" event=request.event.slug organizer=request.organizer.slug %}" class="btn btn-danger btn-save">
-                        <span class="fa fa-eraser"></span>
-                        {% trans "Delete personal data" %}
-                    </a>
-                    <button type="submit" class="btn btn-primary btn-save">
-                        <span class="fa fa-power-off"></span>
-                        {% trans "Go offline" %}
+                    <button type="submit" class="btn btn-danger btn-save">
+                        {% trans "Delete" %}
                     </button>
                 </div>
             </form>
         {% else %}
             <p>
-                {% trans "However, since your shop is offline, it is only visible to the organizing team according to the permissions you configured." %}
+                {% trans "Your event can not be deleted as it already contains orders." %}
+            </p>
+            <p>
+                {% blocktrans trimmed %}
+                    pretix does not allow deleting orders once they have been placed in order to be audit-proof and
+                    trustable by financial authorities.
+                {% endblocktrans %}
+            </p>
+            {% if request.event.live %}
+                <p>
+                    {% trans "You can instead take your shop offline. This will hide it from everyone except from the organizer teams you configured to have access to the event." %}
+                </p>
+                <form action="{% url "control:event.live" event=request.event.slug organizer=request.organizer.slug %}"
+                      method="post">
+                    {% csrf_token %}
+                    <input type="hidden" name="live" value="false">
+
+                    <div class="form-group submit-group">
+                        <a href="{% url "control:event.shredder.start" event=request.event.slug organizer=request.organizer.slug %}"
+                           class="btn btn-danger btn-save">
+                            <span class="fa fa-eraser"></span>
+                            {% trans "Delete personal data" %}
+                        </a>
+                        <button type="submit" class="btn btn-primary btn-save">
+                            <span class="fa fa-power-off"></span>
+                            {% trans "Go offline" %}
+                        </button>
+                    </div>
+                </form>
+            {% else %}
+                <p>
+                    {% trans "However, since your shop is offline, it is only visible to the organizing team according to the permissions you configured." %}
                 <div class="form-group submit-group">
-                    <a href="{% url "control:event.shredder.start" event=request.event.slug organizer=request.organizer.slug %}" class="btn btn-danger btn-save">
+                    <a href="{% url "control:event.shredder.start" event=request.event.slug organizer=request.organizer.slug %}"
+                       class="btn btn-danger btn-save">
                         <span class="fa fa-eraser"></span>
                         {% trans "Delete personal data" %}
                     </a>
                 </div>
-            </p>
+                </p>
+            {% endif %}
         {% endif %}
-    {% endif %}
+    </div>
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/index.html b/src/pretix/control/templates/pretixcontrol/event/index.html
index 59d504464..64854f8db 100644
--- a/src/pretix/control/templates/pretixcontrol/event/index.html
+++ b/src/pretix/control/templates/pretixcontrol/event/index.html
@@ -5,16 +5,20 @@
 {% load staticfiles %}
 {% block title %}{{ request.event.name }}{% endblock %}
 {% block content %}
-    <h1>
-        {{ request.event.name }}
-        <small>
-            {% if request.event.has_subevents %}
-                {% trans "Event series" %}
-            {% else %}
-                {{ request.event.get_date_range_display }}
-            {% endif %}
-        </small>
-    </h1>
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h1>
+                {{ request.event.name }}
+                <small>
+                    {% if request.event.has_subevents %}
+                        {% trans "Event series" %}
+                    {% else %}
+                        {{ request.event.get_date_range_display }}
+                    {% endif %}
+                </small>
+            </h1>
+        </div>
+    </div>
     {% if actions|length > 0 %}
         <div class="panel panel-danger">
             <div class="panel-heading">
@@ -71,7 +75,6 @@
         {% endfor %}
     </div>
 
-    <p>&nbsp;</p>
     <div class="panel panel-default items">
         <div class="panel-heading">
             <h3 class="panel-title">
diff --git a/src/pretix/control/templates/pretixcontrol/event/invoicing.html b/src/pretix/control/templates/pretixcontrol/event/invoicing.html
index 709ffcdf9..ef8085b46 100644
--- a/src/pretix/control/templates/pretixcontrol/event/invoicing.html
+++ b/src/pretix/control/templates/pretixcontrol/event/invoicing.html
@@ -5,33 +5,38 @@
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "Invoicing" %}</legend>
-            {% bootstrap_field form.invoice_address_asked layout="control" %}
-            {% bootstrap_field form.invoice_address_required layout="control" %}
-            {% bootstrap_field form.invoice_name_required layout="control" %}
-            {% bootstrap_field form.invoice_generate layout="control" %}
-            {% bootstrap_field form.invoice_email_attachment layout="control" %}
-            {% bootstrap_field form.invoice_address_vatid layout="control" %}
-            {% bootstrap_field form.invoice_numbers_consecutive layout="control" %}
-            {% bootstrap_field form.invoice_numbers_prefix layout="control" %}
-            {% bootstrap_field form.invoice_renderer layout="control" %}
-            {% bootstrap_field form.invoice_language layout="control" %}
-            {% bootstrap_field form.invoice_include_free layout="control" %}
-            {% bootstrap_field form.invoice_attendee_name layout="control" %}
-            {% bootstrap_field form.invoice_address_from layout="control" %}
-            {% bootstrap_field form.invoice_introductory_text layout="control" %}
-            {% bootstrap_field form.invoice_additional_text layout="control" %}
-            {% bootstrap_field form.invoice_footer_text layout="control" %}
-            {% bootstrap_field form.invoice_logo_image layout="control" %}
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
+                <legend>{% trans "Invoicing" %}</legend>
+            </div>
+            <div class="panel-body">
+                {% bootstrap_field form.invoice_address_asked layout="control" %}
+                {% bootstrap_field form.invoice_address_required layout="control" %}
+                {% bootstrap_field form.invoice_name_required layout="control" %}
+                {% bootstrap_field form.invoice_generate layout="control" %}
+                {% bootstrap_field form.invoice_email_attachment layout="control" %}
+                {% bootstrap_field form.invoice_address_vatid layout="control" %}
+                {% bootstrap_field form.invoice_numbers_consecutive layout="control" %}
+                {% bootstrap_field form.invoice_numbers_prefix layout="control" %}
+                {% bootstrap_field form.invoice_renderer layout="control" %}
+                {% bootstrap_field form.invoice_language layout="control" %}
+                {% bootstrap_field form.invoice_include_free layout="control" %}
+                {% bootstrap_field form.invoice_attendee_name layout="control" %}
+                {% bootstrap_field form.invoice_address_from layout="control" %}
+                {% bootstrap_field form.invoice_introductory_text layout="control" %}
+                {% bootstrap_field form.invoice_additional_text layout="control" %}
+                {% bootstrap_field form.invoice_footer_text layout="control" %}
+                {% bootstrap_field form.invoice_logo_image layout="control" %}
+                <div class="form-group submit-group">
+                    <button type="submit" class="btn btn-default btn-lg" name="preview" value="preview"
+                            formtarget="_blank">
+                        {% trans "Save and show preview" %}
+                    </button>
+                    <button type="submit" class="btn btn-primary btn-save">
+                        {% trans "Save" %}
+                    </button>
+                </div>
+            </div>
         </fieldset>
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-default btn-lg" name="preview" value="preview" formtarget="_blank">
-                {% trans "Save and show preview" %}
-            </button>
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
     </form>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/mail.html b/src/pretix/control/templates/pretixcontrol/event/mail.html
index 139f6fc8e..157553631 100644
--- a/src/pretix/control/templates/pretixcontrol/event/mail.html
+++ b/src/pretix/control/templates/pretixcontrol/event/mail.html
@@ -17,7 +17,7 @@
                 {% bootstrap_field form.mail_bcc layout="control" %}
             </div>
         </fieldset>
-        <div class="panel-group" id="questions_group">
+        <div class="" id="questions_group">
             {% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %}
             {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed" %}
 
diff --git a/src/pretix/control/templates/pretixcontrol/event/payment.html b/src/pretix/control/templates/pretixcontrol/event/payment.html
index 399a1a0b0..e32695dfa 100644
--- a/src/pretix/control/templates/pretixcontrol/event/payment.html
+++ b/src/pretix/control/templates/pretixcontrol/event/payment.html
@@ -58,12 +58,12 @@
                 {% bootstrap_field form.payment_term_expire_automatically layout="control" %}
                 {% bootstrap_field form.payment_term_accept_late layout="control" %}
                 {% bootstrap_field form.tax_rate_default layout="control" %}
+                <div class="form-group submit-group">
+                    <button type="submit" class="btn btn-primary btn-save">
+                        {% trans "Save" %}
+                    </button>
+                </div>
             </div>
         </fieldset>
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
     </form>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/payment_provider.html b/src/pretix/control/templates/pretixcontrol/event/payment_provider.html
index d859f21f1..86c088e1b 100644
--- a/src/pretix/control/templates/pretixcontrol/event/payment_provider.html
+++ b/src/pretix/control/templates/pretixcontrol/event/payment_provider.html
@@ -4,30 +4,37 @@
 {% block inside %}
     <form action="" method="post" class="form-horizontal form-plugins">
         {% csrf_token %}
-        <fieldset>
-            <legend>
-                <a href="{% url 'control:event.settings.payment' event=request.event.slug organizer=request.organizer.slug %}"
-                        class="btn btn-default btn-sm btn-link">
-                    <span class="fa fa-caret-left"></span>
-                    {% trans "Back" %}
-                </a>
-                {% trans "Payment provider:" %} {{ provider.verbose_name }}
-            </legend>
-            {% bootstrap_form form layout='control' %}
-            {% if settings_content %}{{ settings_content|safe }}{% endif %}
-            <p>&nbsp;</p>
-            <div class="alert alert-legal">
-                <strong>{% trans "Warning:" %}</strong>
-                {% blocktrans trimmed %}
-                    Please note that EU Directive 2015/2366 bans surcharging payment fees for most common payment
-                    methods within the European Union. If in doubt, consult a lawyer or refrain from charging payment
-                    fees.
-                {% endblocktrans %}
-                <br>
-                {% blocktrans trimmed %}
-                    In simple terms, this means you need to pay any fees imposed by the payment providers and cannot
-                    pass it on to your customers.
-                {% endblocktrans %}
+        <p>
+            <a href="{% url 'control:event.settings.payment' event=request.event.slug organizer=request.organizer.slug %}"
+               class="btn btn-default">
+                <span class="fa fa-caret-left"></span>
+                {% trans "Back" %}
+            </a>
+        </p>
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
+                <legend>
+                    {% trans "Payment provider:" %} {{ provider.verbose_name }}
+                </legend>
+            </div>
+            <div class="panel-body">
+                {% bootstrap_form form layout='control' %}
+                {% if settings_content %}{{ settings_content|safe }}{% endif %}
+                <p>&nbsp;</p>
+                <div class="alert alert-legal">
+                    <strong>{% trans "Warning:" %}</strong>
+                    {% blocktrans trimmed %}
+                        Please note that EU Directive 2015/2366 bans surcharging payment fees for most common payment
+                        methods within the European Union. If in doubt, consult a lawyer or refrain from charging
+                        payment
+                        fees.
+                    {% endblocktrans %}
+                    <br>
+                    {% blocktrans trimmed %}
+                        In simple terms, this means you need to pay any fees imposed by the payment providers and cannot
+                        pass it on to your customers.
+                    {% endblocktrans %}
+                </div>
             </div>
         </fieldset>
         <div class="form-group submit-group">
diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_delete.html b/src/pretix/control/templates/pretixcontrol/event/tax_delete.html
index 4dd4bd0f9..ac7b8d3d1 100644
--- a/src/pretix/control/templates/pretixcontrol/event/tax_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/event/tax_delete.html
@@ -3,24 +3,33 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete tax rule" %}{% endblock %}
 {% block inside %}
-    <legend>{% trans "Delete tax rule" %}</legend>
     <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% if possible %}
-            <p>{% blocktrans %}Are you sure you want to delete the tax rule <strong>{{ taxrule }}</strong>?{% endblocktrans %}</p>
-        {% else %}
-            <p>{% blocktrans %}You cannot delete a tax rule that is in use for a product or has been in use for any existing orders.{% endblocktrans %}</p>
-        {% endif %}
-        <div class="form-group submit-group">
-            <a href="{% url "control:event.settings.tax" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <legend>{% trans "Delete tax rule" %}</legend>
+            </div>
+            <div class="panel-body">
+                {% csrf_token %}
+                {% if possible %}
+                    <p>{% blocktrans %}Are you sure you want to delete the tax rule <strong>{{ taxrule }}</strong>
+                        ?{% endblocktrans %}</p>
+                {% else %}
+                    <p>{% blocktrans %}You cannot delete a tax rule that is in use for a product or has been in use for
+                        any existing orders.{% endblocktrans %}</p>
+                {% endif %}
+                <div class="form-group submit-group">
+                    <a href="{% url "control:event.settings.tax" organizer=request.event.organizer.slug event=request.event.slug %}"
+                       class="btn
 btn-default btn-cancel">
-                {% trans "Cancel" %}
-            </a>
-            {% if possible %}
-                <button type="submit" class="btn btn-danger btn-save">
-                    {% trans "Delete" %}
-                </button>
-            {% endif %}
+                        {% trans "Cancel" %}
+                    </a>
+                    {% if possible %}
+                        <button type="submit" class="btn btn-danger btn-save">
+                            {% trans "Delete" %}
+                        </button>
+                    {% endif %}
+                </div>
+            </div>
         </div>
     </form>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_edit.html b/src/pretix/control/templates/pretixcontrol/event/tax_edit.html
index 39fd12da9..042d0e5c9 100644
--- a/src/pretix/control/templates/pretixcontrol/event/tax_edit.html
+++ b/src/pretix/control/templates/pretixcontrol/event/tax_edit.html
@@ -10,19 +10,25 @@
     {% endif %}
 {% endblock %}
 {% block inside %}
-    {% if rule %}
-        <legend>{% blocktrans with name=rule.name %}Tax rule: {{ name }}{% endblocktrans %}</legend>
-    {% else %}
-        <legend>{% trans "Tax rule" %}</legend>
-    {% endif %}
     <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% bootstrap_form_errors form %}
-        {% bootstrap_field form.name layout="control" %}
-        {% bootstrap_field form.rate addon_after="%" layout="control" %}
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                {% if rule %}
+                    <legend>{% blocktrans with name=rule.name %}Tax rule: {{ name }}{% endblocktrans %}</legend>
+                {% else %}
+                    <legend>{% trans "Tax rule" %}</legend>
+                {% endif %}
+            </div>
+            {% csrf_token %}
+            <div class="panel-body">
+                {% bootstrap_form_errors form %}
+                {% bootstrap_field form.name layout="control" %}
+                {% bootstrap_field form.rate addon_after="%" layout="control" %}
+            </div>
 
+        </div>
         <details class="panel panel-default"
-                {% if rule.eu_reverse_charge or rule.has_custom_rules or form.errors %}open{% endif %}>
+                 {% if rule.eu_reverse_charge or rule.has_custom_rules or form.errors %}open{% endif %}>
             <summary class="panel-heading">
                 <h4 class="panel-title">
                     <strong>{% trans "Advanced settings" %}</strong>
@@ -31,7 +37,6 @@
             </summary>
             <div id="advanced">
                 <div class="panel-body">
-                    <legend>{% trans "Advanced settings" %}</legend>
                     <div class="alert alert-legal">
                         {% blocktrans trimmed with docs="https://docs.pretix.eu/en/latest/user/events/taxes.html" %}
                             These settings are intended for advanced users. See the
@@ -47,8 +52,10 @@
                     <div class="alert alert-warning">
                         {% blocktrans trimmed %}
                             These settings are intended for professional users with very specific taxation situations.
-                            If you create any rule here, the reverse charge settings above will be ignored. The rules will be
-                            checked in order and once the first rule matches the order, it will be used and all further rules will
+                            If you create any rule here, the reverse charge settings above will be ignored. The rules
+                            will be
+                            checked in order and once the first rule matches the order, it will be used and all further
+                            rules will
                             be ignored. If no rule matches, tax will be charged.
                         {% endblocktrans %}
                         {% trans "All of these rules will only apply if an invoice address is set." %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/tax_index.html b/src/pretix/control/templates/pretixcontrol/event/tax_index.html
index 88ff2355d..ba07af709 100644
--- a/src/pretix/control/templates/pretixcontrol/event/tax_index.html
+++ b/src/pretix/control/templates/pretixcontrol/event/tax_index.html
@@ -2,50 +2,60 @@
 {% load i18n %}
 {% block title %}{% trans "Tax rules" %}{% endblock %}
 {% block inside %}
-    <legend>{% trans "Tax rules" %}</legend>
-    {% if taxrules|length == 0 %}
-        <div class="empty-collection">
-            <p>
-                {% blocktrans trimmed %}
-                    You haven't created any tax rules yet.
-                {% endblocktrans %}
-            </p>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <legend>{% trans "Tax rules" %}</legend>
+        </div>
+        {% if taxrules|length == 0 %}
+            <div class="panel-body empty-collection">
+                <p>
+                    {% blocktrans trimmed %}
+                        You haven't created any tax rules yet.
+                    {% endblocktrans %}
+                </p>
 
-            <a href="{% url "control:event.settings.tax.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                    class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new tax rule" %}</a>
-        </div>
-    {% else %}
-        <p>
-            <a href="{% url "control:event.settings.tax.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new tax rule" %}
-            </a>
-        </p>
-        <div class="table-responsive">
-            <table class="table table-hover table-quotas">
-                <thead>
-                <tr>
-                    <th>{% trans "Name" %}</th>
-                    <th>{% trans "Rate" %}</th>
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {% for tr in taxrules %}
+                <a href="{% url "control:event.settings.tax.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new tax rule" %}</a>
+            </div>
+        {% else %}
+            <div class="panel-body">
+                <a href="{% url "control:event.settings.tax.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new tax rule" %}
+                </a>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-hover table-quotas">
+                    <thead>
                     <tr>
-                        <td>
-                            <strong><a href="{% url "control:event.settings.tax.edit" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}">
-                                {{ tr.name }}
-                            </a></strong>
-                        </td>
-                        <td>{{ tr.rate }} %</td>
-                        <td class="text-right">
-                            <a href="{% url "control:event.settings.tax.edit" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                            <a href="{% url "control:event.settings.tax.delete" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                        </td>
+                        <th>{% trans "Name" %}</th>
+                        <th>{% trans "Rate" %}</th>
+                        <th class="action-col-2"></th>
                     </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    {% endif %}
-    {% include "pretixcontrol/pagination.html" %}
+                    </thead>
+                    <tbody>
+                    {% for tr in taxrules %}
+                        <tr>
+                            <td>
+                                <strong><a
+                                        href="{% url "control:event.settings.tax.edit" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}">
+                                    {{ tr.name }}
+                                </a></strong>
+                            </td>
+                            <td>{{ tr.rate }} %</td>
+                            <td class="text-right">
+                                <a href="{% url "control:event.settings.tax.edit" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}"
+                                   class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.settings.tax.delete" organizer=request.event.organizer.slug event=request.event.slug rule=tr.id %}"
+                                   class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-body">
+                {% include "pretixcontrol/pagination.html" %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/event/widget.html b/src/pretix/control/templates/pretixcontrol/event/widget.html
index 737ba60d1..23c922c3c 100644
--- a/src/pretix/control/templates/pretixcontrol/event/widget.html
+++ b/src/pretix/control/templates/pretixcontrol/event/widget.html
@@ -5,47 +5,55 @@
 {% load eventurl %}
 {% load eventsignal %}
 {% block inside %}
-    <legend>{% trans "Widget" %}</legend>
-    <p>
-        {% blocktrans trimmed %}
-            The pretix widget is a way to embed your ticket shop into your event website. This way, your visitors can
-            buy their ticket right away without leaving your website.
-        {% endblocktrans %}
-    </p>
-    {% if valid %}
-        <p>
-            {% blocktrans trimmed %}
-                To embed the widget onto your website, simply copy the following code to the <code>&lt;head&gt;</code>
-                section of your website:
-            {% endblocktrans %}
-        </p>
-        <pre>&lt;link rel="stylesheet" type="text/css" href="{% abseventurl request.event "presale:event.widget.css" %}"&gt;
+    <fieldset class="panel panel-default">
+        <div class="panel-heading">
+            <legend>{% trans "Widget" %}</legend>
+        </div>
+        <div class="panel-body">
+            <p>
+                {% blocktrans trimmed %}
+                    The pretix widget is a way to embed your ticket shop into your event website. This way, your
+                    visitors can
+                    buy their ticket right away without leaving your website.
+                {% endblocktrans %}
+            </p>
+            {% if valid %}
+                <p>
+                    {% blocktrans trimmed %}
+                        To embed the widget onto your website, simply copy the following code to the
+                        <code>&lt;head&gt;</code>
+                        section of your website:
+                    {% endblocktrans %}
+                </p>
+                <pre>&lt;link rel="stylesheet" type="text/css" href="{% abseventurl request.event "presale:event.widget.css" %}"&gt;
 &lt;script type="text/javascript" src="{{ urlprefix }}{% url "presale:widget.js" lang=form.cleaned_data.language %}" async&gt;&lt;/script&gt;</pre>
-        <p>
-            {% blocktrans trimmed %}
-                Then, copy the following code to the place of your website where you want the widget to show up:
-            {% endblocktrans %}
-        </p>
-        {% if form.cleaned_data.subevent %}
-            {% abseventurl request.event "presale:event.index" subevent=form.cleaned_data.subevent.pk as indexurl %}
-        {% else %}
-          {% abseventurl request.event "presale:event.index" as indexurl %}
-        {% endif %}
-        {% if form.cleaned_data.compatibility_mode %}
-            <pre>&lt;div class="pretix-widget-compat" event="{% abseventurl request.event "presale:event.index" %}"{% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}{% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}&gt;&lt;/div&gt;
+                <p>
+                    {% blocktrans trimmed %}
+                        Then, copy the following code to the place of your website where you want the widget to show up:
+                    {% endblocktrans %}
+                </p>
+                {% if form.cleaned_data.subevent %}
+                    {% abseventurl request.event "presale:event.index" subevent=form.cleaned_data.subevent.pk as indexurl %}
+                {% else %}
+                    {% abseventurl request.event "presale:event.index" as indexurl %}
+                {% endif %}
+                {% if form.cleaned_data.compatibility_mode %}
+                    <pre>&lt;div class="pretix-widget-compat" event="{% abseventurl request.event "presale:event.index" %}"
+                        {% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}
+                        {% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}&gt;&lt;/div&gt;
 &lt;noscript&gt;
    &lt;div class="pretix-widget"&gt;
         &lt;div class="pretix-widget-info-message"&gt;
-                {% blocktrans trimmed with a_attr='target="_blank" rel="noopener" href="'|add:indexurl|add:'"'|safe %}
-                    JavaScript is disabled in your browser. To access our ticket shop without JavaScript,
-                    please &lt;a {{ a_attr }}&gt;click here&lt;/a&gt;.
-                {% endblocktrans %}
-                &lt;/div&gt;
+                        {% blocktrans trimmed with a_attr='target="_blank" rel="noopener" href="'|add:indexurl|add:'"'|safe %}
+                            JavaScript is disabled in your browser. To access our ticket shop without JavaScript,
+                            please &lt;a {{ a_attr }}&gt;click here&lt;/a&gt;.
+                        {% endblocktrans %}
+                        &lt;/div&gt;
     &lt;/div&gt;
 &lt;/noscript&gt;
 </pre>
-        {% else %}
-        <pre>&lt;pretix-widget event="{% abseventurl request.event "presale:event.index" %}"{% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %}{% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}&gt;&lt;/pretix-widget&gt;
+                {% else %}
+                    <pre>&lt;pretix-widget event="{% abseventurl request.event "presale:event.index" %}" {% if form.cleaned_data.subevent %} subevent="{{ form.cleaned_data.subevent.pk }}"{% endif %} {% if form.cleaned_data.voucher %} voucher="{{ form.cleaned_data.voucher }}"{% endif %}&gt;&lt;/pretix-widget&gt;
 &lt;noscript&gt;
    &lt;div class="pretix-widget"&gt;
         &lt;div class="pretix-widget-info-message"&gt;
@@ -57,30 +65,32 @@
     &lt;/div&gt;
 &lt;/noscript&gt;
 </pre>
+                {% endif %}
+                <p>
+                    <a href="https://docs.pretix.eu/en/latest/user/events/widget.html" target="_blank" rel="noopener">
+                        <span class="fa fa-question-circle"></span>
+                        {% trans "Read our documentation for more information" %}
+                    </a>
+                </p>
+            {% else %}
+                <p>
+                    {% blocktrans trimmed %}
+                        Using this form, you can generate a code to copy and paste to your website source.
+                    {% endblocktrans %}
+                </p>
+                <form action="" method="post" class="form-horizontal">
+                    {% csrf_token %}
+                    {% bootstrap_form form layout="control" %}
+                    <div class="form-group">
+                        <div class="col-md-offset-3 col-md-9">
+                            <button type="submit" class="btn btn-primary btn-save">
+                                {% trans "Generate widget code" %}
+                            </button>
+                        </div>
+                    </div>
+                </form>
             {% endif %}
-        <p>
-            <a href="https://docs.pretix.eu/en/latest/user/events/widget.html" target="_blank" rel="noopener">
-                <span class="fa fa-question-circle"></span>
-                {% trans "Read our documentation for more information" %}
-            </a>
-        </p>
-    {% else %}
-        <p>
-            {% blocktrans trimmed %}
-                Using this form, you can generate a code to copy and paste to your website source.
-            {% endblocktrans %}
-        </p>
-        <form action="" method="post" class="form-horizontal">
-            {% csrf_token %}
-            {% bootstrap_form form layout="control" %}
-            <div class="form-group">
-                <div class="col-md-offset-3 col-md-9">
-                    <button type="submit" class="btn btn-primary btn-save">
-                        {% trans "Generate widget code" %}
-                    </button>
-                </div>
-            </div>
-        </form>
-    {% endif %}
-    {% eventsignal request.event "pretix.control.signals.event_settings_widget" request=request  %}
+        </div>
+    </fieldset>
+    {% eventsignal request.event "pretix.control.signals.event_settings_widget" request=request %}
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/item/addons.html b/src/pretix/control/templates/pretixcontrol/item/addons.html
index dfca470bb..0ebb224ba 100644
--- a/src/pretix/control/templates/pretixcontrol/item/addons.html
+++ b/src/pretix/control/templates/pretixcontrol/item/addons.html
@@ -3,17 +3,21 @@
 {% load bootstrap3 %}
 {% load formset_tags %}
 {% block inside %}
-    <p>
-        {% blocktrans trimmed %}
-            With add-ons, you can specify products that can be bought as an addition to this product. For example, if
-            you host a conference with a base conference ticket and a number of workshops, you could define the
-            workshops as add-ons to the conference ticket. With this configuration, the workshops cannot be bought
-            on their own but only in combination with a conference ticket. You can here specify categories of products
-            that can be used as add-ons to this product. You can also specify the minimum and maximum number of
-            add-ons of the given category that can or need to be chosen. The user can buy every add-on from the
-            category at most once. If an add-on product has multiple variations, only one of them can be bought.
-        {% endblocktrans %}
-    </p>
+    <div class="panel panel-default">
+        <div class="panel-body">
+            {% blocktrans trimmed %}
+                With add-ons, you can specify products that can be bought as an addition to this product. For example,
+                if
+                you host a conference with a base conference ticket and a number of workshops, you could define the
+                workshops as add-ons to the conference ticket. With this configuration, the workshops cannot be bought
+                on their own but only in combination with a conference ticket. You can here specify categories of
+                products
+                that can be used as add-ons to this product. You can also specify the minimum and maximum number of
+                add-ons of the given category that can or need to be chosen. The user can buy every add-on from the
+                category at most once. If an add-on product has multiple variations, only one of them can be bought.
+            {% endblocktrans %}
+        </div>
+    </div>
     <form class="form-horizontal branches" method="post" action="">
         {% csrf_token %}
         <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
diff --git a/src/pretix/control/templates/pretixcontrol/item/base.html b/src/pretix/control/templates/pretixcontrol/item/base.html
index 048398b59..24dc6fccf 100644
--- a/src/pretix/control/templates/pretixcontrol/item/base.html
+++ b/src/pretix/control/templates/pretixcontrol/item/base.html
@@ -3,34 +3,35 @@
 {% block title %}{{ object.name }} :: {% trans "Product" %}{% endblock %}
 {% block content %}
     {% if object.id %}
-        <h1>{% trans "Modify product:" %} {{ object.name }}</h1>
-        <ul class="nav nav-pills">
-            <li {% if "event.item" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.item' organizer=request.event.organizer.slug event=request.event.slug item=object.id %}">
-                    {% trans "General information" %}
-                </a>
-            </li>
-            {% if object.has_variations %}
-                <li {% if "event.item.variations" == url_name %}class="active"{% endif %}>
-                    <a href="{% url 'control:event.item.variations' organizer=request.event.organizer.slug event=request.event.slug item=object.id %}">
-                        {% trans "Variations" %}
-                    </a>
-                </li>
-            {% endif %}
-            <li {% if "event.item.addons" == url_name %}class="active"{% endif %}>
-                <a href="{% url 'control:event.item.addons' organizer=request.event.organizer.slug event=request.event.slug item=object.id %}">
-                    {% trans "Add-Ons" %}
-                </a>
-            </li>
-        </ul>
-    {% else %}
-        <h1>{% trans "Create product" %}</h1>
-        <p>{% blocktrans trimmed %}
-            You will be able to adjust further settings in the next step.
-        {% endblocktrans %}</p>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h1 class="panel-title">{% trans "Modify product:" %} {{ object.name }}</h1>
+            </div>
+            <div class="panel-body">
+                <ul class="nav nav-pills">
+                    <li {% if "event.item" == url_name %}class="active"{% endif %}>
+                        <a href="{% url 'control:event.item' organizer=request.event.organizer.slug event=request.event.slug item=object.id %}">
+                            {% trans "General information" %}
+                        </a>
+                    </li>
+                    {% if object.has_variations %}
+                        <li {% if "event.item.variations" == url_name %}class="active"{% endif %}>
+                            <a href="{% url 'control:event.item.variations' organizer=request.event.organizer.slug event=request.event.slug item=object.id %}">
+                                {% trans "Variations" %}
+                            </a>
+                        </li>
+                    {% endif %}
+                    <li {% if "event.item.addons" == url_name %}class="active"{% endif %}>
+                        <a href="{% url 'control:event.item.addons' organizer=request.event.organizer.slug event=request.event.slug item=object.id %}">
+                            {% trans "Add-Ons" %}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
     {% endif %}
     {% if object.id and not object.quotas.exists %}
-        <div class="alert alert-warning">
+        <div class="alert 1alert-warning">
             {% blocktrans trimmed %}
                 Please note that your product will <strong>not</strong> be available for sale until you have added your
                 item to an existing or newly created quota.
diff --git a/src/pretix/control/templates/pretixcontrol/item/create.html b/src/pretix/control/templates/pretixcontrol/item/create.html
index c34dfade2..a8077bf7b 100644
--- a/src/pretix/control/templates/pretixcontrol/item/create.html
+++ b/src/pretix/control/templates/pretixcontrol/item/create.html
@@ -1,40 +1,55 @@
 {% extends "pretixcontrol/item/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
-{% block inside %}
 {% load static %}
-<script type="text/javascript" src="{% static "pretixcontrol/js/ui/hidequota.js" %}"></script>
+{% block inside %}
+    <script type="text/javascript" src="{% static "pretixcontrol/js/ui/hidequota.js" %}"></script>
 
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data">
         {% csrf_token %}
-        <fieldset>
-            <legend>{% trans "General information" %}</legend>
-            {% bootstrap_field form.name layout="control" %}
-            <div class="internal-name-wrapper">
-                {% bootstrap_field form.internal_name layout="control" %}
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
+                <legend>{% trans "General information" %}</legend>
+            </div>
+            <div class="panel-body">
+                <p>{% blocktrans trimmed %}
+                    You will be able to adjust further settings in the next step.
+                {% endblocktrans %}</p>
+                {% bootstrap_field form.name layout="control" %}
+                <div class="internal-name-wrapper">
+                    {% bootstrap_field form.internal_name layout="control" %}
+                </div>
+                {% bootstrap_field form.copy_from layout="control" %}
+                {% bootstrap_field form.has_variations layout="control" %}
+                {% bootstrap_field form.category layout="control" %}
+                {% bootstrap_field form.admission layout="control" %}
             </div>
-            {% bootstrap_field form.copy_from layout="control" %}
-            {% bootstrap_field form.has_variations layout="control" %}
-            {% bootstrap_field form.category layout="control" %}
-            {% bootstrap_field form.admission layout="control" %}
         </fieldset>
         {% if form.quota_option %}
-            <fieldset>
-                <legend>{% trans "Quota settings" %}</legend>
-                {% bootstrap_field form.quota_option layout="control" %}
-                <div id="existing-quota-group">
-                    {% bootstrap_field form.quota_add_existing layout="control" %}
+            <fieldset class="panel panel-default">
+                <div class="panel-heading">
+                    <legend>{% trans "Quota settings" %}</legend>
                 </div>
-                <div id="new-quota-group">
-                    {% bootstrap_field form.quota_add_new_name layout="control" %}
-                    {% bootstrap_field form.quota_add_new_size layout="control" %}
+                <div class="panel-body">
+                    {% bootstrap_field form.quota_option layout="control" %}
+                    <div id="existing-quota-group">
+                        {% bootstrap_field form.quota_add_existing layout="control" %}
+                    </div>
+                    <div id="new-quota-group">
+                        {% bootstrap_field form.quota_add_new_name layout="control" %}
+                        {% bootstrap_field form.quota_add_new_size layout="control" %}
+                    </div>
                 </div>
             </fieldset>
         {% endif %}
-        <fieldset>
-            <legend>{% trans "Price settings" %}</legend>
-            {% bootstrap_field form.default_price layout="control" %}
-            {% bootstrap_field form.tax_rule layout="control" %}
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
+                <legend>{% trans "Price settings" %}</legend>
+            </div>
+            <div class="panel-body">
+                {% bootstrap_field form.default_price layout="control" %}
+                {% bootstrap_field form.tax_rule layout="control" %}
+            </div>
         </fieldset>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
diff --git a/src/pretix/control/templates/pretixcontrol/item/index.html b/src/pretix/control/templates/pretixcontrol/item/index.html
index 07e89d809..0d721c7ff 100644
--- a/src/pretix/control/templates/pretixcontrol/item/index.html
+++ b/src/pretix/control/templates/pretixcontrol/item/index.html
@@ -6,45 +6,70 @@
         {% csrf_token %}
         <div class="row">
             <div class="col-xs-12 col-lg-10">
-                <fieldset>
-                    <legend>{% trans "General information" %}</legend>
-                    {% bootstrap_field form.name layout="control" %}
-                    <div class="internal-name-wrapper">
-                        {% bootstrap_field form.internal_name layout="control" %}
+                <fieldset class="panel panel-default">
+                    <div class="panel-heading">
+                        <legend>{% trans "General information" %}</legend>
+                    </div>
+                    <div class="panel-body">
+                        {% bootstrap_field form.name layout="control" %}
+                        <div class="internal-name-wrapper">
+                            {% bootstrap_field form.internal_name layout="control" %}
+                        </div>
+                        {% bootstrap_field form.active layout="control" %}
+                        {% bootstrap_field form.category layout="control" %}
+                        {% bootstrap_field form.admission layout="control" %}
+                        {% bootstrap_field form.description layout="control" %}
+                        {% bootstrap_field form.picture layout="control" %}
                     </div>
-                    {% bootstrap_field form.active layout="control" %}
-                    {% bootstrap_field form.category layout="control" %}
-                    {% bootstrap_field form.admission layout="control" %}
-                    {% bootstrap_field form.description layout="control" %}
-                    {% bootstrap_field form.picture layout="control" %}
                 </fieldset>
-                <fieldset>
-                    <legend>{% trans "Price settings" %}</legend>
-                    {% bootstrap_field form.default_price addon_after=request.event.currency layout="control" %}
-                    {% bootstrap_field form.tax_rule layout="control" %}
-                    {% bootstrap_field form.free_price layout="control" %}
+                <fieldset class="panel panel-default">
+                    <div class="panel-heading">
+                        <legend>{% trans "Price settings" %}</legend>
+                    </div>
+                    <div class="panel-body">
+                        {% bootstrap_field form.default_price addon_after=request.event.currency layout="control" %}
+                        {% bootstrap_field form.tax_rule layout="control" %}
+                        {% bootstrap_field form.free_price layout="control" %}
+                    </div>
                 </fieldset>
-                <fieldset>
-                    <legend>{% trans "Availability" %}</legend>
-                    {% bootstrap_field form.available_from layout="control" %}
-                    {% bootstrap_field form.available_until layout="control" %}
-                    {% bootstrap_field form.max_per_order layout="control" %}
-                    {% bootstrap_field form.min_per_order layout="control" %}
-                    {% bootstrap_field form.require_voucher layout="control" %}
-                    {% bootstrap_field form.hide_without_voucher layout="control" %}
-                    {% bootstrap_field form.allow_cancel layout="control" %}
+                <fieldset class="panel panel-default">
+                    <div class="panel-heading">
+                        <legend>{% trans "Availability" %}</legend>
+                    </div>
+                    <div class="panel-body">
+                        {% bootstrap_field form.available_from layout="control" %}
+                        {% bootstrap_field form.available_until layout="control" %}
+                        {% bootstrap_field form.max_per_order layout="control" %}
+                        {% bootstrap_field form.min_per_order layout="control" %}
+                        {% bootstrap_field form.require_voucher layout="control" %}
+                        {% bootstrap_field form.hide_without_voucher layout="control" %}
+                        {% bootstrap_field form.allow_cancel layout="control" %}
+                    </div>
                 </fieldset>
-                <fieldset>
-                    <legend>{% trans "Check-in" %}</legend>
-                    {% bootstrap_field form.checkin_attention layout="control" %}
+                <fieldset class="panel panel-default">
+                    <div class="panel-heading">
+                        <legend>{% trans "Check-in" %}</legend>
+                    </div>
+                    <div class="panel-body">
+                        {% bootstrap_field form.checkin_attention layout="control" %}
+                    </div>
                 </fieldset>
-                <fieldset>
-                    <legend>{% trans "Additional settings" %}</legend>
-                    {% bootstrap_field form.original_price addon_after=request.event.currency layout="control" %}
-                    {% for f in plugin_forms %}
-                        {% bootstrap_form f layout="control" %}
-                    {% endfor %}
+                <fieldset class="panel panel-default">
+                    <div class="panel-heading">
+                        <legend>{% trans "Additional settings" %}</legend>
+                    </div>
+                    <div class="panel-body">
+                        {% bootstrap_field form.original_price addon_after=request.event.currency layout="control" %}
+                        {% for f in plugin_forms %}
+                            {% bootstrap_form f layout="control" %}
+                        {% endfor %}
+                    </div>
                 </fieldset>
+                <div class="form-group submit-group">
+                    <button type="submit" class="btn btn-primary btn-save">
+                        {% trans "Save" %}
+                    </button>
+                </div>
             </div>
             <div class="col-xs-12 col-lg-2">
                 <div class="panel panel-default">
@@ -57,10 +82,5 @@
                 </div>
             </div>
         </div>
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-        </div>
     </form>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/categories.html b/src/pretix/control/templates/pretixcontrol/items/categories.html
index 9e140ad20..8068fd411 100644
--- a/src/pretix/control/templates/pretixcontrol/items/categories.html
+++ b/src/pretix/control/templates/pretixcontrol/items/categories.html
@@ -2,56 +2,65 @@
 {% load i18n %}
 {% block title %}{% trans "Product categories" %}{% endblock %}
 {% block inside %}
-    <h1>{% trans "Product categories" %}</h1>
-    <p>
-        {% blocktrans trimmed %}
-            You can use categories to group multiple products together in an organized way.
-        {% endblocktrans %}
-    </p>
-    {% if categories|length == 0 %}
-        <div class="empty-collection">
-            <p>
-                {% blocktrans trimmed %}
-                    You haven't created any categories yet.
-                {% endblocktrans %}
-            </p>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Product categories" %}</h1>
+        </div>
+        {% if categories|length == 0 %}
+            <div class="empty-collection panel-body">
+                <p>
+                    {% blocktrans trimmed %}
+                        You haven't created any categories yet.
+                    {% endblocktrans %}
+                </p>
 
-            <a href="{% url "control:event.items.categories.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                    class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new category" %}</a>
-        </div>
-    {% else %}
-        <p>
-            <a href="{% url "control:event.items.categories.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new category" %}
-            </a>
-        </p>
-        <div class="table-responsive">
-            <table class="table table-hover">
-                <thead>
-                <tr>
-                    <th>{% trans "Product categories" %}</th>
-                    <th class="action-col-2"></th>
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {% for c in categories %}
+                <a href="{% url "control:event.items.categories.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new category" %}</a>
+            </div>
+        {% else %}
+            <div class="panel-body">
+                <a href="{% url "control:event.items.categories.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new category" %}
+                </a>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-hover">
+                    <thead>
                     <tr>
-                        <td>
-                            <strong><a href="{% url "control:event.items.categories.edit" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}">{{ c.name }}</a></strong>
-                        </td>
-                        <td>
-                            <a href="{% url "control:event.items.categories.up" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a>
-                            <a href="{% url "control:event.items.categories.down" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
-                        </td>
-                        <td class="text-right">
-                            <a href="{% url "control:event.items.categories.edit" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                            <a href="{% url "control:event.items.categories.delete" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                        </td>
+                        <th>{% trans "Product categories" %}</th>
+                        <th class="action-col-2"></th>
+                        <th class="action-col-2"></th>
                     </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
-        {% include "pretixcontrol/pagination.html" %}
-    {% endif %}
+                    </thead>
+                    <tbody>
+                    {% for c in categories %}
+                        <tr>
+                            <td>
+                                <strong><a
+                                        href="{% url "control:event.items.categories.edit" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}">{{ c.name }}</a></strong>
+                            </td>
+                            <td>
+                                <a href="{% url "control:event.items.categories.up" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}"
+                                   class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i
+                                        class="fa fa-arrow-up"></i></a>
+                                <a href="{% url "control:event.items.categories.down" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}"
+                                   class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i
+                                        class="fa fa-arrow-down"></i></a>
+                            </td>
+                            <td class="text-right">
+                                <a href="{% url "control:event.items.categories.edit" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}"
+                                   class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.items.categories.delete" organizer=request.event.organizer.slug event=request.event.slug category=c.id %}"
+                                   class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
+                {% include "pretixcontrol/pagination.html" %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/category.html b/src/pretix/control/templates/pretixcontrol/items/category.html
index b2b9c16ec..b75effa25 100644
--- a/src/pretix/control/templates/pretixcontrol/items/category.html
+++ b/src/pretix/control/templates/pretixcontrol/items/category.html
@@ -3,20 +3,28 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Product category" %}{% endblock %}
 {% block inside %}
-	<h1>{% trans "Product category" %}</h1>
-	<form action="" method="post" class="form-horizontal">
-		{% csrf_token %}
+    <form action="" method="post" class="form-horizontal">
+        {% csrf_token %}
         {% bootstrap_form_errors form %}
         <div class="row">
             <div class="col-xs-12{% if category %} col-lg-10{% endif %}">
-                <fieldset>
-                    <legend>{% trans "General information" %}</legend>
-                    {% bootstrap_field form.name layout="control" %}
-                    <div class="internal-name-wrapper">
-                        {% bootstrap_field form.internal_name layout="control" %}
+                <fieldset class="panel panel-default">
+                    <div class="panel-heading">
+                        <legend>{% trans "Product category" %}</legend>
+                    </div>
+                    <div class="panel-body">
+                        {% bootstrap_field form.name layout="control" %}
+                        <div class="internal-name-wrapper">
+                            {% bootstrap_field form.internal_name layout="control" %}
+                        </div>
+                        {% bootstrap_field form.description layout="control" %}
+                        {% bootstrap_field form.is_addon layout="control" %}
+                    </div>
+                    <div class="form-group submit-group">
+                        <button type="submit" class="btn btn-primary btn-save">
+                            {% trans "Save" %}
+                        </button>
                     </div>
-                    {% bootstrap_field form.description layout="control" %}
-                    {% bootstrap_field form.is_addon layout="control" %}
                 </fieldset>
             </div>
             {% if category %}
@@ -32,10 +40,5 @@
                 </div>
             {% endif %}
         </div>
-		<div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
-		</div>
-	</form>
+    </form>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/category_delete.html b/src/pretix/control/templates/pretixcontrol/items/category_delete.html
index eed8e3b7e..3b59cdaf2 100644
--- a/src/pretix/control/templates/pretixcontrol/items/category_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/category_delete.html
@@ -3,19 +3,26 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete product category" %}{% endblock %}
 {% block inside %}
-	<h1>{% trans "Delete product category" %}</h1>
-	<form action="" method="post" class="form-horizontal">
-		{% csrf_token %}
-		<p>{% blocktrans trimmed with name=category.name %}
-            Are you sure you want to delete the category <strong>{{ name }}</strong>?
-        {% endblocktrans %}</p>
-		<div class="form-group submit-group">
-            <a href="{% url "control:event.items.categories" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
-                {% trans "Cancel" %}
-            </a>
-            <button type="submit" class="btn btn-danger btn-save">
-                {% trans "Delete" %}
-            </button>
-		</div>
-	</form>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Delete product category" %}</h1>
+        </div>
+        <div class="panel-body">
+            <form action="" method="post" class="form-horizontal">
+                {% csrf_token %}
+                <p>{% blocktrans trimmed with name=category.name %}
+                    Are you sure you want to delete the category <strong>{{ name }}</strong>?
+                {% endblocktrans %}</p>
+                <div class="form-group submit-group">
+                    <a href="{% url "control:event.items.categories" organizer=request.event.organizer.slug event=request.event.slug %}"
+                       class="btn btn-default btn-cancel">
+                        {% trans "Cancel" %}
+                    </a>
+                    <button type="submit" class="btn btn-danger btn-save">
+                        {% trans "Delete" %}
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html
index 8df1ac1ec..6a07c81ff 100644
--- a/src/pretix/control/templates/pretixcontrol/items/index.html
+++ b/src/pretix/control/templates/pretixcontrol/items/index.html
@@ -2,94 +2,101 @@
 {% load i18n %}
 {% block title %}{% trans "Products" %}{% endblock %}
 {% block inside %}
-    <h1>{% trans "Products" %}</h1>
-    <p>
-        {% blocktrans trimmed %}
-            Below, you find a list of all available products. You can click on a product name to inspect and change
-            product details. You can also use the buttons on the right to change the order of products within a
-            give category.
-        {% endblocktrans %}
-    </p>
-    {% if items|length == 0 %}
-        <div class="empty-collection">
-            <p>
-                {% blocktrans trimmed %}
-                    You haven't created any products yet.
-                {% endblocktrans %}
-            </p>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Products" %}</h1>
+        </div>
+        {% if items|length == 0 %}
+            <div class="empty-collection panel-body">
+                <p>
+                    {% blocktrans trimmed %}
+                        You haven't created any products yet.
+                    {% endblocktrans %}
+                </p>
 
-            <a href="{% url "control:event.items.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                    class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new product" %}</a>
-        </div>
-    {% else %}
-        <p>
-            <a href="{% url "control:event.items.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                    class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new product" %}</a>
-        </p>
-        <div class="table-responsive">
-            <table class="table table-condensed table-hover">
-                <thead>
-                <tr>
-                    <th>{% trans "Product name" %}</th>
-                    <th class="iconcol"></th>
-                    <th class="iconcol"></th>
-                    <th class="iconcol"></th>
-                    <th class="iconcol"></th>
-                    <th>{% trans "Category" %}</th>
-                    <th class="action-col-2"></th>
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {% regroup items by category as cat_list %}
-                {% for c in cat_list %}
-                    {% for i in c.list %}
-                        <tr>
-                            <td><strong>
-                                {% if not i.active %}<strike>{% endif %}
-                                <a href="
+                <a href="{% url "control:event.items.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new product" %}</a>
+            </div>
+        {% else %}
+            <div class="panel-body">
+                <a href="{% url "control:event.items.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new product" %}</a>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-condensed table-hover">
+                    <thead>
+                    <tr>
+                        <th>{% trans "Product name" %}</th>
+                        <th class="iconcol"></th>
+                        <th class="iconcol"></th>
+                        <th class="iconcol"></th>
+                        <th class="iconcol"></th>
+                        <th>{% trans "Category" %}</th>
+                        <th class="action-col-2"></th>
+                        <th class="action-col-2"></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% regroup items by category as cat_list %}
+                    {% for c in cat_list %}
+                        {% for i in c.list %}
+                            <tr>
+                                <td><strong>
+                                    {% if not i.active %}<strike>{% endif %}
+                                    <a href="
                         {% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}">{{ i }}</a>
-                                {% if not i.active %}</strike>{% endif %}
-                            </strong>
-                            </td>
-                            <td>
-                                {% if i.available_from or i.available_until %}
-                                    <span class="fa fa-clock-o fa-fw text-muted" data-toggle="tooltip" title="{% trans "Only available in a limited timeframe" %}">
+                                    {% if not i.active %}</strike>{% endif %}
+                                </strong>
+                                </td>
+                                <td>
+                                    {% if i.available_from or i.available_until %}
+                                        <span class="fa fa-clock-o fa-fw text-muted" data-toggle="tooltip"
+                                              title="{% trans "Only available in a limited timeframe" %}">
                                     </span>
-                                {% endif %}
-                            </td>
-                            <td>
-                                {% if i.admission %}
-                                    <span class="fa fa-user fa-fw text-muted" data-toggle="tooltip" title="{% trans "Admission ticket" %}"></span>
-                                {% endif %}
-                            </td>
-                            <td>
-                                {% if i.var_count %}
-                                    <span class="fa fa-list-ul fa-fw text-muted" data-toggle="tooltip" title="{% trans "Product with variations" %}"></span>
-                                {% endif %}
-                            </td>
-                            <td>
-                                {% if i.hide_without_voucher %}
-                                    <span class="fa fa-ticket fa-fw text-muted" data-toggle="tooltip" title="{% trans "Only visible with a voucher" %}"></span>
-                                {% elif i.require_voucher %}
-                                    <span class="fa fa-ticket fa-fw text-muted" data-toggle="tooltip" title="{% trans "Can only bought using a voucher" %}"></span>
-                                {% endif %}
-                            </td>
-                            <td>{% if i.category %}{{ i.category.name }}{% endif %}</td>
-                            <td>
-                                <a href="{% url "control:event.items.up" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a>
-                                <a href="{% url "control:event.items.down" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
-                            </td>
-                            <td class="text-right">
-                                <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                                <a href="{% url "control:event.items.delete" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                            </td>
-                        </tr>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if i.admission %}
+                                        <span class="fa fa-user fa-fw text-muted" data-toggle="tooltip"
+                                              title="{% trans "Admission ticket" %}"></span>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if i.var_count %}
+                                        <span class="fa fa-list-ul fa-fw text-muted" data-toggle="tooltip"
+                                              title="{% trans "Product with variations" %}"></span>
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    {% if i.hide_without_voucher %}
+                                        <span class="fa fa-ticket fa-fw text-muted" data-toggle="tooltip"
+                                              title="{% trans "Only visible with a voucher" %}"></span>
+                                        {% elif i.require_voucher %}
+                                        <span class="fa fa-ticket fa-fw text-muted" data-toggle="tooltip"
+                                              title="{% trans "Can only bought using a voucher" %}"></span>
+                                    {% endif %}
+                                </td>
+                                <td>{% if i.category %}{{ i.category.name }}{% endif %}</td>
+                                <td>
+                                    <a href="{% url "control:event.items.up" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}"
+                                       class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i
+                                            class="fa fa-arrow-up"></i></a>
+                                    <a href="{% url "control:event.items.down" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}"
+                                       class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i
+                                            class="fa fa-arrow-down"></i></a>
+                                </td>
+                                <td class="text-right">
+                                    <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}"
+                                       class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                    <a href="{% url "control:event.items.delete" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}"
+                                       class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                                </td>
+                            </tr>
+                        {% endfor %}
                     {% endfor %}
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
-        {% include "pretixcontrol/pagination.html" %}
-    {% endif %}
+                    </tbody>
+                </table>
+            </div>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/question.html b/src/pretix/control/templates/pretixcontrol/items/question.html
index a27308f5f..1e9708622 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question.html
@@ -5,84 +5,114 @@
 {% load formset_tags %}
 {% block title %}{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}{% endblock %}
 {% block inside %}
-    <h1>
-        {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
-        <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
-                class="btn btn-default">
-            <span class="fa fa-edit"></span>
-            {% trans "Edit question" %}
-        </a>
-    </h1>
-    <form class="form-inline helper-display-inline" action="" method="get">
-        <p>
-            <select name="status" class="form-control">
-                <option value="" {% if request.GET.status == "" %}selected="selected"{% endif %}>{% trans "All orders" %}</option>
-                <option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option>
-                <option value="n" {% if request.GET.status == "n" %}selected="selected"{% endif %}>{% trans "Pending" %}</option>
-                <option value="np" {% if request.GET.status == "np" or "status" not in request.GET %}selected="selected"{% endif %}>{% trans "Pending or paid" %}</option>
-                <option value="o" {% if request.GET.status == "o" %}selected="selected"{% endif %}>{% trans "Pending (overdue)" %}</option>
-                <option value="e" {% if request.GET.status == "e" %}selected="selected"{% endif %}>{% trans "Expired" %}</option>
-                <option value="ne" {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option>
-                <option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Canceled" %}</option>
-                <option value="r" {% if request.GET.status == "r" %}selected="selected"{% endif %}>{% trans "Refunded" %}</option>
-            </select>
-            <select name="item" class="form-control">
-                <option value="">{% trans "All products" %}</option>
-                {% for item in items %}
-                    <option value="{{ item.id }}"
-                            {% if request.GET.item|add:0 == item.id %}selected="selected"{% endif %}>
-                        {{ item.name }}
-                    </option>
-                {% endfor %}
-            </select>
-            <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
-        </p>
-    </form>
+    <div class="panel panel-default panel-with-btn">
+        <div class="panel-heading">
+            <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
+               class="btn btn-default btn-sm pull-right">
+                <span class="fa fa-edit"></span>
+                {% trans "Edit question" %}
+            </a>
+            <h1 class="panel-title">
+                {% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}
+            </h1>
+        </div>
+        <div class="panel-body">
+            <form class="form-inline helper-display-inline" action="" method="get">
+                <p>
+                    <select name="status" class="form-control">
+                        <option value=""
+                                {% if request.GET.status == "" %}selected="selected"{% endif %}>{% trans "All orders" %}</option>
+                        <option value="p"
+                                {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option>
+                        <option value="n"
+                                {% if request.GET.status == "n" %}selected="selected"{% endif %}>{% trans "Pending" %}</option>
+                        <option value="np"
+                                {% if request.GET.status == "np" or "status" not in request.GET %}selected="selected"{% endif %}>{% trans "Pending or paid" %}</option>
+                        <option value="o"
+                                {% if request.GET.status == "o" %}selected="selected"{% endif %}>{% trans "Pending (overdue)" %}</option>
+                        <option value="e"
+                                {% if request.GET.status == "e" %}selected="selected"{% endif %}>{% trans "Expired" %}</option>
+                        <option value="ne"
+                                {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option>
+                        <option value="c"
+                                {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Canceled" %}</option>
+                        <option value="r"
+                                {% if request.GET.status == "r" %}selected="selected"{% endif %}>{% trans "Refunded" %}</option>
+                    </select>
+                    <select name="item" class="form-control">
+                        <option value="">{% trans "All products" %}</option>
+                        {% for item in items %}
+                            <option value="{{ item.id }}"
+                                    {% if request.GET.item|add:0 == item.id %}selected="selected"{% endif %}>
+                                {{ item.name }}
+                            </option>
+                        {% endfor %}
+                    </select>
+                    <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
+                </p>
+            </form>
+        </div>
+    </div>
     <div class="row" id="question-stats">
         {% if not stats %}
-            <div class="empty-collection col-md-10 col-xs-12">
-                <p>
-                    {% blocktrans trimmed %}
-                        No matching answers found.
-                    {% endblocktrans %}
-                </p>
-                {% if not items %}
-                    <p>
-                        {% trans "You need to assign the question to a product to collect answers." %}
-                    </p>
+            <div class="col-md-10 col-xs-12">
+                <div class="panel panel-default">
+                    <div class="panel-body empty-collection">
+                        <p>
+                            {% blocktrans trimmed %}
+                                No matching answers found.
+                            {% endblocktrans %}
+                        </p>
+                        {% if not items %}
+                            <p>
+                                {% trans "You need to assign the question to a product to collect answers." %}
+                            </p>
 
-                    <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
-                            class="btn btn-primary btn-lg"><i class="fa fa-edit"></i> {% trans "Edit question" %}</a>
-                {% endif %}
+                            <a href="{% url "control:event.items.questions.edit" event=request.event.slug organizer=request.event.organizer.slug question=question.pk %}"
+                               class="btn btn-primary btn-lg"><i class="fa fa-edit"></i> {% trans "Edit question" %}</a>
+                        {% endif %}
+                    </div>
+                </div>
             </div>
         {% else %}
             <div class="col-md-5 col-xs-12">
-                <div class="chart" id="question_chart" data-type="{{ question.type }}">
+                <div class="panel panel-default">
+                    <div class="panel-body">
+                        <div class="chart" id="question_chart" data-type="{{ question.type }}">
 
+                        </div>
+                        <script type="application/json" id="question-chart-data">{{ stats_json|escapejson }}</script>
+                    </div>
                 </div>
-                <script type="application/json" id="question-chart-data">{{ stats_json|escapejson }}</script>
             </div>
             <div class="col-md-5 col-xs-12">
-                <table class="table table-bordered table-hover">
-                    <thead>
-                    <tr>
-                        <th>{% trans "Answer" %}</th>
-                        <th>{% trans "Count" %}</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    {% for stat in stats %}
+                <div class="panel panel-default">
+                    <table class="table table-bordered table-hover">
+                        <thead>
                         <tr>
-                            <td>
-                                <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status={{ request.GET.status|default:"np" }}&item={{ request.GET.item }}&question={{ question.pk }}&answer={{ stat.alink|default:stat.answer|urlencode }}">
-                                    {{ stat.answer }}
-                                </a>
-                            </td>
-                            <td>{{ stat.count }}</td>
+                            <th>{% trans "Answer" %}</th>
+                            <th>{% trans "Count" %}</th>
                         </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody>
+                        {% for stat in stats %}
+                            <tr>
+                                <td>
+                                    <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=
+
+
+
+                                            {{ request.GET.status|default:"np" }}&item={{ request.GET.item }}&question={{ question.pk }}&answer=
+                                        {{ stat.alink|default:stat.answer|urlencode }}">
+                                        {{ stat.answer }}
+                                    </a>
+                                </td>
+                                <td>{{ stat.count }}</td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
             </div>
         {% endif %}
         <div class="col-xs-12 col-lg-2">
diff --git a/src/pretix/control/templates/pretixcontrol/items/question_delete.html b/src/pretix/control/templates/pretixcontrol/items/question_delete.html
index 36aaf3e88..88f7440f1 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question_delete.html
@@ -3,23 +3,36 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete question" %}{% endblock %}
 {% block inside %}
-	<h1>{% trans "Delete question" %}</h1>
-	<form action="" method="post" class="form-horizontal">
-		{% csrf_token %}
-		<p>{% blocktrans %}Are you sure you want to delete the question <strong>{{ question }}</strong>?{% endblocktrans %}</p>
-		{% if dependent|length > 0 %}
-			<p>{% blocktrans %}All answers to the question given by the buyers of the following products will be <strong>lost</strong>.{% endblocktrans %}</p>
-			{% for item in dependent %}
-				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a></li>
-			{% endfor %}
-		{% endif %}
-		<div class="form-group submit-group">
-            <a href="{% url "control:event.items.questions" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
-                {% trans "Cancel" %}
-            </a>
-            <button type="submit" class="btn btn-danger btn-save">
-                {% trans "Delete" %}
-            </button>
-		</div>
-	</form>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Delete question" %}</h1>
+        </div>
+        <div class="panel-body">
+            <form action="" method="post" class="form-horizontal">
+                {% csrf_token %}
+                <p>{% blocktrans %}Are you sure you want to delete the question <strong>{{ question }}</strong>
+                    ?{% endblocktrans %}</p>
+                {% if dependent|length > 0 %}
+                    <p>{% blocktrans %}All answers to the question given by the buyers of the following products will be
+                        <strong>lost</strong>.{% endblocktrans %}</p>
+                    <ul>
+                        {% for item in dependent %}
+                            <li>
+                                <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endif %}
+                <div class="form-group submit-group">
+                    <a href="{% url "control:event.items.questions" organizer=request.event.organizer.slug event=request.event.slug %}"
+                       class="btn btn-default btn-cancel">
+                        {% trans "Cancel" %}
+                    </a>
+                    <button type="submit" class="btn btn-danger btn-save">
+                        {% trans "Delete" %}
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/question_edit.html b/src/pretix/control/templates/pretixcontrol/items/question_edit.html
index 6b8e08586..343597198 100644
--- a/src/pretix/control/templates/pretixcontrol/items/question_edit.html
+++ b/src/pretix/control/templates/pretixcontrol/items/question_edit.html
@@ -10,26 +10,34 @@
     {% endif %}
 {% endblock %}
 {% block inside %}
-    {% if question %}
-        <h1>{% blocktrans with name=question.question %}Question: {{ name }}{% endblocktrans %}</h1>
-    {% else %}
-        <h1>{% trans "Question" %}</h1>
-    {% endif %}
     <form action="" method="post" class="form-horizontal">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "General information" %}</legend>
-            {% bootstrap_field form.question layout="control" %}
-            {% bootstrap_field form.help_text layout="control" %}
-            {% bootstrap_field form.type layout="control" %}
-            {% bootstrap_field form.identifier layout="control" %}
-            {% bootstrap_field form.ask_during_checkin layout="control" %}
-            {% bootstrap_field form.required layout="control" %}
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
+                {% if question %}
+                    <h1 class="panel-title">{% blocktrans with name=question.question %}Question:
+                        {{ name }}{% endblocktrans %}</h1>
+                {% else %}
+                    <h1 class="panel-title">{% trans "Question" %}</h1>
+                {% endif %}
+            </div>
+            <div class="panel-body">
+                {% bootstrap_field form.question layout="control" %}
+                {% bootstrap_field form.help_text layout="control" %}
+                {% bootstrap_field form.type layout="control" %}
+                {% bootstrap_field form.identifier layout="control" %}
+                {% bootstrap_field form.ask_during_checkin layout="control" %}
+                {% bootstrap_field form.required layout="control" %}
+            </div>
         </fieldset>
-        <fieldset>
-            <legend>{% trans "Apply to products" %}</legend>
-            {% bootstrap_field form.items layout="control" %}
+        <fieldset class="panel panel-default">
+            <div class="panel-heading">
+                <legend>{% trans "Apply to products" %}</legend>
+            </div>
+            <div class="panel-body">
+                {% bootstrap_field form.items layout="control" %}
+            </div>
         </fieldset>
         <div class="alert alert-info alert-required-boolean">
             {% blocktrans trimmed %}
@@ -37,77 +45,81 @@
                 accepted. If you want to allow both options, do not make this field required.
             {% endblocktrans %}
         </div>
-        <fieldset id="answer-options">
-            <legend>{% trans "Answer options" %}</legend>
-            <noscript>
-                <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
-            </noscript>
-            <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
-                {{ formset.management_form }}
-                {% bootstrap_formset_errors formset %}
-                <div data-formset-body>
-                    {% for form in formset %}
-                        <div data-formset-form>
-                            <div class="sr-only">
-                                {{ form.id }}
-                                {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
-                                {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
-                            </div>
-                            <div class="row question-option-row">
-                                <div class="col-xs-10">
+        <fieldset class="panel panel-default" id="answer-options">
+            <div class="panel-heading">
+                <legend>{% trans "Answer options" %}</legend>
+            </div>
+            <div class="panel-body">
+                <noscript>
+                    <p>{% trans "Only applicable if you choose 'Choose one/multiple from a list' above." %}</p>
+                </noscript>
+                <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
+                    {{ formset.management_form }}
+                    {% bootstrap_formset_errors formset %}
+                    <div data-formset-body>
+                        {% for form in formset %}
+                            <div data-formset-form>
+                                <div class="sr-only">
+                                    {{ form.id }}
+                                    {% bootstrap_field form.DELETE form_group_class="" layout="inline" %}
+                                    {% bootstrap_field form.ORDER form_group_class="" layout="inline" %}
+                                </div>
+                                <div class="row question-option-row">
+                                    <div class="col-xs-10">
                                     <span class="text-muted">
                                         {% blocktrans trimmed with id=form.instance.identifier %}
                                             Answer option {{ id }}
                                         {% endblocktrans %}
                                     </span>
-                                    {% bootstrap_form_errors form %}
-                                    {% bootstrap_field form.answer layout='inline' form_group_class="" %}
-                                </div>
-                                <div class="col-xs-2 text-right">
-                                    <span>&nbsp;</span><br>
-                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                        <i class="fa fa-arrow-up"></i></button>
-                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                        <i class="fa fa-arrow-down"></i></button>
-                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                        <i class="fa fa-trash"></i></button>
+                                        {% bootstrap_form_errors form %}
+                                        {% bootstrap_field form.answer layout='inline' form_group_class="" %}
+                                    </div>
+                                    <div class="col-xs-2 text-right">
+                                        <span>&nbsp;</span><br>
+                                        <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                            <i class="fa fa-arrow-up"></i></button>
+                                        <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                            <i class="fa fa-arrow-down"></i></button>
+                                        <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                            <i class="fa fa-trash"></i></button>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    {% endfor %}
-                </div>
-                <script type="form-template" data-formset-empty-form>
-                    {% escapescript %}
-                        <div data-formset-form>
-                            <div class="sr-only">
-                                {{ formset.empty_form.id }}
-                                {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
-                                {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
-                            </div>
-                            <div class="row question-option-row">
-                                <div class="col-xs-10">
+                        {% endfor %}
+                    </div>
+                    <script type="form-template" data-formset-empty-form>
+                        {% escapescript %}
+                            <div data-formset-form>
+                                <div class="sr-only">
+                                    {{ formset.empty_form.id }}
+                                    {% bootstrap_field formset.empty_form.DELETE form_group_class="" layout="inline" %}
+                                    {% bootstrap_field formset.empty_form.ORDER form_group_class="" layout="inline" %}
+                                </div>
+                                <div class="row question-option-row">
+                                    <div class="col-xs-10">
                                     <span class="text-muted">
                                         {% trans "New answer option" %}
                                     </span>
-                                    {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
-                                </div>
-                                <div class="col-xs-2 text-right">
-                                    <span>&nbsp;</span><br>
-                                    <button type="button" class="btn btn-default" data-formset-move-up-button>
-                                        <i class="fa fa-arrow-up"></i></button>
-                                    <button type="button" class="btn btn-default" data-formset-move-down-button>
-                                        <i class="fa fa-arrow-down"></i></button>
-                                    <button type="button" class="btn btn-danger" data-formset-delete-button>
-                                        <i class="fa fa-trash"></i></button>
+                                        {% bootstrap_field formset.empty_form.answer layout='inline' form_group_class="" %}
+                                    </div>
+                                    <div class="col-xs-2 text-right">
+                                        <span>&nbsp;</span><br>
+                                        <button type="button" class="btn btn-default" data-formset-move-up-button>
+                                            <i class="fa fa-arrow-up"></i></button>
+                                        <button type="button" class="btn btn-default" data-formset-move-down-button>
+                                            <i class="fa fa-arrow-down"></i></button>
+                                        <button type="button" class="btn btn-danger" data-formset-delete-button>
+                                            <i class="fa fa-trash"></i></button>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    {% endescapescript %}
-                </script>
-                <p>
-                    <button type="button" class="btn btn-default" data-formset-add>
-                        <i class="fa fa-plus"></i> {% trans "Add a new option" %}</button>
-                </p>
+                        {% endescapescript %}
+                    </script>
+                    <p>
+                        <button type="button" class="btn btn-default" data-formset-add>
+                            <i class="fa fa-plus"></i> {% trans "Add a new option" %}</button>
+                    </p>
+                </div>
             </div>
         </fieldset>
         <div class="form-group submit-group">
diff --git a/src/pretix/control/templates/pretixcontrol/items/questions.html b/src/pretix/control/templates/pretixcontrol/items/questions.html
index 035b0882c..502aa7939 100644
--- a/src/pretix/control/templates/pretixcontrol/items/questions.html
+++ b/src/pretix/control/templates/pretixcontrol/items/questions.html
@@ -2,74 +2,89 @@
 {% load i18n %}
 {% block title %}{% trans "Questions" %}{% endblock %}
 {% block inside %}
-    <h1>{% trans "Questions" %}</h1>
-    <p>
-        {% blocktrans trimmed %}
-            Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
-            example might be to ask your users about dietary requirements.
-        {% endblocktrans %}
-    </p>
-    {% if questions|length == 0 %}
-        <div class="empty-collection">
-            <p>
-                {% blocktrans trimmed %}
-                    You haven't created any questions yet.
-                {% endblocktrans %}
-            </p>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Questions" %}</h1>
+        </div>
+        <div class="panel-body">
+            {% blocktrans trimmed %}
+                Questions allow your attendees to fill in additional data about their ticket. If you provide food, one
+                example might be to ask your users about dietary requirements.
+            {% endblocktrans %}
+        </div>
+        {% if questions|length == 0 %}
+            <div class="empty-collection panel-body">
+                <p>
+                    {% blocktrans trimmed %}
+                        You haven't created any questions yet.
+                    {% endblocktrans %}
+                </p>
 
-            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                    class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new question" %}</a>
-        </div>
-    {% else %}
-        <p>
-            <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new question" %}
-            </a>
-        </p>
-        <div class="table-responsive">
-            <table class="table table-hover table-quotas">
-                <thead>
-                <tr>
-                    <th>{% trans "Question" %}</th>
-                    <th>{% trans "Type" %}</th>
-                    <th>{% trans "Products" %}</th>
-                    <th class="action-col-2"></th>
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {% for q in questions %}
+                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new question" %}</a>
+            </div>
+        {% else %}
+            <div class="panel-body">
+                <a href="{% url "control:event.items.questions.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new question" %}
+                </a>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-hover table-quotas">
+                    <thead>
                     <tr>
-                        <td><strong><a href="
-                    {% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">{{ q.question }}</a></strong>
-                        </td>
-                        <td>
-                            {{ q.get_type_display }}
-                            {% if q.required %}
-                                <span class="fa fa-exclamation-circle text-muted"
-                                data-toggle="tooltip" title="{% trans "Required question" %}">
-                                </span>
-                            {% endif %}
-                        </td>
-                        <td>
-                            <ul>
-                                {% for item in q.items.all %}
-                                    <li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a></li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                        <td>
-                            <a href="{% url "control:event.items.questions.up" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a>
-                            <a href="{% url "control:event.items.questions.down" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
-                        </td>
-                        <td class="text-right">
-                            <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                            <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                        </td>
+                        <th>{% trans "Question" %}</th>
+                        <th>{% trans "Type" %}</th>
+                        <th>{% trans "Products" %}</th>
+                        <th class="action-col-2"></th>
+                        <th class="action-col-2"></th>
                     </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
-        {% include "pretixcontrol/pagination.html" %}
-    {% endif %}
+                    </thead>
+                    <tbody>
+                    {% for q in questions %}
+                        <tr>
+                            <td><strong><a href="
+                    {% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">{{ q.question }}</a></strong>
+                            </td>
+                            <td>
+                                {{ q.get_type_display }}
+                                {% if q.required %}
+                                    <span class="fa fa-exclamation-circle text-muted"
+                                          data-toggle="tooltip" title="{% trans "Required question" %}">
+                                </span>
+                                {% endif %}
+                            </td>
+                            <td>
+                                <ul>
+                                    {% for item in q.items.all %}
+                                        <li>
+                                            <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </td>
+                            <td>
+                                <a href="{% url "control:event.items.questions.up" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}"
+                                   class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i
+                                        class="fa fa-arrow-up"></i></a>
+                                <a href="{% url "control:event.items.questions.down" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}"
+                                   class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i
+                                        class="fa fa-arrow-down"></i></a>
+                            </td>
+                            <td class="text-right">
+                                <a href="{% url "control:event.items.questions.edit" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}"
+                                   class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.items.questions.delete" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}"
+                                   class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
+                {% include "pretixcontrol/pagination.html" %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota.html b/src/pretix/control/templates/pretixcontrol/items/quota.html
index 251b710df..33c6408ff 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota.html
@@ -5,16 +5,21 @@
 {% load eventsignal %}
 {% block title %}{% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}{% endblock %}
 {% block inside %}
-    <h1>
-        {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}
-        {% if 'can_change_items' in request.eventpermset %}
-            <a href="{% url "control:event.items.quotas.edit" event=request.event.slug organizer=request.event.organizer.slug quota=quota.pk %}"
-                    class="btn btn-default">
-                <span class="fa fa-edit"></span>
-                {% trans "Edit quota" %}
-            </a>
-        {% endif %}
-    </h1>
+    <div class="panel panel-default panel-with-btn">
+        <div class="panel-heading">
+            {% if 'can_change_items' in request.eventpermset %}
+                <a href="{% url "control:event.items.quotas.edit" event=request.event.slug organizer=request.event.organizer.slug quota=quota.pk %}"
+                   class="btn btn-default btn-sm pull-right">
+                    <span class="fa fa-edit"></span>
+                    {% trans "Edit quota" %}
+                </a>
+            {% endif %}
+            <h1 class="panel-title">
+                {% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}
+                <div class="clearfix"></div>
+            </h1>
+        </div>
+    </div>
     {% if quota.subevent %}
         <p>
             <span class="fa fa-calendar"></span> {{ quota.subevent.name }} – {{ quota.subevent.get_date_range_display }}
@@ -22,48 +27,60 @@
     {% endif %}
     <div class="row" id="quota-stats">
         <div class="col-md-5 col-xs-12">
-            <legend>{% trans "Usage overview" %}</legend>
-            <div class="chart" id="quota_chart">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <legend>{% trans "Usage overview" %}</legend>
+                </div>
+                <div class="panel-body">
+                    <div class="chart" id="quota_chart">
 
+                    </div>
+                    <script type="application/json" id="quota-chart-data">{{ quota_chart_data|escapejson }}</script>
+                </div>
             </div>
-            <script type="application/json" id="quota-chart-data">{{ quota_chart_data|escapejson }}</script>
         </div>
         <div class="col-md-5 col-xs-12">
-            <legend>{% trans "Availability calculation" %}</legend>
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <legend>{% trans "Availability calculation" %}</legend>
+                </div>
+                <div class="panel-body">
 
-            <div class="row">
-                <div class="col-xs-9">{% trans "Total quota" %}</div>
-                <div class="col-xs-3 text-right">
-                    {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ quota.size }}{% endif %}
+                    <div class="row">
+                        <div class="col-xs-9">{% trans "Total quota" %}</div>
+                        <div class="col-xs-3 text-right">
+                            {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ quota.size }}{% endif %}
+                        </div>
+                    </div>
+                    {% for row in quota_table_rows %}
+                        <div class="row">
+                            <div class="col-xs-9">{{ row.label }}</div>
+                            <div class="col-xs-3 text-right"> – {{ row.value }}</div>
+                        </div>
+                    {% endfor %}
+                    <div class="row">
+                        <div class="col-xs-9"><strong>{% trans "Current availability" %}</strong></div>
+                        <div class="col-xs-3 text-right">
+                            {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ avail.1 }}{% endif %}
+                        </div>
+                    </div>
+                    {% if quota_overbooked > 0 %}
+                        <div class="alert alert-warning">
+                            {% blocktrans trimmed with num=quota_overbooked %}
+                                This quota is currently overbooked by {{ num }} tickets.
+                            {% endblocktrans %}
+                        </div>
+                    {% endif %}
+                    {% if has_ignore_vouchers %}
+                        <div class="alert alert-warning">
+                            {% blocktrans trimmed %}
+                                Your event contains vouchers that affect products covered by this quota and that
+                                allow a user to buy products even if this quota is sold out.
+                            {% endblocktrans %}
+                        </div>
+                    {% endif %}
                 </div>
             </div>
-            {% for row in quota_table_rows %}
-                <div class="row">
-                    <div class="col-xs-9">{{ row.label }}</div>
-                    <div class="col-xs-3 text-right"> – {{ row.value }}</div>
-                </div>
-            {% endfor %}
-            <div class="row">
-                <div class="col-xs-9"><strong>{% trans "Current availability" %}</strong></div>
-                <div class="col-xs-3 text-right">
-                    {% if quota.size == None %}{% trans "Infinite" %}{% else %}{{ avail.1 }}{% endif %}
-                </div>
-            </div>
-            {% if quota_overbooked > 0 %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed with num=quota_overbooked %}
-                        This quota is currently overbooked by {{ num }} tickets.
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
-            {% if has_ignore_vouchers %}
-                <div class="alert alert-warning">
-                    {% blocktrans trimmed %}
-                        Your event contains vouchers that affect products covered by this quota and that
-                        allow a user to buy products even if this quota is sold out.
-                    {% endblocktrans %}
-                </div>
-            {% endif %}
         </div>
         <div class="col-md-2 col-xs-12">
             <div class="panel panel-default">
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota_delete.html b/src/pretix/control/templates/pretixcontrol/items/quota_delete.html
index 2b8175f0b..f48f08069 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota_delete.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota_delete.html
@@ -3,23 +3,36 @@
 {% load bootstrap3 %}
 {% block title %}{% trans "Delete quota" %}{% endblock %}
 {% block inside %}
-	<h1>{% trans "Delete quota" %}</h1>
-	<form action="" method="post" class="form-horizontal">
-		{% csrf_token %}
-		<p>{% blocktrans %}Are you sure you want to delete the quota <strong>{{ quota }}</strong>?{% endblocktrans %}</p>
-		{% if dependent|length > 0 %}
-			<p>{% blocktrans %}The following products might be no longer available for sale:{% endblocktrans %}</p>
-			{% for item in dependent %}
-				<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a></li>
-			{% endfor %}
-		{% endif %}
-		<div class="form-group submit-group">
-            <a href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">
-                {% trans "Cancel" %}
-            </a>
-            <button type="submit" class="btn btn-danger btn-save">
-                {% trans "Delete" %}
-            </button>
-		</div>
-	</form>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Delete quota" %}</h1>
+        </div>
+        <div class="panel-body">
+            <form action="" method="post" class="form-horizontal">
+                {% csrf_token %}
+                <p>{% blocktrans %}Are you sure you want to delete the quota <strong>{{ quota }}</strong>
+                    ?{% endblocktrans %}</p>
+                {% if dependent|length > 0 %}
+                    <p>{% blocktrans %}The following products might be no longer available for
+                        sale:{% endblocktrans %}</p>
+                    <ul>
+                        {% for item in dependent %}
+                            <li>
+                                <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endif %}
+                <div class="form-group submit-group">
+                    <a href="{% url "control:event.items.quotas" organizer=request.event.organizer.slug event=request.event.slug %}"
+                       class="btn btn-default btn-cancel">
+                        {% trans "Cancel" %}
+                    </a>
+                    <button type="submit" class="btn btn-danger btn-save">
+                        {% trans "Delete" %}
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/quota_edit.html b/src/pretix/control/templates/pretixcontrol/items/quota_edit.html
index 787cd6653..57f3ad650 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quota_edit.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quota_edit.html
@@ -9,36 +9,37 @@
     {% endif %}
 {% endblock %}
 {% block inside %}
-    {% if question %}
-        <h1>{% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}</h1>
-    {% else %}
-        <h1>{% trans "Quota" %}</h1>
-    {% endif %}
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% bootstrap_form_errors form %}
-        <fieldset>
-            <legend>{% trans "General information" %}</legend>
-            {% bootstrap_field form.name layout="control" %}
-            {% bootstrap_field form.size layout="control" %}
-            {% if form.subevent %}
-                {% bootstrap_field form.subevent layout="control" %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            {% if quota %}
+                <h1 class="panel-title">{% blocktrans with name=quota.name %}Quota: {{ name }}{% endblocktrans %}</h1>
+            {% else %}
+                <h1 class="panel-title">{% trans "Quota" %}</h1>
             {% endif %}
-            <legend>{% trans "Items" %}</legend>
-            <p>
-                {% blocktrans trimmed %}
-                    Please select the products or product variations this quota should be applied to. If you apply two
-                    quotas to the same product, it will only be available if
-                    <strong>both</strong> quotas have capacity
-                    left.
-                {% endblocktrans %}
-            </p>
-            {% bootstrap_field form.itemvars layout="control" %}
-        </fieldset>
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Save" %}
-            </button>
         </div>
-    </form>
+        <form action="" method="post" class="form-horizontal panel-body">
+            {% csrf_token %}
+            {% bootstrap_form_errors form %}
+            <fieldset>
+                {% bootstrap_field form.name layout="control" %}
+                {% bootstrap_field form.size layout="control" %}
+                {% if form.subevent %}
+                    {% bootstrap_field form.subevent layout="control" %}
+                {% endif %}
+                {% bootstrap_field form.itemvars layout="control" %}
+                <p class="help-block">
+                    {% blocktrans trimmed %}
+                        Please select the products or product variations this quota should be applied to. If you apply
+                        two quotas to the same product, it will only be available if <strong>both</strong> quotas have capacity
+                        left.
+                    {% endblocktrans %}
+                </p>
+            </fieldset>
+            <div class="form-group submit-group">
+                <button type="submit" class="btn btn-primary btn-save">
+                    {% trans "Save" %}
+                </button>
+            </div>
+        </form>
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/items/quotas.html b/src/pretix/control/templates/pretixcontrol/items/quotas.html
index 52c74722b..c776af262 100644
--- a/src/pretix/control/templates/pretixcontrol/items/quotas.html
+++ b/src/pretix/control/templates/pretixcontrol/items/quotas.html
@@ -2,82 +2,93 @@
 {% load i18n %}
 {% block title %}{% trans "Quotas" %}{% endblock %}
 {% block inside %}
-    <h1>{% trans "Quotas" %}</h1>
-    <p>
-        {% blocktrans trimmed %}
-            To make your products actually available, you also need quotas. Quotas define, how many instances of
-            your product pretix will sell. This way, you can configure whether your event can take an unlimited
-            number of attendees or the number of attendees is limited. You can assign a product to multiple quotas
-            to fulfil more complex requirements, e.g. if you want to limit the total number of tickets sold and the
-            number of a specific ticket type at the same time.
-        {% endblocktrans %}
-    </p>
-    {% if request.event.has_subevents %}
-        <form class="form-inline helper-display-inline" action="" method="get">
-            {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
-        </form>
-    {% endif %}
-    {% if quotas|length == 0 %}
-        <div class="empty-collection">
-            <p>
-                {% if request.GET.subevent %}
-                    {% trans "Your search did not match any quotas." %}
-                {% else %}
-                    {% blocktrans trimmed %}
-                        You haven't created any quotas yet.
-                    {% endblocktrans %}
-                {% endif %}
-            </p>
-
-            <a href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}"
-                    class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new quota" %}</a>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">{% trans "Quotas" %}</h1>
         </div>
-    {% else %}
-        <p>
-            <a href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new quota" %}
-            </a>
-        </p>
-        <div class="table-responsive">
-            <table class="table table-hover table-quotas">
-                <thead>
-                <tr>
-                    <th>{% trans "Quota name" %}</th>
-                    <th>{% trans "Products" %}</th>
-                    {% if request.event.has_subevents %}
-                        <th>{% trans "Date" context "subevent" %}</th>
+        <div class="panel-body">
+            {% blocktrans trimmed %}
+                To make your products actually available, you also need quotas. Quotas define, how many instances of
+                your product pretix will sell. This way, you can configure whether your event can take an unlimited
+                number of attendees or the number of attendees is limited. You can assign a product to multiple quotas
+                to fulfil more complex requirements, e.g. if you want to limit the total number of tickets sold and the
+                number of a specific ticket type at the same time.
+            {% endblocktrans %}
+        </div>
+        {% if request.event.has_subevents %}
+            <form class="form-inline helper-display-inline" action="" method="get">
+                {% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
+            </form>
+        {% endif %}
+        {% if quotas|length == 0 %}
+            <div class="empty-collection panel-body">
+                <p>
+                    {% if request.GET.subevent %}
+                        {% trans "Your search did not match any quotas." %}
+                    {% else %}
+                        {% blocktrans trimmed %}
+                            You haven't created any quotas yet.
+                        {% endblocktrans %}
                     {% endif %}
-                    <th>{% trans "Total capacity" %}</th>
-                    <th>{% trans "Capacity left" %}</th>
-                    <th class="action-col-2"></th>
-                </tr>
-                </thead>
-                <tbody>
-                {% for q in quotas %}
+                </p>
+
+                <a href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-primary btn-lg"><i class="fa fa-plus"></i> {% trans "Create a new quota" %}</a>
+            </div>
+        {% else %}
+            <div class="panel-body">
+                <a href="{% url "control:event.items.quotas.add" organizer=request.event.organizer.slug event=request.event.slug %}"
+                   class="btn btn-default"><i class="fa fa-plus"></i> {% trans "Create a new quota" %}
+                </a>
+            </div>
+            <div class="table-responsive">
+                <table class="table table-hover table-quotas">
+                    <thead>
                     <tr>
-                        <td>
-                            <strong><a href="{% url "control:event.items.quotas.show" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}">{{ q.name }}</a></strong>
-                        </td>
-                        <td>
-                            <ul>
-                                {% for item in q.items.all %}
-                                    <li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a></li>
-                                {% endfor %}
-                            </ul>
-                        </td>
+                        <th>{% trans "Quota name" %}</th>
+                        <th>{% trans "Products" %}</th>
                         {% if request.event.has_subevents %}
-                            <td>{{ q.subevent.name }} – {{ q.subevent.get_date_range_display }}</td>
+                            <th>{% trans "Date" context "subevent" %}</th>
                         {% endif %}
-                        <td>{% if q.size == None %}Unlimited{% else %}{{ q.size }}{% endif %}</td>
-                        <td>{% include "pretixcontrol/items/fragment_quota_availability.html" with availability=q.availability %}</td>
-                        <td class="text-right">
-                            <a href="{% url "control:event.items.quotas.edit" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
-                            <a href="{% url "control:event.items.quotas.delete" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
-                        </td>
+                        <th>{% trans "Total capacity" %}</th>
+                        <th>{% trans "Capacity left" %}</th>
+                        <th class="action-col-2"></th>
                     </tr>
-                {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    {% endif %}
-    {% include "pretixcontrol/pagination.html" %}
+                    </thead>
+                    <tbody>
+                    {% for q in quotas %}
+                        <tr>
+                            <td>
+                                <strong><a href="{% url "control:event.items.quotas.show" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}">{{ q.name }}</a></strong>
+                            </td>
+                            <td>
+                                <ul>
+                                    {% for item in q.items.all %}
+                                        <li>
+                                            <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item }}</a>
+                                        </li>
+                                    {% endfor %}
+                                </ul>
+                            </td>
+                            {% if request.event.has_subevents %}
+                                <td>{{ q.subevent.name }} – {{ q.subevent.get_date_range_display }}</td>
+                            {% endif %}
+                            <td>{% if q.size == None %}Unlimited{% else %}{{ q.size }}{% endif %}</td>
+                            <td>{% include "pretixcontrol/items/fragment_quota_availability.html" with availability=q.availability %}</td>
+                            <td class="text-right">
+                                <a href="{% url "control:event.items.quotas.edit" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}"
+                                   class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
+                                <a href="{% url "control:event.items.quotas.delete" organizer=request.event.organizer.slug event=request.event.slug quota=q.id %}"
+                                   class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
+                {% include "pretixcontrol/pagination.html" %}
+            </div>
+        {% endif %}
+    </div>
 {% endblock %}
diff --git a/src/pretix/control/templates/pretixcontrol/pagination.html b/src/pretix/control/templates/pretixcontrol/pagination.html
index 3e77cae63..a71f4774f 100644
--- a/src/pretix/control/templates/pretixcontrol/pagination.html
+++ b/src/pretix/control/templates/pretixcontrol/pagination.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% load urlreplace %}
 <nav class="text-center pagination-container">
-    <ul class="pagination">
-        {% if is_paginated %}
+    {% if is_paginated %}
+        <ul class="pagination">
             {% if page_obj.has_previous %}
                 <li>
                     <a href="?{% url_replace request 'page' page_obj.previous_page_number %}">
@@ -12,37 +12,44 @@
             {% endif %}
             <li class="page-current"><a>
                 {% blocktrans trimmed with page=page_obj.number of=page_obj.paginator.num_pages count=page_obj.paginator.count %}
-                    Page {{ page }} of {{ of }} ({{ count }} elements)
+                    Page {{ page }} of {{ of }}
                 {% endblocktrans %}
             </a></li>
             {% if page_obj.has_next %}
                 <li>
-                        <a href="?{% url_replace request 'page' page_obj.next_page_number %}">
+                    <a href="?{% url_replace request 'page' page_obj.next_page_number %}">
                         <span>&raquo;</span>
                     </a>
                 </li>
             {% endif %}
-        {% else %}
-        {% if page_obj.paginator.count > 1 %}
-                <li class="page-current"><a>
-                    {% blocktrans trimmed with count=page_obj.paginator.count %}
-                        {{ count }} elements
-                    {% endblocktrans %}
-                </a></li>
-            {% endif %}
-        {% endif %}
-    </ul>
-    {% if page_size %}
-        <div class="clearfix">
-            <small>
-                {% trans "Show per page:" %}
-            </small>
-            <a href="?{% url_replace request "page_size" "25" "page" "1" %}">
-                {% if page_size == 25 %}<strong>{% endif %}25{% if page_size == 25 %}</strong>{% endif %}</a> |
-            <a href="?{% url_replace request "page_size" "50" "page" "1" %}">
-                {% if page_size == 50 %}<strong>{% endif %}50{% if page_size == 50 %}</strong>{% endif %}</a> |
-            <a href="?{% url_replace request "page_size" "100" "page" "1" %}">
-                {% if page_size == 100 %}<strong>{% endif %}100{% if page_size == 100 %}</strong>{% endif %}</a>
-        </div>
+        </ul>
     {% endif %}
+    {% if page_obj.paginator.count > 0 %}
+        <ul class="pagination pagination-count">
+            <li class="page-current"><a>
+                {% blocktrans trimmed with count=page_obj.paginator.count %}
+                    {{ count }} elements
+                {% endblocktrans %}
+            </a></li>
+        </ul>
+        <ul class="pagination pagination-select">
+            <li class="page-current"><a>
+                {% trans "Show per page:" %}
+            </a></li>
+            <li>
+                <a href="?{% url_replace request "page_size" "25" "page" "1" %}">
+                    {% if page_size == 25 %}<strong>{% endif %}25{% if page_size == 25 %}</strong>{% endif %}</a>
+            </li>
+            <li>
+                <a href="?{% url_replace request "page_size" "50" "page" "1" %}">
+                    {% if page_size == 50 %}<strong>{% endif %}50{% if page_size == 50 %}</strong>{% endif %}</a>
+            </li>
+            <li>
+                <a href="?{% url_replace request "page_size" "100" "page" "1" %}">
+                    {% if page_size == 100 %}<strong>{% endif %}100{% if page_size == 100 %}</strong>{% endif %}</a>
+            </li>
+        </ul>
+    {% endif %}
+    <div class="clearfix">
+    </div>
 </nav>
diff --git a/src/pretix/control/templates/pretixcontrol/shredder/download.html b/src/pretix/control/templates/pretixcontrol/shredder/download.html
index d3bd0b282..115eb7b59 100644
--- a/src/pretix/control/templates/pretixcontrol/shredder/download.html
+++ b/src/pretix/control/templates/pretixcontrol/shredder/download.html
@@ -4,48 +4,57 @@
 {% load order_overview %}
 {% block title %}{% trans "Data shredder" %}{% endblock %}
 {% block content %}
-    <h1>
-        {% trans "Data shredder" %}
-    </h1>
     <form action="{% url "control:event.shredder.shred" event=request.event.slug organizer=request.organizer.slug %}"
           method="post" class="form-horizontal" data-asynctask>
         {% csrf_token %}
-        <fieldset>
-            <legend>{% trans "Step 1: Download data" %}</legend>
-            <p>
-                {% blocktrans trimmed %}
-                    You are about to permamanently delete data from the server, even though you might be required to
-                    keep
-                    some of this data on file. You should therefore download the following file and store it in a safe
-                    place:
-                {% endblocktrans %}
-            </p>
-            <p>
-                <a href="{% url "cachedfile.download" id=file.pk %}" class="btn btn-primary btn-lg">
-                    {% trans "Download data" %}
-                </a>
-            </p>
+        <fieldset class="panel-default panel">
+            <div class="panel-heading">
+                <legend>{% trans "Step 1: Download data" %}</legend>
+            </div>
+            <div class="panel-body">
+                <p>
+                    {% blocktrans trimmed %}
+                        You are about to permamanently delete data from the server, even though you might be required to
+                        keep some of this data on file. You should therefore download the following file and store it in a
+                        safe place:
+                    {% endblocktrans %}
+                </p>
+                <p>
+                    <a href="{% url "cachedfile.download" id=file.pk %}" class="btn btn-primary btn-lg">
+                        {% trans "Download data" %}
+                    </a>
+                </p>
+            </div>
         </fieldset>
-        <fieldset>
-            <legend>{% trans "Step 2: Confirm download" %}</legend>
-            <p>
-                {% blocktrans trimmed %}
-                    In the downloaded file, there is a text file named "CONFIRM_CODE.txt" with a six-character code.
-                    Please enter this code here to confirm that you successfully downloaded the file.
-                {% endblocktrans %}
-            </p>
-            <input type="text" class="form-control" name="confirm_code" required placeholder="{% trans "Confirmation code" %}">
-            <br>
+        <fieldset class="panel-default panel">
+            <div class="panel-heading">
+                <legend>{% trans "Step 2: Confirm download" %}</legend>
+            </div>
+            <div class="panel-body">
+                <p>
+                    {% blocktrans trimmed %}
+                        In the downloaded file, there is a text file named "CONFIRM_CODE.txt" with a six-character code.
+                        Please enter this code here to confirm that you successfully downloaded the file.
+                    {% endblocktrans %}
+                </p>
+                <input type="text" class="form-control" name="confirm_code" required
+                       placeholder="{% trans "Confirmation code" %}">
+                <br>
         </fieldset>
-        <fieldset>
-            <legend>{% trans "Step 3: Confirm deletion" %}</legend>
-            <p>
-                {% blocktrans trimmed with event=request.event.name %}
-                Please re-check that you are fully certain that you want to delete the selected categories of data from the event <strong>{{ event }}</strong>.
-                    In this case, please enter your user password here:
-                {% endblocktrans %}
-            </p>
-            <input type="password" class="form-control" name="password" required placeholder="{% trans "Your password" %}">
+        <fieldset class="panel-default panel">
+            <div class="panel-heading">
+                <legend>{% trans "Step 3: Confirm deletion" %}</legend>
+            </div>
+            <div class="panel-body">
+                <p>
+                    {% blocktrans trimmed with event=request.event.name %}
+                        Please re-check that you are fully certain that you want to delete the selected categories of
+                        data from the event <strong>{{ event }}</strong>.
+                        In this case, please enter your user password here:
+                    {% endblocktrans %}
+                </p>
+                <input type="password" class="form-control" name="password" required
+                       placeholder="{% trans "Your password" %}">
         </fieldset>
         <input type="hidden" name="file" value="{{ file.pk }}">
         <div class="form-group submit-group">
diff --git a/src/pretix/control/templates/pretixcontrol/shredder/index.html b/src/pretix/control/templates/pretixcontrol/shredder/index.html
index 90c32550e..c6259337e 100644
--- a/src/pretix/control/templates/pretixcontrol/shredder/index.html
+++ b/src/pretix/control/templates/pretixcontrol/shredder/index.html
@@ -4,37 +4,44 @@
 {% load order_overview %}
 {% block title %}{% trans "Data shredder" %}{% endblock %}
 {% block content %}
-    <h1>
-        {% trans "Data shredder" %}
-    </h1>
-    <p>
-        {% blocktrans trimmed %}
-            This feature allows you to remove personal data from this event. You will first select what kind of data
-            you want to shred, then you are able to download the affected data and after you confirmed the download,
-            the data will be removed from the server's database. The data might still exist in backups for a limited
-            period of time.
-        {% endblocktrans %}
-        <strong>
-            {% blocktrans trimmed %}
-                Using this will not remove the orders for your event, it just scrubs them of data that can be linked
-                to individual persons.
-            {% endblocktrans %}
-        </strong>
-    </p>
-    <div class="alert alert-legal">
-        <strong>
-            {% blocktrans trimmed %}
-                It is within your own responsibility to check if you are allowed to delete the affected data in your
-                legislation, e.g. for reasons of taxation. In many countries, you need to keep some data in the live
-                system in case of an audit.
-            {% endblocktrans %}
-        </strong>
-        {% blocktrans trimmed %}
-            For most categories of data, you will be able to partially download the data to store it offline. Some
-            kinds of data (such as some payment information) as well as historical log data cannot be downloaded at
-            the moment.
-        {% endblocktrans %}
-        <div class="clear"></div>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <h1 class="panel-title">
+                {% trans "Data shredder" %}
+            </h1>
+        </div>
+        <div class="panel-body">
+
+            <p>
+                {% blocktrans trimmed %}
+                    This feature allows you to remove personal data from this event. You will first select what kind of
+                    data you want to shred, then you are able to download the affected data and after you confirmed the
+                    download, the data will be removed from the server's database. The data might still exist in backups for a
+                    limited period of time.
+                {% endblocktrans %}
+                <strong>
+                    {% blocktrans trimmed %}
+                        Using this will not remove the orders for your event, it just scrubs them of data that can be
+                        linked to individual persons.
+                    {% endblocktrans %}
+                </strong>
+            </p>
+            <div class="alert alert-legal">
+                <strong>
+                    {% blocktrans trimmed %}
+                        It is within your own responsibility to check if you are allowed to delete the affected data in
+                        your legislation, e.g. for reasons of taxation. In many countries, you need to keep some data in the
+                        live system in case of an audit.
+                    {% endblocktrans %}
+                </strong>
+                {% blocktrans trimmed %}
+                    For most categories of data, you will be able to partially download the data to store it offline.
+                    Some kinds of data (such as some payment information) as well as historical log data cannot be downloaded
+                    at the moment.
+                {% endblocktrans %}
+                <div class="clear"></div>
+            </div>
+        </div>
     </div>
     {% if constraints %}
         <div class="alert alert-danger">
@@ -42,10 +49,9 @@
         </div>
     {% else %}
         <form action="{% url "control:event.shredder.export" event=request.event.slug organizer=request.organizer.slug %}"
-                method="post" class="form-horizontal" data-asynctask>
-            <legend>{% trans "Data selection" %}</legend>
+              method="post" class="form-horizontal" data-asynctask>
             {% csrf_token %}
-            <div class="panel-group" id="payment_accordion">
+            <div class="" id="payment_accordion">
                 {% for ident, shredder in shredders.items %}
                     <div class="panel panel-default">
                         <label class="accordion-radio">
diff --git a/src/pretix/static/pretixbase/scss/_theme.scss b/src/pretix/static/pretixbase/scss/_theme.scss
index d4d6daa62..2796b7d10 100644
--- a/src/pretix/static/pretixbase/scss/_theme.scss
+++ b/src/pretix/static/pretixbase/scss/_theme.scss
@@ -111,6 +111,9 @@
 .panel {
   box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
 }
+.panel-default {
+  border: none;
+}
 .panel-default > .panel-heading, .panel-default > .panel-footer {
   background: white;
 }
@@ -127,6 +130,15 @@
 .panel > .table-responsive table th:last-child {
   padding-right: $panel-body-padding;
 }
+.panel > table td,
+.panel > table th,
+.panel > .table-responsive table td,
+.panel > .table-responsive table th {
+  vertical-align: middle;
+}
+.panel-with-btn .panel-title {
+  line-height: 30px;
+}
 
 .panel-danger > .panel-heading, .panel-success > .panel-heading, .panel-default > .panel-heading, .panel-info > .panel-heading, .panel-warning > .panel-heading {
   color: #000000;
diff --git a/src/pretix/static/pretixcontrol/scss/_dashboard.scss b/src/pretix/static/pretixcontrol/scss/_dashboard.scss
index af968e3c8..72f1ada39 100644
--- a/src/pretix/static/pretixcontrol/scss/_dashboard.scss
+++ b/src/pretix/static/pretixcontrol/scss/_dashboard.scss
@@ -2,8 +2,10 @@
   display: flex;
   flex-wrap: wrap;
   align-items: flex-start;
-  margin-left: -5px;
-  margin-right: -5px;
+  margin-left: -10px;
+  margin-right: -10px;
+  margin-bottom: 10px;
+  margin-top: -10px;
 }
 
 .dashboard .widget-container {
@@ -11,10 +13,10 @@
   align-self: stretch;
   padding: 15px 5px;
   min-height: 160px;
-  margin: 5px;
+  margin: 10px;
 
   background: white;
-  box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07);
+  box-shadow:0 2px 5px 0 rgba(78,50,92,.1),0 1px 1px 0 rgba(0,0,0,.07);
   border-radius: $panel-border-radius;
 }
 
diff --git a/src/pretix/static/pretixcontrol/scss/_forms.scss b/src/pretix/static/pretixcontrol/scss/_forms.scss
index bde368583..7bdf035cb 100644
--- a/src/pretix/static/pretixcontrol/scss/_forms.scss
+++ b/src/pretix/static/pretixcontrol/scss/_forms.scss
@@ -71,6 +71,11 @@ div[data-formset-body], div[data-formset-form], div[data-nested-formset-form], d
     @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $btn-border-radius-large);
   }
 }
+.panel-body .submit-group {
+  box-shadow: none;
+  padding: 0;
+
+}
 
 .panel .form-group:last-child {
   margin-bottom: 0;
diff --git a/src/pretix/static/pretixcontrol/scss/main.scss b/src/pretix/static/pretixcontrol/scss/main.scss
index d04033646..80119b9a6 100644
--- a/src/pretix/static/pretixcontrol/scss/main.scss
+++ b/src/pretix/static/pretixcontrol/scss/main.scss
@@ -105,9 +105,7 @@ h1 .btn-sm {
 .btn-toolbar {
     margin-bottom: 20px;
 }
-.container-fluid > .alert:first-child {
-    margin-top: 20px;
-}
+
 
 .flipped-scroll-wrapper {
     overflow-y: auto;
@@ -171,7 +169,7 @@ p.bigger {
     }
 }
 .empty-collection {
-    margin: 20px 0;
+    padding: 40px 0;
     text-align: center;
 
     p {
@@ -566,6 +564,23 @@ ul.pagination {
 .pagination-container {
     margin-bottom: 20px;
 }
+.panel {
+    ul.pagination {
+        margin: 0;
+        float: right;
+    }
+    ul.pagination-count {
+        float: left;
+    }
+    ul.pagination-select {
+        margin: auto;
+        float: none;
+    }
+    .pagination-container {
+        padding: 0;
+        margin: 0;
+    }
+}
 
 .table-payment-providers > tbody > tr > td {
     vertical-align: middle;