diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index c4221b996..8936dd1f7 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -7457,6 +7457,7 @@ h1{
 
 .table thead th{
   border:0;
+  background-color:transparent;
 }
 
 .table td,.table th{
@@ -15381,7 +15382,6 @@ div.grid-field__sort-field+.form__fieldgroup-item{
   padding-left:1.5385rem;
   padding-right:1.5385rem;
   height:53px;
-  background-color:#f6f7f8;
   width:100%;
 }
 
diff --git a/admin/client/src/components/Toolbar/Toolbar.scss b/admin/client/src/components/Toolbar/Toolbar.scss
index c25f7f6bd..166067a8a 100644
--- a/admin/client/src/components/Toolbar/Toolbar.scss
+++ b/admin/client/src/components/Toolbar/Toolbar.scss
@@ -4,7 +4,6 @@
 .toolbar--south {
   @include make-container();
   height: $toolbar-total-height;
-  background-color: $body-bg;
   width: 100%;
 
   .btn-toolbar {
@@ -44,6 +43,7 @@
   margin-right: -$panel-padding-x;
   padding: $spacer-xs;
 
+
   @include media-breakpoint-down(md) {
 
     // If toolbar has too many items for smaller screens
diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
index 31b29267b..bbf95a363 100755
--- a/admin/code/SecurityAdmin.php
+++ b/admin/code/SecurityAdmin.php
@@ -217,13 +217,13 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 			$fields,
 			$actions
 		)->setHTMLID('Form_EditForm');
-		$form->addExtraClass('cms-edit-form');
+		$form->addExtraClass('cms-edit-form fill-height');
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 		// Tab nav in CMS is rendered through separate template
 		if($form->Fields()->hasTabSet()) {
 			$form->Fields()->findOrMakeTab('Root')->setTemplate('SilverStripe\\Forms\\CMSTabSet');
 		}
-		$form->addExtraClass('center ss-tabset cms-tabset ' . $this->BaseCSSClasses());
+		$form->addExtraClass('ss-tabset cms-tabset ' . $this->BaseCSSClasses());
 		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 
 		$this->extend('updateEditForm', $form);
diff --git a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Content.ss b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Content.ss
index c9b672de5..8ccce0742 100644
--- a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Content.ss
+++ b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_Content.ss
@@ -1,4 +1,4 @@
-<div class="cms-content $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
+<div class="cms-content flexbox-area-grow $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
 
 	$Tools
 
diff --git a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
index c5f190d77..8fea1dd7b 100644
--- a/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
+++ b/admin/templates/SilverStripe/Admin/Includes/LeftAndMain_EditForm.ss
@@ -27,7 +27,7 @@
 		$EditFormTools
 	<% end_with %>
 
-	<div class="panel panel--padded cms-content-fields panel--double-toolbar <% if not $Fields.hasTabset %>cms-panel-padded<% end_if %>">
+	<div class="panel panel--padded panel--scrollable flexbox-area-grow <% if not $Fields.hasTabset %>cms-panel-padded<% end_if %>">
 		<% if $Message %>
 		<p id="{$FormName}_error" class="message $MessageType">$Message</p>
 		<% else %>