diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html
index 90918d71e1..a4ba0db72e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.area.overlay.html
@@ -13,7 +13,7 @@
             </umb-editor-header>
 
             <umb-editor-container>
-                <div class="form-vertical umb-block-grid-block-configuration-layout">
+                <div class="form-vertical">
 
                     <div class="umb-group-panel">
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
index 3c005663e8..993088e2eb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
@@ -287,7 +287,7 @@
                         title: data,
                         openAreas: openAreas,
                         view: "views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html",
-                        size: "large",
+                        size: "medium",
                         submit: function(overlayModel) {
                             loadElementTypes()// lets load elementType again, to ensure we are up to date.
                             TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.)
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
index 4d398844ed..9a1acda843 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
@@ -15,9 +15,9 @@
 
             <umb-editor-container>
 
-                <div ng-if="vm.activeTab.alias === 'block'" class="form-vertical umb-block-grid-block-configuration-layout">
+                <div ng-if="vm.activeTab.alias === 'block'" class="form-vertical">
 
-                    <div class="umb-group-panel umb-block-grid-block-configuration__umb-group-panel">
+                    <div class="umb-group-panel">
 
                         <div class="umb-group-panel__header">
                             <localize key="general_General">General</localize>
@@ -80,9 +80,59 @@
                     </div>
 
 
+
+
+                    <div class="umb-group-panel">
+
+                        <div class="umb-group-panel__header">
+                            <localize key="blockEditor_headlineAllowance">Permissions</localize>
+                        </div>
+
+                        <div class="umb-group-panel__content">
+
+                            <!-- allowAtRoot -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="allowAtRoot"><localize key="blockEditor_allowBlockInRoot">Allow in root</localize></label>
+                                    <umb-property-info-button button-title-key="general_readMore">
+                                        <localize key="blockEditor_allowBlockInRootHelp">Make this block available in the root of the layout.</localize>
+                                    </umb-property-info-button>
+                                    <div class="controls">
+                                        <umb-toggle
+                                            input-id="allowAtRoot"
+                                            checked="vm.block.allowAtRoot"
+                                            on-click="vm.block.allowAtRoot = !vm.block.allowAtRoot || false">
+                                        </umb-toggle>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!-- allowInAreas -->
+                            <div class="control-group umb-control-group -no-border">
+                                <div class="umb-el-wrap">
+                                    <label class="control-label" for="allowInAreas"><localize key="blockEditor_allowBlockInAreas">Allow in areas</localize></label>
+                                    <umb-property-info-button button-title-key="general_readMore">
+                                        <localize key="blockEditor_allowBlockInAreasHelp">Make this block available within other Blocks.</localize>
+                                    </umb-property-info-button>
+                                    <div class="controls">
+                                        <umb-toggle
+                                            input-id="allowInAreas"
+                                            checked="vm.block.allowInAreas"
+                                            on-click="vm.block.allowInAreas = !vm.block.allowInAreas || false">
+                                        </umb-toggle>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+
+
                     
 
-                    <div class="umb-group-panel umb-block-grid-block-configuration__umb-group-panel">
+                    <div class="umb-group-panel">
 
                         <div class="umb-group-panel__header">
                             <div>
@@ -131,7 +181,7 @@
 
 
 
-                    <div class="umb-group-panel umb-block-grid-block-configuration__umb-group-panel">
+                    <div class="umb-group-panel">
 
                         <div class="umb-group-panel__header">
                             <localize key="blockEditor_headlineCatalogueAppearance">Catalogue appearance</localize>
@@ -196,59 +246,11 @@
 
                     </div>
 
-
-                    <div class="umb-group-panel umb-block-grid-block-configuration__umb-group-panel">
-
-                        <div class="umb-group-panel__header">
-                            <localize key="blockEditor_headlineAllowance">Permissions</localize>
-                        </div>
-
-                        <div class="umb-group-panel__content">
-
-                            <!-- allowAtRoot -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="allowAtRoot"><localize key="blockEditor_allowBlockInRoot">Allow in root</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_allowBlockInRootHelp">Make this block available in the root of the layout.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-toggle
-                                            input-id="allowAtRoot"
-                                            checked="vm.block.allowAtRoot"
-                                            on-click="vm.block.allowAtRoot = !vm.block.allowAtRoot || false">
-                                        </umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                            <!-- allowInAreas -->
-                            <div class="control-group umb-control-group -no-border">
-                                <div class="umb-el-wrap">
-                                    <label class="control-label" for="allowInAreas"><localize key="blockEditor_allowBlockInAreas">Allow in areas</localize></label>
-                                    <umb-property-info-button button-title-key="general_readMore">
-                                        <localize key="blockEditor_allowBlockInAreasHelp">Make this block available within other Blocks.</localize>
-                                    </umb-property-info-button>
-                                    <div class="controls">
-                                        <umb-toggle
-                                            input-id="allowInAreas"
-                                            checked="vm.block.allowInAreas"
-                                            on-click="vm.block.allowInAreas = !vm.block.allowInAreas || false">
-                                        </umb-toggle>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-
                 </div>
 
                 <div ng-if="vm.activeTab.alias === 'areas'">
 
-                    <div class="umb-group-panel umb-block-grid-block-configuration__umb-group-panel --span-two-cols">
+                    <div class="umb-group-panel">
 
 
                         <div class="umb-group-panel__header">
@@ -288,7 +290,7 @@
                 </div>
 
                 <div ng-if="vm.activeTab.alias === 'advance'">
-                    <div class="umb-group-panel umb-block-grid-block-configuration__umb-group-panel">
+                    <div class="umb-group-panel">
 
                         <div class="umb-group-panel__header">
                             <localize key="blockEditor_headlineAdvanced">Advanced</localize>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less
index 57507f8044..5861cfdda5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.less
@@ -1,28 +1,5 @@
 .umb-block-grid-block-configuration-overlay {
 
-    .umb-block-grid-block-configuration-layout {
-        display: grid;
-        grid-template-columns: repeat(2, minmax(0, 1fr));
-        
-        grid-gap: 0 20px;
-        grid-auto-flow: row;
-        grid-auto-rows: minmax(50px, auto);
-
-        
-    }
-      
-
-    .umb-block-grid-block-configuration__umb-group-panel {
-        @media (max-width: 1024px) {
-            grid-column: span 2;
-        }
-        &.--span-two-cols {
-            grid-column: span 2;
-        }
-        &.--span-two-rows {
-            grid-row: span 2;
-        }
-    }
 
     .umb-node-preview {
         flex-grow: 1;