3 files changed, 9 insertions, 7 deletions
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 295d57eb..51d0341d 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -20,19 +20,21 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Edit details for {{ media.title }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
                                user= media.uploader().username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
-    <div class="submit_box form_box">
+    <div class="edit_box form_box">
+      <h1>Editing {{ media.title }}</h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="submit" class="button" />
+        <a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a>
+        <input type="submit" value="Save changes" class="button" />
       </div>
+      <img src="{{ request.app.public_store.file_url(
+         media['media_files']['thumb']) }}" />
     </div>
   </form>
-  <img src="{{ request.app.public_store.file_url(
-         media['media_files']['thumb']) }}" />
+  
 {% endblock %}    
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 75c31df4..fe1f3369 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -27,7 +27,7 @@
       <h1>Submit yer media</h1>
       {{ wtforms_util.render_divs(submit_form) }}
       <div class="form_submit_buttons">
-      <input type="submit" value="submit" class="button" />
+      <input type="submit" value="Submit" class="button" />
       </div>
     </div>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index c9c3e0db..8c88c174 100644
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -19,7 +19,7 @@
 {% block object_gallery_content -%}
   <div>
     {% if media_entries %}
-      <ul>
+      <ul class="media_thumbnail">
         {% for entry in media_entries %}
           <li class="media_thumbnail">
             <a href="{{ entry.url_for_self(request.urlgen) }}">