diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 4fa0fc5fc..cfe0f4ef0 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% for line in cart.positions %}
     <div class="row-fluid cart-row">
-        <div class="{% if line.has_questions %}col-md-9 col-xs-12{% else %}col-md-4 col-xs-6{% endif %}">
+        <div class="{% if line.has_questions %}col-md-9 col-xs-6{% else %}col-md-4 col-xs-6{% endif %}">
             <strong>{{ line.item }}</strong>
             {% if line.variation %}
                 – {{ line.variation }}
diff --git a/src/pretix/presale/templates/pretixpresale/event/order.html b/src/pretix/presale/templates/pretixpresale/event/order.html
index 9cf2b4395..51e01fa77 100644
--- a/src/pretix/presale/templates/pretixpresale/event/order.html
+++ b/src/pretix/presale/templates/pretixpresale/event/order.html
@@ -8,15 +8,15 @@
             Your order: {{ code }}
         {% endblocktrans %}
         {% if order.status == "n" %}
-            <span class="label label-warning">{% trans "Payment pending" %}</span>
+            <span class="label label-warning pull-right">{% trans "Payment pending" %}</span>
         {% elif order.status == "p" %}
-            <span class="label label-success">{% trans "Paid" %}</span>
+            <span class="label label-success pull-right">{% trans "Paid" %}</span>
         {% elif order.status == "e" %}
-            <span class="label label-danger">{% trans "Payment pending" %}</span>
+            <span class="label label-danger pull-right">{% trans "Payment pending" %}</span>
         {% elif order.status == "c" %}
-            <span class="label label-danger">{% trans "Cancelled" %}</span>
+            <span class="label label-danger pull-right">{% trans "Cancelled" %}</span>
         {% elif order.status == "r" %}
-            <span class="label label-danger">{% trans "Refunded" %}</span>
+            <span class="label label-danger pull-right">{% trans "Refunded" %}</span>
         {% endif %}
     </h2>
     {% if order.status == "n"  %}
diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py
index a13344b74..395cec4f2 100644
--- a/src/pretix/presale/views/checkout.py
+++ b/src/pretix/presale/views/checkout.py
@@ -147,7 +147,7 @@ class CheckoutStart(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, C
                         form.cartpos = form.cartpos.clone()
                         form.cartpos.attendee_name = v
                         form.cartpos.save()
-                    elif k.startswith('question_'):
+                    elif k.startswith('question_') and v is not None:
                         field = form.fields[k]
                         if hasattr(field, 'answer'):
                             # We already have a cached answer object, so we don't