diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
index 3f4235cf..7adb730f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -1,4 +1,4 @@
-{% raw %}{% extends "account/base.html" %}
+{% extends "account/base.html" %}
 
 {% load i18n %}
 {% load crispy_forms_tags %}
@@ -6,7 +6,8 @@
 {% block head_title %}{% trans "Account" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% trans "E-mail Addresses" %}</h1>
+<h1>{% trans "E-mail Addresses" %}</h1>
+
 {% if user.emailaddress_set.all %}
 <p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
 
@@ -15,23 +16,23 @@
 <fieldset class="blockLabels">
 
   {% for emailaddress in user.emailaddress_set.all %}
-<div class="ctrlHolder">
-      <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+<div class="radio">
+  <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
 
-      <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
+    <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
 
-{{ emailaddress.email }}
+    {{ emailaddress.email }}
     {% if emailaddress.verified %}
     <span class="verified">{% trans "Verified" %}</span>
     {% else %}
     <span class="unverified">{% trans "Unverified" %}</span>
     {% endif %}
-      {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
-</label>
+    {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</span>{% endif %}
+  </label>
 </div>
   {% endfor %}
 
-<div class="buttonHolder">
+<div class="form-group">
       <button class="secondaryAction btn btn-primary" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
       <button class="secondaryAction btn btn-primary" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
       <button class="primaryAction btn btn-primary" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
@@ -57,7 +58,8 @@
 {% endblock %}
 
 
-{% block extra_body %}
+{% block javascript %}
+{{ block.super }}
 <script type="text/javascript">
 (function() {
   var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
@@ -70,6 +72,7 @@
     });
   }
 })();
+
+$('.form-group').removeClass('row');
 </script>
 {% endblock %}
-{% endraw %}