diff --git a/config/install/layout_builder_styles.group.default.yml b/config/install/layout_builder_styles.group.default.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7e608f04190c8280606033843a64e6643b1a0a5e
--- /dev/null
+++ b/config/install/layout_builder_styles.group.default.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies: {  }
+id: default
+label: Style
+multiselect: single
+form_type: checkboxes
+required: true
+weight: 100
diff --git a/config/install/layout_builder_styles.style.uw_lbs_carousel_1_item.yml b/config/install/layout_builder_styles.style.uw_lbs_carousel_1_item.yml
index 81b005fb26389bdc5ab018cd08d8f486c4de26d0..3d186603e944b62777ccd5c71512a4e51a280ebd 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_carousel_1_item.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_carousel_1_item.yml
@@ -5,6 +5,7 @@ id: uw_lbs_carousel_1_item
 label: 'Carousel - 1 item'
 classes: uw-carousel--one-item
 type: component
+group: default
 weight: -10
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
diff --git a/config/install/layout_builder_styles.style.uw_lbs_carousel_2_items.yml b/config/install/layout_builder_styles.style.uw_lbs_carousel_2_items.yml
index a438e8b50927e4bdee0cb525afcbccc0901b7c74..21076bf74dbc4a32b5030a85b0daf0d717ea5aa8 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_carousel_2_items.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_carousel_2_items.yml
@@ -5,6 +5,7 @@ id: uw_lbs_carousel_2_items
 label: 'Carousel - 2 items'
 classes: uw-carousel--two-items
 type: component
+group: default
 weight: -9
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
diff --git a/config/install/layout_builder_styles.style.uw_lbs_carousel_3_items.yml b/config/install/layout_builder_styles.style.uw_lbs_carousel_3_items.yml
index 973fc63ad339e9a913e96e3ca5719525975c6b54..a4e344077cf60c9b3f01283a48b8aa45950f3025 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_carousel_3_items.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_carousel_3_items.yml
@@ -5,6 +5,7 @@ id: uw_lbs_carousel_3_items
 label: 'Carousel - 3 items'
 classes: uw-carousel--three-items
 type: component
+group: default
 weight: -8
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
diff --git a/config/install/layout_builder_styles.style.uw_lbs_carousel_4_items.yml b/config/install/layout_builder_styles.style.uw_lbs_carousel_4_items.yml
index 985bf7d57de3889d94dfeea48f017ac08d6afcd3..3576c282101a33ec3cf7cf3e07e0a679e0c840ae 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_carousel_4_items.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_carousel_4_items.yml
@@ -5,6 +5,7 @@ id: uw_lbs_carousel_4_items
 label: 'Carousel - 4 items'
 classes: uw-carousel--four-items
 type: component
+group: default
 weight: -7
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
diff --git a/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml b/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml
index 916c6322afb8beff6b42bc5295f3375a59b998d8..d68c387a7e9a07b92e07db5cc9b03faf2f7dc59c 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width.yml
@@ -5,6 +5,7 @@ id: uw_lbs_contained_width
 label: 'Extra-wide contained width'
 classes: uw-contained-width
 type: section
+group: default
 weight: -4
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
diff --git a/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml b/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
index 68c56dc13ffbed5705e5ed69e69b396c46b44106..c120b5b0db894e084df040c04f9e56f7bba3280a 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
@@ -5,6 +5,7 @@ id: uw_lbs_contained_width_narrow
 label: 'Narrow contained width'
 classes: "uw-contained-width\r\nuw-contained-width--narrow"
 type: section
+group: default
 weight: -6
 block_restrictions: {  }
 layout_restrictions: {  }
diff --git a/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml b/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
index 7303b5664ac1e55113320f14001ddba1af0407f0..7f62da9ba08cf6ef030a7e45ae3bf7ea1376d374 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
@@ -5,6 +5,7 @@ id: uw_lbs_contained_width_wide
 label: 'Wide contained width'
 classes: "uw-contained-width\r\nuw-contained-width--wide"
 type: section
+group: default
 weight: -5
 block_restrictions: {  }
 layout_restrictions: {  }
diff --git a/config/install/layout_builder_styles.style.uw_lbs_full_width.yml b/config/install/layout_builder_styles.style.uw_lbs_full_width.yml
index 43689e4b19d925fb1a1640478683f5f884a5bd2b..461e8dd108adf4514b9d0151ca25263fb0204d10 100644
--- a/config/install/layout_builder_styles.style.uw_lbs_full_width.yml
+++ b/config/install/layout_builder_styles.style.uw_lbs_full_width.yml
@@ -5,6 +5,7 @@ id: uw_lbs_full_width
 label: 'Full width'
 classes: uw-full-width
 type: section
+group: default
 weight: -3
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index 7c4575c5eb82fc28d85e5d4bd38a82a9f2ac2c70..dcf4989998145089027c350a032fafa456205093 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -178,11 +178,8 @@ function uw_cfg_common_entity_presave(EntityInterface $entity) {
  * Remove the None option from layout builder styles.
  */
 function uw_cfg_common_form_layout_builder_configure_section_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
-  // Remove the None option from layout builder styles.
-  unset($form['layout_builder_style']['#empty_option']);
-
   // Ensuring that the contained width is selected by default.
-  $form['layout_builder_style']['#default_value'] = $form['layout_builder_style']['#default_value'] ?: 'uw_lbs_contained_width';
+  $form['layout_builder_style_default']['#default_value']['uw_lbs_contained_width'] = 'uw_lbs_contained_width';
 }
 
 /**