diff --git a/src/Plugin/Layout/Uw2ColumnLayout.php b/src/Plugin/Layout/Uw2ColumnLayout.php
index eb4916305640466cbfcea96d02df1fa948953d4d..c0990ae209c1245d4fbb737399bbfb4b7af72204 100644
--- a/src/Plugin/Layout/Uw2ColumnLayout.php
+++ b/src/Plugin/Layout/Uw2ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw2ColumnLayout extends UwColumnLayoutBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
+    // Get Parents configuration form (which by default adds the Admin Label).
+    $form = parent::buildConfigurationForm($form, $form_state);
+
     // Get the config for this layout.
     $configuration = $this->getConfiguration();
 
@@ -25,7 +28,7 @@ class Uw2ColumnLayout extends UwColumnLayoutBase {
     ];
 
     // The form element for the column widths.
-    $form['layout_settings']['column_class'] = [
+    $form['column_class'] = [
       '#type' => 'select',
       '#title' => $this->t('Column widths'),
       '#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/Uw3ColumnLayout.php b/src/Plugin/Layout/Uw3ColumnLayout.php
index 308cc01ff3c8d570379baf881b6e96bd9472eeb5..2f82b91f6ea5ea887a3d36f0318e095d8aa6abab 100644
--- a/src/Plugin/Layout/Uw3ColumnLayout.php
+++ b/src/Plugin/Layout/Uw3ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw3ColumnLayout extends UwColumnLayoutBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
+    // Get Parents configuration form (which by default adds the Admin Label).
+    $form = parent::buildConfigurationForm($form, $form_state);
+
     // Get the config for this layout.
     $configuration = $this->getConfiguration();
 
@@ -28,7 +31,7 @@ class Uw3ColumnLayout extends UwColumnLayoutBase {
     ];
 
     // The form element for the column widths.
-    $form['layout_settings']['column_class'] = [
+    $form['column_class'] = [
       '#type' => 'select',
       '#title' => $this->t('Column widths'),
       '#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/Uw4ColumnLayout.php b/src/Plugin/Layout/Uw4ColumnLayout.php
index c4c655ec5e7c4e957ca3a5fd63e87b9aa0fa7d5a..669a7a2b03a4bf0f98af14d8af3b8fd667c7e696 100644
--- a/src/Plugin/Layout/Uw4ColumnLayout.php
+++ b/src/Plugin/Layout/Uw4ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw4ColumnLayout extends UwColumnLayoutBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
+    // Get Parents configuration form (which by default adds the Admin Label).
+    $form = parent::buildConfigurationForm($form, $form_state);
+
     // Get the config for this layout.
     $configuration = $this->getConfiguration();
 
@@ -28,7 +31,7 @@ class Uw4ColumnLayout extends UwColumnLayoutBase {
     ];
 
     // The form element for the column widths.
-    $form['layout_settings']['column_class'] = [
+    $form['column_class'] = [
       '#type' => 'select',
       '#title' => $this->t('Column widths'),
       '#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/Uw5ColumnLayout.php b/src/Plugin/Layout/Uw5ColumnLayout.php
index 9a64acc1a7fa82498b69ed070e6ed6ea50cc985c..d75e2b0db8b5100f85fc58f30eefd69495d12e4f 100644
--- a/src/Plugin/Layout/Uw5ColumnLayout.php
+++ b/src/Plugin/Layout/Uw5ColumnLayout.php
@@ -14,6 +14,9 @@ class Uw5ColumnLayout extends UwColumnLayoutBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
+    // Get Parents configuration form (which by default adds the Admin Label).
+    $form = parent::buildConfigurationForm($form, $form_state);
+
     // Get the config for this layout.
     $configuration = $this->getConfiguration();
 
@@ -29,7 +32,7 @@ class Uw5ColumnLayout extends UwColumnLayoutBase {
     ];
 
     // The form element for the column widths.
-    $form['layout_settings']['column_class'] = [
+    $form['column_class'] = [
       '#type' => 'select',
       '#title' => $this->t('Column widths'),
       '#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/UwColumnLayoutBase.php b/src/Plugin/Layout/UwColumnLayoutBase.php
index 06460ba4d740a6c49e53351e75a137bb5b53674f..0086418157785323674f3fd9bd0aa9e6d7e89ad5 100644
--- a/src/Plugin/Layout/UwColumnLayoutBase.php
+++ b/src/Plugin/Layout/UwColumnLayoutBase.php
@@ -16,9 +16,12 @@ class UwColumnLayoutBase extends LayoutDefault implements PluginFormInterface {
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
 
+    // Call parent and let it do its thing (like set the label).
+    parent::submitConfigurationForm($form, $form_state);
+
     // Set the column class in the config.
     $this->configuration['column_class'] = $form_state->getValue(
-      ['layout_settings', 'column_class'],
+      ['column_class'],
       NULL
     );
   }
@@ -39,5 +42,4 @@ class UwColumnLayoutBase extends LayoutDefault implements PluginFormInterface {
 
     return $build;
   }
-
 }
diff --git a/src/Plugin/Layout/UwInvertedLLeftLayout.php b/src/Plugin/Layout/UwInvertedLLeftLayout.php
index 2f3d4c918cdc23643c577b8451bd44b449e76720..3e8281d961d4e3ffca2862ddaa6ac7c2a6b5bd0c 100644
--- a/src/Plugin/Layout/UwInvertedLLeftLayout.php
+++ b/src/Plugin/Layout/UwInvertedLLeftLayout.php
@@ -14,6 +14,9 @@ class UwInvertedLLeftLayout extends UwColumnLayoutBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
+    // Get Parents configuration form (which by default adds the Admin Label).
+    $form = parent::buildConfigurationForm($form, $form_state);
+
     // Get the config for this layout.
     $configuration = $this->getConfiguration();
 
@@ -25,7 +28,7 @@ class UwInvertedLLeftLayout extends UwColumnLayoutBase {
     ];
 
     // The form element for the column widths.
-    $form['layout_settings']['column_class'] = [
+    $form['column_class'] = [
       '#type' => 'select',
       '#title' => $this->t('Column widths for top row'),
       '#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',
diff --git a/src/Plugin/Layout/UwInvertedLRightLayout.php b/src/Plugin/Layout/UwInvertedLRightLayout.php
index e0bd1f7a80511325142de12d7dc88aa1d5e604b4..2bceb312f280dad58cd296fd6dd19da49a5ced88 100644
--- a/src/Plugin/Layout/UwInvertedLRightLayout.php
+++ b/src/Plugin/Layout/UwInvertedLRightLayout.php
@@ -14,6 +14,9 @@ class UwInvertedLRightLayout extends UwColumnLayoutBase {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
 
+    // Get Parents configuration form (which by default adds the Admin Label).
+    $form = parent::buildConfigurationForm($form, $form_state);
+
     // Get the config for this layout.
     $configuration = $this->getConfiguration();
 
@@ -25,7 +28,7 @@ class UwInvertedLRightLayout extends UwColumnLayoutBase {
     ];
 
     // The form element for the column widths.
-    $form['layout_settings']['column_class'] = [
+    $form['column_class'] = [
       '#type' => 'select',
       '#title' => $this->t('Column widths for top row'),
       '#default_value' => !empty($configuration['column_class']) ? $configuration['column_class'] : 'even-split',