diff --git a/templates/sass/style.sass b/templates/sass/style.sass
index 8a0c3c2..c2f1f60 100644
--- a/templates/sass/style.sass
+++ b/templates/sass/style.sass
@@ -152,10 +152,12 @@ form
 
     label
       width: 180px
-      margin: 5px
-      margin-right: 10px
+      margin: 4px 10px 4px 0px
       float: left
 
+    a, span
+      margin: 4px 0px
+      display: inline-block
 
   ol.radio
     margin-left: 195px
@@ -169,9 +171,7 @@ form
 
   li
     padding-bottom: 10px
+    vertical-align: top
 
-  input, select
+  input[type="text"], select
     width: 250px
-
-  input[type="submit"], input[type="reset"]
-    width: auto