diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 5c2f6e0e3..3eede94ac 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -883,7 +883,7 @@ class ApiController(RedditController):
         elif res._chk_errors((errors.NO_TITLE, errors.TITLE_TOO_LONG)):
             res._hide('example_title')
             res._focus('title')
-        elif res._chk_error(errors.INVALID_SUBREDDIT_TYPE):
+        elif res._chk_error(errors.INVALID_OPTION):
             pass
         elif res._chk_errors((errors.BAD_CNAME, errors.USED_CNAME)):
             res._hide('example_domain')
diff --git a/r2/r2/controllers/errors.py b/r2/r2/controllers/errors.py
index 214dd1270..8949d71c2 100644
--- a/r2/r2/controllers/errors.py
+++ b/r2/r2/controllers/errors.py
@@ -59,7 +59,7 @@ error_list = dict((
         ('BANNED_DOMAIN', "Domain banned"),
         ('BAD_CNAME', "that domain isn't going to work"),
         ('USED_CNAME', "that cname is already in use"),
-        ('INVALID_SUBREDDIT_TYPE', _('that option is not valid')),
+        ('INVALID_OPTION', _('that option is not valid')),
         ('DESC_TOO_LONG', _('description is too long')),
         ('CHEATER', 'what do you think you\'re doing there?'),
         ('BAD_EMAILS', _('the following emails are invalid: %(emails)s')),
diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py
index 00ea2f8fb..3edfcb40f 100644
--- a/r2/r2/controllers/validator/validator.py
+++ b/r2/r2/controllers/validator/validator.py
@@ -623,7 +623,7 @@ class VOneOf(Validator):
 
     def run(self, val):
         if self.options and val not in self.options:
-            c.errors.add(errors.INVALID_SUBREDDIT_TYPE)
+            c.errors.add(errors.INVALID_OPTION)
             return self.default
         else:
             return val
diff --git a/r2/r2/public/static/reddit.css b/r2/r2/public/static/reddit.css
index 77f005133..44a54c052 100644
--- a/r2/r2/public/static/reddit.css
+++ b/r2/r2/public/static/reddit.css
@@ -47,17 +47,16 @@ a:focus { -moz-outline-style: none; }
 div.autosize { display: table; width: 1px}
 div.autosize > div { display: table-cell; }
 
-.btn { background-color:#e9e9e9; border: 1px solid #369; padding: 2px;}
-
 input.txt {
     background-color:#f7f7f7;
     border: 1px solid #369; 
 }
 
+input[type=checkbox], input[type=radio] { margin-top: .4em; }
+
 /* forms */
 
 .iform th { text-align: right; color: black; font-weight: normal; text-transform: lowercase; }
-.iform button {background-color:#e9e9e9; border: 1px solid #369; vertical-align: bottom}
 .wrong {color: red; font-weight: normal}
 
 .subform input.text { width: 25em }
@@ -586,8 +585,9 @@ before enabling */
 
 .infobar {
     background-color: #f6e69f;
-    padding: 0px 10px;
+    padding: 5px 10px;
     margin: 5px 310px 5px 5px;
+    border: 1px solid orange;
 }
 
 .menuarea {
@@ -756,9 +756,7 @@ a.star { text-decoration: none; color: #ff8b60 }
     float: left; 
 }
 .commentreply .buttons button { 
-    margin: 0px; 
-    margin-right: 5px;
-    border-top: none;
+    margin: 5px; 
 }
 
 .commentreply table.help { 
@@ -914,9 +912,6 @@ a.star { text-decoration: none; color: #ff8b60 }
 }
 
 .login-form-side button {
-    font-size: 12px;
-    padding: 2px 3px 2px 3px;
-    width: 4em;
     float: right;
 }
 
@@ -1028,13 +1023,6 @@ a.star { text-decoration: none; color: #ff8b60 }
     padding: 1px;
 }
 
-.loginform button { 
-    border: 1px solid #369; 
-    background-color:#e9e9e9; 
-    margin-left: 5px; 
-    margin-right: 10px;
-}
-
 .loginform #captcha { 
     width: 250px;
  }
@@ -1082,7 +1070,6 @@ a.star { text-decoration: none; color: #ff8b60 }
 }
 
 .usertable { margin-left: 10px;} 
-.usertable .pretty-form button { padding: 0px 3px; } /*overwrite pretty-form*/
 .usertable { font-size: larger }
 .usertable td { padding: 0 .7em }
 .usertable { white-space: nowrap }
@@ -1204,21 +1191,30 @@ a.star { text-decoration: none; color: #ff8b60 }
     vertical-align: top; 
  }
 
-.pretty-form input[type=checkbox] {margin: 3px .5em;}
-.pretty-form p {margin: 3px .5em;}
-.pretty-form input[type=radio] {margin: 3px .5em 0px .5em; vertical-align:top}
+.pretty-form p {margin: 3px ;}
+.pretty-form input[type=checkbox],
+.pretty-form input[type=radio] {margin: 2px .5em 0px .5em; }
 .pretty-form img { margin: 3px .5em}
 .pretty-form input[type=text],
 .pretty-form textarea,
-.pretty-form input[type=password] { border: 1px solid gray; width: 25em}
+.pretty-form input[type=password] {
+    border: 1px solid gray;
+    width: 300px; 
+    padding: 2px;
+}
+
+.pretty-form .infobar { 
+    width: 285px; 
+    margin: 5px;
+ }
 
 .pretty-form input[type=text],
+.pretty-form input[type=file],
 .pretty-form input[type=password],
 .pretty-form select,
 .pretty-form b,
 .pretty-form textarea,
-.pretty-form button  { margin: 3px .5em; padding: 1px; }
-.pretty-form button  { padding: 2px}
+.pretty-form button  { margin: 3px .5em; }
 .pretty-form th { text-align: right }
 
 /*pref page boxes*/
@@ -1246,14 +1242,17 @@ a.star { text-decoration: none; color: #ff8b60 }
 .opt-form { font-size: larger }
 .opt-form form { display: inline; }
 
+/* pref table - used for preferences and edit subreddit pages */
 .preftable th { 
     padding: 10px; 
     font-weight: bold; 
     vertical-align: top;
-    text-align: left;
+    text-align: right;
 }
-.preftable td.prefright { padding: 10px }
-.preftable .spacer { margin-top: 5px; margin-bottom: 5px; }
+.preftable td.prefright { padding: 8px 0;}
+.preftable .spacer { margin-bottom: 5px; }
+.preftable .note { width: 100%; vertical-align: top; padding-top: 10px; }
+.save-button { margin-left: 5px; }
 
 .over18 button { margin: 0 10px 0 10px; padding: 5px}
 
diff --git a/r2/r2/public/static/utils.js b/r2/r2/public/static/utils.js
index 63a122ab9..3fe83bd69 100644
--- a/r2/r2/public/static/utils.js
+++ b/r2/r2/public/static/utils.js
@@ -299,7 +299,6 @@ function gotoTextboxLine(textboxID, lineNo) {
 
 function uploadHeaderImage(status) {
   var form = $('upload-header-image');
-  var iframe = $('upload-header-iframe');
 
   form.op.value = 'upload';
   $('img-status').innerHTML = status;
@@ -312,7 +311,6 @@ function uploadHeaderImage(status) {
 
 function deleteHeaderImage(status) {
   var form = $('upload-header-image');
-  var iframe = $('upload-header-iframe');
 
   form.reset();
   form.op.value = 'delete';
@@ -337,6 +335,7 @@ function completedUploadHeaderImage(status,img_src,op) {
   } else {
     $('header-img-preview').src = img_src;
     show('delete-header-img');
+    hide('submit-header-img');
     show('header-img-preview-container');
   }
 }
diff --git a/r2/r2/templates/createsubreddit.html b/r2/r2/templates/createsubreddit.html
index 0d6bc472c..f79718739 100644
--- a/r2/r2/templates/createsubreddit.html
+++ b/r2/r2/templates/createsubreddit.html
@@ -52,275 +52,263 @@ function update_title() {
   </tr>
 </%def>
  
-  %if thing.site:
-    <h1>${_("manage your reddit")}</h1>
-  %else:
-    %if thing.name:
-      <p class="infobar">
-        ${_("that subreddit doesn't exist, but you can create it here.")}</p>
-    %endif
-    <h1>${_("create a reddit")}</h1>
+%if thing.site:
+  <h1>${_("manage your reddit")}</h1>
+%else:
+  %if thing.name:
+    <p class="infobar">
+      ${_("that subreddit doesn't exist, but you can create it here.")}</p>
   %endif
+  <h1>${_("create a reddit")}</h1>
+%endif
 
-  <form class="pretty-form sr-form" action="/post/site_admin" method="post" 
-        onsubmit="return post_form(this, 'site_admin', null, null, true)">
-    %if thing.site:
-      <input type="hidden" name="sr" value="${thing.site._fullname}"/>
-    %endif
-    <table class="content preftable">
-      <tr>
-        <th>
-          <label for="name">${_("name")}</label>
-        </th>
-        <td>
-          %if thing.site:
-            <b id="name">${thing.site.name}</b>
-          %else:
-            <input type="text" name="name" id="name" class="text"
-                   value="${thing.name}"
-                   onchange="update_title()"/>
-          %endif
-        </td>
-        <td id="note_name">
-          %if not thing.site:
-            ${error_field("SUBREDDIT_EXISTS", "span")}
-            ${error_field("BAD_SR_NAME", "span")}
-            <span class="gray" id="example_name">
-              ${_("no spaces, e.g. slashdot")}
-            </span>
-          %endif
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="title">${_("title")}</label>
-        </th>
-        <td>
-          %if thing.site:
-            <input id="title" type="text" name="title" class="text"
-                   value="${thing.site.title}"/>
-          %else:
-            <input id="title" type="text" name="title" class="text" />
-          %endif
-        </td>
-        <td id="note_title">
-          ${error_field("NO_TITLE", "span")}
-          ${error_field("TITLE_TOO_LONG", "span")}
-          %if not thing.site:
-            <span class="gray" id="example_title">
-              ${_("e.g. slashdot: news for nerds, stuff that matters")}
-            </span>
-          %endif
-        </td>
-      </tr>
-
-      <tr>
-        <th>
-          <label for="description">${_("description")}</label>
-        </th>
-        <td>
-          <textarea id="description" name="description"
-                    rows="5" cols="30" class="text">
-            %if thing.site:
-              ${keep_space(thing.site.description or '')}
-            %endif
-          </textarea>
-        </td>
-        <td id="note_description">
-          ${error_field("DESC_TOO_LONG", "span")}
-        </td>
-      </tr>
-
-      %if c.user_is_admin:
-      <tr>
-        <th>
-          <label for="firsttext">${_("first text")}</label>
-        </th>
-        <td>
-          <textarea name="firsttext" rows="5" cols="30" class="text">
-          %if thing.site:
-          ${thing.site.firsttext or ''}
-          %endif
-          </textarea>
-        </td>
-        <td id="note_firsttext">
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="staticdir">${_("static directory")}</label>
-        </th>
-        <td>
-          %if thing.site:
-          <input type="text" name="staticdir" class="text" 
-                 value="${thing.site.static_path or ''}"/>
-          %else:
-          <input type="text" name="staticdir" class="text" />
-          %endif
-        </td>
-        <td id="note_staticdirfile"></td>
-      </tr>
-      <tr>
-        <th>
-          <label for="headerfile">${_("headerfile")}</label>
-        </th>
-        <td>
-          %if thing.site:
-          <input type="text" name="headerfile" class="text" 
-                 value="${thing.site.header or ''}"/>
-          %else:
-          <input type="text" name="headerfile" class="text" />
-          %endif
-        </td>
-        <td id="note_headerfile"></td>
-      </tr>
-      <tr>
-        <th>
-          <label for="stylesheet">${_("style sheet")}</label>
-        </th>
-        <td>
-          %if thing.site:
-          <input type="text" name="stylesheet" class="text" 
-                 value="${thing.site.stylesheet or ''}"/>
-          %else:
-          <input type="text" name="stylesheet" class="text" />
-          %endif
-        </td>
-        <td id="note_stylesheetfile"></td>
-      </tr>
-      <tr>
-        <th>
-          <label for="adfile">${_("ad file")}</label>
-        </th>
-        <td>
-          %if thing.site:
-          <input type="text" name="ad_file" class="text" 
-                 value="${thing.site.ad_file or ''}"/>
-          %else:
-          <input type="text" name="ad_file" class="text" />
-          %endif
-        </td>
-        <td id="note_ad_file"></td>
-      </tr>
-      %endif
-      <tr>
-        <th>
-          <label for="lang">${_("language")}</label>
-        </th>
-        <td>
-          <%
-             default_lang = thing.site and thing.site.lang or c.lang or ''
-             default_lang = default_lang.split('-')[0]
-             default_lang = 'en' if len(default_lang) != 2 else default_lang
-           %>
-          ${language_tool(all_langs = True, default_lang = default_lang)}
-        </td>
-      </tr>
-  
-      <tr>
-        <th>
-          <label>${_("type")}</label>
-        </th>
-        <td colspan="2">
-           <table class="spacer">
-           ${radio_type(_("public"), _("anyone can view and submit"))}
-           ${radio_type(_("restricted"), _("anyone can view, but only contributors can submit links"))}
-           ${radio_type(_("private"), _("only contributors can view and submit"))}
-           </table>
-        </td>
-        <td id="note_type">${error_field("INVALID_SUBREDDIT_TYPE", "span")}</td>
-      </tr>
-  
-      <tr>
-        <th><label>${_("age")}</label></th>
-        <td colspan="2">
-          <input class="nomargin" type="checkbox" name="over_18" id="over_18"
-                 ${thing.site and thing.site.over_18 and "checked='checked'" or ""}/>
-          <label for="over_18">${_("viewers must be over eighteen years old")}</label>
-        </td>
-      </tr>
-      <tr>
-        <th><label>${_("media")}</label></th>
-        <td colspan="2">
-          <input class="nomargin" type="checkbox" 
-                 name="show_media" id="show_media"
-                 ${thing.site and thing.site.show_media and "checked='checked'" or ""}/>
-          <label for="show_media">
-            ${_("show thumbnail images of content")}
-          </label>
-        </td>
-      </tr>
-      <tr>
-        <th>
-          <label for="domain">${_("domain")}</label>
-        </th>
-        <td>
-          %if thing.site:
-            <input id="domain" type="text" name="domain" class="text"
-                   value="${getattr(thing.site, 'domain', None) or ""}"/>
-          %else:
-            <input id="domain" type="text" name="domain" class="text" />
-          %endif
-        </td>
-        <td id="note_domain">
-          ${error_field("BAD_CNAME", "span")}
-          ${error_field("USED_CNAME", "span")}
-          %if not thing.site:
-            <span class="gray" id="example_domain">
-              ${_("e.g. reddit.slashdot.org (optional)")}
-            </span>
-          %endif
-        </td>
-      </tr>
-      <tr>
-        <th>
-        </th>
-        <td colspan="2">
-          %if thing.site:
-          <button name="edit" class="btn" type="submit">${_("update")}</button>
-          %else:
-          <button name="create" class="btn" type="submit">${_("create")}</button>
-          %endif
-          &#32;
-          <span id="status" class="error"></span>
-          ${error_field("RATELIMIT", "span")}
-        </td>
-        <td id="note_create"></td>
-      </tr>
-    </table>
-  </form>
-
-%if thing.site and thing.site.can_change_stylesheet(c.user) and not g.css_killswitch:
-  <h1>${_('change the look')}</h1>
-
-  <table class="content preftable pretty-form sr-form">
+<form class="pretty-form" action="/post/site_admin"
+      id="sr_form" method="post" 
+      onsubmit="return post_form(this, 'site_admin', null, null, true)">
+  %if thing.site:
+    <input type="hidden" name="sr" value="${thing.site._fullname}"/>
+  %endif
+  <table class="preftable">
     <tr>
       <th>
-        <label for="stylesheet_contents">${_("edit stylesheet")}</label>
+        <label for="name">${_("name")}</label>
       </th>
-      <td class="nowrap nopadding">
-        <p>${plain_link(_('edit the stylesheet'),
-                        '/about/stylesheet',
-                        sr_path = True)}</p>
+      <td class="prefright">
+        %if thing.site:
+          <b id="name">${thing.site.name}</b>
+        %else:
+          <input type="text" name="name" id="name" class="text"
+                 value="${thing.name}"
+                 onchange="update_title()"/>
+        %endif
+      </td>
+      <td class="note" id="note_name">
+        %if not thing.site:
+          ${error_field("SUBREDDIT_EXISTS", "span")}
+          ${error_field("BAD_SR_NAME", "span")}
+          <span class="gray" id="example_name">
+            ${_("no spaces, e.g. slashdot")}
+          </span>
+        %endif
       </td>
-      <td id="note_stylesheet_contents"></td>
     </tr>
-    
     <tr>
-      <th><label for="file">${_('upload header image')}</label></th>
-      <td>
-        <form
-         onsubmit="return uploadHeaderImage('${_('submitting')}');"
-         name="upload-header-image" id="upload-header-image"
-         enctype="multipart/form-data"
-         class="pretty-form sr-form"
-         target="upload-header-iframe"
-         action="/api/upload_header_img" method="post">
-          <input type="file" name="file"
-           onchange="return uploadHeaderImage('${_('submitting')}')" />
+      <th>
+        <label for="title">${_("title")}</label>
+      </th>
+      <td class="prefright">
+        %if thing.site:
+          <input id="title" type="text" name="title" class="text"
+                 value="${thing.site.title}"/>
+        %else:
+          <input id="title" type="text" name="title" class="text" />
+        %endif
+      </td>
+      <td class="note" id="note_title">
+        ${error_field("NO_TITLE", "span")}
+        ${error_field("TITLE_TOO_LONG", "span")}
+        %if not thing.site:
+          <span class="gray" id="example_title">
+            ${_("e.g. slashdot: news for nerds, stuff that matters")}
+          </span>
+        %endif
+      </td>
+    </tr>
+
+    <tr>
+      <th>
+        <label for="description">${_("description")}</label>
+      </th>
+      <td class="prefright">
+        <textarea id="description" name="description"
+                  rows="5" cols="30" class="text">
+          %if thing.site:
+            ${keep_space(thing.site.description or '')}
+          %endif
+        </textarea>
+      </td>
+      <td class="note" id="note_description">
+        ${error_field("DESC_TOO_LONG", "span")}
+      </td>
+    </tr>
+
+    %if c.user_is_admin:
+    <tr>
+      <th>
+        <label for="firsttext">${_("first text")}</label>
+      </th>
+      <td class="prefright">
+        <textarea name="firsttext" rows="5" cols="30" class="text">
+        %if thing.site:
+        ${thing.site.firsttext or ''}
+        %endif
+        </textarea>
+      </td>
+      <td class="note" id="note_firsttext">
+      </td>
+    </tr>
+    <tr>
+      <th>
+        <label for="staticdir">${_("static directory")}</label>
+      </th>
+      <td class="prefright">
+        %if thing.site:
+        <input type="text" name="staticdir" class="text" 
+               value="${thing.site.static_path or ''}"/>
+        %else:
+        <input type="text" name="staticdir" class="text" />
+        %endif
+      </td>
+      <td class="note" id="note_staticdirfile"></td>
+    </tr>
+    <tr>
+      <th>
+        <label for="headerfile">${_("headerfile")}</label>
+      </th>
+      <td class="prefright">
+        %if thing.site:
+        <input type="text" name="headerfile" class="text" 
+               value="${thing.site.header or ''}"/>
+        %else:
+        <input type="text" name="headerfile" class="text" />
+        %endif
+      </td>
+      <td class="note" id="note_headerfile"></td>
+    </tr>
+    <tr>
+      <th>
+        <label for="stylesheet">${_("style sheet")}</label>
+      </th>
+      <td class="prefright">
+        %if thing.site:
+        <input type="text" name="stylesheet" class="text" 
+               value="${thing.site.stylesheet or ''}"/>
+        %else:
+        <input type="text" name="stylesheet" class="text" />
+        %endif
+      </td>
+      <td class="note" id="note_stylesheetfile"></td>
+    </tr>
+    <tr>
+      <th>
+        <label for="adfile">${_("ad file")}</label>
+      </th>
+      <td class="prefright">
+        %if thing.site:
+        <input type="text" name="ad_file" class="text" 
+               value="${thing.site.ad_file or ''}"/>
+        %else:
+        <input type="text" name="ad_file" class="text" />
+        %endif
+      </td>
+      <td class="note" id="note_ad_file"></td>
+    </tr>
+    %endif
+    <tr>
+      <th>
+        <label for="lang">${_("language")}</label>
+      </th>
+      <td class="prefright">
+        <%
+           default_lang = thing.site and thing.site.lang or c.lang or ''
+           default_lang = default_lang.split('-')[0]
+           default_lang = 'en' if len(default_lang) != 2 else default_lang
+         %>
+        ${language_tool(all_langs = True, default_lang = default_lang)}
+      </td>
+    </tr>
+
+    <tr>
+      <th>
+        <label>${_("type")}</label>
+      </th>
+      <td colspan="2" class="prefright">
+         <table >
+         ${radio_type(_("public"), _("anyone can view and submit"))}
+         ${radio_type(_("restricted"), _("anyone can view, but only contributors can submit links"))}
+         ${radio_type(_("private"), _("only contributors can view and submit"))}
+         </table>
+      </td>
+    </tr>
+
+    <tr>
+      <th><label>${_("age")}</label></th>
+      <td colspan="2" class="prefright">
+        <input class="nomargin" type="checkbox" name="over_18" id="over_18"
+               ${thing.site and thing.site.over_18 and "checked='checked'" or ""}/>
+        <label for="over_18">${_("viewers must be over eighteen years old")}</label>
+      </td>
+    </tr>
+    <tr>
+      <th><label>${_("media")}</label></th>
+      <td colspan="2" class="prefright">
+        <input class="nomargin" type="checkbox" 
+               name="show_media" id="show_media"
+               ${thing.site and thing.site.show_media and "checked='checked'" or ""}/>
+        <label for="show_media">
+          ${_("show thumbnail images of content")}
+        </label>
+      </td>
+    </tr>
+    <tr>
+      <th>
+        <label for="domain">${_("domain")}</label>
+      </th>
+      <td class="prefright">
+        %if thing.site:
+          <input id="domain" type="text" name="domain" class="text"
+                 value="${getattr(thing.site, 'domain', None) or ""}"/>
+        %else:
+          <input id="domain" type="text" name="domain" class="text" />
+        %endif
+      <div id="domainhelp" class="infobar" style="display: none">
+        ${_("Own a domain?  Enter it here and then go to your DNS provider and add a CNAME record aliasing your domain to rhs.reddit.com. You will be able to access your reddit through your domain.")}
+      </div>
+      </td>
+      <td class="note" id="note_domain">
+        <a id="example_domain" href="javascript:show('domainhelp'); hide('example_domain')">what's this?</a>
+        ${error_field("BAD_CNAME", "span")}
+        ${error_field("USED_CNAME", "span")}
+      </td>
+    </tr>
+
+  </table>
+</form>
+
+<form
+   onsubmit="return uploadHeaderImage('${_('uploading')}');"
+   name="upload-header-image" id="upload-header-image"
+   enctype="multipart/form-data"
+   class="pretty-form"
+   target="upload-header-iframe"
+   action="/api/upload_header_img" method="post">
+  <table class="preftable">
+    %if thing.site and thing.site.can_change_stylesheet(c.user) and not g.css_killswitch:
+    <tr>
+      <th>
+        ${_("look and feel")}
+      </th>
+      <td class="prefright">
+        <div class="spacer">
+          ${plain_link(_("edit the stylesheet"),
+                        "/about/stylesheet",
+                        _sr_path = True)}
+          &#32;
+          <span class="gray">(${_("leaves this page")})</span>
+        </div>
+        <div class="spacer">
+          <label for="headerfile">upload header image</label>
+          <input type="file" name="file" id="headerfile"
+           onchange="show('submit-header-img')"/>
+          <button id="submit-header-img"
+                  type="button"
+                  onclick="return uploadHeaderImage('${_('uploading')}');"
+                  style="display: none;"
+          >${_("Upload")}
+          </button> 
           <button id="delete-header-img"
            class="btn"
-           onclick="return deleteHeaderImage('${_('submitting')}')"
+           onclick="return deleteHeaderImage('${_('deleting')}')"
            %if not thing.site.header:
              style="display: none;"
            %endif
@@ -330,23 +318,40 @@ function update_title() {
           <input type="hidden" name="uh" value="${c.modhash}" />
           <input type="hidden" name="r"  value="${c.site.name}" />
           <input type="hidden" name="op" value="upload" />
-
+  
           <span style="display: none;" class="error" id="img-status"></span>
           <iframe src="about:blank"
            width="600" height="200" style="display: none;"
            name="upload-header-iframe" id="upload-header-iframe"></iframe>
-        </form>
+        </div>
         <div id="header-img-preview-container" style="display: none;">
-          <img id="header-img-preview"
+          <img id="header-img-preview" alt="header preview"
            %if thing.site.header:
              src="${thing.site.header}"
            %else:
              src="/static/kill.png"
            %endif
-          / ><br />
+          /><br />
         </div>
       </td>
     </tr>
+    %endif
   </table>
-%endif
+</form>
 
+<div class="save-button">
+  <%
+     if thing.site:
+         name = "edit"
+         text = _("save options")
+     else:
+         name = "create"
+         text = _("create")
+  %>
+  <button name="${name}" class="btn" type="button"
+          onclick="$('sr_form').onsubmit()"
+  >${text}</button>
+  &#32;
+  <span id="status" class="error"></span>
+  ${error_field("RATELIMIT", "span")}
+</div>
diff --git a/r2/r2/templates/prefoptions.html b/r2/r2/templates/prefoptions.html
index 9dd43c4d9..20511eb4c 100644
--- a/r2/r2/templates/prefoptions.html
+++ b/r2/r2/templates/prefoptions.html
@@ -113,14 +113,10 @@
   <tr>
     <th>${_("link options")}</th>
     <td class="prefright">
-      ${checkbox(_("show me new links on the front page"), "organic")}
-      <br/>
-      ${checkbox(_("compress the link display"), "compress")}
-      <br/>
-      ${checkbox(_("don't show links after i've liked them"), "hide_ups")}
-      <br/>
-      ${checkbox(_("don't show links after i've disliked them"), "hide_downs")}
-      <br/>
+      <p>${checkbox(_("show me new links on the front page"), "organic")}</p>
+      <p>${checkbox(_("compress the link display"), "compress")}</p>
+      <p>${checkbox(_("don't show links after i've liked them"), "hide_ups")}</p>
+      <p>${checkbox(_("don't show links after i've disliked them"), "hide_downs")}</p>
       <%
          # stuff I can soon delete:
          _("display")
@@ -129,15 +125,18 @@
          _("don't show me comments with a score less than")
          _("comments by default")
          %>
-      ${unsafe(_("display %(num)s links at once") % \
-      dict(num=capture(link_options)))}
-      <br/>
+      <p>
+        ${unsafe(_("display %(num)s links at once") % \
+        dict(num=capture(link_options)))}
+      </p>
       <% 
          input = capture(num_input, c.user.pref_min_link_score,
          'min_link_score')
          %>
+      <p>
       ${unsafe(_("don't show me sites with a score less than %(num)s") % dict(num = input))}
       &#32;<span class="little gray">${_("(blank for none)")}</span>
+      </p>
     </td>
   </tr>
   <tr>
@@ -147,10 +146,12 @@
        input = capture(num_input, c.user.pref_min_comment_score,
                        'min_comment_score')
        %>
-    ${unsafe(_("don't show me comments with a score less than %(num)s") % dict(num = input))}
-    &#32;<span class="little gray">${_("(blank for none)")}</span>
-    <br/>
-    <% 
+    <p>
+      ${unsafe(_("don't show me comments with a score less than %(num)s") % dict(num = input))}
+      &#32;<span class="little gray">${_("(blank for none)")}</span>
+    </p>
+    <p>
+      <% 
        input = capture(num_input, c.user.pref_num_comments,
        'num_comments')
        %>