diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index eec1361..5b4b1df 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -54,12 +54,16 @@
         label=_('Mail Host'),
         error_messages={'required': _('Please enter a domain name'),
                         'invalid': _('Please enter a valid domain name.')},
-        required=True)
+        required=True,
+        help_text=_('Example: domain.org'),
+        )
     web_host = forms.CharField(
         label=_('Web Host'),
         error_messages={'required': _('Please enter a host name'),
                         'invalid': _('Please enter a valid host name.')},
-        required=True)
+        required=True,
+        help_text=_('Example: http://www.domain.org'),
+        )
     description = forms.CharField(
         label=_('Description'),
         required=False)
diff --git a/src/postorius/templates/postorius/domain_confirm_delete.html b/src/postorius/templates/postorius/domain_confirm_delete.html
index d728b3f..96fe721 100644
--- a/src/postorius/templates/postorius/domain_confirm_delete.html
+++ b/src/postorius/templates/postorius/domain_confirm_delete.html
@@ -8,11 +8,17 @@
 {% load nav_helpers %}
 
 {% block main %}
-    <h1>{% trans 'Confirm Deletion' %}</h1>
+
+    <div class="page-header">
+        <h2>{% trans 'Confirm Deletion' %}</h2>
+    </div>
+
     <p>{% trans 'Are you sure you want to permanently delete this Domain?' %}</p>
+
     <form action="{{submit_url}}" method="post">
         {% csrf_token %}
         <button class="btn btn-danger" type="submit">{% trans 'Delete' %} {{ domain }}</button>
         <a class="btn btn-default" href="{% url 'domain_index' %}">{% trans 'Cancel' %}</a>
     </form>
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/domain_index.html b/src/postorius/templates/postorius/domain_index.html
index 881885d..da4c017 100644
--- a/src/postorius/templates/postorius/domain_index.html
+++ b/src/postorius/templates/postorius/domain_index.html
@@ -6,32 +6,34 @@
 {% endblock %}
 
 {% block main %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Domains' %}</h1></div>
-        <div class="panel-body">
-            <p class="text-right"><a class="btn btn-success" href="{% url 'domain_new' %}">{% trans 'Add Domain' %}</a></p>
-            <div class="table-responsive">
-                <table class="table table-bordered table-striped">
-                    <thead>
-                        <tr>
-                            <th>{% trans 'Mail Host' %}</th>
-                            <th>{% trans 'URL Host' %}</th>
-                            <th>{% trans 'Description' %}</th>
-                            <th>&nbsp;</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for domain in domains %}
-                            <tr>
-                                <td>{{ domain.mail_host }}</td>
-                                <td>{{ domain.base_url }}</td>
-                                <td>{{ domain.description }}</td>
-                                <td><a href="{% url 'domain_delete' domain.mail_host %}" class="btn btn-xs btn-danger">{% trans 'Delete' %}</a></td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
+
+    <div class="page-header">
+        <h1>{% trans 'Domains' %}</h1>
     </div>
-{% endblock main %}
\ No newline at end of file
+
+    <p class="text-right"><a class="btn btn-success" href="{% url 'domain_new' %}">{% trans 'Add Domain' %}</a></p>
+
+    <div class="table-responsive">
+        <table class="table table-bordered table-striped">
+            <thead>
+                <tr>
+                    <th>{% trans 'Mail Host' %}</th>
+                    <th>{% trans 'URL Host' %}</th>
+                    <th>{% trans 'Description' %}</th>
+                    <th>&nbsp;</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for domain in domains %}
+                    <tr>
+                        <td>{{ domain.mail_host }}</td>
+                        <td>{{ domain.base_url }}</td>
+                        <td>{{ domain.description }}</td>
+                        <td><a href="{% url 'domain_delete' domain.mail_host %}" class="btn btn-xs btn-danger">{% trans 'Delete' %}</a></td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+{% endblock main %}
diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html
index aa8090a..badbc25 100644
--- a/src/postorius/templates/postorius/domain_new.html
+++ b/src/postorius/templates/postorius/domain_new.html
@@ -7,38 +7,31 @@
 {% endblock %}
 
 {% block main %}
-<div class="panel panel-default">
-    <div class="panel-heading"><h1 class="panel-title">{% trans 'Domains' %}</h1></div>
-    <div class="panel-body">
-        <form action="{% url 'domain_new' %}" method="post" class="form-horizontal">
-            {% csrf_token %}
-            {{ form.non_field_errors }}
-            <legend>{% trans 'Add a new Domain' %}</legend>
-            <div class="form-group">
-                {% if form.mail_host.errors %}
-                    <div class="alert alert-danger">{{ form.mail_host.errors }}</div>
-                {% endif %}
-                <label class="col-md-2 control-label" for="id_mail_host">{% trans 'Mail Host' %}:</label>
-                <div class="col-md-5">{{ form.mail_host|add_form_control }}</div>
-                <p class="help-block"><strong>{% trans 'Example' %}:</strong> domain.org</p>
-            </div>
-            <div class="form-group">
-                {% if form.web_host.errors %}
-                    <div class="alert alert-danger">{{ form.web_host.errors }}</div>
-                {% endif %}
-                <label class="col-md-2 control-label" for="id_web_host">{% trans 'Web Host' %}:</label>
-                <div class="col-md-5">{{ form.web_host|add_form_control }}</div>
-                <p class="help-block"><strong>{% trans 'Example' %}:</strong> http://www.domain.org</p>
-            </div>
-            <div class="form-group">
-                {% if form.description.errors %}
-                    <div class="alert alert-danger">{{ form.description.errors }}</div>
-                {% endif %}
-                <label class="col-md-2 control-label" for="id_description">{% trans 'Description' %}:</label>
-                <div class="col-md-5">{{ form.description|add_form_control }}</div>
-            </div>
-            <button class="col-md-offset-2 btn btn-success btn-primary" type="submit">{% trans 'Create Domain' %}</button>
-        </form>
+
+    <div class="page-header">
+        <h2>{% trans 'Add a new Domain' %}</h2>
     </div>
-</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>
+    </form>
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/index.html b/src/postorius/templates/postorius/lists/index.html
index df07dc5..6c76705 100644
--- a/src/postorius/templates/postorius/lists/index.html
+++ b/src/postorius/templates/postorius/lists/index.html
@@ -6,48 +6,49 @@
 {% endblock %}
 
 {% block main %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Mailing Lists' %}</h1></div>
-        <div class="panel-body">
-            {% if user.is_superuser %}
-                <p class="text-right">
-                    {% if domain_count < 2 %}
-                        <a class="btn btn-success" href="{% url 'domain_new' %}">{% trans 'Create New Domain' %}</a>
-                    {% endif %}
-                    <a class="btn btn-success" href="{% url 'list_new' %}">{% trans 'Create New List' %}</a>
-                </p>
-            {% endif %}
-            {% if lists|length > 0 %}
-                <div class="table-responsive">
-                    <table class="table table-bordered table-striped">
-                        <thead>
-                            <tr>
-                                <th>{% trans 'List name' %}</th>
-                                <th>{% trans 'Post address' %}</th>
-                                <th>{% trans 'Description' %}</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {% for list in lists %}
-                                <tr>
-                                    <td>
-                                        <a href="{% url 'list_summary' list_id=list.list_id %}">{{ list.display_name }}</a>
-                                        {% if not list.settings.advertised %} ({% trans 'unadvertised' %}*){% endif %}
-                                    </td>
-                                    <td>{{ list.fqdn_listname }}</td>
-                                    <td>{{ list.settings.description }}</td>
-                                </tr>
-                            {% endfor %}
-                        </tbody>
-                    </table>
-                </div>
-                {% if user.is_superuser %}
-                    <small>* {% trans 'Only admins see unadvertised lists in the list index.' %}</small>
-                {% endif %}
-                {% include 'postorius/_pagination.html' with page=lists %}
-            {% else %}
-                <p>{% trans 'There are currently no mailing lists.' %}</p>
-            {% endif %}
-        </div>
+
+    <div class="page-header">
+        <h1>{% trans 'Mailing Lists' %}</h1>
     </div>
+
+    {% if user.is_superuser %}
+        <p class="text-right">
+            {% if domain_count < 2 %}
+                <a class="btn btn-success" href="{% url 'domain_new' %}">{% trans 'Create New Domain' %}</a>
+            {% endif %}
+            <a class="btn btn-success" href="{% url 'list_new' %}">{% trans 'Create New List' %}</a>
+        </p>
+    {% endif %}
+    {% if lists|length > 0 %}
+        <div class="table-responsive">
+            <table class="table table-bordered table-striped">
+                <thead>
+                    <tr>
+                        <th>{% trans 'List name' %}</th>
+                        <th>{% trans 'Post address' %}</th>
+                        <th>{% trans 'Description' %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for list in lists %}
+                        <tr>
+                            <td>
+                                <a href="{% url 'list_summary' list_id=list.list_id %}">{{ list.display_name }}</a>
+                                {% if not list.settings.advertised %} ({% trans 'unadvertised' %}*){% endif %}
+                            </td>
+                            <td>{{ list.fqdn_listname }}</td>
+                            <td>{{ list.settings.description }}</td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        {% if user.is_superuser %}
+            <small>* {% trans 'Only admins see unadvertised lists in the list index.' %}</small>
+        {% endif %}
+        {% include 'postorius/_pagination.html' with page=lists %}
+    {% else %}
+        <p>{% trans 'There are currently no mailing lists.' %}</p>
+    {% endif %}
+
 {% endblock main %}
diff --git a/src/postorius/templates/postorius/lists/new.html b/src/postorius/templates/postorius/lists/new.html
index 6a215a4..3560ee2 100644
--- a/src/postorius/templates/postorius/lists/new.html
+++ b/src/postorius/templates/postorius/lists/new.html
@@ -7,38 +7,38 @@
 {% endblock %}
 
 {% block main %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Mailing Lists' %}</h1></div>
-        <div class="panel-body">
-            <form action="{% url 'list_new' %}" method="post" class="form-horizontal">
-                <legend>{% trans 'Create a new List' %}</legend>
-                {% csrf_token %}
-                {% for field in form %}
-                    <div class="form-group">
-                        {% if field.errors %}
-                            <div class="row">
-                                <div class="col-md-offset-2 col-md-8 alert alert-danger">{{ field.errors }}</div>
-                            </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="text-center">
-                    <button class="btn btn-success" type="submit">{% trans 'Create List' %}</button>
-                </div>
-            </form>
-        </div>
+
+    <div class="page-header">
+        <h1>{% trans 'Create a new List' %}</h1>
     </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>
+    </form>
+
 {% endblock %}