diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index fff249c8..b092bf5a 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -507,7 +507,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			$form->addExtraClass('cms-edit-form');
 			$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 			// TODO Can't merge $FormAttributes in template at the moment
-			$form->addExtraClass('cms-content center ss-tabset ' . $this->BaseCSSClasses());
+			$form->addExtraClass('center ss-tabset ' . $this->BaseCSSClasses());
 			if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
 
 			if(!$record->canEdit() || $record->IsDeletedFromStage) {
diff --git a/code/controllers/CMSPageEditController.php b/code/controllers/CMSPageEditController.php
index b1dea292..977d321d 100644
--- a/code/controllers/CMSPageEditController.php
+++ b/code/controllers/CMSPageEditController.php
@@ -8,13 +8,4 @@ class CMSPageEditController extends CMSMain {
 	static $url_segment = 'page/edit';
 	static $url_rule = '/$Action/$ID/$OtherID';
 	static $url_priority = 41;
-
-	public function getEditForm($id = null, $fields = null) {
-		$left = new SSViewer('CMSPageController_EditForm_Left');
-		
-		$form = parent::getEditForm($id, $fields);
-		$form->Left = $left->process($this);
-		
-		return $form;
-	}
 }
\ No newline at end of file
diff --git a/templates/CMSPageController_EditForm_Left.ss b/templates/CMSPageController_EditForm_Left.ss
deleted file mode 100644
index 0a3e16e5..00000000
--- a/templates/CMSPageController_EditForm_Left.ss
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="cms-panel-content center">
-	<div class="cms-tree" data-url-tree="$Link(getsubtree)">
-		$SiteTreeAsUL
-	</div>
-</div>
-
-<div class="cms-panel-content-collapsed">
-	<h3 class="cms-panel-header">$SiteConfig.Title</h3>
-</div>
diff --git a/templates/CMSPageEditController_Tools.ss b/templates/CMSPageEditController_Tools.ss
new file mode 100644
index 00000000..15c02ee6
--- /dev/null
+++ b/templates/CMSPageEditController_Tools.ss
@@ -0,0 +1,17 @@
+<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
+	<div class="cms-content-header cms-panel-header north">
+		<h2><% _t('CMSPageEditController.Title','Pages') %></h2>
+	</div>
+	
+	<div class="cms-panel-content center">
+		<div class="cms-tree" data-url-tree="$Link(getsubtree)">
+			$SiteTreeAsUL
+		</div>
+	</div>
+
+	<div class="cms-panel-content-collapsed">
+		<h3 class="cms-panel-header">$SiteConfig.Title</h3>
+	</div>
+
+</div>
+
diff --git a/templates/Includes/AssetAdmin_EditFormTools.ss b/templates/Includes/AssetAdmin_EditFormTools.ss
new file mode 100644
index 00000000..df026e13
--- /dev/null
+++ b/templates/Includes/AssetAdmin_EditFormTools.ss
@@ -0,0 +1,9 @@
+<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}">
+	<div class="cms-panel-content center">
+		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+		TODO
+	</div>
+	<div class="cms-panel-content-collapsed">
+		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/Includes/CMSPageHistoryController_Content.ss b/templates/Includes/CMSPageHistoryController_Content.ss
deleted file mode 100644
index 423f97e5..00000000
--- a/templates/Includes/CMSPageHistoryController_Content.ss
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="cms-content center $BaseCSSClasses" data-layout="{type: 'border'}">
-	<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
-		<div class="cms-content-header north">
-			<div>
-				<h2><% _t('CMSPageHistoryController.History','History') %></h2>
-			</div>
-		</div>
-		
-		<div class="cms-panel-content cms-helper-hide-actions center">
-			$VersionsForm
-		</div>
-	</div>
-
-	$EditForm
-</div>
\ No newline at end of file
diff --git a/templates/Includes/CMSPageHistoryController_Tools.ss b/templates/Includes/CMSPageHistoryController_Tools.ss
new file mode 100644
index 00000000..97eefacd
--- /dev/null
+++ b/templates/Includes/CMSPageHistoryController_Tools.ss
@@ -0,0 +1,11 @@
+<div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
+	<div class="cms-content-header north">
+		<div>
+			<h2><% _t('CMSPageHistoryController.History','History') %></h2>
+		</div>
+	</div>
+	
+	<div class="cms-panel-content cms-helper-hide-actions center">
+		$VersionsForm
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/Includes/CMSPageSettingsController_Tools.ss b/templates/Includes/CMSPageSettingsController_Tools.ss
new file mode 100644
index 00000000..3b7b1752
--- /dev/null
+++ b/templates/Includes/CMSPageSettingsController_Tools.ss
@@ -0,0 +1 @@
+<% include CMSPageEditController_Tools %>
\ No newline at end of file
diff --git a/templates/Includes/CMSPagesController_Content.ss b/templates/Includes/CMSPagesController_Content.ss
index d6de0d21..c76a67c0 100644
--- a/templates/Includes/CMSPagesController_Content.ss
+++ b/templates/Includes/CMSPagesController_Content.ss
@@ -22,15 +22,7 @@
 		</div>
 	</div>
 
-	<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}">
-		<div class="cms-panel-content center">
-			<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
-			$SearchForm
-		</div>
-		<div class="cms-panel-content-collapsed">
-			<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
-		</div>
-	</div>
+	$Tools
 
 	<div class="cms-content-fields center ui-widget-content">
 		
diff --git a/templates/Includes/CMSPagesController_Tools.ss b/templates/Includes/CMSPagesController_Tools.ss
new file mode 100644
index 00000000..3b49ce0a
--- /dev/null
+++ b/templates/Includes/CMSPagesController_Tools.ss
@@ -0,0 +1,9 @@
+<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}">
+	<div class="cms-panel-content center">
+		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+		$SearchForm
+	</div>
+	<div class="cms-panel-content-collapsed">
+		<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss
index 162c7613..18518e90 100644
--- a/templates/Includes/ReportAdmin_Content.ss
+++ b/templates/Includes/ReportAdmin_Content.ss
@@ -4,18 +4,7 @@
 		<h2><% _t('REPORTS','Reports') %></h2>
 	</div>
 
-
-	<div class="cms-content-tools west">
-		
-		<ul class="ui-widget-content">
-		<% control Reports %>
-			<li id="record-$ID">
-				<a href="admin/reports/show/$ID" title="$TreeDescription">$TreeTitle</a>
-			</li>
-		<% end_control %>
-		</ul>
-		
-	</div>
+	$Tools
 
 	<div class="cms-content-fields center ui-widget-content">
 		$EditForm
diff --git a/templates/Includes/ReportAdmin_Tools.ss b/templates/Includes/ReportAdmin_Tools.ss
new file mode 100644
index 00000000..8827eb6f
--- /dev/null
+++ b/templates/Includes/ReportAdmin_Tools.ss
@@ -0,0 +1,11 @@
+<div class="cms-content-tools west">
+	
+	<ul class="ui-widget-content">
+	<% control Reports %>
+		<li id="record-$ID">
+			<a href="admin/reports/show/$ID" title="$TreeDescription">$TreeTitle</a>
+		</li>
+	<% end_control %>
+	</ul>
+	
+</div>
\ No newline at end of file