From e1f4c959d00fe15bc1ec3d5fc6998a3283e066e4 Mon Sep 17 00:00:00 2001
From: Andrew Hosgood <mail@andrewhosgood.com>
Date: Fri, 8 Mar 2024 17:21:19 +0000
Subject: [PATCH] Header and footer analytics (#100)

* Move SCSS includes out of global header

* Allow 100% height for pages with global headers

* Update analytics library

* Tweaks to templates

* Update footer content

* Lint

* Switch from <ul> to <menu> in header and footer

* Reduce font size of footer links

* Disable autofocus on error summary demo

* Add hidden heading for social links

* Add hover state of top links in header
---
 CHANGELOG.md                                  |   2 +
 src/nationalarchives/analytics.mjs            | 153 +++++++++++-------
 .../components/breadcrumbs/template.njk       |   3 +-
 .../components/button/fixtures.json           |   6 +-
 .../components/button/template.njk            |  17 +-
 .../components/cookie-banner/fixtures.json    |  20 +--
 .../components/footer/analytics.js            |  97 +++++++++++
 .../components/footer/fixtures.json           |  19 +--
 .../components/footer/footer.scss             |   4 +-
 .../components/footer/footer.stories.js       |  16 +-
 .../components/footer/template.njk            |  23 +--
 .../components/global-header/analytics.js     |  50 +++++-
 .../components/global-header/fixtures.json    |   2 +-
 .../global-header/global-header.scss          |   4 -
 .../components/global-header/template.njk     |   8 +-
 .../components/grid/grid.scss                 |   1 -
 .../components/header/analytics.js            |  11 +-
 .../components/header/fixtures.json           |   2 +-
 .../components/header/header.scss             |   1 +
 .../components/header/template.njk            |   8 +-
 .../components/picture/analytics.js           |  14 +-
 .../global-header-package.scss                |  10 +-
 .../lib/analytics-helpers.mjs                 |  21 ++-
 .../colour-schemes/colour-themes.stories.js   |  27 ++--
 src/nationalarchives/utilities/_global.scss   |   4 +-
 .../build-global-header-package.sh            |   2 +-
 .../generate-global-header-assets.js          |  15 +-
 27 files changed, 352 insertions(+), 188 deletions(-)
 create mode 100644 src/nationalarchives/components/footer/analytics.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38625018..df14cbd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - The default pagination style is plain buttons but can be changed with the `solid` option
+- Updated the HTML of the headers, adding some attributes to the HTML to reduce reliance on JavaScript
+- Switched from using `<ul>` to `<menu>` in the headers and footer
 - Added some attributes to the HTML of the headers to reduce reliance on the JavaScript
 - Cards without images now get a top border
 
diff --git a/src/nationalarchives/analytics.mjs b/src/nationalarchives/analytics.mjs
index 6ce054ce..35b566e2 100644
--- a/src/nationalarchives/analytics.mjs
+++ b/src/nationalarchives/analytics.mjs
@@ -6,6 +6,7 @@ import {
 } from "./lib/analytics-helpers.mjs";
 import BreadcrumbAnalytics from "./components/breadcrumbs/analytics.js";
 import CheckboxesAnalytics from "./components/checkboxes/analytics.js";
+import FooterAnalytics from "./components/footer/analytics.js";
 import GlobalHeaderAnalytics from "./components/global-header/analytics.js";
 import HeaderAnalytics from "./components/header/analytics.js";
 import HeroAnalytics from "./components/hero/analytics.js";
@@ -18,6 +19,7 @@ import TextareaAnalytics from "./components/textarea/analytics.js";
 const componentAnalytics = [
   ...BreadcrumbAnalytics,
   ...CheckboxesAnalytics,
+  ...FooterAnalytics,
   ...GlobalHeaderAnalytics,
   ...HeaderAnalytics,
   ...HeroAnalytics,
@@ -38,7 +40,19 @@ class EventTracker {
   /** @protected */
   start = new Date();
 
-  constructor() {
+  /** @protected */
+  prefix = "tna";
+
+  constructor(prefix) {
+    if (prefix) {
+      this.prefix = prefix;
+    }
+  }
+
+  /**
+   * Initialise all TNA Frontend component analytics.
+   */
+  initAll() {
     componentAnalytics.forEach((componentConfig) => {
       this.addListener(
         componentConfig.scope,
@@ -65,31 +79,33 @@ class EventTracker {
       return;
     }
     scopeArray.forEach(($scope) => {
-      events.forEach((componentTracking) => {
-        if (!componentTracking.on) {
+      events.forEach((eventConfig) => {
+        if (!eventConfig.on) {
           return;
         }
-        if (componentTracking.targetElement) {
+        if (eventConfig.targetElement) {
           Array.from(
-            $scope.querySelectorAll(componentTracking.targetElement),
-          ).forEach(($el) =>
+            $scope.querySelectorAll(eventConfig.targetElement),
+          ).forEach(($el, index) =>
             this.attachListener(
               $el,
-              componentTracking.on,
               $scope,
-              this.generateEventName(areaName, componentTracking),
-              componentTracking.data,
-              componentTracking.targetElement,
+              this.generateEventName(areaName, eventConfig),
+              eventConfig,
+              scope,
+              areaName,
+              index + 1,
             ),
           );
         } else {
           this.attachListener(
             $scope,
-            componentTracking.on,
             $scope,
-            this.generateEventName(areaName, componentTracking),
-            componentTracking.data,
-            componentTracking.targetElement,
+            this.generateEventName(areaName, eventConfig),
+            eventConfig,
+            scope,
+            areaName,
+            1,
           );
         }
       });
@@ -97,56 +113,63 @@ class EventTracker {
   }
 
   /** @protected */
-  generateEventName(areaName, componentTracking) {
-    return `${areaName}.${componentTracking.eventName || componentTracking.on}`;
+  generateEventName(areaName, eventConfig) {
+    return `${this.prefix}.${areaName}.${eventConfig.eventName || eventConfig.on}`;
   }
 
   /** @protected */
-  attachListener(
-    $el,
-    eventTrigger,
-    $scope,
-    eventName,
-    eventDataInit,
-    targetElement,
-  ) {
-    if (!$el) {
-      return;
-    }
-    $el.addEventListener(eventTrigger, (event) =>
-      this.recordEvent(eventName, {
-        ...eventDataInit,
-        value:
-          typeof eventDataInit.value === "function"
-            ? eventDataInit.value.call(this, $el, $scope, event)
-            : eventDataInit.value || null,
-        state:
-          typeof eventDataInit.state === "function"
-            ? eventDataInit.state.call(this, $el, $scope, event)
-            : eventDataInit.state || null,
-        group:
-          typeof eventDataInit.group === "function"
-            ? eventDataInit.group.call(this, $el, $scope, event)
-            : eventDataInit.group || null,
-        scope: getXPathTo($scope),
-        targetElement: targetElement,
-        timestamp: new Date().toISOString(),
-        uri: window.location.pathname,
-        timeSincePageLoad: new Date() - this.start,
-      }),
+  attachListener($el, $scope, eventName, eventConfig, scope, areaName, index) {
+    const { on, data, targetElement, rootData = {} } = eventConfig;
+    $el.addEventListener(on, (event) =>
+      this.recordEvent(
+        eventName,
+        {
+          ...data,
+          value: this.computedValue(data.value, $el, $scope, event, index),
+          state: this.computedValue(data.state, $el, $scope, event, index),
+          group: this.computedValue(data.group, $el, $scope, event, index),
+          xPath: getXPathTo($scope),
+          targetElement: targetElement,
+          // timestamp: new Date().toISOString(),
+          // uri: window.location.pathname,
+          timeSincePageLoad: new Date() - this.start,
+          index,
+          scope,
+          areaName,
+        },
+        Object.fromEntries(
+          Object.entries(rootData).map(([key, value]) => [
+            key,
+            this.computedValue(value, $el, $scope, event, index),
+          ]),
+        ),
+      ),
     );
   }
 
   /** @protected */
-  recordEvent(eventName, data) {
-    this.events.push({ event: eventName, "tna.data": data });
+  computedValue(value, $el, $scope, event, index) {
+    return typeof value === "function"
+      ? value.call(this, $el, $scope, event, index)
+      : value || null;
+  }
+
+  /** @protected */
+  recordEvent(eventName, data, rootData = {}) {
+    this.events.push({
+      event: eventName,
+      [`${this.prefix}.event`]: data,
+      ...rootData,
+    });
   }
 
   /** @protected */
   getTnaMetaTags() {
     return Object.fromEntries(
       Array.from(
-        document.head.querySelectorAll("meta[name^='tna.'][content]"),
+        document.head.querySelectorAll(
+          `meta[name^='${this.prefix}.'][content]`,
+        ),
       ).map(($metaEl) => [
         $metaEl.getAttribute("name"),
         $metaEl.getAttribute("content"),
@@ -167,8 +190,16 @@ class GA4 extends EventTracker {
   trackingEnabled = false;
   gTagId;
 
-  constructor(id) {
-    super();
+  constructor(id = null, options = {}) {
+    if (GA4._instance) {
+      return GA4._instance;
+    }
+    if (!id) {
+      throw Error("ID was not specified");
+    }
+    const { prefix = null, initAll = true } = options;
+    super(prefix);
+    GA4._instance = this;
     this.gTagId = id;
     window.dataLayer = window.dataLayer || [];
     if (this.cookies.isPolicyAccepted("usage")) {
@@ -183,11 +214,23 @@ class GA4 extends EventTracker {
         }
       }
     });
+    if (initAll) {
+      this.initAll();
+    }
   }
 
   /** @protected */
-  recordEvent(eventName, data) {
-    const ga4Data = { event: eventName, "tna.event": data };
+  recordEvent(eventName, data, rootData = {}) {
+    const ga4Data = {
+      event: eventName,
+      ...Object.fromEntries(
+        Object.entries(data).map(([key, value]) => [
+          `${this.prefix}.event.${key}`,
+          value,
+        ]),
+      ),
+      ...rootData,
+    };
     this.pushToDataLayer(ga4Data);
   }
 
diff --git a/src/nationalarchives/components/breadcrumbs/template.njk b/src/nationalarchives/components/breadcrumbs/template.njk
index 6d4eb7fb..0c3585e8 100644
--- a/src/nationalarchives/components/breadcrumbs/template.njk
+++ b/src/nationalarchives/components/breadcrumbs/template.njk
@@ -2,7 +2,8 @@
 {%- if params.noCollapse -%}
   {%- set containerClasses = containerClasses.concat('tna-breadcrumbs--no-collapse') -%}
 {%- endif -%}
-<nav class="tna-breadcrumbs{{ ' ' + ( containerClasses | join(' ') ) if containerClasses.length else '' }}" data-module="tna-breadcrumbs" aria-label="Breadcrumb"{%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+{%- set classes = containerClasses | join(' ') -%}
+<nav class="tna-breadcrumbs{% if classes %} {{ classes }}{% endif %}" data-module="tna-breadcrumbs" aria-label="Breadcrumb"{%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   <ol class="tna-breadcrumbs__list" {%- if params.structuredData %} itemscope itemtype="https://schema.org/BreadcrumbList"{% endif %}>
   {%- for item in params.items -%}
     <li class="tna-breadcrumbs__item" {%- if params.structuredData %} itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem"{% endif %}>
diff --git a/src/nationalarchives/components/button/fixtures.json b/src/nationalarchives/components/button/fixtures.json
index ef8aae37..4c5b83aa 100644
--- a/src/nationalarchives/components/button/fixtures.json
+++ b/src/nationalarchives/components/button/fixtures.json
@@ -7,7 +7,7 @@
         "text": "Log in",
         "href": "#"
       },
-      "html": "<a href=\"#\" class=\"tna-button \">Log in</a>"
+      "html": "<a href=\"#\" class=\"tna-button\">Log in</a>"
     },
     {
       "name": "with title",
@@ -16,7 +16,7 @@
         "href": "#",
         "title": "Log in to the service"
       },
-      "html": "<a href=\"#\" class=\"tna-button \" title=\"Log in to the service\">Log in</a>"
+      "html": "<a href=\"#\" class=\"tna-button\" title=\"Log in to the service\">Log in</a>"
     },
     {
       "name": "accent",
@@ -45,7 +45,7 @@
           "data-testattribute": "foobar"
         }
       },
-      "html": "<a href=\"#\" class=\"tna-button \" data-testattribute=\"foobar\">Log in</a>"
+      "html": "<a href=\"#\" class=\"tna-button\" data-testattribute=\"foobar\">Log in</a>"
     }
   ]
 }
diff --git a/src/nationalarchives/components/button/template.njk b/src/nationalarchives/components/button/template.njk
index 0eb1af16..60924d79 100644
--- a/src/nationalarchives/components/button/template.njk
+++ b/src/nationalarchives/components/button/template.njk
@@ -1,23 +1,24 @@
-{%- set buttonClasses = [params.classes] if params.classes else [] -%}
+{%- set containerClasses = [params.classes] if params.classes else [] -%}
 {%- if params.accent -%}
-  {%- set buttonClasses = buttonClasses.concat('tna-button--accent') -%}
+  {%- set containerClasses = containerClasses.concat('tna-button--accent') -%}
 {%- endif -%}
 {%- if params.small -%}
-  {%- set buttonClasses = buttonClasses.concat('tna-button--small') -%}
+  {%- set containerClasses = containerClasses.concat('tna-button--small') -%}
 {%- endif -%}
 {%- if params.plain -%}
-  {%- set buttonClasses = buttonClasses.concat('tna-button--plain') -%}
+  {%- set containerClasses = containerClasses.concat('tna-button--plain') -%}
 {%- endif -%}
 {%- if params.iconOnly -%}
-  {%- set buttonClasses = buttonClasses.concat('tna-button--icon-only') -%}
+  {%- set containerClasses = containerClasses.concat('tna-button--icon-only') -%}
 {%- endif -%}
 {%- if params.iconOnlyOnMobile -%}
-  {%- set buttonClasses = buttonClasses.concat('tna-button--icon-only-mobile') -%}
+  {%- set containerClasses = containerClasses.concat('tna-button--icon-only-mobile') -%}
 {%- endif -%}
 {%- if params.rightAlignIcon -%}
-  {%- set buttonClasses = buttonClasses.concat('tna-button--icon-right') -%}
+  {%- set containerClasses = containerClasses.concat('tna-button--icon-right') -%}
 {%- endif -%}
-<{{ 'button' if params.buttonElement else 'a' }}{%- if not params.buttonElement %} href="{{ params.href }}"{%- endif %} class="tna-button {{ buttonClasses | join(' ') }}"{%- if params.buttonElement %} type="{{ params.buttonType or 'button' }}"{% endif -%}{%- if params.title %} title="{{ params.title }}"{% endif %}{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+{%- set classes = containerClasses | join(' ') -%}
+<{{ 'button' if params.buttonElement else 'a' }}{%- if not params.buttonElement %} href="{{ params.href }}"{%- endif %} class="tna-button{% if classes %} {{ classes }}{% endif %}"{%- if params.buttonElement %} type="{{ params.buttonType or 'button' }}"{% endif -%}{%- if params.title %} title="{{ params.title }}"{% endif %}{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   {% if params.icon -%}
   <i class="fa-solid fa-{{ params.icon }}" aria-hidden="true"></i>
   {% endif -%}
diff --git a/src/nationalarchives/components/cookie-banner/fixtures.json b/src/nationalarchives/components/cookie-banner/fixtures.json
index f17c7360..3c80debf 100644
--- a/src/nationalarchives/components/cookie-banner/fixtures.json
+++ b/src/nationalarchives/components/cookie-banner/fixtures.json
@@ -7,7 +7,7 @@
         "serviceName": "My service",
         "cookiesUrl": "/cookies"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "custom preferences set key",
@@ -16,7 +16,7 @@
         "cookiesUrl": "/cookies",
         "cookiesPreferencesSetKey": "custom"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "custom policies",
@@ -25,7 +25,7 @@
         "cookiesUrl": "/cookies",
         "policies": "custom"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"custom\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"custom\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "custom policies key",
@@ -34,7 +34,7 @@
         "cookiesUrl": "/cookies",
         "policiesKey": "custom_key"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"custom_key\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"custom_key\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "with domain",
@@ -43,7 +43,7 @@
         "cookiesUrl": "/cookies",
         "cookiesDomain": "nationalarchives.gov.uk"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"nationalarchives.gov.uk\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"nationalarchives.gov.uk\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "with path",
@@ -52,7 +52,7 @@
         "cookiesUrl": "/cookies",
         "cookiesPath": "/my-service"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"/my-service\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"/my-service\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "with preferences set key",
@@ -61,7 +61,7 @@
         "cookiesUrl": "/cookies",
         "preferencesSetKey": "custom_preferences_set_key"
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"custom_preferences_set_key\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"custom_preferences_set_key\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "insecure",
@@ -70,7 +70,7 @@
         "cookiesUrl": "/cookies",
         "allowInsecure": true
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"true\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"true\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "with classes",
@@ -79,7 +79,7 @@
         "cookiesUrl": "/cookies",
         "classes": "tna-cookie-banner--fixture"
       },
-      "html": "<section class=\"tna-cookie-banner tna-cookie-banner--fixture\" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner tna-cookie-banner--fixture\" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     },
     {
       "name": "with attributes",
@@ -90,7 +90,7 @@
           "data-fixturetest": "pass"
         }
       },
-      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" data-fixturetest=\"pass\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button \" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button \" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
+      "html": "<section class=\"tna-cookie-banner \" data-module=\"tna-cookie-banner\" role=\"region\" data-policies=\"\" data-preferenceskey=\"\" data-policieskey=\"\" data-domain=\"\" data-path=\"\" data-insecure=\"false\" aria-label=\"Cookies on My service\" data-fixturetest=\"pass\" hidden><div class=\"tna-container\"><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--prompt\"><h2 class=\"tna-heading-m\">This website uses cookies</h2><p>We use some essential cookies to make this service work.</p><p>We'd also like to use analytics cookies so we can understand how you use the service and make improvements.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"accept\">Accept cookies</button><button class=\"tna-button\" type=\"button\" value=\"reject\">Reject cookies</button><a href=\"/cookies\" class=\"tna-button tna-button--plain\">Set cookie preferences</a></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--accepted\" tabindex=\"0\" hidden><p>You have accepted optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div><div class=\"tna-column tna-column--full tna-cookie-banner__message tna-cookie-banner__message--rejected\" tabindex=\"0\" hidden><p>You have rejected optional cookies. You can change your cookie settings on the <a href=\"/cookies\">Cookies page</a>.</p><div class=\"tna-button-group\"><button class=\"tna-button\" type=\"button\" value=\"close\">Close this message</button></div></div></div></section>"
     }
   ]
 }
diff --git a/src/nationalarchives/components/footer/analytics.js b/src/nationalarchives/components/footer/analytics.js
new file mode 100644
index 00000000..5df81495
--- /dev/null
+++ b/src/nationalarchives/components/footer/analytics.js
@@ -0,0 +1,97 @@
+import { valueGetters } from "../../lib/analytics-helpers.mjs";
+
+export default [
+  {
+    scope: ".tna-footer",
+    areaName: "footer",
+    events: [
+      {
+        eventName: "link.click",
+        targetElement: ".tna-footer__navigation-block-item-link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Footer",
+          data_link_type: "Link",
+          data_section: valueGetters.closestHeading,
+          data_position: valueGetters.index,
+          data_link: valueGetters.text,
+        },
+      },
+      {
+        eventName: "social_link.click",
+        targetElement: ".tna-footer__social-item-link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Footer",
+          data_link_type: "Icon",
+          data_section: "Social media",
+          data_position: valueGetters.index,
+          data_link: ($el) => $el.getAttribute("data-name"),
+        },
+      },
+      {
+        eventName: "legal_link.click",
+        targetElement: ".tna-footer__legal-item-link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Footer",
+          data_link_type: "Link",
+          data_section: "Legal information",
+          data_position: valueGetters.index,
+          data_link: valueGetters.text,
+        },
+      },
+      {
+        eventName: "mailing_list.click",
+        targetElement: ".tna-footer__mailing-list a.tna-button",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Footer",
+          data_link_type: "Button",
+          data_section: "Mailing list",
+          data_link: valueGetters.text,
+        },
+      },
+      {
+        eventName: "ogl.click",
+        targetElement: ".tna-footer__licence p a.tna-footer__link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Footer",
+          data_link_type: "Link",
+          data_section: "OGL",
+          data_link: valueGetters.text,
+        },
+      },
+      {
+        eventName: "govuk.click",
+        targetElement: ".tna-footer__govuk-link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Footer",
+          data_link_type: "Logo",
+          data_section: "GOV.UK",
+          data_link: valueGetters.text,
+        },
+      },
+    ],
+  },
+];
diff --git a/src/nationalarchives/components/footer/fixtures.json b/src/nationalarchives/components/footer/fixtures.json
index d1396df8..ec7c4121 100644
--- a/src/nationalarchives/components/footer/fixtures.json
+++ b/src/nationalarchives/components/footer/fixtures.json
@@ -9,37 +9,32 @@
     {
       "name": "items",
       "options": {
-        "meta": "<p>Open today<br />09:00&mdash;19:00</p>",
+        "meta": "<p>Open today<br />09:00&ndash;19:00</p>",
         "social": [
           {
             "href": "https://twitter.com/UKNatArchives",
             "icon": "twitter",
-            "title": "Visit us on Twitter"
+            "title": "The National Archives X feed (formally known as Twitter)"
           },
           {
             "href": "https://www.youtube.com/c/TheNationalArchivesUK",
             "icon": "youtube",
-            "title": "Watch us on YouTube"
+            "title": "The National Archives YouTube channel"
           },
           {
             "href": "https://www.facebook.com/TheNationalArchives",
             "icon": "facebook",
-            "title": "See us on Facebook"
+            "title": "The National Archives Facebook page"
           },
           {
             "href": "https://www.flickr.com/photos/nationalarchives",
             "icon": "flickr",
-            "title": "See our Flickr feed"
+            "title": "The National Archives Flickr feed"
           },
           {
             "href": "https://www.instagram.com/nationalarchivesuk/",
             "icon": "instagram",
-            "title": "See us on Instagram"
-          },
-          {
-            "href": "https://www.nationalarchives.gov.uk/rss/",
-            "icon": "rss",
-            "title": "Read our RSS feed"
+            "title": "The National Archives Instagram feed"
           }
         ],
         "navigation": [
@@ -139,7 +134,7 @@
           }
         ]
       },
-      "html": "<footer class=\"tna-footer \"><div class=\"tna-container\"><div class=\"tna-column tna-column--flex-1 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-1\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><title>The National Archives</title><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\" /><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\" /><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\" /></g></svg><h2 class=\"tna-heading-m tna-footer__title\">The National Archives</h2><address class=\"tna-footer__address\">Kew, Richmond<br>TW9 4DU</address><div class=\"tna-footer__meta\"><p>Open today<br />09:00&mdash;19:00</p></div><nav class=\"tna-footer__social\" role=\"navigation\" aria-label=\"Social links\"><ul class=\"tna-ul tna-ul--plain tna-footer__social-items\"><li class=\"tna-footer__social-item\"><a href=\"https://twitter.com/UKNatArchives\" class=\"tna-footer__social-item-link\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M459.4 151.7c.3 4.5 .3 9.1 .3 13.6 0 138.7-105.6 298.6-298.6 298.6-59.5 0-114.7-17.2-161.1-47.1 8.4 1 16.6 1.3 25.3 1.3 49.1 0 94.2-16.6 130.3-44.8-46.1-1-84.8-31.2-98.1-72.8 6.5 1 13 1.6 19.8 1.6 9.4 0 18.8-1.3 27.6-3.6-48.1-9.7-84.1-52-84.1-103v-1.3c14 7.8 30.2 12.7 47.4 13.3-28.3-18.8-46.8-51-46.8-87.4 0-19.5 5.2-37.4 14.3-53 51.7 63.7 129.3 105.3 216.4 109.8-1.6-7.8-2.6-15.9-2.6-24 0-57.8 46.8-104.9 104.9-104.9 30.2 0 57.5 12.7 76.7 33.1 23.7-4.5 46.5-13.3 66.6-25.3-7.8 24.4-24.4 44.8-46.1 57.8 21.1-2.3 41.6-8.1 60.4-16.2-14.3 20.8-32.2 39.3-52.6 54.3z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Visit us on Twitter</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.youtube.com/c/TheNationalArchivesUK\" class=\"tna-footer__social-item-link\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M549.7 124.1c-6.3-23.7-24.8-42.3-48.3-48.6C458.8 64 288 64 288 64S117.2 64 74.6 75.5c-23.5 6.3-42 24.9-48.3 48.6-11.4 42.9-11.4 132.3-11.4 132.3s0 89.4 11.4 132.3c6.3 23.7 24.8 41.5 48.3 47.8C117.2 448 288 448 288 448s170.8 0 213.4-11.5c23.5-6.3 42-24.2 48.3-47.8 11.4-42.9 11.4-132.3 11.4-132.3s0-89.4-11.4-132.3zm-317.5 213.5V175.2l142.7 81.2-142.7 81.2z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Watch us on YouTube</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.facebook.com/TheNationalArchives\" class=\"tna-footer__social-item-link\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M512 256C512 114.6 397.4 0 256 0S0 114.6 0 256C0 376 82.7 476.8 194.2 504.5V334.2H141.4V256h52.8V222.3c0-87.1 39.4-127.5 125-127.5c16.2 0 44.2 3.2 55.7 6.4V172c-6-.6-16.5-1-29.6-1c-42 0-58.2 15.9-58.2 57.2V256h83.6l-14.4 78.2H287V510.1C413.8 494.8 512 386.9 512 256h0z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">See us on Facebook</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.flickr.com/photos/nationalarchives\" class=\"tna-footer__social-item-link\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM144.5 319c-35.1 0-63.5-28.4-63.5-63.5s28.4-63.5 63.5-63.5 63.5 28.4 63.5 63.5-28.4 63.5-63.5 63.5zm159 0c-35.1 0-63.5-28.4-63.5-63.5s28.4-63.5 63.5-63.5 63.5 28.4 63.5 63.5-28.4 63.5-63.5 63.5z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">See our Flickr feed</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.instagram.com/nationalarchivesuk/\" class=\"tna-footer__social-item-link\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">See us on Instagram</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.nationalarchives.gov.uk/rss/\" class=\"tna-footer__social-item-link\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM96 136c0-13.3 10.7-24 24-24c137 0 248 111 248 248c0 13.3-10.7 24-24 24s-24-10.7-24-24c0-110.5-89.5-200-200-200c-13.3 0-24-10.7-24-24zm0 96c0-13.3 10.7-24 24-24c83.9 0 152 68.1 152 152c0 13.3-10.7 24-24 24s-24-10.7-24-24c0-57.4-46.6-104-104-104c-13.3 0-24-10.7-24-24zm0 120a32 32 0 1 1 64 0 32 32 0 1 1 -64 0z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">Read our RSS feed</span></a></li></ul></nav></div><div class=\"tna-footer__navigation tna-column tna-column--width-1-2 tna-column--full-medium tna-column--full-small tna-column--full-tiny tna-column--order-2 tna-column--order-4-medium tna-columns tna-columns--2 tna-columns--1-tiny\"><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Quick links\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Quick links</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/)\" class=\"tna-footer__navigation-block-item-link\">About us</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/contact-us/)\" class=\"tna-footer__navigation-block-item-link\">Contact us</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/news/)\" class=\"tna-footer__navigation-block-item-link\">News</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://blog.nationalarchives.gov.uk/)\" class=\"tna-footer__navigation-block-item-link\">Blog</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://media.nationalarchives.gov.uk/)\" class=\"tna-footer__navigation-block-item-link\">Podcasts and videos</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://images.nationalarchives.gov.uk/)\" class=\"tna-footer__navigation-block-item-link\">Image library</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/press-room/)\" class=\"tna-footer__navigation-block-item-link\">Press room</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/jobs/)\" class=\"tna-footer__navigation-block-item-link\">Jobs and careers</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/contact-us/british-citizenship-services/)\" class=\"tna-footer__navigation-block-item-link\">British citizenship services</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/archives-sector/our-archives-sector-role/historical-manuscripts-commission/)\" class=\"tna-footer__navigation-block-item-link\">Historical Manuscripts Commission</a></li></ul></nav><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Our other websites\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Our other websites</h3><ul class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/webarchive/\" class=\"tna-footer__navigation-block-item-link\">UK Government Web Archive</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.legislation.gov.uk/\" class=\"tna-footer__navigation-block-item-link\">Legislation.gov.uk</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://caselaw.nationalarchives.gov.uk/\" class=\"tna-footer__navigation-block-item-link\">Find case law</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.thegazette.co.uk/\" class=\"tna-footer__navigation-block-item-link\" title=\"The Gazette (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">The Gazette</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/the-national-archives-trust/\" class=\"tna-footer__navigation-block-item-link\">The National Archives Trust</a></li></ul></nav></div><div class=\"tna-column tna-column--width-1-4 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-3\"><div class=\"tna-footer__mailing-list\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Join the National Archives' mailing list</h3><p>Subscribe for regular news, updates and priority booking for events.</p><div class=\"tna-button-group\"><a href=\"https://www.nationalarchives.gov.uk/contact-us/email-updates/\" class=\"tna-button tna-button--accent\">Subscribe</a></div></div></div></div><div class=\"tna-container\"><nav class=\"tna-footer__legal tna-column tna-column--full\" role=\"navigation\" aria-label=\"General site links\"><ul class=\"tna-footer__legal-items tna-ul tna-ul--plain\"><li class=\"tna-footer__legal-item\"><a href=\"#/accessibility\" class=\"tna-footer__legal-item-link\">Accessibility statement</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/freedom-of-information\" class=\"tna-footer__legal-item-link\">Freedom of information</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/terms-and-conditions\" class=\"tna-footer__legal-item-link\">Terms and conditions</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/privacy\" class=\"tna-footer__legal-item-link\">Privacy policy</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/cookies\" class=\"tna-footer__legal-item-link\">Cookies</a></li></ul><hr></nav></div><div class=\"tna-container tna-footer__licence\"><div class=\"tna-column tna-column--full-tiny\"><svg class=\"tna-footer__licence-logo\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 483.2 195.7\" width=\"60\" height=\"24\"><title>Open Government Licence</title><path fill=\"currentColor\" d=\"M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145\" /></svg></div><div class=\"tna-column tna-column--flex-1\"><p>All content is available under the <a href=\"https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/\" class=\"tna-footer__link\">Open Government Licence v3.0</a>, except where otherwise stated</p></div><div class=\"tna-column tna-column--full-small tna-column--full-tiny tna-footer__govuk\"><a href=\"https://www.gov.uk/\" class=\"tna-footer__govuk-link\"><svg aria-hidden=\"true\" class=\"tna-footer__govuk-logotype-crown\" width=\"32\" height=\"30\" focusable=\"false\" viewBox=\"0 0 32 30\" xmlns=\"http://www.w3.org/2000/svg\"><title>GOV.UK</title><path d=\"M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8\" fill=\"currentColor\" fill-rule=\"evenodd\" /></svg>GOV.UK</a></div></div></footer>"
+      "html": "<footer class=\"tna-footer \"><div class=\"tna-container\"><div class=\"tna-column tna-column--flex-1 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-1\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><title>The National Archives</title><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\" /><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\" /><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\" /></g></svg><h2 class=\"tna-heading-m tna-footer__title\">The National Archives</h2><address class=\"tna-footer__address\">Kew, Richmond<br>TW9 4DU</address><div class=\"tna-footer__meta\"><p>Open today<br />09:00&ndash;19:00</p></div><h3 class=\"tna-!--visually-hidden\">Follow us</h3><nav class=\"tna-footer__social\" role=\"navigation\" aria-label=\"Social links\"><menu class=\"tna-ul tna-ul--plain tna-footer__social-items\"><li class=\"tna-footer__social-item\"><a href=\"https://twitter.com/UKNatArchives\" class=\"tna-footer__social-item-link\" data-name=\"twitter\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">The National Archives X feed (formally known as Twitter)</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.youtube.com/c/TheNationalArchivesUK\" class=\"tna-footer__social-item-link\" data-name=\"youtube\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 576 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M549.7 124.1c-6.3-23.7-24.8-42.3-48.3-48.6C458.8 64 288 64 288 64S117.2 64 74.6 75.5c-23.5 6.3-42 24.9-48.3 48.6-11.4 42.9-11.4 132.3-11.4 132.3s0 89.4 11.4 132.3c6.3 23.7 24.8 41.5 48.3 47.8C117.2 448 288 448 288 448s170.8 0 213.4-11.5c23.5-6.3 42-24.2 48.3-47.8 11.4-42.9 11.4-132.3 11.4-132.3s0-89.4-11.4-132.3zm-317.5 213.5V175.2l142.7 81.2-142.7 81.2z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">The National Archives YouTube channel</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.facebook.com/TheNationalArchives\" class=\"tna-footer__social-item-link\" data-name=\"facebook\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 512 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M512 256C512 114.6 397.4 0 256 0S0 114.6 0 256C0 376 82.7 476.8 194.2 504.5V334.2H141.4V256h52.8V222.3c0-87.1 39.4-127.5 125-127.5c16.2 0 44.2 3.2 55.7 6.4V172c-6-.6-16.5-1-29.6-1c-42 0-58.2 15.9-58.2 57.2V256h83.6l-14.4 78.2H287V510.1C413.8 494.8 512 386.9 512 256h0z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">The National Archives Facebook page</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.flickr.com/photos/nationalarchives\" class=\"tna-footer__social-item-link\" data-name=\"flickr\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zM144.5 319c-35.1 0-63.5-28.4-63.5-63.5s28.4-63.5 63.5-63.5 63.5 28.4 63.5 63.5-28.4 63.5-63.5 63.5zm159 0c-35.1 0-63.5-28.4-63.5-63.5s28.4-63.5 63.5-63.5 63.5 28.4 63.5 63.5-28.4 63.5-63.5 63.5z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">The National Archives Flickr feed</span></a></li><li class=\"tna-footer__social-item\"><a href=\"https://www.instagram.com/nationalarchivesuk/\" class=\"tna-footer__social-item-link\" data-name=\"instagram\"><svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 448 512\"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d=\"M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z\"/></svg><span class=\"tna-footer__social-item-link-text tna-!--visually-hidden\">The National Archives Instagram feed</span></a></li></menu></nav></div><div class=\"tna-footer__navigation tna-column tna-column--width-1-2 tna-column--full-medium tna-column--full-small tna-column--full-tiny tna-column--order-2 tna-column--order-4-medium tna-columns tna-columns--2 tna-columns--1-tiny\"><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Quick links\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Quick links</h3><menu class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/)\" class=\"tna-footer__navigation-block-item-link\">About us</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/contact-us/)\" class=\"tna-footer__navigation-block-item-link\">Contact us</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/news/)\" class=\"tna-footer__navigation-block-item-link\">News</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://blog.nationalarchives.gov.uk/)\" class=\"tna-footer__navigation-block-item-link\">Blog</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://media.nationalarchives.gov.uk/)\" class=\"tna-footer__navigation-block-item-link\">Podcasts and videos</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://images.nationalarchives.gov.uk/)\" class=\"tna-footer__navigation-block-item-link\">Image library</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/press-room/)\" class=\"tna-footer__navigation-block-item-link\">Press room</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/jobs/)\" class=\"tna-footer__navigation-block-item-link\">Jobs and careers</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/contact-us/british-citizenship-services/)\" class=\"tna-footer__navigation-block-item-link\">British citizenship services</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/archives-sector/our-archives-sector-role/historical-manuscripts-commission/)\" class=\"tna-footer__navigation-block-item-link\">Historical Manuscripts Commission</a></li></menu></nav><nav class=\"tna-footer__navigation-block tna-columns__block\" role=\"navigation\" aria-label=\"Our other websites\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Our other websites</h3><menu class=\"tna-footer__navigation-block-items tna-ul tna-ul--plain\"><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/webarchive/\" class=\"tna-footer__navigation-block-item-link\">UK Government Web Archive</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.legislation.gov.uk/\" class=\"tna-footer__navigation-block-item-link\">Legislation.gov.uk</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://caselaw.nationalarchives.gov.uk/\" class=\"tna-footer__navigation-block-item-link\">Find case law</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.thegazette.co.uk/\" class=\"tna-footer__navigation-block-item-link\" title=\"The Gazette (opens in new tab)\" target=\"_blank\" rel=\"noreferrer noopener\">The Gazette</a></li><li class=\"tna-footer__navigation-block-item\"><a href=\"https://www.nationalarchives.gov.uk/about/the-national-archives-trust/\" class=\"tna-footer__navigation-block-item-link\">The National Archives Trust</a></li></menu></nav></div><div class=\"tna-column tna-column--width-1-4 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-3\"><div class=\"tna-footer__mailing-list\"><h3 class=\"tna-footer__navigation-block-heading tna-heading-m\">Sign up to our emails</h3><p>Hear about our latest news, stories from the collection and priority booking for events.</p><div class=\"tna-button-group\"><a href=\"https://www.nationalarchives.gov.uk/contact-us/email-updates/\" class=\"tna-button tna-button--accent\">Subscribe</a></div></div></div></div><div class=\"tna-container\"><nav class=\"tna-footer__legal tna-column tna-column--full\" role=\"navigation\" aria-label=\"General site links\"><menu class=\"tna-footer__legal-items tna-ul tna-ul--plain\"><li class=\"tna-footer__legal-item\"><a href=\"#/accessibility\" class=\"tna-footer__legal-item-link\">Accessibility statement</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/freedom-of-information\" class=\"tna-footer__legal-item-link\">Freedom of information</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/terms-and-conditions\" class=\"tna-footer__legal-item-link\">Terms and conditions</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/privacy\" class=\"tna-footer__legal-item-link\">Privacy policy</a></li><li class=\"tna-footer__legal-item\"><a href=\"#/cookies\" class=\"tna-footer__legal-item-link\">Cookies</a></li></menu><hr></nav></div><div class=\"tna-container tna-footer__licence\"><div class=\"tna-column tna-column--full-tiny\"><svg class=\"tna-footer__licence-logo\" xmlns=\"http://www.w3.org/2000/svg\" focusable=\"false\" aria-hidden=\"true\" viewBox=\"0 0 483.2 195.7\" width=\"60\" height=\"24\"><title>Open Government Licence</title><path fill=\"currentColor\" d=\"M421.5 142.8V.1l-50.7 32.3v161.1h112.4v-50.7zm-122.3-9.6A47.12 47.12 0 0 1 221 97.8c0-26 21.1-47.1 47.1-47.1 16.7 0 31.4 8.7 39.7 21.8l42.7-27.2A97.63 97.63 0 0 0 268.1 0c-36.5 0-68.3 20.1-85.1 49.7A98 98 0 0 0 97.8 0C43.9 0 0 43.9 0 97.8s43.9 97.8 97.8 97.8c36.5 0 68.3-20.1 85.1-49.7a97.76 97.76 0 0 0 149.6 25.4l19.4 22.2h3v-87.8h-80l24.3 27.5zM97.8 145c-26 0-47.1-21.1-47.1-47.1s21.1-47.1 47.1-47.1 47.2 21 47.2 47S123.8 145 97.8 145\" /></svg></div><div class=\"tna-column tna-column--flex-1\"><p>All content is available under the <a href=\"https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/\" class=\"tna-footer__link\">Open Government Licence v3.0</a>, except where otherwise stated</p></div><div class=\"tna-column tna-column--full-small tna-column--full-tiny tna-footer__govuk\"><a href=\"https://www.gov.uk/\" class=\"tna-footer__govuk-link\"><svg aria-hidden=\"true\" class=\"tna-footer__govuk-logotype-crown\" width=\"32\" height=\"30\" focusable=\"false\" viewBox=\"0 0 32 30\" xmlns=\"http://www.w3.org/2000/svg\"><title>GOV.UK</title><path d=\"M22.6 10.4c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m-5.9 6.7c-.9.4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4m10.8-3.7c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s0 2-1 2.4m3.3 4.8c-1 .4-2-.1-2.4-1-.4-.9.1-2 1-2.4.9-.4 2 .1 2.4 1s-.1 2-1 2.4M17 4.7l2.3 1.2V2.5l-2.3.7-.2-.2.9-3h-3.4l.9 3-.2.2c-.1.1-2.3-.7-2.3-.7v3.4L15 4.7c.1.1.1.2.2.2l-1.3 4c-.1.2-.1.4-.1.6 0 1.1.8 2 1.9 2.2h.7c1-.2 1.9-1.1 1.9-2.1 0-.2 0-.4-.1-.6l-1.3-4c-.1-.2 0-.2.1-.3m-7.6 5.7c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m-5 3c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s.1 2 1 2.4m-3.2 4.8c.9.4 2-.1 2.4-1 .4-.9-.1-2-1-2.4-.9-.4-2 .1-2.4 1s0 2 1 2.4m14.8 11c4.4 0 8.6.3 12.3.8 1.1-4.5 2.4-7 3.7-8.8l-2.5-.9c.2 1.3.3 1.9 0 2.7-.4-.4-.8-1.1-1.1-2.3l-1.2 4c.7-.5 1.3-.8 2-.9-1.1 2.5-2.6 3.1-3.5 3-1.1-.2-1.7-1.2-1.5-2.1.3-1.2 1.5-1.5 2.1-.1 1.1-2.3-.8-3-2-2.3 1.9-1.9 2.1-3.5.6-5.6-2.1 1.6-2.1 3.2-1.2 5.5-1.2-1.4-3.2-.6-2.5 1.6.9-1.4 2.1-.5 1.9.8-.2 1.1-1.7 2.1-3.5 1.9-2.7-.2-2.9-2.1-2.9-3.6.7-.1 1.9.5 2.9 1.9l.4-4.3c-1.1 1.1-2.1 1.4-3.2 1.4.4-1.2 2.1-3 2.1-3h-5.4s1.7 1.9 2.1 3c-1.1 0-2.1-.2-3.2-1.4l.4 4.3c1-1.4 2.2-2 2.9-1.9-.1 1.5-.2 3.4-2.9 3.6-1.9.2-3.4-.8-3.5-1.9-.2-1.3 1-2.2 1.9-.8.7-2.3-1.2-3-2.5-1.6.9-2.2.9-3.9-1.2-5.5-1.5 2-1.3 3.7.6 5.6-1.2-.7-3.1 0-2 2.3.6-1.4 1.8-1.1 2.1.1.2.9-.3 1.9-1.5 2.1-.9.2-2.4-.5-3.5-3 .6 0 1.2.3 2 .9l-1.2-4c-.3 1.1-.7 1.9-1.1 2.3-.3-.8-.2-1.4 0-2.7l-2.9.9C1.3 23 2.6 25.5 3.7 30c3.7-.5 7.9-.8 12.3-.8\" fill=\"currentColor\" fill-rule=\"evenodd\" /></svg>GOV.UK</a></div></div></footer>"
     }
   ]
 }
diff --git a/src/nationalarchives/components/footer/footer.scss b/src/nationalarchives/components/footer/footer.scss
index 2995235e..1898e55b 100644
--- a/src/nationalarchives/components/footer/footer.scss
+++ b/src/nationalarchives/components/footer/footer.scss
@@ -42,7 +42,7 @@
     &-items {
       display: flex;
       flex-wrap: wrap;
-      gap: 1rem;
+      gap: 0.3125rem;
       align-items: flex-start;
     }
 
@@ -105,6 +105,8 @@
         padding-top: 0.375rem;
         padding-bottom: 0.375rem;
 
+        @include typography.relative-font-size(16);
+
         @include colour.colour-border("keyline", 1px, solid, bottom);
 
         &-link {
diff --git a/src/nationalarchives/components/footer/footer.stories.js b/src/nationalarchives/components/footer/footer.stories.js
index c4e996bf..05456527 100644
--- a/src/nationalarchives/components/footer/footer.stories.js
+++ b/src/nationalarchives/components/footer/footer.stories.js
@@ -45,37 +45,31 @@ const Template = ({
 
 export const Standard = Template.bind({});
 Standard.args = {
-  meta: "<p>Open today<br>09:00&mdash;19:00</p>",
   social: [
     {
       href: "https://twitter.com/UKNatArchives",
       icon: "twitter",
-      title: "Visit us on Twitter",
+      title: "The National Archives X feed (formally known as Twitter)",
     },
     {
       href: "https://www.youtube.com/c/TheNationalArchivesUK",
       icon: "youtube",
-      title: "Watch us on YouTube",
+      title: "The National Archives YouTube channel",
     },
     {
       href: "https://www.facebook.com/TheNationalArchives",
       icon: "facebook",
-      title: "See us on Facebook",
+      title: "The National Archives Facebook page",
     },
     {
       href: "https://www.flickr.com/photos/nationalarchives",
       icon: "flickr",
-      title: "See our Flickr feed",
+      title: "The National Archives Flickr feed",
     },
     {
       href: "https://www.instagram.com/nationalarchivesuk/",
       icon: "instagram",
-      title: "See us on Instagram",
-    },
-    {
-      href: "https://www.nationalarchives.gov.uk/rss/",
-      icon: "rss",
-      title: "Read our RSS feed",
+      title: "The National Archives Instagram feed",
     },
   ],
   navigation: [
diff --git a/src/nationalarchives/components/footer/template.njk b/src/nationalarchives/components/footer/template.njk
index daea4e1b..96bb5862 100644
--- a/src/nationalarchives/components/footer/template.njk
+++ b/src/nationalarchives/components/footer/template.njk
@@ -23,13 +23,16 @@
       </div>
       {%- endif %}
       {%- if params.social %}
+        <h3 class="tna-!--visually-hidden">
+          Follow us
+        </h3>
         <nav class="tna-footer__social" role="navigation" aria-label="Social links">
-          <ul class="tna-ul tna-ul--plain tna-footer__social-items">
+          <menu class="tna-ul tna-ul--plain tna-footer__social-items">
           {%- for item in params.social %}
             <li class="tna-footer__social-item">
-              <a href="{{ item.href }}" class="tna-footer__social-item-link">
+              <a href="{{ item.href }}" class="tna-footer__social-item-link" data-name="{{ item.icon }}">
                 {%- if item.icon == 'twitter' %}
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M459.4 151.7c.3 4.5 .3 9.1 .3 13.6 0 138.7-105.6 298.6-298.6 298.6-59.5 0-114.7-17.2-161.1-47.1 8.4 1 16.6 1.3 25.3 1.3 49.1 0 94.2-16.6 130.3-44.8-46.1-1-84.8-31.2-98.1-72.8 6.5 1 13 1.6 19.8 1.6 9.4 0 18.8-1.3 27.6-3.6-48.1-9.7-84.1-52-84.1-103v-1.3c14 7.8 30.2 12.7 47.4 13.3-28.3-18.8-46.8-51-46.8-87.4 0-19.5 5.2-37.4 14.3-53 51.7 63.7 129.3 105.3 216.4 109.8-1.6-7.8-2.6-15.9-2.6-24 0-57.8 46.8-104.9 104.9-104.9 30.2 0 57.5 12.7 76.7 33.1 23.7-4.5 46.5-13.3 66.6-25.3-7.8 24.4-24.4 44.8-46.1 57.8 21.1-2.3 41.6-8.1 60.4-16.2-14.3 20.8-32.2 39.3-52.6 54.3z"/></svg>
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
                 {%- elif item.icon == 'youtube' %}
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M549.7 124.1c-6.3-23.7-24.8-42.3-48.3-48.6C458.8 64 288 64 288 64S117.2 64 74.6 75.5c-23.5 6.3-42 24.9-48.3 48.6-11.4 42.9-11.4 132.3-11.4 132.3s0 89.4 11.4 132.3c6.3 23.7 24.8 41.5 48.3 47.8C117.2 448 288 448 288 448s170.8 0 213.4-11.5c23.5-6.3 42-24.2 48.3-47.8 11.4-42.9 11.4-132.3 11.4-132.3s0-89.4-11.4-132.3zm-317.5 213.5V175.2l142.7 81.2-142.7 81.2z"/></svg>
                 {%- elif item.icon == 'facebook' %}
@@ -49,7 +52,7 @@
               </a>
             </li>
           {%- endfor %}
-          </ul>
+          </menu>
         </nav>
       {%- endif %}
     </div>
@@ -62,7 +65,7 @@
           {{ group.title }}
         </h3>
         {%- endif %}
-        <ul class="tna-footer__navigation-block-items tna-ul tna-ul--plain">
+        <menu class="tna-footer__navigation-block-items tna-ul tna-ul--plain">
         {%- for item in group.items %}
           <li class="tna-footer__navigation-block-item">
             <a href="{{ item.href }}" class="tna-footer__navigation-block-item-link"{%- if item.title or item.newTab %} title="{{ item.title if item.title else item.text }}{%- if item.newTab %} (opens in new tab){% endif %}"{% endif %}{%- if item.newTab %} target="_blank" rel="noreferrer noopener"{% endif %}>
@@ -70,7 +73,7 @@
             </a>
           </li>
         {%- endfor %}
-        </ul>
+        </menu>
       </nav>
       {%- endfor %}
     </div>
@@ -79,10 +82,10 @@
     <div class="tna-column tna-column--width-1-4 tna-column--width-1-2-medium tna-column--full-small tna-column--full-tiny tna-column--order-3">
       <div class="tna-footer__mailing-list">
         <h3 class="tna-footer__navigation-block-heading tna-heading-m">
-          Join the National Archives' mailing list
+          Sign up to our emails
         </h3>
         <p>
-          Subscribe for regular news, updates and priority booking for events.
+          Hear about our latest news, stories from the collection and priority booking for events.
         </p>
         <div class="tna-button-group">
           {{ tnaButton({
@@ -98,7 +101,7 @@
   <div class="tna-container">
     {%- if params.legal %}
     <nav class="tna-footer__legal tna-column tna-column--full" role="navigation" aria-label="General site links">
-      <ul class="tna-footer__legal-items tna-ul tna-ul--plain">
+      <menu class="tna-footer__legal-items tna-ul tna-ul--plain">
         {%- for item in params.legal %}
         <li class="tna-footer__legal-item">
           <a href="{{ item.href }}" class="tna-footer__legal-item-link" {%- if item.title %} title="{{ item.title }}"{% endif %}>
@@ -106,7 +109,7 @@
           </a>
         </li>
         {%- endfor %}
-      </ul>
+      </menu>
       <hr>
     </nav>
     {%- else %}
diff --git a/src/nationalarchives/components/global-header/analytics.js b/src/nationalarchives/components/global-header/analytics.js
index 92a37a92..25fa12f7 100644
--- a/src/nationalarchives/components/global-header/analytics.js
+++ b/src/nationalarchives/components/global-header/analytics.js
@@ -1,3 +1,5 @@
+import { valueGetters } from "../../lib/analytics-helpers.mjs";
+
 export default [
   {
     scope: ".tna-global-header",
@@ -8,14 +10,46 @@ export default [
         targetElement: ".tna-global-header__navigation-button",
         on: "click",
         data: {
-          // eslint-disable-next-line no-unused-vars
-          state: ($el, $scope, event) => {
-            const expanded = $el.getAttribute("aria-expanded");
-            if (expanded === null) {
-              return null;
-            }
-            return expanded.toString() === "true" ? "opened" : "closed";
-          },
+          state: valueGetters.expanded,
+        },
+      },
+      {
+        eventName: "logo.click",
+        targetElement: ".tna-global-header__logo",
+        on: "click",
+        rootData: {
+          data_component_name: "Header",
+          data_link_type: "Logo",
+          data_link: "The National Archives",
+        },
+      },
+      {
+        eventName: "primary_link.click",
+        targetElement: ".tna-global-header__navigation-item-link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Header",
+          data_link_type: "Menu",
+          data_section: valueGetters.text,
+          data_position: valueGetters.index,
+          data_link: valueGetters.text,
+        },
+      },
+      {
+        eventName: "secondary_link.click",
+        targetElement: ".tna-global-header__top-navigation-link",
+        on: "click",
+        data: {
+          value: valueGetters.text,
+        },
+        rootData: {
+          data_component_name: "Header",
+          data_link_type: "Icon",
+          data_position: valueGetters.index,
+          data_link: valueGetters.text,
         },
       },
     ],
diff --git a/src/nationalarchives/components/global-header/fixtures.json b/src/nationalarchives/components/global-header/fixtures.json
index 4789c698..98809eaf 100644
--- a/src/nationalarchives/components/global-header/fixtures.json
+++ b/src/nationalarchives/components/global-header/fixtures.json
@@ -34,7 +34,7 @@
           }
         ]
       },
-      "html": "<header class=\"tna-global-header \" data-module=\"tna-global-header\"><div class=\"tna-container tna-global-header__main\"><div class=\"tna-column tna-column--flex-1 tna-column--order-2\"><span class=\"tna-global-header__logo-wrapper\"><a href=\"#/\" class=\"tna-global-header__logo\" title=\"The National Archives - Beta\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><title>The National Archives</title><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\" /><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\" /><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\" /></g></svg><span class=\"tna-global-header__logo-strapline\">Beta</span></a></span></div><div class=\"tna-column tna-column--order-2 tna-global-header__navigation-button-wrapper\"><button class=\"tna-global-header__navigation-button\" type=\"button\" aria-controls=\"tna-header__navigation tna-header__top-navigation\" hidden>Menu<span class=\"tna-global-header__hamburger\"></span></button></div><nav class=\"tna-column tna-column--full-small tna-column--full-tiny tna-column--order-3 tna-global-header__navigation-wrapper\" id=\"tna-header__navigation\" aria-label=\"Main site navigation\"><ul class=\"tna-global-header__navigation\"><li class=\"tna-global-header__navigation-item\"><a href=\"#/alpha\" class=\"tna-global-header__navigation-item-link\" tabindex=\"0\">Alpha</a></li><li class=\"tna-global-header__navigation-item\"><a href=\"#/beta\" class=\"tna-global-header__navigation-item-link\" tabindex=\"0\">Beta</a></li><li class=\"tna-global-header__navigation-item\"><a href=\"#/gamma\" class=\"tna-global-header__navigation-item-link\" tabindex=\"0\">Gamma</a></li></ul></nav><nav class=\"tna-column tna-column--full tna-column--order-1 tna-column--order-4-small tna-column--order-4-tiny tna-global-header__top-navigation-wrapper\" id=\"tna-header__top-navigation\" aria-label=\"Secondary site navigation\"><ul class=\"tna-global-header__top-navigation\"><li class=\"tna-global-header__top-navigation-item\"><a href=\"#/top-1\" class=\"tna-global-header__top-navigation-link\" tabindex=\"0\">Top item 1</a></li><li class=\"tna-global-header__top-navigation-item\"><a href=\"#/top-2\" class=\"tna-global-header__top-navigation-link\" tabindex=\"0\">Top item 2</a></li></ul></nav></div></header>"
+      "html": "<header class=\"tna-global-header \" data-module=\"tna-global-header\"><div class=\"tna-container tna-global-header__main\"><div class=\"tna-column tna-column--flex-1 tna-column--order-2\"><span class=\"tna-global-header__logo-wrapper\"><a href=\"#/\" class=\"tna-global-header__logo\" title=\"The National Archives - Beta\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><title>The National Archives</title><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\" /><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\" /><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\" /></g></svg><span class=\"tna-global-header__logo-strapline\">Beta</span></a></span></div><div class=\"tna-column tna-column--order-2 tna-global-header__navigation-button-wrapper\"><button class=\"tna-global-header__navigation-button\" type=\"button\" aria-controls=\"tna-header__navigation tna-header__top-navigation\" hidden>Menu<span class=\"tna-global-header__hamburger\"></span></button></div><nav class=\"tna-column tna-column--full-small tna-column--full-tiny tna-column--order-3 tna-global-header__navigation-wrapper\" id=\"tna-header__navigation\" aria-label=\"Main site navigation\"><menu class=\"tna-global-header__navigation\"><li class=\"tna-global-header__navigation-item\"><a href=\"#/alpha\" class=\"tna-global-header__navigation-item-link\" tabindex=\"0\">Alpha</a></li><li class=\"tna-global-header__navigation-item\"><a href=\"#/beta\" class=\"tna-global-header__navigation-item-link\" tabindex=\"0\">Beta</a></li><li class=\"tna-global-header__navigation-item\"><a href=\"#/gamma\" class=\"tna-global-header__navigation-item-link\" tabindex=\"0\">Gamma</a></li></menu></nav><nav class=\"tna-column tna-column--full tna-column--order-1 tna-column--order-4-small tna-column--order-4-tiny tna-global-header__top-navigation-wrapper\" id=\"tna-header__top-navigation\" aria-label=\"Secondary site navigation\"><menu class=\"tna-global-header__top-navigation\"><li class=\"tna-global-header__top-navigation-item\"><a href=\"#/top-1\" class=\"tna-global-header__top-navigation-link\" tabindex=\"0\">Top item 1</a></li><li class=\"tna-global-header__top-navigation-item\"><a href=\"#/top-2\" class=\"tna-global-header__top-navigation-link\" tabindex=\"0\">Top item 2</a></li></menu></nav></div></header>"
     }
   ]
 }
diff --git a/src/nationalarchives/components/global-header/global-header.scss b/src/nationalarchives/components/global-header/global-header.scss
index eba11174..b57f6360 100644
--- a/src/nationalarchives/components/global-header/global-header.scss
+++ b/src/nationalarchives/components/global-header/global-header.scss
@@ -3,10 +3,6 @@
 @use "../../tools/colour";
 @use "../../tools/typography";
 @use "../../tools/media";
-@use "../../utilities/colour" as colourUtils;
-@use "../../utilities/global";
-// @use "../../utilities/typography" as typographyUtils;
-@use "../grid";
 
 .tna-global-header {
   padding-top: 1rem;
diff --git a/src/nationalarchives/components/global-header/template.njk b/src/nationalarchives/components/global-header/template.njk
index 23380fe5..e16028d7 100644
--- a/src/nationalarchives/components/global-header/template.njk
+++ b/src/nationalarchives/components/global-header/template.njk
@@ -37,18 +37,18 @@
     </div>
     {%- if params.navigation %}
     <nav class="tna-column tna-column--full-small tna-column--full-tiny tna-column--order-3 tna-global-header__navigation-wrapper" id="{{ 'tna-header__navigation' or params.navigationId }}" aria-label="Main site navigation">
-      <ul class="tna-global-header__navigation">
+      <menu class="tna-global-header__navigation">
         {%- for item in params.navigation %}
         <li class="tna-global-header__navigation-item">
           <a href="{{ item.href }}" class="tna-global-header__navigation-item-link" {%- if item.title %} title="{{ item.title }}"{% endif %} tabindex="0">{{ item.text }}</a>
         </li>
         {%- endfor %}
-      </ul>
+      </menu>
     </nav>
     {%- endif %}
     {%- if params.topNavigation %}
     <nav class="tna-column tna-column--full tna-column--order-1 tna-column--order-4-small tna-column--order-4-tiny tna-global-header__top-navigation-wrapper" id="{{ 'tna-header__top-navigation' or params.topNavigationId }}" aria-label="Secondary site navigation">
-      <ul class="tna-global-header__top-navigation">
+      <menu class="tna-global-header__top-navigation">
         {%- for item in params.topNavigation %}
         <li class="tna-global-header__top-navigation-item">
           <a href="{{ item.href }}" class="tna-global-header__top-navigation-link" {%- if item.title %} title="{{ item.title }}"{% endif %} tabindex="0">
@@ -63,7 +63,7 @@
           </a>
         </li>
         {%- endfor %}
-      </ul>
+      </menu>
     </nav>
     {%- endif %}
   </div>
diff --git a/src/nationalarchives/components/grid/grid.scss b/src/nationalarchives/components/grid/grid.scss
index e945fb30..739ab9dc 100644
--- a/src/nationalarchives/components/grid/grid.scss
+++ b/src/nationalarchives/components/grid/grid.scss
@@ -33,7 +33,6 @@
 }
 
 .tna-column {
-  margin: 0;
   padding-right: math.div(grid.$gutter-width, 2);
   padding-left: math.div(grid.$gutter-width, 2);
 
diff --git a/src/nationalarchives/components/header/analytics.js b/src/nationalarchives/components/header/analytics.js
index 09630ae3..9045e986 100644
--- a/src/nationalarchives/components/header/analytics.js
+++ b/src/nationalarchives/components/header/analytics.js
@@ -1,3 +1,5 @@
+import { valueGetters } from "../../lib/analytics-helpers.mjs";
+
 export default [
   {
     scope: ".tna-header",
@@ -8,14 +10,7 @@ export default [
         targetElement: ".tna-header__navigation-toggle-button",
         on: "click",
         data: {
-          // eslint-disable-next-line no-unused-vars
-          state: ($el, $scope, event) => {
-            const expanded = $el.getAttribute("aria-expanded");
-            if (expanded === null) {
-              return null;
-            }
-            return expanded.toString() === "true" ? "opened" : "closed";
-          },
+          state: valueGetters.expanded,
         },
       },
     ],
diff --git a/src/nationalarchives/components/header/fixtures.json b/src/nationalarchives/components/header/fixtures.json
index 6ee78d01..6ac0186b 100644
--- a/src/nationalarchives/components/header/fixtures.json
+++ b/src/nationalarchives/components/header/fixtures.json
@@ -40,7 +40,7 @@
           "target": "_blank"
         }
       },
-      "html": "<header class=\"tna-header \" data-module=\"tna-header\"><div class=\"tna-header__exit\"><div class=\"tna-container\"><div class=\"tna-column tna-column--full\"><a href=\"#\" class=\"tna-header__exit-link\" target=\"_blank\">Go to the current National Archives website<i class=\"fa-solid fa-arrow-up-right-from-square\" aria-hidden=\"true\"></i></a></div></div></div><div class=\"tna-container tna-header__contents\"><div class=\"tna-column tna-header__logo\"><a href=\"#/\" class=\"tna-header__logo-link tna-header__logo-link--href\" title=\"The National Archives - Beta\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><title>The National Archives</title><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><span class=\"tna-header__logo-strapline\">Beta</span></a></div><div class=\"tna-column tna-header__navigation-toggle\"><button class=\"tna-header__navigation-toggle-button\" type=\"button\" aria-controls=\"tna-header__navigation\" hidden>Menu<span class=\"tna-header__hamburger\"></span></button></div><nav class=\"tna-column tna-column--flex-1 tna-column--full-small tna-column--full-tiny tna-header__navigation\" id=\"tna-header__navigation\" aria-label=\"Main site navigation\"><ul class=\"tna-header__navigation-items\"><li class=\"tna-header__navigation-item\"><a href=\"#/alpha\" class=\"tna-header__navigation-item-link tna-header__navigation-item-link--selected\" tabindex=\"0\" aria-current=\"true\">Alpha</a></li><li class=\"tna-header__navigation-item\"><a href=\"#/beta\" class=\"tna-header__navigation-item-link\" tabindex=\"0\">Beta</a></li><li class=\"tna-header__navigation-item\"><a href=\"#/gamma\" class=\"tna-header__navigation-item-link\" tabindex=\"0\">Gamma</a></li></ul><ul class=\"tna-header__top-navigation-items\"><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-1\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\">Top item 1</a></li><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-2\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\"><i class=\"fa-solid fa-phone\" aria-hidden=\"true\"></i>Top item 2</a></li></ul></nav></div></header>"
+      "html": "<header class=\"tna-header \" data-module=\"tna-header\"><div class=\"tna-header__exit\"><div class=\"tna-container\"><div class=\"tna-column tna-column--full\"><a href=\"#\" class=\"tna-header__exit-link\" target=\"_blank\">Go to the current National Archives website<i class=\"fa-solid fa-arrow-up-right-from-square\" aria-hidden=\"true\"></i></a></div></div></div><div class=\"tna-container tna-header__contents\"><div class=\"tna-column tna-header__logo\"><a href=\"#/\" class=\"tna-header__logo-link tna-header__logo-link--href\" title=\"The National Archives - Beta\"><svg xmlns=\"http://www.w3.org/2000/svg\" xml:space=\"preserve\" class=\"tna-logo\" style=\"enable-background:new 0 0 160 160\" viewBox=\"0 0 160 160\" width=\"96\" height=\"96\"><title>The National Archives</title><path fill=\"transparent\" d=\"M0 0h160v160H0z\" class=\"tna-logo__background\"/><g class=\"tna-logo__foreground\" fill=\"currentColor\"><path d=\"M1.9 107.2h156.3V158H1.9v-50.8zm0-52.7h156.3v50.8H1.9V54.5zm0-52.6h77.2v50.8H1.9V1.9zm79 0h77.2v50.8H80.9V1.9zm0-1.9H0v160h160V0H80.9z\"/><path d=\"M21.3 19.5h-5.4v-3h14.3v3h-5.4v18.4h-3.5zM31.6 16.5H35v9h8.4v-9h3.4v21.4h-3.4v-9.3H35v9.3h-3.4zM50.9 16.5h12.2v3h-8.8v6.1h7.4v3h-7.4v6.3h8.8v3H50.9zM19.7 69.2h3.8l6.4 12.5c.6 1.1 1.1 2.7 1.6 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.5v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2H23c.2 1.4.3 3.3.3 5v11.5h-3.5c-.1 0-.1-21.4-.1-21.4zM47.8 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8H45c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zM43 69.2h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6L43 69.2zM57.2 72.3h-5.4v-3.1H66v3.1h-5.4v18.4h-3.4zM67.8 69.2h3.5v21.4h-3.5zM87.5 80c0-5.3-1.7-8-4.8-8-3.2 0-4.8 2.7-4.8 8 0 5.2 1.6 7.9 4.8 7.9 3.2 0 4.8-2.7 4.8-7.9m-13.3 0c0-7 3-11.1 8.5-11.1 5.4 0 8.4 4.1 8.4 11.1 0 6.9-3 11-8.4 11s-8.5-4.1-8.5-11M94.3 69.2H98l6.4 12.5c.6 1.1 1.2 2.7 1.7 4h.2c-.2-1.7-.3-3.6-.3-4.8V69.2h3.4v21.4h-3.7l-6.3-12.3c-.7-1.4-1.2-2.7-1.7-4.2h-.2c.2 1.4.3 3.3.3 5v11.5h-3.5V69.2zM122.4 82.6l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4h-3.5l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM129.9 69.2h3.5v18.4h8.4v3.1h-11.9zM26.9 135.2l-1.7-6.3c-.3-1.1-.6-2.2-.9-3.8h-.2c-.3 1.6-.5 2.6-.8 3.8l-1.7 6.3h5.3zm-4.8-13.4h4.2l6.2 21.4H29l-1.5-5.2h-6.6l-1.4 5.2h-3.6l6.2-21.4zM39.9 132.5c2.5 0 3.4-1.6 3.4-3.9 0-2.2-1-3.8-3.4-3.8h-2.7v7.7h2.7zm-6.1-10.7h6.4c4.5 0 6.7 2.4 6.7 6.6 0 3.1-1.5 5.6-3.7 6.3v.2c1 1.1 4 7.5 4.8 7.9v.5h-3.8c-1-.6-3.6-7.2-4.4-7.8h-2.5v7.8h-3.5v-21.5zM52.9 132.5c0 5.3 1.9 8 4.8 8s4-2 4-5.2l3.5.1c0 .2.1.4.1.6 0 4.4-2.1 7.5-7.5 7.5-5.2 0-8.5-3.9-8.5-11.1 0-7.1 3.3-11 8.5-11 6.4 0 7.5 4.6 7.5 7.2 0 .3 0 .7-.1.9l-3.5.1c0-3.3-1.2-5.2-4-5.2-2.9.2-4.8 2.9-4.8 8.1M68 121.8h3.5v9.1h8.3v-9.1h3.5v21.5h-3.5v-9.4h-8.3v9.4H68zM87.9 121.8h3.5v21.4h-3.5zM94.2 121.8h3.6l3.2 12.3c.5 1.9.8 3.6 1.1 5.6h.2c.3-2 .6-3.7 1.1-5.6l3.2-12.3h3.6l-6.1 21.4H100l-5.8-21.4zM112.7 121.8H125v3.1h-8.8v6h7.4v3h-7.4v6.3h8.8v3.1h-12.3zM130.4 136c0 .2-.1.5-.1.8 0 1.9.8 3.7 3.4 3.7 2.1 0 3.3-1.2 3.3-2.9 0-1.6-.7-2.4-2.2-3l-3.4-1.3c-2.4-.9-4.2-2.4-4.2-5.7 0-3.5 2.3-6.1 6.6-6.1 5.5 0 6.4 3.6 6.4 5.9 0 .3 0 .7-.1 1.1l-3.4.1c0-.2.1-.5.1-.7 0-1.7-.6-3.2-3-3.2-2.1 0-3 1.2-3 2.8 0 1.7.9 2.5 2.2 2.9l3.5 1.3c2.6 1 4.3 2.6 4.3 5.8 0 3.6-2.4 6.1-7 6.1-5.9 0-6.8-3.9-6.8-6.5 0-.3 0-.6.1-1l3.3-.1z\"/></g></svg><span class=\"tna-header__logo-strapline\">Beta</span></a></div><div class=\"tna-column tna-header__navigation-toggle\"><button class=\"tna-header__navigation-toggle-button\" type=\"button\" aria-controls=\"tna-header__navigation\" hidden>Menu<span class=\"tna-header__hamburger\"></span></button></div><nav class=\"tna-column tna-column--flex-1 tna-column--full-small tna-column--full-tiny tna-header__navigation\" id=\"tna-header__navigation\" aria-label=\"Main site navigation\"><menu class=\"tna-header__navigation-items\"><li class=\"tna-header__navigation-item\"><a href=\"#/alpha\" class=\"tna-header__navigation-item-link tna-header__navigation-item-link--selected\" tabindex=\"0\" aria-current=\"true\">Alpha</a></li><li class=\"tna-header__navigation-item\"><a href=\"#/beta\" class=\"tna-header__navigation-item-link\" tabindex=\"0\">Beta</a></li><li class=\"tna-header__navigation-item\"><a href=\"#/gamma\" class=\"tna-header__navigation-item-link\" tabindex=\"0\">Gamma</a></li></menu><menu class=\"tna-header__top-navigation-items\"><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-1\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\">Top item 1</a></li><li class=\"tna-header__top-navigation-item\"><a href=\"#/top-2\" class=\"tna-header__top-navigation-item-link\" tabindex=\"0\"><i class=\"fa-solid fa-phone\" aria-hidden=\"true\"></i>Top item 2</a></li></menu></nav></div></header>"
     }
   ]
 }
diff --git a/src/nationalarchives/components/header/header.scss b/src/nationalarchives/components/header/header.scss
index 328c8428..139e9a17 100644
--- a/src/nationalarchives/components/header/header.scss
+++ b/src/nationalarchives/components/header/header.scss
@@ -231,6 +231,7 @@
       &,
       &:link,
       &:visited {
+        @include colour.colour-font("font-base");
         @include typography.interacted-text-decoration;
       }
     }
diff --git a/src/nationalarchives/components/header/template.njk b/src/nationalarchives/components/header/template.njk
index b1a1a3d5..5ef355e8 100644
--- a/src/nationalarchives/components/header/template.njk
+++ b/src/nationalarchives/components/header/template.njk
@@ -42,7 +42,7 @@
     </div>
     <nav class="tna-column tna-column--flex-1 tna-column--full-small tna-column--full-tiny tna-header__navigation" id="{{ 'tna-header__navigation' or params.navigationId }}" aria-label="Main site navigation">
       {%- if params.navigation %}
-      <ul class="tna-header__navigation-items">
+      <menu class="tna-header__navigation-items">
         {%- for item in params.navigation %}
         <li class="tna-header__navigation-item">
           <a href="{{ item.href }}" class="tna-header__navigation-item-link{%- if item.selected %} tna-header__navigation-item-link--selected{% endif %}" tabindex="0" {%- if item.selected %} aria-current="true"{% endif %} {%- if item.title %} title="{{ item.title }}"{% endif %}>
@@ -50,10 +50,10 @@
           </a>
         </li>
         {%- endfor %}
-      </ul>
+      </menu>
       {%- endif %}
       {%- if params.topNavigation %}
-      <ul class="tna-header__top-navigation-items">
+      <menu class="tna-header__top-navigation-items">
         {%- for item in params.topNavigation %}
         <li class="tna-header__top-navigation-item">
           <a href="{{ item.href }}" class="tna-header__top-navigation-item-link" tabindex="0" {%- if item.title %} title="{{ item.title }}"{% endif %}>
@@ -64,7 +64,7 @@
           </a>
         </li>
         {%- endfor %}
-      </ul>
+      </menu>
       {%- endif %}
     </nav>
     {%- endif %}
diff --git a/src/nationalarchives/components/picture/analytics.js b/src/nationalarchives/components/picture/analytics.js
index a98ec088..3cd03f00 100644
--- a/src/nationalarchives/components/picture/analytics.js
+++ b/src/nationalarchives/components/picture/analytics.js
@@ -1,4 +1,7 @@
-import { getClosestHeading } from "../../lib/analytics-helpers.mjs";
+import {
+  getClosestHeading,
+  valueGetters,
+} from "../../lib/analytics-helpers.mjs";
 
 export default [
   {
@@ -10,14 +13,7 @@ export default [
         targetElement: ".tna-picture__toggle-transcript",
         on: "click",
         data: {
-          // eslint-disable-next-line no-unused-vars
-          state: ($el, $scope, event) => {
-            const expanded = $el.getAttribute("aria-expanded");
-            if (expanded === null) {
-              return null;
-            }
-            return expanded.toString() === "true" ? "opened" : "closed";
-          },
+          state: valueGetters.expanded,
           // eslint-disable-next-line no-unused-vars
           value: ($el, $scope, event) => {
             const heading = getClosestHeading($scope);
diff --git a/src/nationalarchives/global-header-package.scss b/src/nationalarchives/global-header-package.scss
index 4a500448..7fce4ea7 100644
--- a/src/nationalarchives/global-header-package.scss
+++ b/src/nationalarchives/global-header-package.scss
@@ -1,5 +1,5 @@
 // @use "variables/assets";
-@use "variables/grid" with (
+@use "variables/grid" as gridVars with (
   $largest-container-width: 1270px,
   $gutter-width: 30px,
   $gutter-width-tiny: 15px
@@ -9,7 +9,10 @@
 @use "tools/colour";
 @use "tools/typography";
 
+@use "utilities/colour" as colourUtils;
+
 @use "components/global-header";
+@use "components/grid";
 @use "components/footer";
 
 .tna-template {
@@ -94,8 +97,3 @@
     }
   }
 }
-
-// $fa-font-path: assets.$fa-font-path;
-// @import "lib/font-awesome/fontawesome";
-// @import "lib/font-awesome/solid";
-// @import "lib/font-awesome/brands";
diff --git a/src/nationalarchives/lib/analytics-helpers.mjs b/src/nationalarchives/lib/analytics-helpers.mjs
index c341d306..254d9a66 100644
--- a/src/nationalarchives/lib/analytics-helpers.mjs
+++ b/src/nationalarchives/lib/analytics-helpers.mjs
@@ -50,14 +50,19 @@ const getClosestHeading = ($element) => {
 };
 
 const valueGetters = {
-  // eslint-disable-next-line no-unused-vars
-  text: ($el, $scope, event) => $el.innerText,
-  // eslint-disable-next-line no-unused-vars
-  html: ($el, $scope, event) => $el.innerHTML,
-  // eslint-disable-next-line no-unused-vars
-  value: ($el, $scope, event) => $el.value,
-  // eslint-disable-next-line no-unused-vars
-  checked: ($el, $scope, event) => ($el.checked ? "checked" : "unchecked"),
+  text: ($el) => $el.innerText,
+  html: ($el) => $el.innerHTML,
+  value: ($el) => $el.value,
+  index: ($el, $scope, event, index) => index,
+  checked: ($el) => ($el.checked ? "checked" : "unchecked"),
+  expanded: ($el) => {
+    const expanded = $el.getAttribute("aria-expanded");
+    if (expanded === null) {
+      return null;
+    }
+    return expanded.toString() === "true" ? "opened" : "closed";
+  },
+  closestHeading: ($el) => getClosestHeading($el),
 };
 
 export { getXPathTo, getClosestHeading, valueGetters };
diff --git a/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js b/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js
index f95f8d93..d62eb599 100644
--- a/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js
+++ b/src/nationalarchives/stories/utilities/colour-schemes/colour-themes.stories.js
@@ -1098,6 +1098,7 @@ const Template = ({ theme, accent }) => {
                       href: "#email",
                     },
                   ],
+                  disableAutoFocus: true,
                 },
               })}
               ${TextInput({
@@ -1216,37 +1217,32 @@ const Template = ({ theme, accent }) => {
     </main>
     ${Footer({
       params: {
-        meta: "<p>Open today<br>09:00&mdash;19:00</p>",
+        meta: "<p>Open today<br>09:00&ndash;19:00</p>",
         social: [
           {
             href: "https://twitter.com/UKNatArchives",
             icon: "twitter",
-            title: "Visit us on Twitter",
+            title: "The National Archives X feed (formally known as Twitter)",
           },
           {
             href: "https://www.youtube.com/c/TheNationalArchivesUK",
             icon: "youtube",
-            title: "Watch us on YouTube",
+            title: "The National Archives YouTube channel",
           },
           {
             href: "https://www.facebook.com/TheNationalArchives",
             icon: "facebook",
-            title: "See us on Facebook",
+            title: "The National Archives Facebook page",
           },
           {
             href: "https://www.flickr.com/photos/nationalarchives",
             icon: "flickr",
-            title: "See our Flickr feed",
+            title: "The National Archives Flickr feed",
           },
           {
             href: "https://www.instagram.com/nationalarchivesuk/",
             icon: "instagram",
-            title: "See us on Instagram",
-          },
-          {
-            href: "https://www.nationalarchives.gov.uk/rss/",
-            icon: "rss",
-            title: "Read our RSS feed",
+            title: "The National Archives Instagram feed",
           },
         ],
         navigation: [
@@ -1367,18 +1363,27 @@ Light.args = {
 };
 
 export const Dark = Template.bind({});
+Dark.parameters = {
+  chromatic: { disableSnapshot: true },
+};
 Dark.args = {
   theme: "dark",
   accent: "pink",
 };
 
 export const LightHighContrast = Template.bind({});
+LightHighContrast.parameters = {
+  chromatic: { disableSnapshot: true },
+};
 LightHighContrast.args = {
   theme: "light high-contrast",
   accent: "pink",
 };
 
 export const DarkHighContrast = Template.bind({});
+DarkHighContrast.parameters = {
+  chromatic: { disableSnapshot: true },
+};
 DarkHighContrast.args = {
   theme: "dark high-contrast",
   accent: "pink",
diff --git a/src/nationalarchives/utilities/_global.scss b/src/nationalarchives/utilities/_global.scss
index 895dd420..5666853b 100644
--- a/src/nationalarchives/utilities/_global.scss
+++ b/src/nationalarchives/utilities/_global.scss
@@ -19,7 +19,9 @@
   margin: 0;
   padding: 0;
 
-  &:has(.tna-header):has(#main-content[role="main"]):has(.tna-footer) {
+  &:has(:is(.tna-global-header, .tna-header)):has(
+      #main-content[role="main"]
+    ):has(.tna-footer) {
     display: flex;
     flex-direction: column;
 
diff --git a/tasks/global-header/build-global-header-package.sh b/tasks/global-header/build-global-header-package.sh
index 06a86215..bd0d0340 100755
--- a/tasks/global-header/build-global-header-package.sh
+++ b/tasks/global-header/build-global-header-package.sh
@@ -4,5 +4,5 @@ set -e
 ./tasks/build-package.sh
 rm -fR package-global-header
 mkdir package-global-header
-cp -R package/nationalarchives/global-header-package.css package/nationalarchives/global-header-package.css.map package/nationalarchives/components/global-header/global-header.js package/nationalarchives/components/global-header/global-header.js.map package/nationalarchives/global-header-package.scss package/nationalarchives/assets LICENCE package-global-header
+cp -R package/nationalarchives/global-header-package.css package/nationalarchives/global-header-package.css.map package/nationalarchives/components/global-header/global-header.js package/nationalarchives/components/global-header/global-header.js.map package/nationalarchives/global-header-package.scss package/nationalarchives/assets package/nationalarchives/analytics.js package/nationalarchives/analytics.js.map LICENCE package-global-header
 node tasks/global-header/generate-global-header-assets.js
diff --git a/tasks/global-header/generate-global-header-assets.js b/tasks/global-header/generate-global-header-assets.js
index 17d2fb1b..1e81c8f8 100644
--- a/tasks/global-header/generate-global-header-assets.js
+++ b/tasks/global-header/generate-global-header-assets.js
@@ -72,32 +72,27 @@ const footerHTML = nunjucks
         {
           href: "https://twitter.com/UKNatArchives",
           icon: "twitter",
-          title: "Visit us on Twitter",
+          title: "The National Archives X feed (formally known as Twitter)",
         },
         {
           href: "https://www.youtube.com/c/TheNationalArchivesUK",
           icon: "youtube",
-          title: "Watch us on YouTube",
+          title: "The National Archives YouTube channel",
         },
         {
           href: "https://www.facebook.com/TheNationalArchives",
           icon: "facebook",
-          title: "See us on Facebook",
+          title: "The National Archives Facebook page",
         },
         {
           href: "https://www.flickr.com/photos/nationalarchives",
           icon: "flickr",
-          title: "See our Flickr feed",
+          title: "The National Archives Flickr feed",
         },
         {
           href: "https://www.instagram.com/nationalarchivesuk/",
           icon: "instagram",
-          title: "See us on Instagram",
-        },
-        {
-          href: "https://www.nationalarchives.gov.uk/rss/",
-          icon: "rss",
-          title: "Read our RSS feed",
+          title: "The National Archives Instagram feed",
         },
       ],
       navigation: [