diff --git a/pages/settings.mako b/pages/settings.mako
index 265ba6a..ad718a3 100644
--- a/pages/settings.mako
+++ b/pages/settings.mako
@@ -2,12 +2,12 @@
 <%namespace module="toolserver.settings" import="main"/>\
 <%! from json import dumps, loads %>
 <% bot, cookies, status, langs, projects = main(environ, headers) %>
-            <h1>Settings</h1>
             % if status:
                 <div class="green-box">
                     <p>${status}</p>
                 </div>
             % endif
+            <h1>Settings</h1>
             <p>This page contains some configurable options for this Toolserver site. Settings are saved as cookies. You can view and delete all cookies generated by this site at the bottom of this page.</p>
             <form action="${environ['PATH_INFO']}" method="post">
                 <input type="hidden" name="action" value="set">
diff --git a/static/css/main.css b/static/css/main.css
index 670aba8..4acaca4 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -11,6 +11,10 @@ ul, ol {
     line-height: 1.5;
 }
 
+h1, h2, h3, h4, h5, h6 {
+    margin-top: 0.30em;
+}
+
 div#header {
     margin: 30px 60px 30px 60px;
     padding: 2px 15px 2px 15px;
@@ -21,7 +25,7 @@ div#header {
 div#container {
     line-height: 1.25;
     margin: 0 60px 100px 60px;
-    padding: 5px 15px 10px 15px;
+    padding: 15px 15px 15px 15px;
     border: 1px solid #777;
     background-color: #FFF;
 }
@@ -81,15 +85,15 @@ div.divider {
 div.green-box {
     padding: 0 10px 0 10px;
     margin: 0 5px 10px 5px;
-    background-color: #FEE;
-    border: 1px solid #F77;
+    background-color: #EFE;
+    border: 1px solid #7F7;
 }
 
 div.red-box {
     padding: 0 10px 0 10px;
     margin: 0 5px 10px 5px;
-    background-color: #EFE;
-    border: 1px solid #7F7;
+    background-color: #FEE;
+    border: 1px solid #F77;
 }
 
 div.indentable {