diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_accounts.html b/mozillians/jinja2/phonebook/includes/profile_edit_accounts.html
index 2764f0554..f9573141b 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_accounts.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_accounts.html
@@ -45,7 +45,7 @@
@@ -64,7 +64,7 @@
diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_basic.html b/mozillians/jinja2/phonebook/includes/profile_edit_basic.html
index ff7ce047f..b0ac6f340 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_basic.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_basic.html
@@ -80,7 +80,7 @@
@@ -139,7 +139,7 @@
@@ -176,7 +176,7 @@
@@ -223,7 +223,7 @@
diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_developer.html b/mozillians/jinja2/phonebook/includes/profile_edit_developer.html
index 3e28fad9b..15c3e7b47 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_developer.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_developer.html
@@ -36,7 +36,9 @@ {{ _('Privacy') }}
{% if user.userprofile.is_vouched %}
diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_groups.html b/mozillians/jinja2/phonebook/includes/profile_edit_groups.html
index 6e9651fa0..52e86e130 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_groups.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_groups.html
@@ -48,7 +48,7 @@
diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_location.html b/mozillians/jinja2/phonebook/includes/profile_edit_location.html
index 8f0753e6f..4f8fc9d44 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_location.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_location.html
@@ -117,7 +117,9 @@
{{ location_form.lng }}
diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_registration.html b/mozillians/jinja2/phonebook/includes/profile_edit_registration.html
index 682ff4719..ea3e1a9d9 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_registration.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_registration.html
@@ -191,7 +191,9 @@
diff --git a/mozillians/jinja2/phonebook/includes/profile_edit_you.html b/mozillians/jinja2/phonebook/includes/profile_edit_you.html
index 5e939bb4e..171963afa 100644
--- a/mozillians/jinja2/phonebook/includes/profile_edit_you.html
+++ b/mozillians/jinja2/phonebook/includes/profile_edit_you.html
@@ -38,7 +38,9 @@
@@ -65,7 +67,8 @@
{{ _('Fitted') }}
-
+
{% for t_select in t_choices[1:7] %}
@@ -78,7 +81,8 @@
{{ _('Straight-cut') }}
-
+
{% for t_select in t_choices[7:14] %}
@@ -95,7 +99,9 @@