diff --git a/mozillians/phonebook/forms.py b/mozillians/phonebook/forms.py
index 0bffa1cd7..36a8bb007 100644
--- a/mozillians/phonebook/forms.py
+++ b/mozillians/phonebook/forms.py
@@ -156,42 +156,15 @@ def clean_username(self):
         return username
 
 
-class ProfileForm(happyforms.ModelForm):
+class BasicInformationForm(happyforms.ModelForm):
     photo = forms.ImageField(label=_lazy(u'Profile Photo'), required=False)
     photo_delete = forms.BooleanField(label=_lazy(u'Remove Profile Photo'),
                                       required=False)
-    date_mozillian = forms.DateField(
-        required=False,
-        label=_lazy(u'When did you get involved with Mozilla?'),
-        widget=MonthYearWidget(years=range(1998, datetime.today().year + 1),
-                               required=False))
-    skills = forms.CharField(
-        label='',
-        help_text=_lazy(u'Start typing to add a skill (example: Python, '
-                        u'javascript, Graphic Design, User Research)'),
-        required=False)
-    lat = forms.FloatField(widget=forms.HiddenInput)
-    lng = forms.FloatField(widget=forms.HiddenInput)
-    savecountry = forms.BooleanField(
-        label=_lazy(u'Required'),
-        initial=True, required=False,
-        widget=forms.CheckboxInput(attrs={'disabled': 'disabled'})
-    )
-    saveregion = forms.BooleanField(label=_lazy(u'Save'), required=False, show_hidden_initial=True)
-    savecity = forms.BooleanField(label=_lazy(u'Save'), required=False, show_hidden_initial=True)
 
     class Meta:
         model = UserProfile
-        fields = ('full_name', 'ircname', 'bio', 'photo',
-                  'allows_community_sites', 'tshirt',
-                  'title', 'allows_mozilla_sites',
-                  'date_mozillian', 'story_link', 'timezone',
-                  'privacy_photo', 'privacy_full_name', 'privacy_ircname',
-                  'privacy_timezone', 'privacy_tshirt',
-                  'privacy_bio', 'privacy_geo_city', 'privacy_geo_region',
-                  'privacy_geo_country', 'privacy_groups',
-                  'privacy_skills', 'privacy_languages',
-                  'privacy_date_mozillian', 'privacy_story_link', 'privacy_title')
+        fields = ('photo', 'privacy_photo', 'full_name',
+                  'privacy_full_name', 'bio', 'privacy_bio',)
         widgets = {'bio': forms.Textarea()}
 
     def clean_photo(self):
@@ -215,6 +188,18 @@ def clean_photo(self):
                 photo.size = cleaned_photo.tell()
         return photo
 
+
+class SkillsForm(happyforms.ModelForm):
+    skills = forms.CharField(
+        label='',
+        help_text=_lazy(u'Start typing to add a skill (example: Python, '
+                        u'javascript, Graphic Design, User Research)'),
+        required=False)
+
+    class Meta:
+        model = UserProfile
+        fields = ('privacy_skills',)
+
     def clean_skills(self):
         if not re.match(r'^[a-zA-Z0-9 +.:,-]*$', self.cleaned_data['skills']):
             # Commas cannot be included in skill names because we use them to
@@ -226,6 +211,32 @@ def clean_skills(self):
                       map(lambda x: x.strip() or False,
                           skills.lower().split(',')))
 
+    def save(self, *args, **kwargs):
+        """Save the data to profile."""
+        self.instance.set_membership(Skill, self.cleaned_data['skills'])
+        super(SkillsForm, self).save(*args, **kwargs)
+
+
+class LanguagesPrivacyForm(happyforms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ('privacy_languages',)
+
+
+class LocationForm(happyforms.ModelForm):
+    lat = forms.FloatField(widget=forms.HiddenInput)
+    lng = forms.FloatField(widget=forms.HiddenInput)
+    savecountry = forms.BooleanField(label=_lazy(u'Required'),
+                                     initial=True, required=False,
+                                     widget=forms.CheckboxInput(attrs={'disabled': 'disabled'}))
+    saveregion = forms.BooleanField(label=_lazy(u'Save'), required=False, show_hidden_initial=True)
+    savecity = forms.BooleanField(label=_lazy(u'Save'), required=False, show_hidden_initial=True)
+
+    class Meta:
+        model = UserProfile
+        fields = ('timezone', 'privacy_timezone', 'privacy_geo_city', 'privacy_geo_region',
+                  'privacy_geo_country',)
+
     def clean(self):
         # If lng/lat were provided, make sure they point at a country somewhere...
         if self.cleaned_data.get('lat') is not None and self.cleaned_data.get('lng') is not None:
@@ -256,10 +267,43 @@ def clean(self):
 
         return self.cleaned_data
 
-    def save(self, *args, **kwargs):
-        """Save the data to profile."""
-        self.instance.set_membership(Skill, self.cleaned_data['skills'])
-        super(ProfileForm, self).save(*args, **kwargs)
+
+class ContributionForm(happyforms.ModelForm):
+    date_mozillian = forms.DateField(
+        required=False,
+        label=_lazy(u'When did you get involved with Mozilla?'),
+        widget=MonthYearWidget(years=range(1998, datetime.today().year + 1),
+                               required=False))
+
+    class Meta:
+        model = UserProfile
+        fields = ('title', 'privacy_title',
+                  'date_mozillian', 'privacy_date_mozillian',
+                  'story_link', 'privacy_story_link',)
+
+
+class TshirtForm(happyforms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ('tshirt', 'privacy_tshirt',)
+
+
+class GroupsPrivacyForm(happyforms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ('privacy_groups',)
+
+
+class IRCForm(happyforms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ('ircname', 'privacy_ircname',)
+
+
+class DeveloperForm(happyforms.ModelForm):
+    class Meta:
+        model = UserProfile
+        fields = ('allows_community_sites', 'allows_mozilla_sites',)
 
 
 class BaseLanguageFormSet(BaseInlineFormSet):
@@ -296,11 +340,17 @@ def email_changed(self):
         return self.cleaned_data['email'] != self.initial['email']
 
 
-class RegisterForm(ProfileForm):
+class RegisterForm(BasicInformationForm, LocationForm):
     optin = forms.BooleanField(
         widget=forms.CheckboxInput(attrs={'class': 'checkbox'}),
         required=True)
 
+    class Meta:
+        model = UserProfile
+        fields = ('photo', 'full_name', 'timezone', 'privacy_photo', 'privacy_full_name', 'optin',
+                  'privacy_timezone', 'privacy_geo_city', 'privacy_geo_region',
+                  'privacy_geo_country',)
+
 
 class VouchForm(happyforms.Form):
     """Vouching is captured via a user's id and a description of the reason for vouching."""
@@ -336,4 +386,4 @@ class APIKeyRequestForm(happyforms.ModelForm):
 
     class Meta:
         model = APIv2App
-        fields = ('name', 'description', 'url')
+        fields = ('name', 'description', 'url',)
diff --git a/mozillians/phonebook/views.py b/mozillians/phonebook/views.py
index c81d80df1..2bb0d6243 100644
--- a/mozillians/phonebook/views.py
+++ b/mozillians/phonebook/views.py
@@ -5,12 +5,13 @@
 from django.contrib.auth.models import User
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.db import transaction
-from django.http import Http404
+from django.http import HttpResponseRedirect, Http404
 from django.shortcuts import get_object_or_404, render
 from django.utils import timezone
 from django.views.decorators.cache import cache_page, never_cache
 from django.views.decorators.http import require_POST
 
+from funfactory.helpers import urlparams
 from funfactory.urlresolvers import reverse
 from tower import ugettext as _
 from waffle.decorators import waffle_flag
@@ -157,79 +158,111 @@ def view_profile(request, username):
 @never_cache
 def edit_profile(request):
     """Edit user profile view."""
-    # Don't user request.user
+    # Don't use request.user
     user = User.objects.get(pk=request.user.id)
     profile = user.userprofile
     user_groups = profile.groups.all().order_by('name')
     user_skills = stringify_groups(profile.skills.all().order_by('name'))
-
-    user_form = forms.UserForm(request.POST or None, instance=user)
-    queryset = ExternalAccount.objects.exclude(type=ExternalAccount.TYPE_EMAIL)
-    accounts_formset = forms.AccountsFormset(request.POST or None,
-                                             instance=profile,
-                                             queryset=queryset)
-    new_profile = False
-    form = forms.ProfileForm
-    language_formset = forms.LanguagesFormset(request.POST or None,
-                                              instance=profile,
-                                              locale=request.locale)
-
-    if not profile.is_complete:
-        new_profile = True
-        form = forms.RegisterForm
-
-    profile_form = form(request.POST or None, request.FILES or None,
-                        instance=profile,
-                        initial={'skills': user_skills,
-                                 'saveregion': True if profile.geo_region else False,
-                                 'savecity': True if profile.geo_city else False,
-                                 'lat': profile.lat,
-                                 'lng': profile.lng})
-
-    all_forms = [user_form, profile_form, accounts_formset, language_formset]
-
-    # Using ``list`` to force calling is_valid on all the forms, even if earlier
-    # ones are not valid, so we detect and display all the errors.
-    if all(list(f.is_valid() for f in all_forms)):
-        old_username = request.user.username
-        user_form.save()
-        profile_form.save()
-        accounts_formset.save()
-        language_formset.save()
-
-        if new_profile:
-            redeem_invite(profile, request.session.get('invite-code'))
-            messages.info(request, _(u'Your account has been created.'))
-        elif user.username != old_username:
-            # Notify the user that their old profile URL won't work.
-            messages.info(request,
-                          _(u'You changed your username; please note your '
-                            u'profile URL has also changed.'))
-
-        return redirect('phonebook:profile_view', user.username)
-
     emails = ExternalAccount.objects.filter(type=ExternalAccount.TYPE_EMAIL)
-    email_privacy_form = forms.EmailPrivacyForm(request.POST or None, instance=profile)
-    alternate_email_formset = forms.AlternateEmailFormset(request.POST or None,
-                                                          instance=profile,
-                                                          queryset=emails)
+    accounts_qs = ExternalAccount.objects.exclude(type=ExternalAccount.TYPE_EMAIL)
+
+    sections = {
+        'registration_section': ['user_form', 'registration_form'],
+        'basic_section': ['user_form', 'basic_information_form'],
+        'groups_section': ['groups_privacy_form'],
+        'skills_section': ['skills_form'],
+        'email_section': ['email_privacy_form', 'alternate_email_formset'],
+        'languages_section': ['language_privacy_form', 'language_formset'],
+        'accounts_section': ['accounts_formset'],
+        'irc_section': ['irc_form'],
+        'location_section': ['location_form'],
+        'contribution_section': ['contribution_form'],
+        'tshirt_section': ['tshirt_form'],
+        'developer_section': ['developer_form']
+    }
+
+    curr_sect = next((s for s in sections.keys() if s in request.POST), None)
+
+    def get_request_data(form):
+        if curr_sect and form in sections[curr_sect]:
+            return request.POST
+        return None
+
+    ctx = {}
+    ctx['user_form'] = forms.UserForm(get_request_data('user_form'), instance=user)
+    ctx['registration_form'] = forms.RegisterForm(get_request_data('registration_form'),
+                                                  request.FILES or None,
+                                                  instance=profile)
+    basic_information_data = get_request_data('basic_information_form')
+    ctx['basic_information_form'] = forms.BasicInformationForm(basic_information_data,
+                                                               request.FILES or None,
+                                                               instance=profile)
+    ctx['accounts_formset'] = forms.AccountsFormset(get_request_data('accounts_formset'),
+                                                    instance=profile,
+                                                    queryset=accounts_qs)
+    ctx['language_formset'] = forms.LanguagesFormset(get_request_data('language_formset'),
+                                                     instance=profile,
+                                                     locale=request.locale)
+    language_privacy_data = get_request_data('language_privacy_form')
+    ctx['language_privacy_form'] = forms.LanguagesPrivacyForm(language_privacy_data,
+                                                              instance=profile)
+    ctx['skills_form'] = forms.SkillsForm(get_request_data('skills_form'), instance=profile,
+                                          initial={'skills': user_skills})
+    location_initial = {
+        'saveregion': True if profile.geo_region else False,
+        'savecity': True if profile.geo_city else False,
+        'lat': profile.lat,
+        'lng': profile.lng
+    }
+    ctx['location_form'] = forms.LocationForm(get_request_data('location_form'), instance=profile,
+                                              initial=location_initial)
+    ctx['contribution_form'] = forms.ContributionForm(get_request_data('contribution_form'),
+                                                      instance=profile)
+    ctx['tshirt_form'] = forms.TshirtForm(get_request_data('tshirt_form'), instance=profile)
+    ctx['groups_privacy_form'] = forms.GroupsPrivacyForm(get_request_data('groups_privacy_form'),
+                                                         instance=profile)
+    ctx['irc_form'] = forms.IRCForm(get_request_data('irc_form'), instance=profile)
+    ctx['developer_form'] = forms.DeveloperForm(get_request_data('developer_form'),
+                                                instance=profile)
+    ctx['email_privacy_form'] = forms.EmailPrivacyForm(get_request_data('email_privacy_form'),
+                                                       instance=profile)
+    alternate_email_formset_data = get_request_data('alternate_email_formset')
+    ctx['alternate_email_formset'] = forms.AlternateEmailFormset(alternate_email_formset_data,
+                                                                 instance=profile,
+                                                                 queryset=emails)
+    forms_valid = True
+    if request.POST:
+        if not curr_sect:
+            raise Http404
+        curr_forms = map(lambda x: ctx[x], sections[curr_sect])
+        forms_valid = all(map(lambda x: x.is_valid(), curr_forms))
+        if forms_valid:
+            old_username = request.user.username
+            for f in curr_forms:
+                f.save()
+
+            if curr_sect == 'registration_section':
+                redeem_invite(profile, request.session.get('invite-code'))
+            elif user.username != old_username:
+                msg = (u'You changed your username; '
+                       u'please note your profile URL has also changed.')
+                messages.info(request, _(msg))
+
+            next_section = request.GET.get('next')
+            next_url = urlparams(reverse('phonebook:profile_edit'), next_section)
+            return HttpResponseRedirect(next_url)
+
+    ctx.update({
+        'user_groups': user_groups,
+        'profile': request.user.userprofile,
+        'vouch_threshold': settings.CAN_VOUCH_THRESHOLD,
+        'mapbox_id': settings.MAPBOX_PROFILE_ID,
+        'apps': user.apiapp_set.filter(is_active=True),
+        'appsv2': profile.apps.filter(enabled=True),
+        'forms_valid': forms_valid
+    })
 
-    data = dict(profile_form=profile_form,
-                user_form=user_form,
-                accounts_formset=accounts_formset,
-                email_privacy_form=email_privacy_form,
-                alternate_email_formset=alternate_email_formset,
-                user_groups=user_groups,
-                profile=request.user.userprofile,
-                language_formset=language_formset,
-                vouch_threshold=settings.CAN_VOUCH_THRESHOLD,
-                mapbox_id=settings.MAPBOX_PROFILE_ID,
-                apps=user.apiapp_set.filter(is_active=True),
-                appsv2=profile.apps.filter(enabled=True))
-
-    # If there are form errors, don't send a 200 OK.
-    status = 400 if any(f.errors for f in all_forms) else 200
-    return render(request, 'phonebook/edit_profile.html', data, status=status)
+    return render(request, 'phonebook/edit_profile.html', ctx)
 
 
 @allow_unvouched
diff --git a/mozillians/templates/includes/field.html b/mozillians/templates/includes/field.html
index bc0f79f6a..39c22773d 100644
--- a/mozillians/templates/includes/field.html
+++ b/mozillians/templates/includes/field.html
@@ -2,15 +2,18 @@
   <div class="privacy-controls">
     <span class="info glyphicon glyphicon-eye-open" aria-hidden="true" title="{{ _('Choose visibility group for this field') }}"></span>
     <div class="btn-group btn-group-xs" role="group">
-    {% for value, text in field.field.choices %}
-      {% if value == 1 %}
-        <button type="button" class="btn btn-default active">{{ text }}</button>
-      {% else %}
-        <button type="button" class="privacy-toggle btn btn-default {% if value == field.value() %}active{% endif %}" data-target="{{ field.name }}" data-value="{{ value }}">{{ text }}</button>
-      {% endif %}
-    {% endfor %}
-    <input type="hidden" value="{{ field.value() }}" name="{{ field.name }}" id="{{ field.name }}">
+      {% for value, text in field.field.choices %}
+        {% if value == 1 %}
+          <button type="button" class="btn btn-default active">{{ text }}</button>
+        {% else %}
+          <button type="button" class="privacy-toggle btn btn-default {% if value == field.value()|int %}active{% endif %}" data-target="{{ field.name }}" data-value="{{ value }}">{{ text }}</button>
+        {% endif %}
+      {% endfor %}
+      <input type="hidden" value="{{ field.value() }}" name="{{ field.html_name }}" id="{{ field.auto_id }}">
     </div>
+    {% if field.errors %}
+      <div class="error-message">{{ field.errors }}</div>
+    {% endif %}
   </div>
 {% else %}
 
diff --git a/mozillians/templates/phonebook/edit_profile.html b/mozillians/templates/phonebook/edit_profile.html
index fb087e459..e1a5624a7 100644
--- a/mozillians/templates/phonebook/edit_profile.html
+++ b/mozillians/templates/phonebook/edit_profile.html
@@ -8,12 +8,11 @@
 {% block extrahead %}
   <link href="https://api.tiles.mapbox.com/mapbox.js/v1.6.2/mapbox.css"
         type="text/css" rel="stylesheet" media="screen" />
-  {{ profile_form.media.css }}
+  {{ registration_form.media.css }}
 {% endblock extrahead %}
 
 {% block content %}
-  {% if (profile_form.errors or user_form.errors or accounts_formset.errors
-         or language_formset.errors) %}
+  {% if not forms_valid %}
       <div class="alert alert-error">
         {{ _('Please correct the errors below.') }}
       </div>
@@ -76,211 +75,8 @@
     </div>
 
   {% else %}
-
     {# This is the required-only profile form for new registrations. #}
-    <form class="edit-profile" id="edit-prfile-form" method="POST" action="" enctype="multipart/form-data">
-      {{ csrf() }}
-
-      {% if (profile_form.non_field_errors() or user_form.non_field_errors()
-             or accounts_formset.non_form_errors() or language_formset.non_form_errors()) %}
-        <ul class="unstyled">
-          {% for error in profile_form.non_field_errors() %}
-            <li class="alert alert-error">{{ error }}</li>
-          {% endfor %}
-          {% for error in user_form.non_field_errors() %}
-            <li class="alert alert-error">{{ error }}</li>
-          {% endfor %}
-          {% for error in accounts_formset.non_form_errors() %}
-            <li class="alert alert-error">{{ error }}</li>
-          {% endfor %}
-          {% for error in language_formset.non_form_errors() %}
-            <li class="alert alert-error">{{ error }}</li>
-          {% endfor %}
-        </ul>
-      {% endif %}
-
-      <div class="panel panel-default">
-        <div class="panel-heading">{{ _('Basic Information') }}</div>
-        <div class="panel-body">
-          <div class="row">
-            <div class="col-md-12">
-              {% include 'phonebook/includes/photo_form.html' %}
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-md-12">
-              <fieldset>
-                <div class="row">
-                  <div class="col-md-12">
-                    {{ mozillians_field(user_form.username) }}
-                  </div>
-                </div>
-              </fieldset>
-            </div>
-          </div>
-
-          <div class="row">
-            <div class="col-md-12">
-              <fieldset>
-                <div class="row">
-                  <div class="col-md-6">
-                    {{ mozillians_field(profile_form.full_name) }}
-                  </div>
-                  <div class="col-md-6 text-right">
-                    {{ privacy_field(profile_form.privacy_full_name) }}
-                  </div>
-                </div>
-              </fieldset>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="panel panel-default">
-        <div class="panel-heading">{{ _('Location') }}</div>
-        <div class="panel-body">
-          <div class="row">
-            <div class="col-md-12">
-              <fieldset>
-                {% for error in profile_form.errors['location'] %}
-                  <span class="error-message">{{ error }}</span>
-                {% endfor %}
-                <div id="location">
-                  <div id="map" data-mapboxid="{{ mapbox_id }}"></div>
-                  <div id="location_gps_button"><i class="icon-target"></i></div>
-                  <img id="location_gps_loading" src="{{ static('mozillians/img/loader_blue.gif') }}">
-                  <input id="location_search" type="search"/>
-                  <input id="location_search_button" class="button" type="button" value="Search location"/>
-                  <img id="location_search_loading" src="{{ static('mozillians/img/loader_blue.gif') }}">
-                  <ol id="location_search_results" class="scroll-shadows"></ol>
-                </div>
-                <div id="gps_error" class="error-message" style="display:none;">
-                  <i class="icon-target"></i> {{ _('You have denied Location services.') }}
-                </div>
-                <div id="location_wrong" >
-                  <a id="improve_this_map" target="_blank"
-                     href="http://www.openstreetmap.org/note/new#map=13/{{profile.lat}}/{{profile.lng}}&layers=N">
-                    Improve this map</a>
-                  <a href="https://wiki.mozilla.org/Mozillians/Locations" target="_blank" class="small">[learn more]</a>
-                </div>
-              </fieldset>
-
-              <fieldset>
-                <div class="row">
-                  <div class="col-md-9">
-                    {{ mozillians_field(profile_form.timezone) }}
-                  </div>
-                  <div class="col-md-3">
-                    {{ privacy_field(profile_form.privacy_timezone) }}
-                  </div>
-                </div>
-              </fieldset>
-
-              <fieldset>
-                <div class="row">
-                  <div class="col-md-6">
-                    <label class="required">{{ _('Country') }}</label>
-                    <span id="display_country" class="geodisplay"
-                          data-mapbox="{{ profile.geo_country.name if profile.geo_country else ''}}">
-                    </span>
-                  </div>
-                  <div class="col-md-3">
-                    <div class="geocheckbox {% if profile_form.savecountry.errors %} error {% endif %}">
-                      {{ profile_form.savecountry }}
-                      {{ profile_form.savecountry.label_tag() }}
-                      {% for error in profile_form.savecountry.errors %}
-                        <span class="error-message">{{ error }}</span>
-                      {% endfor %}
-                    </div>
-                  </div>
-                  <div class="col-md-3">
-                    {{ privacy_field(profile_form.privacy_geo_country) }}
-                  </div>
-                </div>
-              </fieldset>
-
-              <fieldset>
-                <div class="row">
-                  <div class="col-md-6">
-                    <label>{{ _('Region') }}</label>
-                    <span id="display_province" class="geodisplay"
-                          data-mapbox="{{ profile.geo_region.name if profile.geo_region else ''}}">
-                    </span>
-                  </div>
-                  <div class="col-md-3">
-                    <div class="geocheckbox {% if profile_form.saveregion.errors %} error {% endif %}">
-                      {{ profile_form.saveregion }}
-                      {{ profile_form.saveregion.label_tag() }}
-                      {% for error in profile_form.saveregion.errors %}
-                        <span class="error-message">{{ error }}</span>
-                      {% endfor %}
-                    </div>
-                  </div>
-                  <div class="col-md-3">
-                    {{ privacy_field(profile_form.privacy_geo_region) }}
-                  </div>
-                </div>
-              </fieldset>
-
-              <fieldset>
-                <div class="row">
-                  <div class="col-md-6">
-                    <label>{{ _('City') }}</label>
-                    <span id="display_city" class="geodisplay"
-                          data-mapbox="{{ profile.geo_city.name if profile.geo_city else ''}}"></span>
-                  </div>
-                  <div class="col-md-3">
-                    <div class="geocheckbox {% if profile_form.savecity.errors %} error {% endif %}">
-                      {{ profile_form.savecity }}
-                      {{ profile_form.savecity.label_tag() }}
-                      {% for error in profile_form.savecity.errors %}
-                        <span class="error-message">{{ error }}</span>
-                      {% endfor %}
-                    </div>
-                  </div>
-                  <div class="col-md-3">
-                    {{ privacy_field(profile_form.privacy_geo_city) }}
-                  </div>
-                </div>
-              </fieldset>
-              {{ profile_form.lat }}
-              {{ profile_form.lng }}
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="panel panel-default">
-        <div class="panel-body">
-          <div class="row">
-            <div class="col-md-12">
-              <fieldset id="privacy-verify">
-                {% if profile_form.optin.errors %}
-                  <div class="error">
-                    {{ _('This field is required.') }}
-                  </div>
-                {% endif %}
-                  <label class="checkbox required">
-                    {{ profile_form.optin }}
-                  </label>
-                  <label id="{{ profile_form.optin.id_for_label }}" {% if profile_form.optin.errors %}class="error"{% endif %}>
-                    {% trans privacy_url='http://mozilla.org/privacy/websites/' %}
-                      I'm okay with you handling this info as you explain
-                      in <a href="{{ privacy_url }}">Mozilla's privacy
-                      policy</a>.
-                    {% endtrans %}
-                  </label>
-              </fieldset>
-            </div>
-          </div>
-        </div>
-        <div class="panel-footer">
-          <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Create Profile') }}</button>
-        </div>
-      </div>
-
-    </form>
+    {% include 'phonebook/includes/profile_edit_registration.html' %}
   {% endif %}
 {% endblock %}
 
@@ -291,5 +87,5 @@
     <script src="{{ static('mozillians/js/profile_edit.js') }}"></script>
     <script src="{{ static('mozillians/js/profile_edit_mapbox.js') }}"></script>
   {% endcompress %}
-  {{ profile_form.media.js }}
+  {{ registration_form.media.js }}
 {% endblock %}
diff --git a/mozillians/templates/phonebook/includes/photo_form.html b/mozillians/templates/phonebook/includes/photo_form.html
index 9865c38bf..09bd170fa 100644
--- a/mozillians/templates/phonebook/includes/photo_form.html
+++ b/mozillians/templates/phonebook/includes/photo_form.html
@@ -1,12 +1,12 @@
 <fieldset>
   <div id="photo" class="row">
-    <div class="col-md-3">
-      <label for="id_photo"> {{ _('Profile Photo') }} </label>
+    <div class="{% if profile.is_complete %}col-md-3{% else %}col-md-4{% endif %}">
+      <label for="id_photo">{{ _('Profile Photo') }}</label>
       <div class="profile-photo">
         <img src="{{ profile.get_photo_url('100x100') }}" alt="{{ _('Profile photo') }}">
       </div>
     </div>
-    <div class="col-md-6">
+    <div class="{% if profile.is_complete %}col-md-6 col-sm-6{% else %}col-md-8{% endif %}">
       <input class="input-file photo" id="id_photo" type="file" name="photo">
       {% if profile.photo %}
         <div id="id_photo_delete">
@@ -17,8 +17,12 @@
         </div>
       {% endif %}
     </div>
-    <div class="col-md-3 text-right">
-      {{ privacy_field(profile_form.privacy_photo) }}
+    <div class="{% if profile.is_complete %}col-md-3 text-right{% else %}col-md-8 registration{% endif %}">
+      {% if profile.is_complete %}
+        {{ privacy_field(basic_information_form.privacy_photo) }}
+      {% else %}
+        {{ privacy_field(registration_form.privacy_photo) }}
+      {% endif %}
     </div>
   </div>
 </fieldset>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_accounts.html b/mozillians/templates/phonebook/includes/profile_edit_accounts.html
index 6fcf91242..473c514bd 100644
--- a/mozillians/templates/phonebook/includes/profile_edit_accounts.html
+++ b/mozillians/templates/phonebook/includes/profile_edit_accounts.html
@@ -4,6 +4,13 @@
     <div class="panel panel-default">
       <div class="panel-heading">{{ _('External Accounts') }}</div>
       <div class="panel-body">
+        {% if accounts_formset.non_form_errors() %}
+          <ul class="unstyled">
+            {% for error in accounts_formset.non_form_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+          </ul>
+        {% endif %}
         <fieldset>
           <div class="row">
             <div class="col-md-12" id="accounts">
@@ -33,7 +40,7 @@
         </fieldset>
       </div>
       <div class="panel-footer">
-        <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Update External Accounts') }}</button>
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="accounts_section">{{ _('Update External Accounts') }}</button>
       </div>
     </div>
 
@@ -42,17 +49,17 @@
       <div class="panel-body">
         <fieldset>
           <div class="row">
-            <div class="col-md-9">
-              {{ mozillians_field(profile_form.ircname) }}
+            <div class="col-md-9 col-sm-8">
+              {{ mozillians_field(irc_form.ircname) }}
             </div>
             <div class="col-md-3">
-              {{ privacy_field(profile_form.privacy_ircname) }}
+              {{ privacy_field(irc_form.privacy_ircname) }}
             </div>
           </div>
         </fieldset>
       </div>
       <div class="panel-footer">
-        <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Update IRC information') }}</button>
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="irc_section">{{ _('Update IRC information') }}</button>
       </div>
     </div>
   </div>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_basic.html b/mozillians/templates/phonebook/includes/profile_edit_basic.html
index 13b4720d0..5fc83b60b 100644
--- a/mozillians/templates/phonebook/includes/profile_edit_basic.html
+++ b/mozillians/templates/phonebook/includes/profile_edit_basic.html
@@ -5,23 +5,33 @@
       <div class="panel-heading">{{ _('Basic Information') }}</div>
       <div class="panel-body">
 
-      {% if (profile_form.non_field_errors() or user_form.non_field_errors()
-            or accounts_formset.non_form_errors() or language_formset.non_form_errors()) %}
-       <ul class="unstyled">
-         {% for error in profile_form.non_field_errors() %}
-           <li class="alert alert-error">{{ error }}</li>
-         {% endfor %}
-         {% for error in user_form.non_field_errors() %}
-           <li class="alert alert-error">{{ error }}</li>
-         {% endfor %}
-         {% for error in accounts_formset.non_form_errors() %}
-           <li class="alert alert-error">{{ error }}</li>
-         {% endfor %}
-         {% for error in language_formset.non_form_errors() %}
-           <li class="alert alert-error">{{ error }}</li>
-         {% endfor %}
-       </ul>
-      {% endif %}
+        {% if (basic_information_form.non_field_errors()
+               or user_form.non_field_errors()
+               or language_formset.non_form_errors()
+               or email_privacy_form.non_field_errors()
+               or alternate_email_formset.non_form_errors()
+               or skills_form.non_field_errors()) %}
+          <ul class="unstyled">
+            {% for error in basic_information_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+            {% for error in user_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+            {% for error in language_formset.non_form_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+            {% for error in email_privacy_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+            {% for error in alternate_email_formset.non_form_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+            {% for error in skills_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+          </ul>
+        {% endif %}
 
         {% include 'phonebook/includes/photo_form.html' %}
 
@@ -35,19 +45,19 @@
 
         <fieldset>
           <div class="row">
-            <div class="col-md-8">
-              {{ mozillians_field(profile_form.full_name) }}
+            <div class="col-md-8 col-sm-6">
+              {{ mozillians_field(basic_information_form.full_name) }}
             </div>
             <div class="col-md-4 text-right">
-              {{ privacy_field(profile_form.privacy_full_name) }}
+              {{ privacy_field(basic_information_form.privacy_full_name) }}
             </div>
           </div>
         </fieldset>
 
         <fieldset>
           <div class="row">
-            <div class="col-md-9">
-              {{ mozillians_field(profile_form.bio) }}
+            <div class="col-md-9 col-sm-6">
+              {{ mozillians_field(basic_information_form.bio) }}
               <span class="under-input-field">
                 {% trans url='http://daringfireball.net/projects/markdown/syntax' %}
                   Use <a href="{{ url }}">Markdown</a> for bold, italic, lists and links.
@@ -55,14 +65,14 @@
               </span>
             </div>
             <div class="col-md-3 text-right">
-              {{ privacy_field(profile_form.privacy_bio) }}
+              {{ privacy_field(basic_information_form.privacy_bio) }}
             </div>
           </div>
         </fieldset>
       </div>
 
       <div class="panel-footer">
-        <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Update Information') }}</button>
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="basic_section">{{ _('Update Information') }}</button>
       </div>
     </div>
   </form>
@@ -113,6 +123,9 @@
           </div>
         </fieldset>
       </div>
+      <div class="panel-footer">
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="email_section">{{ _('Update Emails') }}</button>
+      </div>
     </div>
   </form>
 
@@ -123,26 +136,32 @@
         {{ _('Skills') }}
       </div>
       <div class="panel-body">
-        <div class="row">
-          <div class="col-md-9">
-            <p class="field_description">
-              {% trans %}
-                A skill is the learned capacity to carry out pre-determined
-                results often with the minimum outlay of time, energy, or
-                both.
-              {% endtrans %}
-            </p>
-            <fieldset id="skills" data-autocomplete-url="{{ url('groups:search_skills') }}">
-              {{ mozillians_field(profile_form.skills) }}
-            </fieldset>
+        <fieldset>
+          <div class="row">
+            <div class="col-md-9 col-sm-9">
+              <p class="field_description">
+                {% trans %}
+                  A skill is the learned capacity to carry out pre-determined
+                  results often with the minimum outlay of time, energy, or
+                  both.
+                {% endtrans %}
+              </p>
+            </div>
+            <div class="col-md-3 col-sm-3 text-right">
+              {{ privacy_field(skills_form.privacy_skills) }}
+            </div>
           </div>
-          <div class="col-md-3">
-            {{ privacy_field(profile_form.privacy_skills) }}
+          <div class="row">
+            <div class="col-md-12">
+              <fieldset id="skills" data-autocomplete-url="{{ url('groups:search_skills') }}">
+                {{ mozillians_field(skills_form.skills) }}
+              </fieldset>
+            </div>
           </div>
-        </div>
+        </fieldset>
       </div>
       <div class="panel-footer">
-        <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Update Skills') }}</button>
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="skills_section">{{ _('Update Skills') }}</button>
       </div>
     </div>
   </form>
@@ -154,7 +173,7 @@
       <div class="panel-body">
         <fieldset>
           <div class="row">
-            <div class="col-md-9" id="languages">
+            <div class="col-md-9 col-sm-9" id="languages">
               <p class="field_description">
                 {% trans %}
                   The Mozilla Project spans over many countries and
@@ -183,13 +202,13 @@
               <a href="#" id="languages-addfield" class="addField"><i class="icon-plus-circle"></i> {{ _('Add language') }}</a>
             </div>
             <div class="col-md-3">
-              {{ privacy_field(profile_form.privacy_languages) }}
+              {{ privacy_field(language_privacy_form.privacy_languages) }}
             </div>
           </div>
         </fieldset>
       </div>
       <div class="panel-footer">
-        <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Update Languages') }}</button>
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="languages_section">{{ _('Update Languages') }}</button>
       </div>
     </div>
   </form>
@@ -210,7 +229,7 @@
     </div>
     <div class="panel-footer">
       <a href="{{ url('phonebook:profile_confirm_delete') }}" id="delete-profile"
-	 class="btn btn-danger delete">
+         class="btn btn-danger delete disabled">
         {{ _('Delete Profile') }}
       </a>
     </div>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_developer.html b/mozillians/templates/phonebook/includes/profile_edit_developer.html
index fdc21ab66..bb400742b 100644
--- a/mozillians/templates/phonebook/includes/profile_edit_developer.html
+++ b/mozillians/templates/phonebook/includes/profile_edit_developer.html
@@ -2,9 +2,16 @@
   {{ csrf() }}
   <div id="developer-tab" class="hidden-xs hidden-sm settings-tab">
     <div class="panel panel-default">
-      <div class="panel-heading">{{ _('Developer') }}</div>
+      <div class="panel-heading">{{ _('API privacy') }}</div>
       <div class="panel-body">
-        <fieldset id="services" class="edit-controls">
+        {% if developer_form.non_field_errors() %}
+          <ul class="unstyled">
+            {% for error in developer_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+          </ul>
+        {% endif %}
+        <fieldset id="privacy" class="edit-controls">
           <p class="field_description">
             {% trans bugzilla_url='http://bugzilla.mozilla.org',
                      reps_url='http://reps.mozilla.org' %}
@@ -14,26 +21,34 @@
             {% endtrans %}
           <h4>{{ _('Privacy') }}</h4>
           <p>
-            {{ profile_form.allows_community_sites.label_tag() }}
-            {{ profile_form.allows_community_sites }}
+            {{ developer_form.allows_community_sites.label_tag() }}
+            {{ developer_form.allows_community_sites }}
           </p>
           <p>
-            {{ profile_form.allows_mozilla_sites.label_tag() }}
-            {{ profile_form.allows_mozilla_sites }}
+            {{ developer_form.allows_mozilla_sites.label_tag() }}
+            {{ developer_form.allows_mozilla_sites }}
           </p>
           <p>
             API Version 2, currently under testing, respects the defined
             per field privacy levels. These fields will become obsolete
             and eventually dropped along with the API Version 1.
           </p>
-
-          {% if user.userprofile.is_vouched and waffle.flag('apiv2') %}
-            <h4>{{ _('Developers') }}</h4>
-            <p>Developers can request API keys and manage existing ones using our dedicated API page.</p>
-            <a class="cancel" href="{{ url('phonebook:apikeys') }}">Manage API keys</a>
-          {% endif %}
         </fieldset>
       </div>
+      <div class="panel-footer">
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="developer_section">{{ _('Update Privacy Settings') }}</button>
+      </div>
     </div>
+    {% if user.userprofile.is_vouched and waffle.flag('apiv2') %}
+      <div class="panel panel-default">
+        <div class="panel-heading">{{ _('Developer') }}</div>
+        <div class="panel-body">
+          <fieldset id="api" class="edit-controls">
+            <p>Developers can request API keys and manage existing ones using our dedicated API page.</p>
+            <a class="cancel" href="{{ url('phonebook:apikeys') }}">Manage API keys</a>
+          </fieldset>
+        </div>
+      </div>
+    {% endif %}
   </div>
 </form>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_groups.html b/mozillians/templates/phonebook/includes/profile_edit_groups.html
index 44a60ebd3..928dc1be7 100644
--- a/mozillians/templates/phonebook/includes/profile_edit_groups.html
+++ b/mozillians/templates/phonebook/includes/profile_edit_groups.html
@@ -4,6 +4,13 @@
     <div class="panel panel-default">
       <div class="panel-heading">{{ _('Groups') }}</div>
       <div class="panel-body">
+        {% if groups_privacy_form.non_field_errors() %}
+          <ul class="unstyled">
+            {% for error in groups_privacy_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+          </ul>
+        {% endif %}
         <fieldset id="groups">
           <p class="field_description">
             {% trans %}
@@ -37,9 +44,12 @@
               </li>
             {% endfor %}
           </ul>
-          {{ privacy_field(profile_form.privacy_groups) }}
+          {{ privacy_field(groups_privacy_form.privacy_groups) }}
         </fieldset>
       </div>
+      <div class="panel-footer">
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="groups_section">{{ _('Update Groups') }}</button>
+      </div>
     </div>
   </div>
 </form>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_location.html b/mozillians/templates/phonebook/includes/profile_edit_location.html
index 3cfd98c41..0cdf27a43 100644
--- a/mozillians/templates/phonebook/includes/profile_edit_location.html
+++ b/mozillians/templates/phonebook/includes/profile_edit_location.html
@@ -4,8 +4,15 @@
     <div class="panel panel-default">
       <div class="panel-heading">{{ _('Location') }}</div>
       <div class="panel-body">
+        {% if location_form.non_field_errors() %}
+          <ul class="unstyled">
+            {% for error in location_form.non_field_errors() %}
+              <li class="alert alert-error">{{ error }}</li>
+            {% endfor %}
+          </ul>
+        {% endif %}
         <fieldset>
-          {% for error in profile_form.errors['location'] %}
+          {% for error in location_form.errors['location'] %}
             <span class="error-message">{{ error }}</span>
           {% endfor %}
           <div id="location">
@@ -30,87 +37,87 @@
 
         <fieldset>
           <div class="row">
-            <div class="col-md-9">
-              {{ mozillians_field(profile_form.timezone) }}
+            <div class="col-md-9 col-sm-8">
+              {{ mozillians_field(location_form.timezone) }}
             </div>
             <div class="col-md-3">
-              {{ privacy_field(profile_form.privacy_timezone) }}
+              {{ privacy_field(location_form.privacy_timezone) }}
             </div>
           </div>
         </fieldset>
 
         <fieldset>
           <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6 col-sm-6">
               <label class="required">{{ _('Country') }}</label>
               <span id="display_country" class="geodisplay"
                     data-mapbox="{{ profile.geo_country.name if profile.geo_country else ''}}">
               </span>
             </div>
-            <div class="col-md-3">
-              <div class="geocheckbox {% if profile_form.savecountry.errors %} error {% endif %}">
-                {{ profile_form.savecountry }}
-                {{ profile_form.savecountry.label_tag() }}
-                {% for error in profile_form.savecountry.errors %}
+            <div class="col-md-3 col-sm-3">
+              <div class="geocheckbox {% if location_form.savecountry.errors %} error {% endif %}">
+                {{ location_form.savecountry }}
+                {{ location_form.savecountry.label_tag() }}
+                {% for error in location_form.savecountry.errors %}
                   <span class="error-message">{{ error }}</span>
                 {% endfor %}
               </div>
             </div>
             <div class="col-md-3">
-              {{ privacy_field(profile_form.privacy_geo_country) }}
+              {{ privacy_field(location_form.privacy_geo_country) }}
             </div>
           </div>
         </fieldset>
 
         <fieldset>
           <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6 col-sm-6">
               <label>{{ _('Region') }}</label>
               <span id="display_province" class="geodisplay"
                     data-mapbox="{{ profile.geo_region.name if profile.geo_region else ''}}">
               </span>
             </div>
-            <div class="col-md-3">
-              <div class="geocheckbox {% if profile_form.saveregion.errors %} error {% endif %}">
-                {{ profile_form.saveregion }}
-                {{ profile_form.saveregion.label_tag() }}
-                {% for error in profile_form.saveregion.errors %}
+            <div class="col-md-3 col-sm-3">
+              <div class="geocheckbox {% if location_form.saveregion.errors %} error {% endif %}">
+                {{ location_form.saveregion }}
+                {{ location_form.saveregion.label_tag() }}
+                {% for error in location_form.saveregion.errors %}
                   <span class="error-message">{{ error }}</span>
                 {% endfor %}
               </div>
             </div>
             <div class="col-md-3">
-              {{ privacy_field(profile_form.privacy_geo_region) }}
+              {{ privacy_field(location_form.privacy_geo_region) }}
             </div>
           </div>
         </fieldset>
 
         <fieldset>
           <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6 col-sm-6">
               <label>{{ _('City') }}</label>
               <span id="display_city" class="geodisplay"
                     data-mapbox="{{ profile.geo_city.name if profile.geo_city else ''}}"></span>
             </div>
-            <div class="col-md-3">
-              <div class="geocheckbox {% if profile_form.savecity.errors %} error {% endif %}">
-                {{ profile_form.savecity }}
-                {{ profile_form.savecity.label_tag() }}
-                {% for error in profile_form.savecity.errors %}
+            <div class="col-md-3 col-sm-3">
+              <div class="geocheckbox {% if location_form.savecity.errors %} error {% endif %}">
+                {{ location_form.savecity }}
+                {{ location_form.savecity.label_tag() }}
+                {% for error in location_form.savecity.errors %}
                   <span class="error-message">{{ error }}</span>
                 {% endfor %}
               </div>
             </div>
             <div class="col-md-3">
-              {{ privacy_field(profile_form.privacy_geo_city) }}
+              {{ privacy_field(location_form.privacy_geo_city) }}
             </div>
           </div>
         </fieldset>
-        {{ profile_form.lat }}
-        {{ profile_form.lng }}
+        {{ location_form.lat }}
+        {{ location_form.lng }}
       </div>
       <div class="panel-footer">
-        <button class="btn btn-primary" id="form-submit-top" type="submit">{{ _('Update Location') }}</button>
+        <button class="btn btn-primary" id="form-submit-top" type="submit" name="location_section">{{ _('Update Location') }}</button>
       </div>
     </div>
   </div>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_registration.html b/mozillians/templates/phonebook/includes/profile_edit_registration.html
new file mode 100644
index 000000000..2f4a9043c
--- /dev/null
+++ b/mozillians/templates/phonebook/includes/profile_edit_registration.html
@@ -0,0 +1,191 @@
+<form class="edit-profile" id="edit-profile-form" method="POST" action="" enctype="multipart/form-data">
+   {{ csrf() }}
+
+   {% if (registration_form.non_field_errors() or user_form.non_field_errors()) %}
+     <ul class="unstyled">
+       {% for error in registration_form.non_field_errors() %}
+         <li class="alert alert-error">{{ error }}</li>
+       {% endfor %}
+       {% for error in user_form.non_field_errors() %}
+         <li class="alert alert-error">{{ error }}</li>
+       {% endfor %}
+     </ul>
+   {% endif %}
+
+   <div class="panel panel-default">
+     <div class="panel-heading">{{ _('Basic Information') }}</div>
+     <div class="panel-body">
+       <div class="row">
+         <div class="col-md-6">
+           {% include 'phonebook/includes/photo_form.html' %}
+         </div>
+
+         <div class="col-md-6 registration">
+           <fieldset>
+             <div class="row">
+               <div class="col-md-12">
+                 {{ mozillians_field(user_form.username) }}
+               </div>
+             </div>
+           </fieldset>
+
+           <fieldset>
+             <div class="row">
+               <div class="col-md-12 col-sm-6">
+                 {{ mozillians_field(registration_form.full_name) }}
+               </div>
+             </div>
+             <div class="row">
+               <div class="col-md-12 registration">
+                 {{ privacy_field(registration_form.privacy_full_name) }}
+               </div>
+             </div>
+           </fieldset>
+         </div>
+       </div>
+     </div>
+    </div>
+
+  <div class="panel panel-default">
+    <div class="panel-heading">{{ _('Location') }}</div>
+    <div class="panel-body">
+      <div class="row">
+        <div class="col-md-12">
+          <fieldset>
+            {% for error in registration_form.errors['location'] %}
+              <span class="error-message">{{ error }}</span>
+            {% endfor %}
+            <div id="location">
+              <div id="map" data-mapboxid="{{ mapbox_id }}"></div>
+              <div id="location_gps_button"><i class="icon-target"></i></div>
+              <img id="location_gps_loading" src="{{ static('mozillians/img/loader_blue.gif') }}">
+              <input id="location_search" type="search"/>
+              <input id="location_search_button" class="button" type="button" value="Search location"/>
+              <img id="location_search_loading" src="{{ static('mozillians/img/loader_blue.gif') }}">
+              <ol id="location_search_results" class="scroll-shadows"></ol>
+            </div>
+            <div id="gps_error" class="error-message" style="display:none;">
+              <i class="icon-target"></i> {{ _('You have denied Location services.') }}
+            </div>
+            <div id="location_wrong" >
+              <a id="improve_this_map" target="_blank"
+                 href="http://www.openstreetmap.org/note/new#map=13/{{profile.lat}}/{{profile.lng}}&layers=N">
+                Improve this map</a>
+              <a href="https://wiki.mozilla.org/Mozillians/Locations" target="_blank" class="small">[learn more]</a>
+            </div>
+          </fieldset>
+
+          <fieldset>
+            <div class="row">
+              <div class="col-md-9 col-sm-8">
+                {{ mozillians_field(registration_form.timezone) }}
+              </div>
+              <div class="col-md-3">
+                {{ privacy_field(registration_form.privacy_timezone) }}
+              </div>
+            </div>
+          </fieldset>
+
+          <fieldset>
+            <div class="row">
+              <div class="col-md-5 col-sm-6">
+                <label class="required">{{ _('Country') }}</label>
+                <span id="display_country" class="geodisplay"
+                      data-mapbox="{{ profile.geo_country.name if profile.geo_country else ''}}">
+                </span>
+              </div>
+              <div class="col-md-4 col-sm-3">
+                <div class="geocheckbox {% if registration_form.savecountry.errors %} error {% endif %}">
+                  {{ registration_form.savecountry }}
+                  {{ registration_form.savecountry.label_tag() }}
+                  {% for error in registration_form.savecountry.errors %}
+                    <span class="error-message">{{ error }}</span>
+                  {% endfor %}
+                </div>
+              </div>
+              <div class="col-md-3">
+                {{ privacy_field(registration_form.privacy_geo_country) }}
+              </div>
+            </div>
+          </fieldset>
+
+          <fieldset>
+            <div class="row">
+              <div class="col-md-5 col-sm-6">
+                <label>{{ _('Region') }}</label>
+                <span id="display_province" class="geodisplay"
+                      data-mapbox="{{ profile.geo_region.name if profile.geo_region else ''}}">
+                </span>
+              </div>
+              <div class="col-md-4 col-sm-3">
+                <div class="geocheckbox {% if registration_form.saveregion.errors %} error {% endif %}">
+                  {{ registration_form.saveregion }}
+                  {{ registration_form.saveregion.label_tag() }}
+                  {% for error in registration_form.saveregion.errors %}
+                    <span class="error-message">{{ error }}</span>
+                  {% endfor %}
+                </div>
+              </div>
+              <div class="col-md-3">
+                {{ privacy_field(registration_form.privacy_geo_region) }}
+              </div>
+            </div>
+          </fieldset>
+
+          <fieldset>
+            <div class="row">
+              <div class="col-md-5 col-sm-6">
+                <label>{{ _('City') }}</label>
+                <span id="display_city" class="geodisplay"
+                      data-mapbox="{{ profile.geo_city.name if profile.geo_city else ''}}"></span>
+              </div>
+              <div class="col-md-4 col-sm-3">
+                <div class="geocheckbox {% if registration_form.savecity.errors %} error {% endif %}">
+                  {{ registration_form.savecity }}
+                  {{ registration_form.savecity.label_tag() }}
+                  {% for error in registration_form.savecity.errors %}
+                    <span class="error-message">{{ error }}</span>
+                  {% endfor %}
+                </div>
+              </div>
+              <div class="col-md-3">
+                {{ privacy_field(registration_form.privacy_geo_city) }}
+              </div>
+            </div>
+          </fieldset>
+          {{ registration_form.lat }}
+          {{ registration_form.lng }}
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="panel panel-default">
+    <div class="panel-body">
+      <div class="row">
+        <div class="col-md-12">
+          <fieldset id="privacy-verify">
+            {% if registration_form.optin.errors %}
+              <div class="error">
+                {{ _('This field is required.') }}
+              </div>
+            {% endif %}
+            <label class="checkbox required">
+              {{ registration_form.optin }}
+            </label>
+            <label id="{{ registration_form.optin.id_for_label }}" {% if registration_form.optin.errors %}class="error"{% endif %}>
+              {% trans privacy_url='http://mozilla.org/privacy/websites/' %}
+                I'm okay with you handling this info as you explain
+                in <a href="{{ privacy_url }}">Mozilla's privacy
+                policy</a>.
+              {% endtrans %}
+            </label>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+    <div class="panel-footer">
+      <button class="btn btn-primary" id="form-submit-top" type="submit" name="registration_section">{{ _('Create Profile') }}</button>
+    </div>
+  </div>
+</form>
diff --git a/mozillians/templates/phonebook/includes/profile_edit_you.html b/mozillians/templates/phonebook/includes/profile_edit_you.html
index 269661338..d63d05915 100644
--- a/mozillians/templates/phonebook/includes/profile_edit_you.html
+++ b/mozillians/templates/phonebook/includes/profile_edit_you.html
@@ -6,7 +6,7 @@
       <div class="panel-body">
         <fieldset>
           <div class="row">
-            <div class="col-md-9">
+            <div class="col-md-9 col-sm-8">
               {{ mozillians_field(contribution_form.title) }}
             </div>
             <div class="col-md-3">
@@ -17,7 +17,7 @@
 
         <fieldset>
           <div class="row">
-            <div class="col-md-9">
+            <div class="col-md-9 col-sm-8">
               {{ mozillians_field(contribution_form.date_mozillian) }}
             </div>
             <div class="col-md-3">
@@ -28,7 +28,7 @@
 
         <fieldset>
           <div class="row">
-            <div class="col-md-9">
+            <div class="col-md-9 col-sm-8">
               {{ mozillians_field(contribution_form.story_link) }}
             </div>
             <div class="col-md-3">