diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 7d4ef041..9b88a028 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -72,6 +72,36 @@ JS
 		
 		CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
 	}
+
+	public function getEditForm($id = null, $fields = null) {
+		$form = parent::getEditForm($id, $fields);
+
+		$fields = $form->Fields();
+		$fields->findOrMakeTab('Root.TreeView', _t('AssetAdmin.TreeView', 'Tree View'));
+		$fields->addFieldToTab('Root.TreeView',
+			// TODO Replace with lazy loading on client to avoid performance hit of rendering potentially unused views
+			new LiteralField(
+				'Tree',
+				FormField::createTag(
+					'div', 
+					array(
+						'class' => 'cms-tree', 
+						'data-url' => $this->Link('getsubtree'), 
+						'data-url-savetreenode' => $this->Link('savetreenode')
+					),
+					$this->SiteTreeAsUL()
+				)
+			)
+		);
+
+		$form->addExtraClass('cms-edit-form');
+		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
+		// TODO Can't merge $FormAttributes in template at the moment
+		$form->addExtraClass('center ss-tabset ' . $this->BaseCSSClasses());
+		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+
+		return $form;
+	}
 	
 	public function AddForm() {
 		$form = parent::AddForm();
diff --git a/code/controllers/CMSFileAddController.php b/code/controllers/CMSFileAddController.php
index e282a10c..44b4d2ff 100644
--- a/code/controllers/CMSFileAddController.php
+++ b/code/controllers/CMSFileAddController.php
@@ -35,11 +35,14 @@ class CMSFileAddController extends AssetAdmin {
 		}
 
 		$form = new Form($this, 'getEditForm', new FieldList($uploadField), new FieldList());
-		$form->addExtraClass('cms-content center cms-edit-form ' . $this->BaseCSSClasses());
+		$form->addExtraClass('center cms-edit-form ' . $this->BaseCSSClasses());
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 
 		return $form;
 	}
 
+	function Tools() {
+		return false;
+	}
 
 }
\ No newline at end of file
diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
deleted file mode 100644
index c647b543..00000000
--- a/templates/Includes/AssetAdmin_Content.ss
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="cms-content center ss-tabset $BaseCSSClasses" data-layout="{type: 'border'}">
-
-	<div class="cms-content-header north">
-		<div>
-			<h2>
-				<% include CMSBreadcrumbs %>
-			</h2>
-			<div class="cms-content-header-tabs">
-				<ul>
-					<li>
-						<a href="#cms-content-listview"><% _t('AssetAdmin.ListView', 'List View') %></a>
-					</li>
-					<li>
-						<a href="#cms-content-galleryview"><% _t('AssetAdmin.GalleryView', 'Gallery View') %></a>
-					</li>
-					<li>
-						<a href="#cms-content-treeview"><% _t('AssetAdmin.TreeView', 'Tree View') %></a>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-
-
-	<div class="cms-content-tools cms-panel west cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
-		<div class="cms-panel-content center">
-			<h3 class="cms-panel-header north"></h3>
-			
-			<div class="cms-content-tools-actions ui-widget-content">
-				$AddForm
-			</div>
-			<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)">
-				$SiteTreeAsUL
-			</div>
-		</div>
-		
-	</div>
-
-	<div class="cms-content-fields center">
-		<div id="cms-content-listview">
-			$EditForm
-		</div>
-		<div id="cms-content-treeview">
-			<i>Not implemented yet</i>
-		</div>
-		<div id="cms-content-galleryview">
-			<i>Not implemented yet</i>
-		</div>
-	</div>
-	
-</div>
\ No newline at end of file
diff --git a/templates/Includes/AssetAdmin_EditForm.ss b/templates/Includes/AssetAdmin_EditForm.ss
deleted file mode 100644
index 45fe1125..00000000
--- a/templates/Includes/AssetAdmin_EditForm.ss
+++ /dev/null
@@ -1 +0,0 @@
-<% include Form %>
\ No newline at end of file
diff --git a/templates/Includes/AssetAdmin_EditFormTools.ss b/templates/Includes/AssetAdmin_Tools.ss
similarity index 100%
rename from templates/Includes/AssetAdmin_EditFormTools.ss
rename to templates/Includes/AssetAdmin_Tools.ss
diff --git a/templates/Includes/CMSFileAddController_Content.ss b/templates/Includes/CMSFileAddController_Content.ss
deleted file mode 100644
index 29a6dbf6..00000000
--- a/templates/Includes/CMSFileAddController_Content.ss
+++ /dev/null
@@ -1,37 +0,0 @@
-<% with EditForm %>
-	<form $FormAttributes data-layout="{type: 'border'}">
-
-		<div class="cms-content-header north">
-			<div>
-				<h2><% _t('CMSAddPageController.Title','Add pages') %></h2>
-			</div>
-		</div>
-
-		<div class="cms-content-fields center cms-panel-content cms-panel-padded">
-
-			<% 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 %> 
-				<% control Fields %>
-					$FieldHolder
-				<% end_control %>
-			</fieldset>
-		</div>
-
-		<div class="cms-content-actions south">
-			<% if Actions %>
-			<div class="Actions">
-				<% control Actions %>
-					$Field
-				<% end_control %>
-			</div>
-			<% end_if %>
-		</div>
-
-	</form>
-<% end_with %>