diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html
index badbc25..50f2802 100644
--- a/src/postorius/templates/postorius/domain_new.html
+++ b/src/postorius/templates/postorius/domain_new.html
@@ -3,35 +3,17 @@
 {% load bootstrap_tags %}
 
 {% block subtitle %}
-{% trans 'Add Domain' %}
+{% trans 'Add domain' %}
 {% endblock %}
 
 {% block main %}
 
     <div class="page-header">
-        <h2>{% trans 'Add a new Domain' %}</h2>
+        <h2>{% trans 'Add a new domain' %}</h2>
     </div>
 
     <form action="{% url 'domain_new' %}" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {{ form.non_field_errors }}
-        {% for field in form %}
-            <div class="form-group {% if field.errors %}has-error{% endif %}">
-                {% if field.errors %}
-                    <div class="alert alert-danger">{{ field.errors }}</div>
-                {% endif %}
-                <label class="col-md-2 control-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-                <div class="col-md-5">{{ field|add_form_control }}</div>
-                <p id="help-{{ field.id_for_label }}" class="col-md-3 help-block">
-                    {{ field.help_text }}
-                </p>
-            </div>
-        {% endfor %}
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-8">
-                <button class="btn btn-primary" type="submit">{% trans 'Create Domain' %}</button>
-            </div>
-        </div>
+        {% render_form_horizontal form 2 8 'Create domain' %}
     </form>
 
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lib/form-horizontal.html b/src/postorius/templates/postorius/lib/form-horizontal.html
new file mode 100644
index 0000000..06fe277
--- /dev/null
+++ b/src/postorius/templates/postorius/lib/form-horizontal.html
@@ -0,0 +1,48 @@
+{% load i18n %}
+{% load bootstrap_tags %}
+
+{% if form.non_field_errors %}
+    <div class="alert alert-danger">{{ form.non_field_errors }}</div>
+{% endif %}
+
+{% csrf_token %}
+{% for hidden in form.hidden_fields %}
+    {{ hidden }}
+{% endfor %}
+
+{% for field in form.visible_fields %}
+    <div class="form-group {% if field.errors %}has-errors{% endif %}">
+        <label class="control-label col-md-{{ size_left }}"
+               for="{{ field.id_for_label }}">
+            {{ field.label }}
+        </label>
+        <div class="col-md-{{ size_right }}">
+            {% if field|fieldtype == 'RadioSelect' %}
+                {% for choice in field %}
+                    <label class="radio-inline">
+                        {{ choice.tag }}
+                        {{ choice.choice_label }}
+                    </label>
+                {% endfor %}
+            {% else %}
+                {{ field|add_form_control }}
+            {% endif %}
+            {% for error in field.errors %}
+                <div class="text-danger">{{ error }}</div>
+            {% endfor %}
+        </div>
+        {% if field.help_text %}
+        <p id="help-{{ field.id_for_label }}"
+           class="col-md-offset-{{ size_left }} col-md-{{ size_right }} help-block">
+            {{ field.help_text }}
+        </p>
+        {% endif %}
+    </div>
+{% endfor %}
+{% if button %}
+    <div class="form-group">
+        <div class="col-md-offset-{{ size_left }} col-md-{{ size_right }}">
+            <button class="btn btn-primary" type="submit">{% trans button %}</button>
+        </div>
+    </div>
+{% endif %}
diff --git a/src/postorius/templates/postorius/lists/mass_removal.html b/src/postorius/templates/postorius/lists/mass_removal.html
index 5e5b3c6..f1185dd 100644
--- a/src/postorius/templates/postorius/lists/mass_removal.html
+++ b/src/postorius/templates/postorius/lists/mass_removal.html
@@ -8,21 +8,7 @@
     {% list_nav 'mass_removal' 'Mass Removal' %}
 
     <form action="{% url 'mass_removal' list.list_id %}" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% if form.non_field_errors %}
-            <div class="alert alert-danger">
-                {{ form.non_field_errors }}
-            </div>
-        {% endif %}
-        <div class="form-group {% if form.emails.errors %}has-error{% endif %}">
-            {% if form.emails.errors %}
-                <div class="alert alert-danger">
-                    {{ form.emails.errors }}
-                </div>
-            {% endif %}
-            <label class="control-label col-md-2" for="{{ form.emails.id_for_label }}">{{ form.emails.label }}</label>
-            <div class="col-md-8">{{ form.emails|add_form_control }}</div>
-        </div>
+        {% render_form_horizontal form 2 8 %}
         <div class="form-group">
             <div class="col-md-offset-2 col-md-8">
                 <button class="btn btn-warning" type="submit">{% trans 'Unsubscribe users' %}</button>
diff --git a/src/postorius/templates/postorius/lists/mass_subscribe.html b/src/postorius/templates/postorius/lists/mass_subscribe.html
index aff0d83..7f77b1e 100644
--- a/src/postorius/templates/postorius/lists/mass_subscribe.html
+++ b/src/postorius/templates/postorius/lists/mass_subscribe.html
@@ -12,24 +12,7 @@
     {% list_nav 'mass_subscribe' 'Mass Subscription' %}
 
     <form action="{% url 'mass_subscribe' list.list_id %}" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% if form.non_field_errors %}
-            <div class="alert alert-danger">
-                {{ form.non_field_errors }}
-            </div>
-        {% endif %}
-        <div class="form-group {% if form.emails.errors %}has-error{% endif %}">
-            {% if form.emails.errors %}
-                <div class="alert alert-danger">{{ form.emails.errors }}</div>
-            {% endif %}
-            <label class="control-label col-md-2" for="{{ form.emails.id_for_label }}">{{ form.emails.label }}</label>
-            <div class="col-md-8">{{ form.emails|add_form_control }}</div>
-        </div>
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-8">
-                <button class="btn btn-primary" type="submit">{% trans 'Subscribe users' %}</button>
-            </div>
-        </div>
+        {% render_form_horizontal form 2 8 'Subscribe users' %}
     </form>
 
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/memberoptions.html b/src/postorius/templates/postorius/lists/memberoptions.html
index 47ade42..542581e 100644
--- a/src/postorius/templates/postorius/lists/memberoptions.html
+++ b/src/postorius/templates/postorius/lists/memberoptions.html
@@ -16,38 +16,7 @@
         <p>{% trans 'You are not the owner for this list' %}</p>
     {% else %}
         <form action="{% url 'list_member_options' list.list_id mm_member.email %}" method="post" class="form-horizontal">
-            {% csrf_token %}
-            {% for field in settingsform %}
-                <div class="form-group {% if field.errors %}has-errors{% endif %}">
-                    {% if field.errors %}
-                        <div class="alert alert-danger">{{ field.errors }}</div>
-                    {% endif %}
-                    <label class="control-label col-md-3" for="{{ field.id_for_label }}">
-                        {{ field.label }}
-                    </label>
-                    <div class="col-md-8">
-                    {% if field|fieldtype == 'RadioSelect' %}
-                        {% for choice in field %}
-                            <label class="radio-inline">
-                                {{ choice.tag }}
-                                {{ choice.choice_label }}
-                            </label>
-                        {% endfor %}
-                        </td>
-                    {% else %}
-                        {{ field|add_form_control }}
-                    {% endif %}
-                    </div>
-                    <p id="help-{{ field.id_for_label }}" class="col-md-offset-3 col-md-8 help-block">
-                        {{ field.help_text }}
-                    </p>
-                </div>
-           {% endfor %}
-            <div class="form-group">
-                <div class="col-md-offset-3 col-md-8">
-                    <button class="btn btn-primary" type="submit">{% trans 'Save changes' %}</button>
-                </div>
-            </div>
+            {% render_form_horizontal settingsform 3 8 'Save changes' %}
         </form>
 
     {% endif %}
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index 3560ee2..5ac9807 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -13,32 +13,7 @@
     </div>
 
     <form action="{% url 'list_new' %}" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% for field in form %}
-            <div class="form-group {% if field.errors %}has-error{% endif %}">
-                {% if field.errors %}
-                    <div class="alert alert-danger">{{ field.errors }}</div>
-                {% endif %}
-                <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}</label>
-                <div class="col-md-8">
-                {% if field|fieldtype == 'RadioSelect' %}
-                    {% for choice in field %}
-                        <label class="radio-inline">
-                            {{ choice.tag }}
-                            {{ choice.choice_label }}
-                        </label>
-                    {% endfor %}
-                {% else %}
-                    {{ field|add_form_control }}
-                {% endif %}
-                </div>
-            </div>
-        {% endfor %}
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-8">
-                <button class="btn btn-primary" type="submit">{% trans 'Create List' %}</button>
-            </div>
-        </div>
+        {% render_form_horizontal form 2 8 'Create list' %}
     </form>
 
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index d37311b..84ddaf9 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -17,38 +17,9 @@
         {% endfor %}
     </ul>
 
-    <form action="{% url 'list_settings' list_id=list.list_id visible_section=visible_section %}" method="post" class="form-horizontal list_settings">
-        {% csrf_token %}
-        {% for field in form %}
-            <div class="form-group {% if field.errors %}has-errors{% endif %}">
-                {% if field.errors %}
-                    <div class="alert alert-danger">{{ field.errors }}</div>
-                {% endif %}
-                <label class="control-label col-md-3" for="{{ field.id_for_label }}">
-                    {{ field.label }}
-                </label>
-                <div class="col-md-8">
-                {% if field|fieldtype == 'RadioSelect' %}
-                    {% for choice in field %}
-                        <label class="radio-inline">
-                            {{ choice.tag }}
-                            {{ choice.choice_label }}
-                        </label>
-                    {% endfor %}
-                {% else %}
-                    {{ field|add_form_control }}
-                {% endif %}
-                </div>
-                <p id="help-{{ field.id_for_label }}" class="col-md-offset-3 col-md-8 help-block">
-                    {{ field.help_text }}
-                </p>
-            </div>
-        {% endfor %}
-        <div class="form-group">
-            <div class="col-md-offset-3 col-md-8">
-                <button class="btn btn-primary" type="submit">{% trans 'Save changes' %}</button>
-            </div>
-        </div>
+    <form action="{% url 'list_settings' list_id=list.list_id visible_section=visible_section %}"
+          method="post" class="form-horizontal list_settings">
+        {% render_form_horizontal form 3 8 'Save changes' %}
     </form>
 
 {% endblock %}
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index 8974803..23343dc 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -35,24 +35,7 @@
                 {% trans 'You are subscribed to this list with the following address:' %} <em>{{ subscribed_address }}</em>
             </p>
             <form action="{% url 'change_subscription' list.list_id %}" method="post" class="form-horizontal">
-                {% csrf_token %}
-                {% if change_subscription_form.non_field_errors %}
-                    <div class="alert alert-danger">{{ change_subscription_form.non_field_errors }}</div>
-                {% endif %}
-                {% for field in change_subscription_form %}
-                    <div class="form-group {% if field.errors %}has-error{% endif %}">
-                        {% if field.errors %}
-                            <div class="alert alert-danger">{{ field.errors }}</div>
-                        {% endif %}
-                        <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}</label>
-                        <div class="col-md-8">{{ field|add_form_control }}</div>
-                    </div>
-                {% endfor %}
-                <div class="form-group">
-                    <div class="col-md-offset-2 col-md-8">
-                        <input class="btn btn-primary" type="submit" value="{% trans 'Change Subscription' %}">
-                    </div>
-                </div>
+                {% render_form_horizontal change_subscription_form 2 8 'Change subscription' %}
             </form>
             <p class="col-md-offset-2">
                 <a href="{% url 'list_unsubscribe' list.list_id subscribed_address %}" class="btn btn-danger">
@@ -62,24 +45,7 @@
         {% else %}
             <h2>{% trans 'Subscribe to this list' %}</h2>
             <form action="{% url 'list_subscribe' list.list_id %}" method="post" class="form-horizontal">
-                {% csrf_token %}
-                {% if subscribe_form.non_field_errors %}
-                    <div class="alert alert-danger">{{ subscribe_form.non_field_errors }}</div>
-                {% endif %}
-                {% for field in subscribe_form %}
-                    <div class="form-group {% if field.errors %}has-error{% endif %}">
-                        {% if field.errors %}
-                            <div class="alert alert-danger">{{ field.errors }}</div>
-                        {% endif %}
-                        <label class="control-label col-md-2" for="{{ field.id_for_label }}">{{ field.label }}</label>
-                        <div class="col-md-8">{{ field|add_form_control }}</div>
-                    </div>
-                {% endfor %}
-                <div class="form-group">
-                    <div class="col-md-offset-2 col-md-8">
-                        <input class="btn btn-primary" type="submit" value="{% trans 'Subscribe' %}" />
-                    </div>
-                </div>
+                {% render_form_horizontal subscribe_form 2 8 'Subscribe' %}
             </form>
         {% endif %}
     {% else %}
diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index 5db5ddf..4a25a97 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -17,28 +17,7 @@
     <div class="row">
         <div class="col-md-6">
             <form action="" method="post" class="well form-horizontal">
-                {% csrf_token %}
-                {% if form.non_field_errors %}
-                    <div class="alert alert-danger">{{ form.non_field_errors }}</div>
-                {% endif %}
-                {% for field in form %}
-                    {% if field.errors %}
-                        <div class="alert alert-danger">{{ field.errors }}</div>
-                    {% endif %}
-                    <div class="form-group">
-                        <label class="control-label col-md-4" for="{{ field.label.id_for_label }}">
-                            {{ field.label }}
-                        </label>
-                        <div class="col-md-8">
-                            {{ field|add_form_control }}
-                        </div>
-                    </div>
-                {% endfor %}
-                <div class="form-group">
-                    <div class="col-md-offset-4 col-md-8">
-                        <button class="btn btn-primary" type="submit">{% trans 'Log in' %}</button>
-                    </div>
-                </div>
+                {% render_form_horizontal form 4 8 'Log in' %}
             </form>
         </div>
         <div class="col-md-6 text-center persona-login">
diff --git a/src/postorius/templates/postorius/user_address_activation.html b/src/postorius/templates/postorius/user_address_activation.html
index dfbcb3a..e97586a 100644
--- a/src/postorius/templates/postorius/user_address_activation.html
+++ b/src/postorius/templates/postorius/user_address_activation.html
@@ -4,32 +4,15 @@
 {% load nav_helpers %}
 
 {% block subtitle %}
-{% trans 'Add Email' %} | {{ user.username }}
+{% trans 'Add email' %} | {{ user.username }}
 {% endblock %}
 
 {% block main %}
 
-    {% user_nav 'add_email' 'Add Email Address' %}
+    {% user_nav 'add_email' 'Add email address' %}
 
     <form class="form-horizontal" action="{% url 'address_activation' %}" method="post">
-        {% csrf_token %}
-        <div class="form-group {% if form.email.errors %}has-errors{% endif %}">
-            {% if form.email.errors %}
-                <div class="alert alert-danger">{{ form.email.errors }}</div>
-            {% endif %}
-            <label class="control-label col-md-2" for="{{ form.email.id_for_label }}">
-                {{ form.email.label }}
-            </label>
-            <div class="col-md-5">
-                {{ form.email|add_form_control }}
-            </div>
-        </div>
-        {{ form.user_email }}
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-5">
-                <button class="btn btn-primary" type="submit">{% trans 'Add Email Address' %}</button>
-            </div>
-        </div>
+        {% render_form_horizontal form 2 5 'Add email address' %}
     </form>
 
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 64acb5c..44a312a 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -4,58 +4,27 @@
 {% load nav_helpers %}
 
 {% block subtitle %}
-{% trans 'Subscription Preferences' %} | {{ user.username }}
+{% trans 'Subscription settings' %} | {{ user.username }}
 {% endblock %}
 
 {% block main %}
 
-    {% user_nav 'settings' 'Subscription Settings' %}
+    {% user_nav 'settings' 'Subscription settings' %}
 
     <ul class="nav nav-tabs">
-        <li class="active"><a>{% trans 'Global Mailman Preferences' %}</a></li>
-        <li><a href="{% url 'user_address_preferences' %}">{% trans 'Address Based Preferences' %}</a></li>
-        <li><a href="{% url 'user_subscription_preferences' %}">{% trans 'Subscription Based Preferences' %}</a></li>
+        <li class="active"><a>{% trans 'Global Mailman preferences' %}</a></li>
+        <li><a href="{% url 'user_address_preferences' %}">{% trans 'Address-based preferences' %}</a></li>
+        <li><a href="{% url 'user_subscription_preferences' %}">{% trans 'Subscription-based preferences' %}</a></li>
     </ul>
 
     {% if not mm_user %}
         <div>
-            <h1>{% trans 'No Preferences Available' %}</h1>
+            <h1>{% trans 'No preferences available' %}</h1>
         </div>
         <p>{% trans 'You are not yet subscribed to any lists, so you have no Mailman preferences.' %}</p>
     {% else %}
         <form action="{% url 'user_mailmansettings' %}" method="post" class="form-horizontal">
-            {% csrf_token %}
-            {% for field in settingsform %}
-                <div class="form-group {% if field.errors %}has-errors{% endif %}">
-                    {% if field.errors %}
-                        <div class="alert alert-danger">{{ field.errors }}</div>
-                    {% endif %}
-                    <label class="control-label col-md-3" for="{{ field.id_for_label }}">
-                        {{ field.label }}
-                    </label>
-                    <div class="col-md-8">
-                    {% if field|fieldtype == 'RadioSelect' %}
-                        {% for choice in field %}
-                            <label class="radio-inline">
-                                {{ choice.tag }}
-                                {{ choice.choice_label }}
-                            </label>
-                        {% endfor %}
-                        </td>
-                    {% else %}
-                        {{ field|add_form_control }}
-                    {% endif %}
-                    </div>
-                    <p id="help-{{ field.id_for_label }}" class="col-md-offset-3 col-md-8 help-block">
-                        {{ field.help_text }}
-                    </p>
-                </div>
-            {% endfor %}
-            <div class="form-group">
-                <div class="col-md-offset-3 col-md-8">
-                    <button class="btn btn-primary" type="submit">{% trans 'Save changes' %}</button>
-                </div>
-            </div>
+            {% render_form_horizontal settingsform 3 8 'Save changes' %}
         </form>
     {% endif %}
 
diff --git a/src/postorius/templatetags/bootstrap_tags.py b/src/postorius/templatetags/bootstrap_tags.py
index a65eaad..d2e384b 100644
--- a/src/postorius/templatetags/bootstrap_tags.py
+++ b/src/postorius/templatetags/bootstrap_tags.py
@@ -28,4 +28,14 @@
 
 @register.filter('fieldtype')
 def fieldtype(field):
-    return field.field.widget.__class__.__name__
\ No newline at end of file
+    return field.field.widget.__class__.__name__
+
+
+@register.inclusion_tag('postorius/lib/form-horizontal.html', takes_context=True)
+def render_form_horizontal(context, form, size_left=2, size_right=8, button=None):
+    return dict(
+        form=form,
+        size_left=size_left,
+        size_right=size_right,
+        button=button,
+        )