diff --git a/code/controllers/CMSSettingsController.php b/code/controllers/CMSSettingsController.php
index 028ecc6f..17e71749 100644
--- a/code/controllers/CMSSettingsController.php
+++ b/code/controllers/CMSSettingsController.php
@@ -1,5 +1,5 @@
 <?php
-class CMSSettingsController extends CMSMain {
+class CMSSettingsController extends LeftAndMain {
 
 	static $url_segment = 'settings';
 	static $url_rule = '/$Action/$ID/$OtherID';
@@ -16,9 +16,9 @@ class CMSSettingsController extends CMSMain {
 		$actions = $siteConfig->getCMSActions();
 		$form = new Form($this, 'EditForm', $fields, $actions);
 		$form->addExtraClass('root-form');
-		$form->addExtraClass('cms-edit-form');
-		// TODO Can't merge $FormAttributes in template at the moment
-		$form->addExtraClass('cms-content center ss-tabset cms-panel-padded');
+
+		$form->addExtraClass('cms-edit-form cms-panel-padded center');
+
 		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
 		$form->setHTMLID('Form_EditForm');
 		$form->loadDataFrom($siteConfig);
@@ -33,6 +33,7 @@ class CMSSettingsController extends CMSMain {
 		return $form;
 	}
 
+
 	/**
 	 * Save the current sites {@link SiteConfig} into the database
 	 *
diff --git a/templates/Includes/CMSSettingsController_Content.ss b/templates/Includes/CMSSettingsController_Content.ss
index 40443e04..cb9fd1b8 100644
--- a/templates/Includes/CMSSettingsController_Content.ss
+++ b/templates/Includes/CMSSettingsController_Content.ss
@@ -1 +1,33 @@
-$EditForm
\ No newline at end of file
+<div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border">
+
+	<div class="cms-content-header north">
+		<div>
+			<% with EditForm %>
+				<h2>
+				<% with Controller %>
+					<% include CMSSectionIcon %>
+					<% include CMSBreadcrumbs %>
+				<% end_with %>
+				</h2>
+				<% if Fields.hasTabset %>
+					<% with Fields.fieldByName('Root') %>
+					<div class="cms-tabset cms-content-header-tabs ss-ui-tabs-nav">
+						<ul>
+						<% loop Tabs %>
+							<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+						<% end_loop %>
+						</ul>
+					</div>
+					<% end_with %>
+				<% end_if %>
+			<% end_with %>
+		</div>
+	</div>
+
+	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
+
+		$EditForm
+
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/templates/Includes/CMSSettingsController_EditForm.ss b/templates/Includes/CMSSettingsController_EditForm.ss
new file mode 100644
index 00000000..5c315fb4
--- /dev/null
+++ b/templates/Includes/CMSSettingsController_EditForm.ss
@@ -0,0 +1,30 @@
+<form $FormAttributes>
+
+	<% if Message %>
+	<p id="{$FormName}_error" class="message $MessageType">$Message</p>
+	<% else %>
+	<p id="{$FormName}_error" class="message $MessageType" style="display: none"></p>
+	<% end_if %>
+
+	<fieldset>
+		<% if Legend %><legend>$Legend</legend><% end_if %>
+		<% loop Fields %>
+			$FieldHolder
+		<% end_loop %>
+		<div class="clear"><!-- --></div>
+	</fieldset>
+
+	<% if Actions %>
+	<div class="Actions">
+		<% loop Actions %>
+			$Field
+		<% end_loop %>
+		<% if CurrentPage.LinkPreview %>
+		<a href="$CurrentPage.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
+			<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
+		</a>
+		<% end_if %>
+	</div>
+	<% end_if %>
+
+</form>
\ No newline at end of file