diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index a69eb1fd..1d04fc73 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -95,7 +95,7 @@ a.mediagoblin_logo:hover {
   border-radius:5px;
   border:none;
   color:#272727;
-  margin:10px 0px;
+  margin:10px 0px 10px 15px;
   font-size:1em;
   text-align:center;
   padding-left:11px;
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 70cc17d1..51d0341d 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -29,7 +29,8 @@
       <h1>Editing {{ media.title }}</h1>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="save changes" 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']) }}" />
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>