diff --git a/client/css/post-upload.styl b/client/css/post-upload.styl
index 16c32f0..ac7dd68 100644
--- a/client/css/post-upload.styl
+++ b/client/css/post-upload.styl
@@ -5,6 +5,7 @@
         width: 100%
         max-width: 40em
         margin: 0 auto
+        text-align: left
 
         &.inactive
             input[type=submit]
@@ -17,13 +18,17 @@
             padding: 2em
 
     input[type=submit]
-        float: left
+        margin-top: 1em
+
+    .messages
+        margin-top: 1em
 
     .uploadables-container
-        margin: 2em 0
-        text-align: left
         line-height: 200%
 
+        li
+            margin: 0 0 1.2em 0
+
         .uploadable
             .file
                 overflow: hidden
diff --git a/client/css/post-view.styl b/client/css/post-view.styl
index 11c66d1..996410a 100644
--- a/client/css/post-view.styl
+++ b/client/css/post-view.styl
@@ -139,7 +139,9 @@
     input[type=submit],
     input[type=button],
     button
-        margin-top: 1em
         width: 100%
         &:focus
             border: 2px solid $text-color !important
+
+    .messages
+        margin-top: 1em
diff --git a/client/html/post_edit_sidebar.tpl b/client/html/post_edit_sidebar.tpl
index d3321b5..392d4e4 100644
--- a/client/html/post_edit_sidebar.tpl
+++ b/client/html/post_edit_sidebar.tpl
@@ -1,5 +1,9 @@
 <div class='edit-sidebar'>
     <form autocomplete='off'>
+        <input type='submit' value='Save' class='submit'/>
+
+        <div class='messages'></div>
+
         <% if (ctx.canEditPostSafety) { %>
             <section class='safety'>
                 <label>Safety</label>
@@ -90,9 +94,5 @@
                 </ul>
             </section>
         <% } %>
-
-        <div class='messages'></div>
-
-        <input type='submit' value='Save' class='submit'/>
     </form>
 </div>
diff --git a/client/html/post_upload.tpl b/client/html/post_upload.tpl
index 26c6039..faf5f86 100644
--- a/client/html/post_upload.tpl
+++ b/client/html/post_upload.tpl
@@ -2,10 +2,10 @@
     <form>
         <div class='dropper-container'></div>
 
-        <ul class='uploadables-container'></ul>
+        <input type='submit' value='Upload all' class='submit'/>
 
         <div class='messages'></div>
 
-        <input type='submit' value='Upload all' class='submit'/>
+        <ul class='uploadables-container'></ul>
     </form>
 </div>