diff --git a/navigation.yml b/navigation.yml
index a9b5f37..48efc74 100644
--- a/navigation.yml
+++ b/navigation.yml
@@ -981,102 +981,134 @@
   - name: Groups
     url: "/about/groups/"
     pages:
-    - name: 'AGWG: Accessibility Guidelines <abbr title="Working Group">WG</abbr>'
+    - name: 'Accessibility Guidelines <abbr title="Working Group">WG</abbr>'
       url: "/about/groups/agwg/"
       pages:
-      - name: Charter
-        url: "https://www.w3.org/WAI/GL/charter"
-      - name: Task Forces
-        url: "/about/groups/agwg/task-forces/"
+      - name: 'Accessibility Conformance Testing <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/conformance-testing/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/conformance-testing/work-statement/"
+          hide: true
+        - name: Work Statement 2020
+          url: "/about/groups/task-forces/conformance-testing/work-statement-2020/"
+          hide: true
+      - name: 'Cognitive and Learning Disabilities <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/coga/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/coga/work-statement/"
+          hide: true
+      - name: 'Low Vision Accessibility <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/low-vision-a11y-tf/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/low-vision-a11y-tf/work-statement/"
+          hide: true
+      - name: 'Mobile Accessibility <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/matf/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/matf/work-statement/"
+          hide: true
+      - name: 'WCAG 2.x Backlog <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/wcag2x-backlog/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/wcag2x-backlog/work-statement/"
+          hide: true
+      - name: 'WCAG2ICT <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/wcag2ict/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/wcag2ict/work-statement/"
+          hide: true
       - name: Decision Policy
         url: "/about/groups/agwg/decision-policy/"
-      - name: Communication
-        url: "/about/groups/agwg/communication/"
-      - name: How to Participate (Join)
-        url: "/about/groups/agwg/participate/"
-    - name: 'APA: Accessible Platform <abbr title="Working Group">WG</abbr>'
+        hide: true
+    - name: 'Accessible Platform Architectures <abbr title="Working Group">WG</abbr>'
       url: "/about/groups/apawg/"
       pages:
-      - name: Charter
-        url: "https://www.w3.org/2023/07/apa-wg-charter"
-      - name: Task Forces
-        url: "/about/groups/apawg/task-forces/"
+      - name: 'Framework for Accessible Specification of Technologies <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/fast/"
+        pages:
+          - name: Work Statement
+            url: "/about/groups/task-forces/fast/work-statement/"
+            hide: true
+      - name: 'Maturity Model <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/maturity-model/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/maturity-model/work-statement/"
+          hide: true
+      - name: 'Research Questions <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/research-questions/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/research-questions/work-statement/"
+          hide: true
+      - name: 'Spoken Presentation <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/spoken-presentation/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/spoken-presentation/work-statement/"
+          hide: true
+      - name: 'WAI-Adapt <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/adapt/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/adapt/work-statement/"
+          hide: true
       - name: Decision Policy
         url: "/about/groups/apawg/decision-policy/"
-      - name: Deliverables and Status
-        url: "/about/groups/apawg/deliverables/"
-      - name: APA Video Examples
-        url: "/about/groups/apawg/video-examples/"
-      - name: Communication
-        url: "/about/groups/apawg/communication/"
-      - name: How to Contribute
-        url: "/about/groups/apawg/contribute/"
-      - name: How to Participate (Join)
-        url: "/about/groups/apawg/participate/"
-    - name: 'ARIA: Accessible Rich Internet Applications <abbr title="Working Group">WG</abbr>'
+        hide: true
+    - name: 'ARIA <abbr title="Working Group">WG</abbr>'
       url: "/about/groups/ariawg/"
       pages:
-      - name: Charter
-        url: "https://www.w3.org/WAI/ARIA/charter"
-      - name: Task Forces
-        url: "/about/groups/ariawg/task-forces/"
+      - name: 'ARIA Authoring Practices <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/practices/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/practices/work-statement/"
+          hide: true
+      - name: 'PDF Accessibility <abbr title="Application Programming Interfaces">APIs</abbr> Mapping <abbr title="Task Force">TF</abbr>'
+        url: "/about/groups/task-forces/pdf-aam/"
+        pages:
+        - name: Work Statement
+          url: "/about/groups/task-forces/pdf-aam/work-statement/"
+          hide: true
       - name: Decision Policy
         url: "/about/groups/ariawg/decision-policy/"
-      - name: Workflow
-        url: "/about/groups/ariawg/workflow/"
-      - name: Roadmap
-        url: "/about/groups/ariawg/roadmap/"
-      - name: Deliverables and Status
-        url: "/about/groups/ariawg/planning/"
-      - name: Communication
-        url: "/about/groups/ariawg/communication/"
-      - name: Editors
-        url: "/about/groups/ariawg/editors/"
-      - name: How to Contribute
-        url: "/about/groups/ariawg/contribute/"
-      - name: How to Participate (Join)
-        url: "/about/groups/ariawg/participate/"
-    - name: 'EOWG: Education and Outreach <abbr title="Working Group">WG</abbr>'
-      url: "/about/groups/eowg/"
-      hide: true
-      pages:
-      - name: Participate (Join)
-        url: "/about/groups/eowg/participate/"
-        hide: true
-      - name: Participants
-        url: "/about/groups/eowg/participants/"
         hide: true
-    - name: 'WAI IG: WAI Interest Group'
+    - name: 'WAI Interest Group'
       url: "/about/groups/waiig/"
-    - name: 'Group Task Forces'
-      url: "/about/groups/task-forces/"
+    - name: 'Previous groups'
+      url: "/about/groups/previous-groups/"
       pages:
-      - name: 'ACT: Accessibility Conformance Testing <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/conformance-testing/"
-      - name: 'APG: ARIA Authoring Practices <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/practices/"
-      - name: 'COGA: Cognitive and Learning Disabilities <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/coga/"
-      - name: 'CSS A11Y: CSS Accessibility <abbr title="Task Force">TF</abbr>'
+      - name: 'Education and Outreach <abbr title="Working Group">WG</abbr>'
+        url: "/about/groups/eowg/"
+        hide: true
+        pages:
+          - name: Participate (Join)
+            url: "/about/groups/eowg/participate/"
+            hide: true
+          - name: Participants
+            url: "/about/groups/eowg/participants/"
+            hide: true
+      - name: 'CSS Accessibility <abbr title="Task Force">TF</abbr>'
         url: "/about/groups/task-forces/css-a11y/"
-      - name: 'LVTF: Low Vision Accessibility <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/low-vision-a11y-tf/"
-      - name: 'MATF: Mobile Accessibility <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/matf/"
-      - name: 'MMTF: Maturity Model <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/maturity-model/"
-      - name: 'RQTF: Research Question <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/research-questions/"
+        hide: true
+        pages:
+          - name: Work Statement
+            url: "/about/groups/task-forces/css-a11y/work-statement/"
+            hide: true
       - name: 'Silver <abbr title="Task Force">TF</abbr>'
         url: "/about/groups/task-forces/silver/"
-      - name: 'Spoken Presentation <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/pronunciation/"
-      - name: 'WAI-Adapt <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/adapt/"
-      - name: 'WCAG 2.x Backlog <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/wcag2x-backlog/"
-      - name: 'WCAG2ICT <abbr title="Task Force">TF</abbr>'
-        url: "/about/groups/task-forces/wcag2ict/"
+        hide: true
+        pages:
+          - name: Work Statement
+            url: "/about/groups/task-forces/silver/work-statement/"
+            hide: true
   - name: Translating
     url: "/about/translating/"
     pages: