--- a/templates/sat_website/thank_you.html	Tue Feb 03 15:14:42 2015 +0100
+++ b/templates/sat_website/thank_you.html	Tue Feb 03 15:15:59 2015 +0100
@@ -28,29 +28,20 @@
 {% block main_container %}
 
 <p>{% trans "Your subscription has been registered." %}</p>
-    {% for section, fields in form.sections.items %}
-        <div class="form-group">
-            {% for field in fields %}
-                {% if field.name == "payment_method" %}
-                    {% if form.subscription_amount.value != "0" %}
-                        <div>{{ field.label }}: {{ field|selected_label }}</div>
-                    {% endif %}
-                {% elif field.name == "subscription_amount" %}
-                    <div>{{ field.label }}: {{ field.value }} €</div>
-                {% elif field.name != "email_confirmation" and field.value %}
-                    <div>{{ field.label }}: {{ field.value }}</div>
-                {% endif %}
-            {% endfor %}
-        </div>
+<div class="form-group">
+    {% for label, value in form.results %}
+        <div>{{ label }}: {{ value }}</div>
     {% endfor %}
-    </fieldset>
-</form>
-
-{% if form.subscription_amount.value != "0" %}
-<div class="alert alert-info" role="alert">{% blocktrans with amount=form.subscription_amount.value method=form.payment_method|selected_label %}
-You chose to pay your annual subscription of {{ amount }} € via {{ method }}. You will receive during the next hours/days an email containing all the details (it is not automatised yet).
-{% endblocktrans %}
 </div>
 
+<div class="alert alert-info" role="alert">
+{% if form.subscription_amount.value != "0" %}
+	{% blocktrans with amount=form.subscription_amount.value method=form.payment_method|selected_label|lower %}
+	You chose to pay your annual subscription of {{ amount }} € via {{ method }}.<br/>You should receive in a couple of minutes an email from us containing all the details to proceed with the payment.
+	{% endblocktrans %}
+{% else %}
+    {% blocktrans %}You should receive in a couple of minutes a confirmation email from us.{% endblocktrans %}
 {% endif %}
+</div>
+
 {% endblock %}