diff --git a/templates/Includes/AssetAdmin_Content.ss b/templates/Includes/AssetAdmin_Content.ss
index d3ed9c41..d14eb09d 100644
--- a/templates/Includes/AssetAdmin_Content.ss
+++ b/templates/Includes/AssetAdmin_Content.ss
@@ -1,36 +1,33 @@
 <div class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
+	<% with EditForm %>
 	<div class="cms-content-header north">
-		<% with EditForm %>
-			<div class="cms-content-header-info">
-				<% include BackLink_Button %>
+		<div class="cms-content-header-info">
+			<% include BackLink_Button %>
 
-				<h2 id="page-title-heading">
-				<% with Controller %>
-					<% include CMSBreadcrumbs %>
-				<% end_with %>
-				</h2>
+			<h2 id="page-title-heading">
+			<% with Controller %>
+				<% include CMSBreadcrumbs %>
+			<% end_with %>
+			</h2>
+		</div>
+		<% if Fields.hasTabset %>
+			<% with Fields.fieldByName('Root') %>
+			<div class="cms-content-header-tabs">
+				<ul>
+				<% loop Tabs %>
+					<li<% if extraClass %> class="$extraClass"<% end_if %>><a href="#$id">$Title</a></li>
+				<% end_loop %>
+				</ul>
 			</div>
-			<% if Fields.hasTabset %>
-				<% with Fields.fieldByName('Root') %>
-				<div class="cms-content-header-tabs">
-					<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 %>
+			<% end_with %>
+		<% end_if %>
 	</div>
 
 	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
-
-		$Tools
-		
-		$EditForm
-		
+		$Top.Tools
+		$forTemplate
 	</div>
+	<% end_with %>
 	
 </div>
\ No newline at end of file