diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index fb4930a2..2efdb9e4 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -27,8 +27,8 @@ class EditForm(wtforms.Form):
     description = wtforms.TextAreaField('Description of this work')
 
 class EditProfileForm(wtforms.Form):
-    url = wtforms.TextField(
-        'website URL',
-        [wtforms.validators.URL(message='Improperly formed URL')])
-    bio = wtforms.TextAreaField('bio',
+    bio = wtforms.TextAreaField('Bio',
         [wtforms.validators.Length(min=0, max=500)])
+    url = wtforms.TextField(
+        'Website',
+        [wtforms.validators.URL(message='Improperly formed URL')])
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 63bf013f..8ce474f0 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -20,12 +20,12 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Edit details for {{ user['username'] }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.profile',
                                user=user.username) }}"
         method="POST" enctype="multipart/form-data">
-    <div class="submit_box form_box">
+    <div class="edit_box form_box">
+      <h1>Editing {{ user['username'] }}'s profile</h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
         <input type="submit" value="submit" class="button" />