diff --git a/src/postorius/templates/postorius/login.html b/src/postorius/templates/postorius/login.html
index d9c4999..5db5ddf 100644
--- a/src/postorius/templates/postorius/login.html
+++ b/src/postorius/templates/postorius/login.html
@@ -9,46 +9,54 @@
 {% endblock %}
 
 {% block main %}
-    {% browserid_info %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><h1 class="panel-title">{% trans 'Login with username and password or with Mozilla Persona' %}</h1></div>
-        <div class="panel-body">
-            <div class="row">
-                <div class="col-md-offset-3 col-md-3">
-                    <form action="" method="post" class="well">
-                        {% 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 for="{{ field.label.id_for_label }}">{{ field.label }}:</label>
-                                {{ field|add_form_control }}
-                            </div>
-                        {% endfor %}
-                      <button class="btn btn-primary" type="submit">{% trans 'Log in' %}</button>
-                    </form>
+
+    <div class="page-header">
+        <h3>{% trans 'Login with username and password or with Mozilla Persona' %}</h3>
+    </div>
+
+    <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>
-                <div class="col-md-3 persona-login">
-                    <a rel="nofollow" class="browserid-login persona-button" id="browserid" href="#">
-                        <img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="{% trans 'Login using BrowserID' %}" />
-                    </a>
-                    <p>
-                        {% blocktrans %}
-                            Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data.
-                            For more information see the <a href="http://www.mozilla.org/en-US/persona">Mozilla website</a>.
-                        {% endblocktrans %}
-                    </p>
-                    <noscript>
-                        <p class="text-error">
-                            {% trans 'Mozilla Persona requires the use of JavaScript.' %}
-                        </p>
-                    </noscript>
-                </div>
-            </div>
+            </form>
+        </div>
+        <div class="col-md-6 text-center persona-login">
+            {% browserid_info %}
+            <a rel="nofollow" class="browserid-login persona-button" id="browserid" href="#">
+                <img src="{% static 'postorius/img/sign_in_blue.png' %}" alt="{% trans 'Login using BrowserID' %}" />
+            </a>
+            <p>
+                {% blocktrans %}
+                    Mozilla Persona is an easy way to sign into multiple websites, while still controlling your personal data.
+                    For more information see the <a href="http://www.mozilla.org/en-US/persona">Mozilla website</a>.
+                {% endblocktrans %}
+            </p>
+            <noscript>
+                <p class="text-error">
+                    {% trans 'Mozilla Persona requires the use of JavaScript.' %}
+                </p>
+            </noscript>
         </div>
     </div>