diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css
index 7fded5530f..0fb5f6efdb 100644
--- a/admin/templates/default/app.css
+++ b/admin/templates/default/app.css
@@ -148,7 +148,7 @@ span#admin-mailaccount_acc_id {
 /**
  * new et2 site configuration
  */
-#admin-site-config > div > .subHeader {
+#admin-site-config > div > et2-vbox > .subHeader {
     border-bottom: 3px solid #696969;
     padding-left: 3px;
     padding-bottom: 3px;
@@ -156,6 +156,19 @@ span#admin-mailaccount_acc_id {
     margin-bottom: 5px;
 }
 
+#admin-site-config > div > et2-vbox {
+	height: 100%;
+}
+
+#admin-site-config .mainContent, #admin-site-config .mainContent et2-tabbox {
+	flex-grow: 1;
+}
+
+#admin-site-config .mainContent > div {
+	display: flex;
+	flex-direction: column;
+}
+
 #admin-index_ajax_target > form[id$="-config"] tr.th > td,
 #admin-site-config .subHeader {
     font-weight: bold;
diff --git a/admin/templates/default/config.xet b/admin/templates/default/config.xet
index c50e116b9c..f2b9319631 100644
--- a/admin/templates/default/config.xet
+++ b/admin/templates/default/config.xet
@@ -53,14 +53,26 @@
 						<option value="disabled">{No}</option>
 					</et2-select>
 				</row>
-				<!-- remove currently not supported/necessary development option debug_minify
 				<row>
-					<et2-description  value="Disable minifying of javascript and CSS files" label="%s:"></et2-description>
-					<et2-select  id="newsettings[debug_minify]">
+					<et2-description  value="Group hierarchy" span="all" class="subHeader"></et2-description>
+				</row>
+				<row>
+					<et2-description  value="Show groups in container based on" label="%s:"></et2-description>
+					<et2-select  id="newsettings[group_container_attribute]">
 						<option value="">{No} - {Default}</option>
-						<option value="True">Yes</option>
+						<option value="account_lid">{Group name}: /^([^ ]+) / --> $1</option>
+						<option value="account_dn">LDAP DN: /,CN=([^,]+),/ --> $1</option>
 					</et2-select>
-				</row -->
+				</row>
+				<row>
+					<et2-description  value="Regular expression to find part to use as container" label="%s:"></et2-description>
+					<et2-hbox>
+						<et2-textbox id="newsettings[group_container_regexp]" placeholder="/,CN=([^,]+),/"></et2-textbox>
+						<et2-description value="-->" style="position: relative; top: .5em"></et2-description>
+						<et2-textbox id="newsettings[group_container_replace]" placeholder="$1" width="100px"></et2-textbox>
+					</et2-hbox>
+				</row>
+
 				<row>
 					<et2-description  value="Encryption" span="all" class="subHeader"></et2-description>
 				</row>
@@ -390,7 +402,7 @@
 		</grid>
 	</template>
 	<template id="admin.config" template="" lang="" group="0" version="18.1">
-		<et2-tabbox  id="tabs" width="100%">
+        <et2-tabbox id="tabs">
 			<tabs>
 				<tab id="general" label="General"/>
 				<tab id="appearance" label="Appearance"/>
diff --git a/admin/templates/default/site-config.xet b/admin/templates/default/site-config.xet
index 1caac70be9..4d096f4916 100644
--- a/admin/templates/default/site-config.xet
+++ b/admin/templates/default/site-config.xet
@@ -2,35 +2,26 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2.0//EN" "https://www.egroupware.org/etemplate2.0.dtd">
 <overlay>
 	<template id="admin.site-config" template="" lang="" group="0" version="16.1">
-		<grid width="100%">
-			<columns>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<et2-description  value="Site configuration" class="subHeader"></et2-description>
-				</row>
-				<row disabled="@need_tab">
-					<template template="@template" width="99%"/>
-				</row>
-				<row disabled="!@need_tab">
-					<et2-tabbox  id="tabs2" width="100%">
-						<tabs>
-							<tab id="config" label="Configuration"/>
-						</tabs>
-						<tabpanels>
-							<template template="@template" width="99%"/>
-						</tabpanels>
-					</et2-tabbox>
-				</row>
-				<row class="dialogFooterToolbar">
-					<et2-hbox>
-						<et2-button id="save" label="Save"></et2-button>
-						<et2-button id="apply" label="Apply"></et2-button>
-						<et2-button id="cancel" label="Cancel"></et2-button>
-					</et2-hbox>
-				</row>
-			</rows>
-		</grid>
+        <et2-vbox height="100%">
+            <et2-description value="Site configuration" class="subHeader"></et2-description>
+            <et2-box disabled="@need_tab" class="mainContent">
+                <template template="@template" width="99%"/>
+            </et2-box>
+            <et2-box disabled="!@need_tab" class="mainContent">
+                <et2-tabbox id="tabs2">
+                    <tabs>
+                        <tab id="config" label="Configuration"/>
+                    </tabs>
+                    <tabpanels>
+                        <template template="@template" width="99%"/>
+                    </tabpanels>
+                </et2-tabbox>
+            </et2-box>
+            <et2-hbox class="dialogFooterToolbar">
+                <et2-button id="save" label="Save"></et2-button>
+                <et2-button id="apply" label="Apply"></et2-button>
+                <et2-button id="cancel" label="Cancel"></et2-button>
+            </et2-hbox>
+        </et2-vbox>
 	</template>
 </overlay>
\ No newline at end of file