Cp regions remove vaccs opt2

app/assets/sass/_overrides.scss

@@ -5,13 +5,17 @@
   }
 }
 
+.nhsuk-width-container {
+  max-width: 1100px;
+}
+
 .app-pre-footer-banner {
   border-top: 1px solid #b1b4b6;
 }
 
 .app-pre-footer-banner .govuk-phase-banner__content {
   display: flex;
-  flex-wrap: nowrap;
+  flex-wrap: wrap;
   align-items: baseline;
   @include nhsuk-font(16);
   margin-top: 24px;

app/assets/sass/components/_related-nav.scss

@@ -23,3 +23,4 @@
   list-style: none;
   padding-left: 0;
 }
+

app/assets/sass/main.scss

@@ -1,5 +1,6 @@
 // Import NHS.UK frontend library
 @import "nhsuk-frontend/dist/nhsuk";
+@import "../../../node_modules/@x-govuk/govuk-prototype-components/src/x-govuk";
 
 // Local override classes
 @import 'overrides';
@@ -149,3 +150,184 @@ border-radius: 3px;
 .nhsuk-checkboxes__item[hidden] {
   display: none;
 }
+
+.x-govuk-sub-navigation__section-item--current {
+  background-color: transparent;
+}
+
+.app-pharmacy-back-link {
+  margin-bottom: 24px;
+}
+
+.app-pharmacy-page-title {
+  margin-bottom: nhsuk-spacing(6);
+}
+
+@include nhsuk-media-query($from: tablet) {
+  .app-pharmacy-back-link {
+    margin-bottom: 48px;
+  }
+}
+
+.app-section-navigation {
+  margin-bottom: nhsuk-spacing(4);
+}
+
+.app-section-navigation__list {
+  @include nhsuk-font(19);
+
+  display: flex;
+  flex-flow: row nowrap;
+  gap: nhsuk-spacing(1) nhsuk-spacing(2);
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  box-shadow: inset 0 -1px $nhsuk-border-colour;
+  overflow-x: auto;
+}
+
+.app-section-navigation__item {
+  margin: 0;
+}
+
+.app-section-navigation__link {
+  @include nhsuk-link-style-default;
+  @include nhsuk-link-style-no-visited-state;
+
+  display: block;
+  padding: nhsuk-spacing(2) 2px;
+  text-decoration: none;
+  white-space: nowrap;
+}
+
+.app-section-navigation__link[aria-current="page"] {
+  box-shadow: inset 0 -4px $nhsuk-link-colour;
+}
+
+.app-section-navigation__link[aria-current="page"]:focus {
+  box-shadow: inset 0 -4px $nhsuk-text-colour;
+}
+
+.app-section-navigation__current {
+  font-weight: 700;
+}
+
+.app-section-navigation--vertical .app-section-navigation__list {
+  flex-flow: column;
+  gap: 0;
+  box-shadow: none;
+  overflow: visible;
+}
+
+.app-section-navigation--vertical .app-section-navigation__item {
+  border-left: 4px solid transparent;
+}
+
+.app-section-navigation--vertical .app-section-navigation__item--current {
+  border-left-color: $nhsuk-link-colour;
+}
+
+.app-section-navigation--vertical .app-section-navigation__link {
+  padding: nhsuk-spacing(1) nhsuk-spacing(2) nhsuk-spacing(1) calc(#{nhsuk-spacing(2)} + 4px);
+}
+
+.app-section-navigation--vertical .app-section-navigation__link[aria-current="page"] {
+  box-shadow: none;
+}
+
+.app-section-navigation--vertical .app-section-navigation__link[aria-current="page"]:focus {
+  box-shadow: inset 0 -4px $nhsuk-text-colour;
+}
+
+.app-pharmacy-users-table-responsive {
+  container-name: pharmacy-users-table;
+  container-type: inline-size;
+  max-width: 100%;
+}
+
+.app-pharmacy-users-table {
+  width: 100%;
+}
+
+.app-pharmacy-users-table .app-pharmacy-users-vaccinator {
+  white-space: nowrap;
+  width: 1%;
+}
+
+.app-pharmacy-users-actions a {
+  display: block;
+}
+
+.app-pharmacy-users-actions a + a {
+  margin-top: nhsuk-spacing(1);
+}
+
+@media (max-width: 1200px) {
+  .app-pharmacy-layout-nav,
+  .app-pharmacy-layout-content {
+    float: none;
+    width: 100%;
+  }
+
+  .app-pharmacy-layout-nav {
+    margin-bottom: nhsuk-spacing(4);
+  }
+}
+
+@container pharmacy-users-table (max-width: 700px) {
+  .app-pharmacy-users-table {
+    min-width: 0;
+  }
+
+  .app-pharmacy-users-table thead {
+    display: none;
+  }
+
+  .app-pharmacy-users-table,
+  .app-pharmacy-users-table tbody,
+  .app-pharmacy-users-table tr,
+  .app-pharmacy-users-table td {
+    display: block;
+    width: 100%;
+  }
+
+  .app-pharmacy-users-table tr {
+    box-sizing: border-box;
+    border-bottom: 1px solid $nhsuk-border-colour;
+    margin-bottom: nhsuk-spacing(3);
+    padding-bottom: nhsuk-spacing(2);
+  }
+
+  .app-pharmacy-users-table td {
+    border-bottom: 0;
+    min-width: 0;
+    padding: nhsuk-spacing(1) 0;
+  }
+
+  .app-pharmacy-users-table td::before {
+    content: attr(data-label);
+    display: block;
+    font-weight: 700;
+    margin-bottom: 2px;
+  }
+
+  .app-pharmacy-users-actions a {
+    display: inline;
+    margin-right: nhsuk-spacing(3);
+  }
+
+  .app-pharmacy-users-actions a + a {
+    margin-top: 0;
+  }
+}
+
+@include nhsuk-media-query($from: tablet) {
+  .app-pharmacy-users-table {
+    min-width: 760px;
+  }
+
+  .app-section-navigation--vertical {
+    margin-right: -#{nhsuk-spacing(2)};
+    margin-left: -#{nhsuk-spacing(2)};
+  }
+}

app/components/secondary-navigation/_secondary-navigation.scss

@@ -62,3 +62,32 @@
       padding-bottom: nhsuk-spacing(4) - $_current-link-border-width;
     }
   }
+
+  .app-secondary-navigation--side {
+    border-bottom: 0;
+    border-left: 4px solid $nhsuk-border-colour;
+    margin-bottom: nhsuk-spacing(6);
+    padding-left: nhsuk-spacing(3);
+  }
+
+  .app-secondary-navigation--side .app-secondary-navigation__list {
+    @include nhsuk-font(19);
+
+    display: block;
+    margin-bottom: 0;
+  }
+
+  .app-secondary-navigation--side .app-secondary-navigation__list-item {
+    margin: 0 0 nhsuk-spacing(2);
+    padding: 0;
+  }
+
+  .app-secondary-navigation--side .app-secondary-navigation__list-item:not(:last-child) {
+    margin-right: 0;
+  }
+
+  .app-secondary-navigation--side .app-secondary-navigation__list-item--current {
+    border-left-width: $_current-link-border-width;
+    margin-left: ((nhsuk-spacing(2) + $_current-link-border-width) * -1);
+    padding-left: nhsuk-spacing(2);
+  }

app/components/x-govuk-secondary-navigation/macro.njk

@@ -0,0 +1,3 @@
+{% macro xGovukSecondaryNavigation(params) %}
+  {%- include "./template.njk" -%}
+{% endmacro %}

app/components/x-govuk-secondary-navigation/template.njk

@@ -0,0 +1,16 @@
+{% from "../../../node_modules/nhsuk-frontend/dist/nhsuk/macros/attributes.njk" import nhsukAttributes %}
+
+<nav class="x-govuk-secondary-navigation {%- if params.classes %} {{ params.classes }}{% endif -%}" {% if params.labelledBy %}aria-labelledby="{{ params.labelledBy }}"{% else %}aria-label="{{ params.visuallyHiddenTitle or "Secondary menu" }}"{% endif %}
+  {{- nhsukAttributes(params.attributes) }}>
+  <ul class="x-govuk-secondary-navigation__list">
+  {% for item in params.items %}
+    {% if item %}
+    <li class="x-govuk-secondary-navigation__list-item{{ " x-govuk-secondary-navigation__list-item--current" if item.current }}{% if item.classes %} {{ item.classes }}{% endif -%}">
+      <a class="x-govuk-secondary-navigation__link" href="{{ item.href }}"{{ " aria-current=page" if item.current }}>
+        {{- item.text -}}
+      </a>
+    </li>
+    {% endif %}
+  {% endfor %}
+  </ul>
+</nav>

app/components/x-govuk-sub-navigation/macro.njk

@@ -0,0 +1,3 @@
+{% macro xGovukSubNavigation(params) %}
+  {%- include "./template.njk" -%}
+{% endmacro %}

app/components/x-govuk-sub-navigation/template.njk

@@ -0,0 +1,33 @@
+{% from "../../../node_modules/nhsuk-frontend/dist/nhsuk/macros/attributes.njk" import nhsukAttributes -%}
+
+<nav class="x-govuk-sub-navigation{%- if params.classes %} {{ params.classes }}{% endif %}" aria-labelledby="sub-navigation-heading"
+  {{- nhsukAttributes(params.attributes) }}>
+  <h2 class="nhsuk-u-visually-hidden" id="sub-navigation-heading">{{ params.visuallyHiddenTitle or "Pages in this section" }}</h2>
+{% for theme, items in params.items | groupby("theme") %}
+  {% if theme != "undefined" %}
+  <h3 class="x-govuk-sub-navigation__theme">
+    {{- theme -}}
+  </h3>
+  {% endif %}
+  <ul class="x-govuk-sub-navigation__section">
+  {% for item in items %}
+    {% if item %}
+    <li class="x-govuk-sub-navigation__section-item{% if item.parent or item.current %} x-govuk-sub-navigation__section-item--current{% endif %}">
+      <a class="x-govuk-sub-navigation__link" href="{{ item.href }}"{% if item.current %} aria-current="true"{% endif %}>{{ item.text }}</a>
+      {% if item.parent and item.children | length > 0 %}
+      <ul class="x-govuk-sub-navigation__section x-govuk-sub-navigation__section--nested">
+      {% for child in item.children %}
+        <li class="x-govuk-sub-navigation__section-item">
+          <a class="x-govuk-sub-navigation__link" href="{{ child.href }}"{% if child.current %} aria-current="true"{% endif %}>
+            {{- child.text -}}
+          </a>
+        </li>
+      {% endfor %}
+      </ul>
+      {% endif %}
+    </li>
+    {% endif %}
+  {% endfor %}
+  </ul>
+{% endfor %}
+</nav>

app/data/organisations.js

@@ -186,9 +186,9 @@ module.exports = [
   },
   {
     id: "RVL",
-    name: "Barnet and chase farm Hospitals NHS Trust",
+    name: "Barnet and Chase Farm Hospitals NHS Trust",
     address: {
-      line1: "Barnet General hospital",
+      line1: "Barnet General Hospital",
       town: "Barnet",
       postcode: "EN5 3DJ"
     },
@@ -222,7 +222,7 @@ module.exports = [
   },
   {
     id: "RRP",
-    name: "Barnet, enfield and haringey mental Health NHS Trust",
+    name: "Barnet, Enfield and Haringey Mental Health NHS Trust",
     address: {
       line1: "Trust headquarters block b2",
       town: "London",
@@ -240,7 +240,7 @@ module.exports = [
   },
   {
     id: "RCN",
-    name: "Barnsley Community and priority services NHS Trust",
+    name: "Barnsley Community and Priority Services NHS Trust",
     address: {
       line1: "Kendray hospital",
       town: "Barnsley",
@@ -7694,7 +7694,7 @@ module.exports = [
     id: "RDC",
     name: "Wellhouse NHS Trust",
     address: {
-      line1: "Barnet hospital",
+      line1: "Barnet Hospital",
       town: "Barnet",
       postcode: "EN5 3DJ"
     },