diff --git a/config/install/core.entity_form_display.user.user.default.yml b/config/install/core.entity_form_display.user.user.default.yml
index 8dc67d81c6a90e69b4a27755aeffb343ad2b989e..91a951a4b4dceadb25bcf5635da76d7bbf1da3ba 100644
--- a/config/install/core.entity_form_display.user.user.default.yml
+++ b/config/install/core.entity_form_display.user.user.default.yml
@@ -2,6 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.user.user.field_last_password_reset
+    - field.field.user.user.field_password_expiration
     - field.field.user.user.field_uw_first_name
     - field.field.user.user.field_uw_last_name
   module:
@@ -63,4 +65,6 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
+  field_last_password_reset: true
+  field_password_expiration: true
   langcode: true
diff --git a/config/install/core.entity_view_display.user.user.default.yml b/config/install/core.entity_view_display.user.user.default.yml
index 6d933dfd885b52eac5e2b48faa1d164e78a91c5b..39dde7793995fd1183a7d50ea823f791a58cee89 100644
--- a/config/install/core.entity_view_display.user.user.default.yml
+++ b/config/install/core.entity_view_display.user.user.default.yml
@@ -2,6 +2,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.user.user.field_last_password_reset
+    - field.field.user.user.field_password_expiration
     - field.field.user.user.field_uw_first_name
     - field.field.user.user.field_uw_last_name
   module:
@@ -22,6 +24,8 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
+  field_last_password_reset: true
+  field_password_expiration: true
   field_uw_first_name: true
   field_uw_last_name: true
   langcode: true
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 f352744a8d0750d8b3c40ee3cc05688edc348ce3..81b005fb26389bdc5ab018cd08d8f486c4de26d0 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
@@ -8,3 +8,4 @@ type: component
 weight: -10
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
+layout_restrictions: {  }
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 c4ead54d79f455d60c1c580169cbcb90c236c075..a438e8b50927e4bdee0cb525afcbccc0901b7c74 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
@@ -8,3 +8,4 @@ type: component
 weight: -9
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
+layout_restrictions: {  }
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 8f05eb8ad0eb2b363eaddd8e4bce4ddd73aa4cf6..973fc63ad339e9a913e96e3ca5719525975c6b54 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
@@ -8,3 +8,4 @@ type: component
 weight: -8
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
+layout_restrictions: {  }
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 ff8a94c649edf1aebd06f7315c7d964b85ec4606..985bf7d57de3889d94dfeea48f017ac08d6afcd3 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
@@ -8,3 +8,4 @@ type: component
 weight: -7
 block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
+layout_restrictions: {  }
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 d026b96db6e4033c488295975c61e4c37152dbfc..916c6322afb8beff6b42bc5295f3375a59b998d8 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
@@ -13,3 +13,4 @@ block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
   - 'inline_block:uw_cbl_image'
   - 'inline_block:uw_cbl_remote_video'
+layout_restrictions: {  }
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 133375c0cb99387511babafe1ba5cab3eff401e8..68c56dc13ffbed5705e5ed69e69b396c46b44106 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
@@ -7,3 +7,4 @@ classes: "uw-contained-width\r\nuw-contained-width--narrow"
 type: section
 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 bd262e70d9aa34894a652e1538880e5cd320080b..7303b5664ac1e55113320f14001ddba1af0407f0 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
@@ -7,3 +7,4 @@ classes: "uw-contained-width\r\nuw-contained-width--wide"
 type: section
 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 6854f4af206808986a8aa195c85de38c78ee654b..43689e4b19d925fb1a1640478683f5f884a5bd2b 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
@@ -13,3 +13,4 @@ block_restrictions:
   - 'inline_block:uw_cbl_facts_and_figures'
   - 'inline_block:uw_cbl_image'
   - 'inline_block:uw_cbl_remote_video'
+layout_restrictions: {  }
diff --git a/uw_cfg_common.info.yml b/uw_cfg_common.info.yml
index b1bb717e4c15bae8a4ddb6f0ed408e832621d7b9..7f982f6bd5504d5e8c1f72e08acca5fc0964cb9a 100644
--- a/uw_cfg_common.info.yml
+++ b/uw_cfg_common.info.yml
@@ -1,4 +1,4 @@
-name: 'UW Configure common'
+name: 'UW Configure Common'
 description: 'Configuration for all common WCMS'
 type: module
 core_version_requirement: '^8.9 || ^9'
@@ -49,3 +49,4 @@ dependencies:
   - 'metatag:metatag_extended_perms'
   - 'quick_node_clone:quick_node_clone'
   - 'subpathauto:subpathauto'
+  - 'uw_cfg_common:uw_cfg_common'