diff --git a/code/controllers/CMSSettingsController.php b/code/controllers/CMSSettingsController.php
index 986157c2..8b2404db 100644
--- a/code/controllers/CMSSettingsController.php
+++ b/code/controllers/CMSSettingsController.php
@@ -41,7 +41,8 @@ class CMSSettingsController extends LeftAndMain {
 			$this, 'EditForm', $fields, $actions
 		)->setHTMLID('Form_EditForm');
 		$form->setResponseNegotiator($this->getResponseNegotiator());
-		$form->addExtraClass('cms-add-form cms-content center cms-edit-form');
+		$form->addExtraClass('root-form');
+		$form->addExtraClass('cms-edit-form cms-panel-padded center');
 		// don't add data-pjax-fragment=CurrentForm, its added in the content template instead
 
 		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
diff --git a/templates/Includes/CMSSettingsController_Content.ss b/templates/Includes/CMSSettingsController_Content.ss
index c10e458e..900872c0 100644
--- a/templates/Includes/CMSSettingsController_Content.ss
+++ b/templates/Includes/CMSSettingsController_Content.ss
@@ -1,4 +1,4 @@
-<div id="settings-controller-cms-content" class="cms-content cms-edit-form center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">
+<div id="settings-controller-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content CurrentForm">
 
 	<div class="cms-content-header north">
 		<% with $EditForm %>
@@ -7,10 +7,9 @@
 					<% include CMSBreadcrumbs %>
 				<% end_with %>
 			</div>
-
 			<% if $Fields.hasTabset %>
 				<% with $Fields.fieldByName('Root') %>
-				<div class="cms-content-header-tabs cms-tabset-nav-primary ss-ui-tabs-nav">
+				<div class="cms-content-header-tabs">
 					<ul class="cms-tabset-nav-primary">
 					<% loop $Tabs %>
 						<li<% if $extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
@@ -28,4 +27,4 @@
 
 	</div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/Includes/CMSSettingsController_EditForm.ss b/templates/Includes/CMSSettingsController_EditForm.ss
index 6ffc7fc9..b7f5f3ca 100644
--- a/templates/Includes/CMSSettingsController_EditForm.ss
+++ b/templates/Includes/CMSSettingsController_EditForm.ss
@@ -1,33 +1,29 @@
-<form $FormAttributes data-layout-type="border">
+<form $FormAttributes>
 
-	<div class="cms-content-fields center">
-		<% 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 %>
+	<% 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>
-	</div>
+	<fieldset>
+		<% if $Legend %><legend>$Legend</legend><% end_if %>
+		<% loop $Fields %>
+			$FieldHolder
+		<% end_loop %>
+		<div class="clear"><!-- --></div>
+	</fieldset>
 
-	<div class="cms-content-actions cms-content-controls south">
-		<% if $Actions %>
-		<div class="Actions">
-			<% loop $Actions %>
-				$Field
-			<% end_loop %>
-			<% if $Controller.LinkPreview %>
-				<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
-					<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
-				</a>
-			<% end_if %>
-		</div>
+	<% if $Actions %>
+	<div class="Actions">
+		<% loop $Actions %>
+			$Field
+		<% end_loop %>
+		<% if $Controller.LinkPreview %>
+			<a href="$Controller.LinkPreview" class="cms-preview-toggle-link ss-ui-button" data-icon="preview">
+				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
+			</a>
 		<% end_if %>
 	</div>
-</form>
\ No newline at end of file
+	<% end_if %>
+</form>