diff --git a/apps/site/src/content/design-system/components/alert/accessibilityDemo.mdoc b/apps/site/src/content/design-system/components/alert/accessibilityDemo.mdoc
index c31aadceb..0067fcac8 100644
--- a/apps/site/src/content/design-system/components/alert/accessibilityDemo.mdoc
+++ b/apps/site/src/content/design-system/components/alert/accessibilityDemo.mdoc
@@ -1,4 +1,4 @@
-```tsx
+```jsx
 <div>
   <ComponentTitle>Success</ComponentTitle>
   <Alert look="success">
diff --git a/apps/site/src/content/design-system/components/alert/index.yaml b/apps/site/src/content/design-system/components/alert/index.yaml
index 84d80d50b..b47eae3ec 100644
--- a/apps/site/src/content/design-system/components/alert/index.yaml
+++ b/apps/site/src/content/design-system/components/alert/index.yaml
@@ -27,15 +27,15 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Colours
     slug: foundation/colour
diff --git a/apps/site/src/content/design-system/components/badge/index.yaml b/apps/site/src/content/design-system/components/badge/index.yaml
index 2b258b974..88d298682 100644
--- a/apps/site/src/content/design-system/components/badge/index.yaml
+++ b/apps/site/src/content/design-system/components/badge/index.yaml
@@ -24,12 +24,12 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Buttons
     slug: components/button
diff --git a/apps/site/src/content/design-system/components/button/index.yaml b/apps/site/src/content/design-system/components/button/index.yaml
index dc2264688..f69591cf4 100644
--- a/apps/site/src/content/design-system/components/button/index.yaml
+++ b/apps/site/src/content/design-system/components/button/index.yaml
@@ -5,6 +5,7 @@ description: >-
   accessibility.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Button sizes
@@ -31,15 +32,15 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Icons
     slug: foundation/icon
diff --git a/apps/site/src/content/design-system/components/compacta/index.yaml b/apps/site/src/content/design-system/components/compacta/index.yaml
index 7a970b4aa..011599c3c 100644
--- a/apps/site/src/content/design-system/components/compacta/index.yaml
+++ b/apps/site/src/content/design-system/components/compacta/index.yaml
@@ -4,6 +4,7 @@ description: >-
   fields, saving valuable screen space.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Default
@@ -22,9 +23,6 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility notes
       slug: accessibility-notes
diff --git a/apps/site/src/content/design-system/components/date-picker/index.yaml b/apps/site/src/content/design-system/components/date-picker/index.yaml
index 7ca64418a..60a04ff58 100644
--- a/apps/site/src/content/design-system/components/date-picker/index.yaml
+++ b/apps/site/src/content/design-system/components/date-picker/index.yaml
@@ -4,6 +4,7 @@ description: >-
   something, or assist in providing “day of the week” context.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Sizes
@@ -30,9 +31,6 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
diff --git a/apps/site/src/content/design-system/components/input-group/index.yaml b/apps/site/src/content/design-system/components/input-group/index.yaml
index 1c87cd15e..027d7a67d 100644
--- a/apps/site/src/content/design-system/components/input-group/index.yaml
+++ b/apps/site/src/content/design-system/components/input-group/index.yaml
@@ -36,15 +36,15 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Text inputs
     slug: components/input
diff --git a/apps/site/src/content/design-system/components/link/index.yaml b/apps/site/src/content/design-system/components/link/index.yaml
index 163856b2d..f7e54c436 100644
--- a/apps/site/src/content/design-system/components/link/index.yaml
+++ b/apps/site/src/content/design-system/components/link/index.yaml
@@ -6,6 +6,7 @@ description: >-
   Anchor.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Standalone
@@ -24,15 +25,15 @@ design:
       slug: visual-design
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Colours
     slug: foundation/colour
diff --git a/apps/site/src/content/design-system/components/progress-indicator/index.yaml b/apps/site/src/content/design-system/components/progress-indicator/index.yaml
index dbdd79669..683767d4d 100644
--- a/apps/site/src/content/design-system/components/progress-indicator/index.yaml
+++ b/apps/site/src/content/design-system/components/progress-indicator/index.yaml
@@ -2,6 +2,7 @@ name: Progress indicator
 description: Progress indicators are used to show a state of loading.
 namedExport:
   discriminant: false
+excludeFromNavbar: true
 design:
   - title:
       name: Progress indicator
diff --git a/apps/site/src/content/design-system/components/progress-rope/accessibility/colour-impairment-demonstration/content.mdoc b/apps/site/src/content/design-system/components/progress-rope/accessibility/colour-impairment-demonstration/content.mdoc
deleted file mode 100644
index 8cbe95006..000000000
--- a/apps/site/src/content/design-system/components/progress-rope/accessibility/colour-impairment-demonstration/content.mdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-{% shortCode name="accessibility-colour-impairment" /%}
-
-{% accessibilityDemo /%}
diff --git a/apps/site/src/content/design-system/components/progress-rope/index.yaml b/apps/site/src/content/design-system/components/progress-rope/index.yaml
index 899e26d33..7be9f2b81 100644
--- a/apps/site/src/content/design-system/components/progress-rope/index.yaml
+++ b/apps/site/src/content/design-system/components/progress-rope/index.yaml
@@ -4,6 +4,7 @@ description: >-
   applications and is designed to be used with the GEL forms framework.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Default progress rope
@@ -26,9 +27,6 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
diff --git a/apps/site/src/content/design-system/components/radio-group/index.yaml b/apps/site/src/content/design-system/components/radio-group/index.yaml
index 2d38434dd..32f636fad 100644
--- a/apps/site/src/content/design-system/components/radio-group/index.yaml
+++ b/apps/site/src/content/design-system/components/radio-group/index.yaml
@@ -39,15 +39,15 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Checkboxes
     slug: components/checkbox-group
diff --git a/apps/site/src/content/design-system/components/table/index.yaml b/apps/site/src/content/design-system/components/table/index.yaml
index da087515b..ced6a0a4f 100644
--- a/apps/site/src/content/design-system/components/table/index.yaml
+++ b/apps/site/src/content/design-system/components/table/index.yaml
@@ -5,6 +5,7 @@ description: >-
   comparing values.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Basic table
@@ -39,12 +40,12 @@ design:
       slug: dos-and-donts
     noTitle: false
 accessibility:
-  - title:
-      name: Colour impairment demonstration
-      slug: colour-impairment-demonstration
   - title:
       name: Accessibility features
       slug: accessibility-features
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Panels
     slug: components/panel
diff --git a/apps/site/src/content/design-system/components/compacta/accessibility/colour-impairment-demonstration/content.mdoc b/apps/site/src/content/design-system/foundation/icon/accessibility/colour-impairment-demonstration/content.mdoc
similarity index 100%
rename from apps/site/src/content/design-system/components/compacta/accessibility/colour-impairment-demonstration/content.mdoc
rename to apps/site/src/content/design-system/foundation/icon/accessibility/colour-impairment-demonstration/content.mdoc
diff --git a/apps/site/src/content/design-system/foundation/icon/index.yaml b/apps/site/src/content/design-system/foundation/icon/index.yaml
index b1edaf791..f830daf9c 100644
--- a/apps/site/src/content/design-system/foundation/icon/index.yaml
+++ b/apps/site/src/content/design-system/foundation/icon/index.yaml
@@ -5,6 +5,7 @@ description: >-
   controls, comprehension, and legibility.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: All icons
@@ -37,6 +38,9 @@ accessibility:
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Logos
     slug: foundation/logo
diff --git a/apps/site/src/content/design-system/components/date-picker/accessibility/colour-impairment-demonstration/content.mdoc b/apps/site/src/content/design-system/foundation/text-styling/accessibility/colour-impairment-demonstration/content.mdoc
similarity index 100%
rename from apps/site/src/content/design-system/components/date-picker/accessibility/colour-impairment-demonstration/content.mdoc
rename to apps/site/src/content/design-system/foundation/text-styling/accessibility/colour-impairment-demonstration/content.mdoc
diff --git a/apps/site/src/content/design-system/foundation/text-styling/index.yaml b/apps/site/src/content/design-system/foundation/text-styling/index.yaml
index 77853a3c3..b25f87516 100644
--- a/apps/site/src/content/design-system/foundation/text-styling/index.yaml
+++ b/apps/site/src/content/design-system/foundation/text-styling/index.yaml
@@ -4,6 +4,7 @@ description: >-
   better reading and scanning experiences for users.
 namedExport:
   discriminant: false
+excludeFromNavbar: false
 design:
   - title:
       name: Editorial text styles
@@ -28,6 +29,9 @@ accessibility:
   - title:
       name: Notes on accessibility
       slug: notes-on-accessibility
+  - title:
+      name: Colour impairment demonstration
+      slug: colour-impairment-demonstration
 relatedComponents:
   - title: Fonts
     slug: foundation/font