diff --git a/admin/css/screen.css b/admin/css/screen.css
index 724e46234..84a90c6df 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -560,6 +560,12 @@ form.import-form label.left { width: 250px; }
 /** -------------------------------------------- Page Edit Controller -------------------------------------------- */
 .cms-container .CMSMain.CMSPageEditController { margin-left: -1px; }
 
+/** -------------------------------------------- Page Settings Controller -------------------------------------------- */
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li { white-space: nowrap; padding-top: 8px; }
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .optionset li label { padding-left: 2px; }
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .fieldgroup .fieldgroup-field { width: 216px; padding-left: 0; }
+.cms-container .CMSMain.CMSPageSettingsController .tab#Root_Settings .TreeDropdownField .treedropdownfield-toggle-panel-link { border-left: none; background: none; background-image: none; }
+
 /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file).  The styles are usually added through jstree.js on DOM load,  but we need it earlier in order to correctly display the uninitialized tree. */
 .cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; }
 .cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; margin: 0; padding: 0; list-style-type: none; display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; }
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index 38e360239..08fcc8cd2 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -1594,3 +1594,28 @@ form.import-form {
 	// Fix pixel gap between nav tree and main page header
  	margin-left:-1px;
 }
+
+/** --------------------------------------------
+ * Page Settings Controller
+ * -------------------------------------------- */
+
+.cms-container .CMSMain.CMSPageSettingsController {
+	.tab#Root_Settings {
+		.optionset li {
+			white-space:nowrap;
+			padding-top:$grid-y;
+			label {
+				padding-left:2px;
+			}
+		}
+		.fieldgroup .fieldgroup-field {
+			width:$grid-x*27;
+			padding-left:0;
+		}
+		.TreeDropdownField .treedropdownfield-toggle-panel-link {
+			border-left:none;
+			background:none;
+			background-image:none;
+		}
+	}
+}
\ No newline at end of file
diff --git a/css/UnitTesting.css b/css/UnitTesting.css
index 99224bf62..472b51952 100644
--- a/css/UnitTesting.css
+++ b/css/UnitTesting.css
@@ -8,17 +8,17 @@ table.details tr { background: #eeeee0; }
 
 p { line-height: 1.5em; margin-top: 0.5em; margin-bottom: 1.0em; }
 
-h1 { margin: 0px 0px 5px; font: 165% verdana,arial,helvetica; }
+h1 { margin: 0px 0px 5px; font: 165% verdana, arial, helvetica; }
 
-h2 { margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica; }
+h2 { margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana, arial, helvetica; }
 
-h3 { margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica; }
+h3 { margin-bottom: 0.5em; font: bold 115% verdana, arial, helvetica; }
 
-h4 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h4 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
 
-h5 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h5 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
 
-h6 { margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica; }
+h6 { margin-bottom: 0.5em; font: bold 100% verdana, arial, helvetica; }
 
 .Error { font-weight: bold; color: red; }
 
diff --git a/templates/forms/CheckboxField_holder_small.ss b/templates/forms/CheckboxField_holder_small.ss
index 3f8a501fb..511dbb1be 100644
--- a/templates/forms/CheckboxField_holder_small.ss
+++ b/templates/forms/CheckboxField_holder_small.ss
@@ -1,5 +1,5 @@
+$Field
+
 <% if $Title %>
 	<label class="checkboxfield-small" <% if ID %>for="$ID"<% end_if %>>$Title</label>
-<% end_if %>
-
-$Field
\ No newline at end of file
+<% end_if %>
\ No newline at end of file