diff --git a/code/controller/AssetAdmin.php b/code/controller/AssetAdmin.php
index 1ab93749..5ca819c7 100755
--- a/code/controller/AssetAdmin.php
+++ b/code/controller/AssetAdmin.php
@@ -291,6 +291,13 @@ JS
 // HTML;
 	}
 	
+	function AddForm() {
+		$form = parent::AddForm();
+		$form->Actions()->fieldByName('action_doAdd')->setTitle(_t('AssetAdmin.ActionAdd', 'Add folder'));
+		
+		return $form;
+	}
+	
 	/**
 	 * Add a new group and return its details suitable for ajax.
 	 * 
diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
new file mode 100644
index 00000000..f45b43ee
--- /dev/null
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -0,0 +1,44 @@
+<div class="cms-content center ss-tabset" data-layout="{type: 'border'}">
+
+	<div class="cms-content-header north">
+		<h2><% _t('AssetAdmin.Title', 'Find &amp; Organize') %></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 class="cms-content-tools west">
+		<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 class="cms-content-form center">
+		<div id="cms-content-listview">
+			$EditForm
+		</div>
+		<div id="cms-content-treeview">
+			...
+		</div>
+		<div id="cms-content-galleryview">
+			...
+		</div>
+	</div>
+	
+</div>
\ No newline at end of file
diff --git a/templates/Includes/AssetAdmin_EditForm.ss b/templates/Includes/AssetAdmin_EditForm.ss
new file mode 100644
index 00000000..45fe1125
--- /dev/null
+++ b/templates/Includes/AssetAdmin_EditForm.ss
@@ -0,0 +1 @@
+<% include Form %>
\ No newline at end of file
diff --git a/templates/Includes/AssetAdmin_left.ss b/templates/Includes/AssetAdmin_left.ss
deleted file mode 100755
index b6203e4d..00000000
--- a/templates/Includes/AssetAdmin_left.ss
+++ /dev/null
@@ -1,49 +0,0 @@
-	<div id="treepanes">
-		<h3>
-			<a href="#"><% _t('FOLDERS','Folders') %></a>
-		</h3>
-		
-		<div>
-			<div id="TreeActions">
-
-				<ul>
-					<li>
-						<a href="#TreeActions-create" id="TreeActions-create-btn">
-							<% _t('CREATE','Create',PR_HIGH) %>
-						</a>
-					</li>
-					<li>
-						<a href="#TreeActions-batchactions" id="batchactions">
-							<% _t('BATCHACTIONS','Batch Actions',PR_HIGH) %>
-						</a>
-					</li>
-				</ul>
-
-				<div id="TreeActions-create">
-					$AddForm
-				</div>
-
-				<div id="TreeActions-batchactions">
-					$BatchActionsForm
-				</div>
-
-			</div>
-			
-			<div class="checkboxAboveTree">
-				<input type="checkbox" id="sortitems" />
-				<label for="sortitems">
-					<% _t('ENABLEDRAGGING','Allow drag &amp; drop reordering', PR_HIGH) %>
-				</label>
-			</div>
-
-			<div id="sitetree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" class="jstree jstree-apple">
-				$SiteTreeAsUL
-			</div>
-			
-			<div id="TreeActions-sync">
-				$SyncForm
-			</div>
-			
-		</div>
-
-	</div>
\ No newline at end of file