diff --git a/shop/templates/order_detail.html b/shop/templates/order_detail.html
index 515b65b1..a9e8811f 100644
--- a/shop/templates/order_detail.html
+++ b/shop/templates/order_detail.html
@@ -78,14 +78,16 @@
 <h3>Payment</h3>
 {% if not order.paid %}
 <p class="lead">Your order is currently unpaid. Please pick a payment option below.</p>
-<p><i>Once you accept the terms and go to the payment your order will be 
+<p>Once you accept the terms and go to the payment your order will be 
 finalized and you will no longer be able to change the products or 
-quantities - so make sure your order is correct before proceeding!</i></p>
+quantities - so make sure your order is correct before proceeding!</p>
 <form method="POST">
   {% csrf_token %}
-  <div class="checkbox">
-    <label><input type="checkbox" name="accept_terms"> Accept <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. If you have puchased merchadise you also accept that the payment will be drawn on your account when you pay, but the merchandise will not be delivered until you pick it up during the event.</label>
-  </div>
+  <p>
+    <div class="checkbox">
+      <label><input type="checkbox" name="accept_terms"> Accept <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. If you have puchased merchandise you also accept that the payment will be drawn on your account when you pay, but the merchandise will not be delivered until you pick it up during the event.</label>
+    </div>
+  </p>
   {% bootstrap_button "<i class='glyphicon glyphicon-credit-card'></i> Credit card" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %}
   {% bootstrap_button "<i class='glyphicon glyphicon-bitcoin'></i> Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %}
   {% bootstrap_button "<i class='glyphicon glyphicon-piggy-bank'></i> Bank transfer" button_type="submit" button_class="btn-primary" name="payment_method" value="bank_transfer" %}
diff --git a/shop/views.py b/shop/views.py
index 9ac4818a..dd2a7fcd 100644
--- a/shop/views.py
+++ b/shop/views.py
@@ -256,7 +256,7 @@ class OrderDetailView(
         payment_method = request.POST.get('payment_method')
 
         if not request.POST.get('accept_terms'):
-            messages.error(request, "You need to accept the general terms &amp; conditions before you can continue!")
+            messages.error(request, "You need to accept the general terms and conditions before you can continue!")
             return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': order.pk}))
 
         if payment_method in order.PAYMENT_METHODS: