diff --git a/client/css/forms.styl b/client/css/forms.styl
index 79ce0a6..01ec4bb 100644
--- a/client/css/forms.styl
+++ b/client/css/forms.styl
@@ -7,7 +7,7 @@ form
 
     ul
         list-style-type: none
-        margin: 0
+        margin: 0 0 1em 0
         padding: 0
         li
             margin-top: 1.2em
@@ -16,8 +16,6 @@ form
             padding: 0.3em 0
     .input
         margin-bottom: 1em
-    .buttons
-        margin-top: 1.5em
     .input li:first-child label:not(.radio):not(.checkbox):not(.file-dropper),
     .input li:first-child
         padding-top: 0
@@ -203,7 +201,6 @@ div.tag-input
             opacity: .5
 
         .buttons
-            margin: 0
             float: right
             a
                 margin-left: 1em
diff --git a/client/css/main.styl b/client/css/main.styl
index a9f14d1..99cdb13 100644
--- a/client/css/main.styl
+++ b/client/css/main.styl
@@ -150,7 +150,7 @@ a .access-key
     width: 30em
     max-width: 100%
     .message
-        margin: 0.25em 0
+        margin: 0 0 1em 0
         display: inline-block
         text-align: left
         padding: 0.5em 1em
@@ -241,4 +241,4 @@ a .access-key
                 float: right
                 line-height: 2em
     .expander-content
-        padding: 1em 0.5em
+        padding: 0.5em 0.5em 1em 0.5em
diff --git a/client/css/tags.styl b/client/css/tags.styl
index 2387784..524c6ca 100644
--- a/client/css/tags.styl
+++ b/client/css/tags.styl
@@ -58,7 +58,7 @@
         word-break: break-all
         line-height: 130%
         margin-top: 0
-    .messages, form
+    form, .messages
         width: 100%
     .tag-edit
         textarea
diff --git a/client/css/users.styl b/client/css/users.styl
index 22467ad..f05505b 100644
--- a/client/css/users.styl
+++ b/client/css/users.styl
@@ -47,7 +47,7 @@
             margin-right: 1em
 
     #user-edit
-        form
+        form, .messages
             width: 100%
         .avatar
             #avatar-content