diff --git a/admin/css/screen.css b/admin/css/screen.css
index 5d06dee71..5255fc2c8 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -276,7 +276,7 @@ body.cms { overflow: hidden; }
 .cms-content-toolbar .cms-tree-view-modes * { display: inline-block; }
 
 /* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */
-.cms-content-tools { background-color: #dde3e7; width: 192px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; /* buttons now need to line with with reduced input sizes */ }
+.cms-content-tools { background-color: #dde3e7; width: 192px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; float: left; position: relative; /* buttons now need to line with with reduced input sizes */ }
 .cms-content-tools .cms-panel-header { padding: 0; margin: 0 0 7px; line-height: 24px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -moz-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -o-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); }
 .cms-content-tools .cms-panel-content { width: 176px; padding: 8px 8px; overflow-x: hidden; overflow-y: auto; }
 .cms-content-tools .cms-content-header { background-color: #748d9d; border-bottom: 2px solid #5c7382; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #748d9d)); background-image: -webkit-linear-gradient(#b0bec7, #748d9d); background-image: -moz-linear-gradient(#b0bec7, #748d9d); background-image: -o-linear-gradient(#b0bec7, #748d9d); background-image: -ms-linear-gradient(#b0bec7, #748d9d); background-image: linear-gradient(#b0bec7, #748d9d); }
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index d9d607fd6..a4e18b8e0 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -405,6 +405,8 @@ body.cms {
 	overflow-y: auto;	
 	overflow-x: hidden;
 	z-index: 70;
+	float: left;
+	position: relative;
 	
 	.cms-panel-header {
 		padding: 0;
diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss
index abda7b723..74f9cdd12 100644
--- a/admin/templates/Includes/LeftAndMain_EditForm.ss
+++ b/admin/templates/Includes/LeftAndMain_EditForm.ss
@@ -1,7 +1,6 @@
 <% if IncludeFormTag %>
 <form $FormAttributes data-layout="{type: 'border'}">
 <% end_if %>
-
 	<div class="cms-content-header north">
 		<div>
 			<h2 id="page-title-heading" title="$Record.Breadcrumbs(20, true)">
@@ -22,43 +21,45 @@
 			<!-- <div class="cms-content-search">...</div> -->
 		</div>
 	</div>
-
-	<div class="cms-content-fields center">
-
-		<!-- <div class="cms-content-tools west">
+	
+	<% if Left %>
+		<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools" data-expandOnClick="true" data-layout="{type: 'border'}">
 			$Left
-		</div> -->
+		</div>
+	<% end_if %>
+	
+	<div class="center cms-panel-layout" id="center-container-here" data-layout="{type: 'border'}">
+		<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 %> 
+				<% control Fields %>
+					$FieldHolder
+				<% end_control %>
+				<div class="clear"><!-- --></div>
+			</fieldset>
+		</div>
 
-		<fieldset>
-			<% if Legend %><legend>$Legend</legend><% end_if %> 
-			<% control Fields %>
-				$FieldHolder
-			<% end_control %>
-			<div class="clear"><!-- --></div>
-		</fieldset>
-	</div>
-
-	<div class="cms-content-actions south">
-		<% if Actions %>
-		<div class="Actions">
-			<% control Actions %>
-				$Field
-			<% end_control %>
-			<% if CurrentPage.PreviewLink %>
-			<a href="$CurrentPage.PreviewLink" class="cms-preview-toggle-link ss-ui-button">
-				<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
-			</a>
+		<div class="cms-content-actions south">
+			<% if Actions %>
+			<div class="Actions">
+				<% control Actions %>
+					$Field
+				<% end_control %>
+				<% if CurrentPage.PreviewLink %>
+				<a href="$CurrentPage.PreviewLink" class="cms-preview-toggle-link ss-ui-button">
+					<% _t('LeftAndMain.PreviewButton', 'Preview') %> &raquo;
+				</a>
+				<% end_if %>
+			</div>
 			<% end_if %>
 		</div>
-		<% end_if %>
 	</div>
-
 <% if IncludeFormTag %>
 </form>
 <% end_if %>
\ No newline at end of file