diff --git a/src/postorius/templates/postorius/domain_confirm_delete.html b/src/postorius/templates/postorius/domain_confirm_delete.html
index 00e3f93..d728b3f 100644
--- a/src/postorius/templates/postorius/domain_confirm_delete.html
+++ b/src/postorius/templates/postorius/domain_confirm_delete.html
@@ -2,17 +2,17 @@
 {% load i18n %}
 
 {% block subtitle %}
-{% trans "Confirm Domain Removal | " as page_title %}{{ page_title|add:domain}}
+{% trans 'Confirm Domain Removal' %} | {{ domain}}
 {% endblock %}
 
 {% load nav_helpers %}
 
 {% block main %}
     <h1>{% trans 'Confirm Deletion' %}</h1>
-
-    <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" href="{% url 'domain_index' %}">{% trans "Cancel" %}</a>
+    <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 cdb6455..881885d 100644
--- a/src/postorius/templates/postorius/domain_index.html
+++ b/src/postorius/templates/postorius/domain_index.html
@@ -2,33 +2,36 @@
 {% load i18n %}
 
 {% block subtitle %}
-{% trans "Domains" as page_title %}{{ page_title }}
+{% trans 'Domains' %}
 {% endblock %}
 
 {% block main %}
-    <h1>{% trans "Domain Index" %}</h1>
-    <p>
-        <a class="btn btn-success" href="{% url 'domain_new' %}">{% trans "Create Domain" %}</a>
-    </p>
-
-    <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-mini btn-danger">{% trans 'Delete' %}</a></td>
-    		</tr>
-            {% endfor %}
-    	</tbody>
-    </table>
-{% endblock 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>
+{% endblock main %}
\ No newline at end of file
diff --git a/src/postorius/templates/postorius/domain_new.html b/src/postorius/templates/postorius/domain_new.html
index ab7cfff..aa8090a 100644
--- a/src/postorius/templates/postorius/domain_new.html
+++ b/src/postorius/templates/postorius/domain_new.html
@@ -1,48 +1,44 @@
 {% extends postorius_base_template %}
 {% load i18n %}
+{% load bootstrap_tags %}
 
 {% block subtitle %}
-{% trans "Add Domain" as page_title %}{{ page_title }}
+{% trans 'Add Domain' %}
 {% endblock %}
 
 {% block main %}
-    <form action="{% url 'domain_new' %}" method="post" class="well form-horizontal"> {% csrf_token %}
-    {{ form.non_field_errors }}
-    <fieldset>
-	<legend>{% trans "Add a new Domain" %}</legend>
-
-	<div class="control-group">
-	    {{ form.mail_host.errors }}
-	    <label for="id_mail_host" class="control-label">{% trans "Mail Host:" %}</label>
-	    <div class="controls">
-		{{ form.mail_host}}
-		<p class="help-block"><strong>{% trans "Example:" %}</strong> {% trans "domain.org" %}</p>
-	    </div>
-	</div>
-
-	<div class="control-group">
-	    {{ form.web_host.errors }}
-	    <label for="id_web_host" class="control-label">{% trans "Web Host:" %}</label>
-	    <div class="controls">
-		{{ form.web_host}}
-		<p class="help-block"><strong>{% trans "Example:" %}</strong> {% trans "http://www.domain.org" %}</p>
-	    </div>
-	</div>
-
-	<div class="control-group">
-	    {{ form.description.errors }}
-	    <label for="id_description" class="control-label">{% trans "Description:" %}</label>
-	    <div class="controls">
-		{{ form.description}}
-		<p class="help-block"><strong>{% trans "Example:" %}</strong> {% trans "Test lists will live on this domain." %}</p>
-	    </div>
-	</div>
-
-	<div class="form-actions">
-	    <button class="btn btn-success btn-primary" type="submit">{% trans "Create Domain" %}</button>
-	</div>
-
-    </fieldset>
-</form>
-
+<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>
+</div>
 {% endblock main %}