diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_blockquote.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_blockquote.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2109bbbb15bbc59fca18a40ed037e656527941eb
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_blockquote.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_blockquote
+block_id: 'inline_block:uw_cbl_blockquote'
+category: uw_bc_content
+label: Blockquote
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/blockquote.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_call_to_action.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_call_to_action.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ca613476f29f4be0f78212e42be298bd75476cdd
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_call_to_action.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_call_to_action
+block_id: 'inline_block:uw_cbl_call_to_action'
+category: uw_bc_content
+label: 'Call to action'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/calltoaction.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_copy_text.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_copy_text.yml
new file mode 100644
index 0000000000000000000000000000000000000000..55883cd1722b371aebc24457399c5d3a82c91317
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_copy_text.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_copy_text
+block_id: 'inline_block:uw_cbl_copy_text'
+category: uw_bc_content
+label: 'Copy text'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/copytext.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_facebook.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_facebook.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1507c1dc51e49113cc3b7b4537b885a9d546c5ed
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_facebook.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_facebook
+block_id: 'inline_block:uw_cbl_facebook'
+category: uw_bc_external_embeds
+label: Facebook
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/facebook.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_facts_and_figures.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_facts_and_figures.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bc44f0009dc5743945e7d9b47088bb6144e103c5
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_facts_and_figures.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_facts_and_figures
+block_id: 'inline_block:uw_cbl_facts_and_figures'
+category: uw_bc_content
+label: 'Facts and figures'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/factsandfigures.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_google_maps.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_google_maps.yml
new file mode 100644
index 0000000000000000000000000000000000000000..db4d95c5b53b3857fc64a0dd134c159f7483e844
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_google_maps.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_google_maps
+block_id: 'inline_block:uw_cbl_google_maps'
+category: uw_bc_external_embeds
+label: 'Google Maps'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/maps_google.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_image.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_image.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2d03d2bd88cae17ccb1c7a0ef5c34b89e51c4e62
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_image.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_image
+block_id: 'inline_block:uw_cbl_image'
+category: uw_bc_content
+label: 'Full width image'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/fullwidthimage.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_image_gallery.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_image_gallery.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f6d9e53de9aa60c21bec100b0785a458406b4a2c
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_image_gallery.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_image_gallery
+block_id: 'inline_block:uw_cbl_image_gallery'
+category: uw_bc_content
+label: 'Image gallery'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/imagegallery.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_instagram.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_instagram.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6269319f2ed5716c5706bc7d25471c4bee49e23a
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_instagram.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_instagram
+block_id: 'inline_block:uw_cbl_instagram'
+category: uw_bc_external_embeds
+label: Instagram
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/instagram.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailman.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailman.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9f858c5326fef16b7de81b7caf52344b768ee727
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_mailman.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_mailman
+block_id: 'inline_block:uw_cbl_mailman'
+category: uw_bc_content
+label: 'Mailman subscription'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/mailman.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_powerbi.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_powerbi.yml
new file mode 100644
index 0000000000000000000000000000000000000000..db75c5040b33c25a6720a0093b23bf7ba3cb42b6
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_powerbi.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_powerbi
+block_id: 'inline_block:uw_cbl_powerbi'
+category: uw_bc_external_embeds
+label: PowerBI
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/powerbi.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_related_links.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_related_links.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3755517912e1b1f8cd6838d6b022bb3a5a2d1bc8
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_related_links.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_related_links
+block_id: 'inline_block:uw_cbl_related_links'
+category: uw_bc_content
+label: 'Related links'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/relatedlinks.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_remote_video.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_remote_video.yml
new file mode 100644
index 0000000000000000000000000000000000000000..afef66aef9f71fadf1011f53f6b1cb799464571b
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_remote_video.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_remote_video
+block_id: 'inline_block:uw_cbl_remote_video'
+category: uw_bc_external_embeds
+label: 'Remote video'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/video.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_tableau.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_tableau.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a3dd534736d8daf1c099840fa70dc56ef551087d
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_tableau.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_tableau
+block_id: 'inline_block:uw_cbl_tableau'
+category: uw_bc_external_embeds
+label: 'Tableau visualization'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/tableau.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_timeline.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_timeline.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0fab7b5952639130d82f327d6c3e7997c2d8646b
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_timeline.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_timeline
+block_id: 'inline_block:uw_cbl_timeline'
+category: uw_bc_content
+label: Timeline
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/timeline.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_twitter.yml b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_twitter.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c2659882ef84a6233fe07f394a4dadbe27c6352c
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_twitter.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: inline_blockuw_cbl_twitter
+block_id: 'inline_block:uw_cbl_twitter'
+category: uw_bc_external_embeds
+label: Twitter
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/twitter.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_blog_teaser.yml b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_blog_teaser.yml
new file mode 100644
index 0000000000000000000000000000000000000000..954b14e6754b7580cccca6bd4372b9de508533df
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_blog_teaser.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: uw_cbl_blog_teaser
+block_id: uw_cbl_blog_teaser
+category: uw_bc_teasers
+label: 'Blog post teaser'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/blogteaser.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_event_teaser.yml b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_event_teaser.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9c4991a047c5d4ef7a79256e713457d1826ad0bc
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_event_teaser.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: uw_cbl_event_teaser
+block_id: uw_cbl_event_teaser
+category: uw_bc_teasers
+label: 'Event teaser'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventteaser.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_multi_type_list.yml b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_multi_type_list.yml
new file mode 100644
index 0000000000000000000000000000000000000000..86eb077fb78e2c29310c295ac45b8cb07c0c980a
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_multi_type_list.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: uw_cbl_multi_type_list
+block_id: uw_cbl_multi_type_list
+category: uw_bc_listings
+label: 'Multi-type list'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/multitypelist.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_news_teaser.yml b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_news_teaser.yml
new file mode 100644
index 0000000000000000000000000000000000000000..84e191e1fd5757ab2dbf5107d837ea1c5ff2764b
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.uw_cbl_news_teaser.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: uw_cbl_news_teaser
+block_id: uw_cbl_news_teaser
+category: uw_bc_teasers
+label: 'News item teaser'
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newsteaser.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_blogs-blogs_listing_block.yml b/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_blogs-blogs_listing_block.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9e8ffbd62bb6e1a5126b13c83b4f0d70dc066600
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_blogs-blogs_listing_block.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: views_blockuw_view_blogs-blogs_listing_block
+block_id: 'views_block:uw_view_blogs-blogs_listing_block'
+category: uw_bc_listings
+label: 'Blog post list'
+weight: -2
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/bloglist.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_events-events_listing_block.yml b/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_events-events_listing_block.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8409fbd84819910e7743dfe2012d2b1dd1788594
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_events-events_listing_block.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: views_blockuw_view_events-events_listing_block
+block_id: 'views_block:uw_view_events-events_listing_block'
+category: uw_bc_listings
+label: 'Event list'
+weight: -1
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventlist.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_news_items-news_items_listing_block.yml b/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_news_items-news_items_listing_block.yml
new file mode 100644
index 0000000000000000000000000000000000000000..61b53a9be7b038e366c4a02c9273263d83b17356
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.views_blockuw_view_news_items-news_items_listing_block.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: views_blockuw_view_news_items-news_items_listing_block
+block_id: 'views_block:uw_view_news_items-news_items_listing_block'
+category: uw_bc_listings
+label: 'News item list'
+weight: 1
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newslist.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.webform_block.yml b/config/install/layout_builder_browser.layout_builder_browser_block.webform_block.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a90fe286bb512818d72efe5d126ecae68a3372db
--- /dev/null
+++ b/config/install/layout_builder_browser.layout_builder_browser_block.webform_block.yml
@@ -0,0 +1,10 @@
+langcode: en
+status: true
+dependencies: {  }
+id: webform_block
+block_id: webform_block
+category: uw_bc_webforms
+label: Webform
+weight: 0
+image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/webform.svg
+image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_content.yml b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_content.yml
index 50e40679e908821f5517f30752ed57848148cd85..d409a3d03f05ce94c429e49938945b0a603158ee 100755
--- a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_content.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_content.yml
@@ -20,11 +20,6 @@ blocks:
     weight: 0
     image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/copytext.svg
     image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_expand_collapse'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/expandcollapse.svg
-    image_alt: ''
   -
     block_id: 'inline_block:uw_cbl_facts_and_figures'
     weight: 0
diff --git a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_external_embeds.yml b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_external_embeds.yml
index 03e03111c6da5884daa22ff3fe8e00dade08a133..f38e76414d394bcf39c5e1a490af83698618ed84 100644
--- a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_external_embeds.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_external_embeds.yml
@@ -4,39 +4,3 @@ dependencies: {  }
 id: uw_bc_external_embeds
 label: 'External embeds'
 weight: null
-blocks:
-  -
-    block_id: 'inline_block:uw_cbl_facebook'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/facebook.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_instagram'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/instagram.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_remote_video'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/video.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_tableau'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/tableau.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_twitter'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/twitter.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_powerbi'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/powerbi.svg
-    image_alt: ''
-  -
-    block_id: 'inline_block:uw_cbl_google_maps'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/maps_google.svg
-    image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_listings.yml b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_listings.yml
index fa5261c0c2f5320b10b1d3dfb20a600fd6998ff2..4b089a384cf89a1478e8c1b69e4896639d9495ec 100644
--- a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_listings.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_listings.yml
@@ -4,24 +4,3 @@ dependencies: {  }
 id: uw_bc_listings
 label: Listings
 weight: null
-blocks:
-  -
-    block_id: 'views_block:uw_view_blogs-blogs_listing_block'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/bloglist.svg
-    image_alt: ''
-  -
-    block_id: 'views_block:uw_view_events-events_listing_block'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventlist.svg
-    image_alt: ''
-  -
-    block_id: 'views_block:uw_view_news_items-news_items_listing_block'
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newslist.svg
-    image_alt: ''
-  -
-    block_id: uw_cbl_multi_type_list
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/multitypelist.svg
-    image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_teasers.yml b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_teasers.yml
index 02458cf188ed0d4f117daf609bb5a4db162c5ab7..5d3350eeb942588ddc737064f3b21adf60e81adf 100644
--- a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_teasers.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_teasers.yml
@@ -4,19 +4,3 @@ dependencies: {  }
 id: uw_bc_teasers
 label: Teasers
 weight: null
-blocks:
-  -
-    block_id: uw_cbl_blog_teaser
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/blogteaser.svg
-    image_alt: ''
-  -
-    block_id: uw_cbl_news_teaser
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/newsteaser.svg
-    image_alt: ''
-  -
-    block_id: uw_cbl_event_teaser
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/eventteaser.svg
-    image_alt: ''
diff --git a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_webforms.yml b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_webforms.yml
index 1ea273fac06822ab3dcf7a0d11bc0fc008fac778..73d11669a6125aabfd5c06883e2a5b280ec29cfb 100644
--- a/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_webforms.yml
+++ b/config/install/layout_builder_browser.layout_builder_browser_blockcat.uw_bc_webforms.yml
@@ -4,9 +4,3 @@ dependencies: {  }
 id: uw_bc_webforms
 label: Webforms
 weight: null
-blocks:
-  -
-    block_id: webform_block
-    weight: 0
-    image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/webform.svg
-    image_alt: ''
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 00d757054e514454e182dd90405f75a856b4dc7f..f352744a8d0750d8b3c40ee3cc05688edc348ce3 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,6 @@ id: uw_lbs_carousel_1_item
 label: 'Carousel - 1 item'
 classes: uw-carousel--one-item
 type: component
-weight: 0
+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 88c8d085caf7885e417a1ead64cd36567f1e0b5e..c4ead54d79f455d60c1c580169cbcb90c236c075 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,6 @@ id: uw_lbs_carousel_2_items
 label: 'Carousel - 2 items'
 classes: uw-carousel--two-items
 type: component
-weight: 0
+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 2d9265f7a2b2f0bd6a7bc97d88ab4a593128955f..8f05eb8ad0eb2b363eaddd8e4bce4ddd73aa4cf6 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,6 @@ id: uw_lbs_carousel_3_items
 label: 'Carousel - 3 items'
 classes: uw-carousel--three-items
 type: component
-weight: 0
+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 37924349abf05d8d30bf4179aec9b5c82276ac5c..ff8a94c649edf1aebd06f7315c7d964b85ec4606 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,6 @@ id: uw_lbs_carousel_4_items
 label: 'Carousel - 4 items'
 classes: uw-carousel--four-items
 type: component
-weight: 0
+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 dddabf08494157f790f04db76280e21652b2ce1e..d026b96db6e4033c488295975c61e4c37152dbfc 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
@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies: {  }
 id: uw_lbs_contained_width
-label: 'Contained width'
+label: 'Extra-wide contained width'
 classes: uw-contained-width
 type: section
-weight: 0
+weight: -4
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
   - 'inline_block:uw_cbl_copy_text'
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
new file mode 100644
index 0000000000000000000000000000000000000000..133375c0cb99387511babafe1ba5cab3eff401e8
--- /dev/null
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width_narrow.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies: {  }
+id: uw_lbs_contained_width_narrow
+label: 'Narrow contained width'
+classes: "uw-contained-width\r\nuw-contained-width--narrow"
+type: section
+weight: -6
+block_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
new file mode 100644
index 0000000000000000000000000000000000000000..bd262e70d9aa34894a652e1538880e5cd320080b
--- /dev/null
+++ b/config/install/layout_builder_styles.style.uw_lbs_contained_width_wide.yml
@@ -0,0 +1,9 @@
+langcode: en
+status: true
+dependencies: {  }
+id: uw_lbs_contained_width_wide
+label: 'Wide contained width'
+classes: "uw-contained-width\r\nuw-contained-width--wide"
+type: section
+weight: -5
+block_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 1f92dcc2c47c56c16c1e89aeaff8f67db931b903..6854f4af206808986a8aa195c85de38c78ee654b 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,7 +5,7 @@ id: uw_lbs_full_width
 label: 'Full width'
 classes: uw-full-width
 type: section
-weight: 0
+weight: -3
 block_restrictions:
   - 'inline_block:uw_cbl_call_to_action'
   - 'inline_block:uw_cbl_copy_text'
diff --git a/config/install/user.role.uw_role_site_owner.yml b/config/install/user.role.uw_role_site_owner.yml
index 7a6e21c7e7283285d99aa399b87c0a1ba9d13953..1490dc50de358d1ad32e50f345a13a53504fefc5 100644
--- a/config/install/user.role.uw_role_site_owner.yml
+++ b/config/install/user.role.uw_role_site_owner.yml
@@ -17,6 +17,7 @@ permissions:
   - 'administer main menu items'
   - 'administer role expire'
   - 'administer shortcuts'
+  - 'administer users'
   - 'administer uw-menu-audience-menu menu items'
   - 'can override my_dashboard dashboard'
   - 'can view my_dashboard dashboard'
diff --git a/uw_cfg_common.info.yml b/uw_cfg_common.info.yml
index 34af4ef5b9c882848d427914c9bd3585d1f76bbb..c082308d7e9f3f1aa43071eec61c69f928d34606 100644
--- a/uw_cfg_common.info.yml
+++ b/uw_cfg_common.info.yml
@@ -3,11 +3,13 @@ description: 'Configuration for all common WCMS'
 type: module
 core_version_requirement: '^8.7.7 || ^9'
 dependencies:
+  - block_content
   - block_list_override
   - captcha
   - ckeditor
   - config_views
   - core_event_dispatcher
+  - ctools
   - editor
   - features
   - field
@@ -28,5 +30,7 @@ dependencies:
   - pathauto
   - preprocess_event_dispatcher
   - taxonomy
+  - text
   - user
   - views
+
diff --git a/uw_cfg_common.links.menu.yml b/uw_cfg_common.links.menu.yml
index f342ed2610193c6ce29df3bf342fd8889a8fa607..7f7c69f76a1bf1a0ec70001a2f67f62692a65249 100644
--- a/uw_cfg_common.links.menu.yml
+++ b/uw_cfg_common.links.menu.yml
@@ -41,7 +41,7 @@ uw_global_footer.accessibility:
   weight: 2
 
 uw_global_footer.media:
-  title: 'Media'
+  title: 'News'
   menu_name: uw-menu-global-footer
   url: https://uwaterloo.ca/news/
   weight: 3
@@ -116,313 +116,181 @@ uw_content_management.content_types:
   title: 'Content types'
   menu_name: uw-menu-content-management
   route_name: entity.node_type.collection
-  weight: 10
+  weight: 0
 
 uw_content_management.content_types.blog_post:
   title: 'Blog post'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_blog
-  weight: 10
+  weight: 0
+
+uw_content_management.content_types.catalog_item.add_blog_tag:
+  title: 'Add blog tag'
+  parent: uw_content_management.content_types.blog_post
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_blog_tags/add
+  weight: 0
 
-uw_content_management.content_types.blog_post.blog_settings:
-  title: 'Blog page settings'
+uw_content_management.content_types.catalog_item.list_blog_tag:
+  title: 'List blog tags'
   parent: uw_content_management.content_types.blog_post
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_blog_tags/overview
+  weight: 0
 
 uw_content_management.content_types.catalog_item:
   title: 'Catalog item'
   parent: uw_content_management.content_types
-  url: internal:/node/add
-  weight: 10
-
-uw_content_management.content_types.catalog_item.catalog_settings:
-  title: 'Catalog settings'
-  parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 10
+  url: internal:/node/add/uw_ct_catalog_item
+  weight: 0
 
 uw_content_management.content_types.catalog_item.add_catalog:
   title: 'Add catalog'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 20
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalogs/add
+  weight: 0
 
 uw_content_management.content_types.catalog_item.list_catalogs:
   title: 'List catalogs'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 30
-
-uw_content_management.content_types.catalog_item.merge_catalogs:
-  title: 'Merge catalogs'
-  parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 40
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalogs/overview
+  weight: 0
 
 uw_content_management.content_types.catalog_item.add_catalog_category:
   title: 'Add catalog category'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 50
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalog_categories/add
+  weight: 0
 
 uw_content_management.content_types.catalog_item.list_catalog_categories:
   title: 'List catalog categories'
   parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 60
-
-uw_content_management.content_types.catalog_item.merge_catalog_categories:
-  title: 'Merge catalog categories'
-  parent: uw_content_management.content_types.catalog_item
-  url: internal:/node/add
-  weight: 70
-
-uw_content_management.content_types.contact:
-  title: 'Contact'
-  parent: uw_content_management.content_types
-  url: internal:/node/add
-  weight: 20
-
-uw_content_management.content_types.contact.rearrange_contacts:
-  title: 'Rearrange contacts'
-  parent: uw_content_management.content_types.contact
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_catalog_categories/overview
+  weight: 0
 
 uw_content_management.content_types.event:
   title: 'Event'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_event
-  weight: 30
+  weight: 0
+
+uw_content_management.content_types.event.add_event_tag:
+  title: 'Add event tag'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_tags/add
+  weight: 0
+
+uw_content_management.content_types.event.list_event_tags:
+  title: 'List event tags'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_tags/overview
+  weight: 0
+
+uw_content_management.content_types.event.add_event_type:
+  title: 'Add event type'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_type/add
+  weight: 0
+
+uw_content_management.content_types.event.list_event_types:
+  title: 'List event types'
+  parent: uw_content_management.content_types.event
+  url: internal:/admin/structure/taxonomy/manage/uw_tax_event_type/overview
+  weight: 0
 
 uw_content_management.content_types.news_item:
   title: 'News item'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_news_item
-  weight: 40
+  weight: 0
+
+uw_content_management.content_types.news_item.add_news_tag:
+  title: 'Add news tag'
+  parent: uw_content_management.content_types.news_item
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_news_tags/add
+  weight: 0
+
+uw_content_management.content_types.news_item.list_news_tags:
+  title: 'List news tags'
+  parent: uw_content_management.content_types.news_item
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_news_tags/overview
+  weight: 0
 
 uw_content_management.content_types.site_footer:
   title: 'Site footer'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_site_footer
-  weight: 30
+  weight: 0
 
 uw_content_management.content_types.web_page:
   title: 'Web page'
   parent: uw_content_management.content_types
   url: internal:/node/add/uw_ct_web_page
-  weight: 40
+  weight: 0
 
 uw_content_management.forms:
   title: 'Forms'
   menu_name: uw-menu-content-management
   url: internal:/admin/structure/webform
-  weight: 50
+  weight: 0
 
 uw_content_management.forms.form:
   title: 'Form'
   parent: uw_content_management.forms
   url: internal:/admin/structure/webform/add
-  weight: 10
+  weight: 0
 
 uw_content_management.forms.form.manage_submissions:
   title: 'Manage submissions'
   parent: uw_content_management.forms.form
   url: internal:/admin/structure/webform/submissions/manage
-  weight: 10
-
-uw_content_management.reusable_content:
-  title: 'Reusable content'
-  menu_name: uw-menu-content-management
-  route_name: entity.node_type.collection
-  weight: 40
-
-uw_content_management.reusable_content.blockquote:
-  title: 'Blockquote'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_blockquote
-  weight: 10
-
-uw_content_management.reusable_content.call_to_action:
-  title: 'Call to action'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_call_to_action
-  weight: 15
-
-uw_content_management.reusable_content.copy_text:
-  title: 'Copy text'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_copy_text
-  weight: 20
-
-uw_content_management.reusable_content.expand_collapse:
-  title: 'Expand / Collapse'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_expand_collapse
-  weight: 25
-
-uw_content_management.reusable_content.facebook:
-  title: 'Facebook'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_facebook
-  weight: 30
-
-uw_content_management.reusable_content.facts_and_figures:
-  title: 'Facts and figures'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_facts_and_figures
-  weight: 35
-
-uw_content_management.reusable_content.image:
-  title: 'Full width image'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_image
-  weight: 40
-
-uw_content_management.reusable_content.instagram:
-  title: 'Instagram'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_instagram
-  weight: 45
-
-uw_content_management.reusable_content.mailmain:
-  title: 'Mailman subscription'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_mailman
-  weight: 50
-
-uw_content_management.reusable_content.remove_video:
-  title: 'Remote video'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_remote_video
-  weight: 55
-
-uw_content_management.reusable_content.tableau:
-  title: 'Tableau visualization'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_tableau
-  weight: 60
-
-uw_content_management.reusable_content.twitter:
-  title: 'Twitter'
-  parent: uw_content_management.reusable_content
-  url: internal:/block/add/uw_cbl_twitter
-  weight: 65
+  weight: 0
 
 uw_content_management.global_vocabularies:
   title: 'Global vocabularies'
   menu_name: uw-menu-content-management
-  route_name: entity.node_type.collection
-  weight: 50
+  url: internal:/admin/structure/taxonomy
+  weight: 0
 
 uw_content_management.global_vocabularies.audience:
   title: 'Audience'
   parent: uw_content_management.global_vocabularies
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_audience
+  weight: 0
 
-uw_content_management.global_vocabularies.audience.list_terms:
-  title: 'List terms'
+uw_content_management.global_vocabularies.audience.add_term:
+  title: 'Add term'
   parent: uw_content_management.global_vocabularies.audience
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_audience/add
+  weight: 0
 
-uw_content_management.global_vocabularies.audience.merge_terms:
-  title: 'Merge terms'
+uw_content_management.global_vocabularies.audience.list_terms:
+  title: 'List terms'
   parent: uw_content_management.global_vocabularies.audience
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/structure/taxonomy/manage/uw_vocab_audience/overview
+  weight: 0
 
-uw_site_management.google_universal_analytics:
-  title: 'Google Universal Analytics'
+uw_site_management.content_access:
+  title: 'Content access'
   menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 5
-
-uw_site_management.home_page_banner_settings:
-  title: 'Home page banner settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 10
+  url: internal:/admin/content-access
+  weight: 0
 
 uw_site_management.menus:
   title: 'Menus'
   menu_name: uw-menu-site-management
   route_name: entity.menu.collection
-  weight: 15
-
-uw_site_management.microsoft_teams_options:
-  title: 'Microsoft Teams options'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 20
-
-uw_site_management.open_authentication:
-  title: 'Open authentication'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 25
-
-uw_site_management.path_review_report:
-  title: 'Path review report'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 30
-
-uw_site_management.project_settings:
-  title: 'Project settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 35
-
-uw_site_management.redirects:
-  title: 'Redirects'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 40
-
-uw_site_management.service_ist_settings:
-  title: 'Service IST settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 45
-
-uw_site_management.service_settings:
-  title: 'Service settings'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 50
-
-uw_site_management.shortcuts:
-  title: 'Shortcuts'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 55
-
-uw_site_management.slack_options:
-  title: 'Slack options'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 60
-
-uw_site_management.slack_mattermost_options:
-  title: 'Slack/Mattermost options'
-  menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 65
+  weight: 0
 
 uw_site_management.submit_request:
   title: 'Submit request'
   menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 70
+  url: mailto:rt-ist-wcms@rt.uwaterloo.ca
+  weight: 0
 
 uw_site_management.wcms_how_to_documents:
   title: 'WCMS how-to documents'
   menu_name: uw-menu-site-management
-  url: internal:/node/add
-  weight: 75
+  url: https://uwaterloo.ca/web-resources/wcms-users/training-and-support/wcms-how-documents
+  weight: 0
 
 uw_main_menu.blog:
   title: 'Blog'
diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index 45770f0d0b29e68ce5d7818c5bcb496c3cc14072..1d273c3c757e1e3c04b6a492bea80afd4cada900 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -5,10 +5,31 @@
  * Module file.
  */
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\webform\WebformInterface;
 use Drupal\webform\WebformSubmissionStorageInterface;
 
+/**
+ * Implements hook_entity_presave().
+ */
+function uw_cfg_common_entity_presave(EntityInterface $entity) {
+
+  // Check if we are on a menu link.
+  if ($entity->getEntityTypeId() == 'menu_link_content') {
+
+    // Check that we are on a Information For (audience) link.
+    if ($entity->menu_name->value == 'uw-menu-audience-menu') {
+
+      // Invalid all the menu caching.
+      \Drupal::cache('menu')->invalidateAll();
+
+      // Rebuild all the menus.
+      \Drupal::service('plugin.manager.menu.link')->rebuild();
+    }
+  }
+}
+
 /**
  * Implements hook_form_FORM_ID_alter().
  *
@@ -19,7 +40,7 @@ function uw_cfg_common_form_layout_builder_configure_section_alter(array &$form,
   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-contained-width';
+  $form['layout_builder_style']['#default_value'] = $form['layout_builder_style']['#default_value'] ?: 'uw_lbs_contained_width';
 }
 
 /**