diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 14200466..fc6b1605 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -25,7 +25,7 @@
                                user= media.get_uploader.username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
-    <div class="form_box_xl">
+    <div class="form_box_xl edit_box">
       <h1>{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}</h1>
       <div style="text-align: center;" >
         <img src="{{ request.app.public_store.file_url(
@@ -39,5 +39,5 @@
       </div>
     </div>
   </form>
-  
+
 {% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 0a564161..e8a968e6 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -29,7 +29,7 @@
   <form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{ 
                                                      user.username }}"
         method="POST" enctype="multipart/form-data">
-    <div class="grid_8 prefix_1 suffix_1 edit_box form_box">
+    <div class="form_box edit_box">
       <h1>
         {%- trans username=user.username -%}
           Changing {{ username }}'s account settings
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index d6461757..97c03e37 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -24,7 +24,7 @@
   <form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ 
                                                      user.username }}"
         method="POST" enctype="multipart/form-data">
-    <div class="form_box_xl">
+    <div class="form_box edit_box">
       <h1>
         {%- trans username=user.username -%}
           Editing {{ username }}'s profile