diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index cc60d7c9..55e5a02e 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -101,6 +101,10 @@ label {
   font-size:18px;
 }
 
+.submit_box {
+  width:600px;
+}
+
 .form_box h1 {
   font-size:28px;
 }
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 8fdbe4ed..75c31df4 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -20,16 +20,15 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Submit yer media</h1>
 
   <form action="{{ request.urlgen('mediagoblin.submit.start') }}"
         method="POST" enctype="multipart/form-data">
-    <table>
-      {{ wtforms_util.render_table(submit_form) }}
-      <tr>
-        <td></td>
-        <td><input type="submit" value="submit" class="button" /></td>
-      </tr>
-    </table>
+    <div class="submit_box form_box">
+      <h1>Submit yer media</h1>
+      {{ wtforms_util.render_divs(submit_form) }}
+      <div class="form_submit_buttons">
+      <input type="submit" value="submit" class="button" />
+      </div>
+    </div>
   </form>
 {% endblock %}