diff --git a/app/assets/javascript/calendar-table-actions.js b/app/assets/javascript/calendar-table-actions.js
index f8d8b672..16255008 100644
--- a/app/assets/javascript/calendar-table-actions.js
+++ b/app/assets/javascript/calendar-table-actions.js
@@ -1,6 +1,3 @@
-  var lastSelectedCell = null;
-  var selectableCells = Array.from(document.querySelectorAll('.calendar-table td:not(.calendar-table-no-data)'));
-
   function clearSelectedDays() {
     document.querySelectorAll('.calendar-table td.--date-selected').forEach(function (cell) {
       cell.classList.remove('--date-selected');
@@ -59,7 +56,6 @@
           clickedScheduleName.textContent = isAlreadySelected ? 'Select schedule' : 'Deselect schedule';
         }
 
-        lastSelectedCell = clickedStartCell;
         return;
       }
 
@@ -71,25 +67,27 @@
         return;
       }
 
-      if (event.shiftKey && lastSelectedCell) {
-        var startIndex = selectableCells.indexOf(lastSelectedCell);
-        var endIndex = selectableCells.indexOf(cell);
-
-        if (startIndex !== -1 && endIndex !== -1) {
-          var rangeStart = Math.min(startIndex, endIndex);
-          var rangeEnd = Math.max(startIndex, endIndex);
-
-          for (var index = rangeStart; index <= rangeEnd; index++) {
-            selectableCells[index].classList.add('--date-selected');
-          }
-        }
-      } else {
-        cell.classList.toggle('--date-selected');
-      }
-
-      lastSelectedCell = cell;
+      cell.classList.toggle('--date-selected');
     });
 
     table.classList.add('--js-enabled');
   });
+
+  var selectDaysForm = document.getElementById('select-days-form');
+
+  if (selectDaysForm) {
+    selectDaysForm.addEventListener('submit', function () {
+      selectDaysForm.querySelectorAll('input[name="selectedDays"]').forEach(function (input) {
+        input.remove();
+      });
+
+      document.querySelectorAll('.calendar-table td.--date-selected[data-date]').forEach(function (cell) {
+        var input = document.createElement('input');
+        input.type = 'hidden';
+        input.name = 'selectedDays';
+        input.value = cell.getAttribute('data-date');
+        selectDaysForm.appendChild(input);
+      });
+    });
+  }
   
\ No newline at end of file
diff --git a/app/assets/sass/components/_calendar-table.scss b/app/assets/sass/components/_calendar-table.scss
index ce5422d0..4858c63d 100644
--- a/app/assets/sass/components/_calendar-table.scss
+++ b/app/assets/sass/components/_calendar-table.scss
@@ -82,6 +82,7 @@
       text-wrap: nowrap;
     }
   }
+
   .--schedule-end {
     position: relative;
     border-right-color: nhsuk-colour("grey-2");
@@ -109,6 +110,12 @@
   margin-bottom: nhsuk-spacing(2);
 }
 
+.--template-name {
+  display: block;
+  padding: nhsuk-spacing(1);
+  margin-top: nhsuk-spacing(2);
+}
+
 ///
 /// 
 /// 
diff --git a/app/assets/sass/components/_clinic-capacity-summary.scss b/app/assets/sass/components/_clinic-capacity-summary.scss
new file mode 100644
index 00000000..8a473091
--- /dev/null
+++ b/app/assets/sass/components/_clinic-capacity-summary.scss
@@ -0,0 +1,18 @@
+@use "nhsuk-frontend/dist/nhsuk/core" as *;
+
+.app-clinic-capacity-summary {
+  @include nhsuk-responsive-margin(4, "bottom");
+
+  .nhsuk-table__body {
+    display: flex;
+  }
+    .nhsuk-table__header:not(:last-child) {
+      @include nhsuk-responsive-padding(1, "right");
+      border: 0;
+    }
+    .nhsuk-table__cell {
+      @include nhsuk-responsive-padding(5, "right");
+      border: 0;
+    }
+
+}
\ No newline at end of file
diff --git a/app/assets/sass/components/_progress-bar.scss b/app/assets/sass/components/_progress-bar.scss
index e3ac3c90..e6b7780e 100644
--- a/app/assets/sass/components/_progress-bar.scss
+++ b/app/assets/sass/components/_progress-bar.scss
@@ -55,34 +55,44 @@
     min-width: 0;
   }
 }
-.app-progress-bar::-webkit-progress-bar {
+::-webkit-progress-bar {
   background: #fff;
 }
 .app-progress-bar::-moz-progress-bar {
   background: #fff;
 }
 
-.app-progress-bar.--generic::-webkit-progress-value,
+.app-progress-bar.--generic::-webkit-progress-value {
+  background: var(--generic-chart-hatch);
+}
 .app-progress-bar.--generic::-moz-progress-bar {
   background: var(--generic-chart-hatch);
 }
 
-.app-progress-bar.--standard::-webkit-progress-value,
+.app-progress-bar.--standard::-webkit-progress-value {
+  background: var(--standard-chart-hatch);
+}
 .app-progress-bar.--standard::-moz-progress-bar {
   background: var(--standard-chart-hatch);
 }
 
-.app-progress-bar.--special::-webkit-progress-value,
+.app-progress-bar.--special::-webkit-progress-value {
+  background: var(--special-chart-hatch);
+}
 .app-progress-bar.--special::-moz-progress-bar {
   background: var(--special-chart-hatch);
 }
 
-.app-progress-bar.--ceased::-webkit-progress-value,
+.app-progress-bar.--ceased::-webkit-progress-value {
+  background: var(--ceased-chart-hatch);
+}
 .app-progress-bar.--ceased::-moz-progress-bar {
   background: var(--ceased-chart-hatch);
 }
 
-.app-progress-bar.--vhr::-webkit-progress-value,
+.app-progress-bar.--vhr::-webkit-progress-value {
+  background: var(--vhr-chart-hatch);
+}
 .app-progress-bar.--vhr::-moz-progress-bar {
   background: var(--vhr-chart-hatch);
-}
\ No newline at end of file
+}
diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss
index b57d3ddb..dff61b53 100755
--- a/app/assets/sass/main.scss
+++ b/app/assets/sass/main.scss
@@ -21,6 +21,7 @@
 // https://github.com/NHSDigital/manage-breast-screening-prototype
 
 @forward "components/calendar-table";
+@forward "components/clinic-capacity-summary";
 @forward "components/clinic-level-breadcrumbs";
 @forward "components/grid-extensions";
 @forward "components/inline-detailed-search";
@@ -42,6 +43,24 @@ a {
   @extend .nhsuk-link--no-visited-state;
 }
 
+// Makes a <button> look and behave like the .panel-item links it sits alongside
+.app-link-button {
+  display: block;
+  width: 100%;
+  padding: 0;
+  border: 0;
+  background: none;
+  text-align: left;
+  font: inherit;
+  color: $nhsuk-link-colour;
+  cursor: pointer;
+
+  &:hover {
+    color: nhsuk-shade($nhsuk-link-colour, 20%);
+    text-decoration: underline;
+  }
+}
+
 .app-card-editable {
   display: flex;
   justify-content: space-between;
diff --git a/app/config.js b/app/config.js
index f2f2928e..ad7cc64b 100644
--- a/app/config.js
+++ b/app/config.js
@@ -2,8 +2,7 @@
 
 module.exports = {
   // Service name
-  serviceName: 'Cohort to clinic prototype',
-
+  serviceName: "Cohort to clinic prototype",
   // Port to run the prototype on locally
   port: 3000
 }
diff --git a/app/data/session-data-defaults.js b/app/data/session-data-defaults.js
index 812305bb..8003d2d0 100644
--- a/app/data/session-data-defaults.js
+++ b/app/data/session-data-defaults.js
@@ -1,6 +1,5 @@
 const participants = require('./participants')
 
-// currently just for the September Test "clickthru"
 module.exports = {
   participants,
   stagedCount: 0,
@@ -14,5 +13,10 @@ module.exports = {
   clinicLength: "1 day",
   clinicCapacityPercentBooked: "0",
   clinicCapacityAvailable: "10",
-  clinicCapacityTotal: "10"
+  clinicCapacityTotal: "10",
+  createCapacityFromZero: {
+    schedules: [],
+    selectedDays: [],
+    dayTemplates: {}
+  }
 }
\ No newline at end of file
diff --git a/app/locals.js b/app/locals.js
index aaf309e3..4b6dd5ab 100644
--- a/app/locals.js
+++ b/app/locals.js
@@ -7,6 +7,39 @@ module.exports = function(req, res, next) {
   //
   // req.locals.organisationName = 'NHS'
 
+  res.locals.bsoName = "Mereford and Wensley Breast Screening Service"
+  res.locals.bsoCode = "MW01"
+  res.locals.staticBaseUnit = "Mereford and Wensley Screening Centre"
+  res.locals.staticLocationShort = "Mereford and Wensley District Hospital"
+  res.locals.mobileUnits = [
+    "Davison",
+    "Drummond",
+    "Dunlop",
+    "Garrud",
+    "Howey",
+    "Kenney",
+    "Lenton",
+    "Pankhurst"
+  ]
+  res.locals.locationsShort = [
+    "Brookfield Sports Pavilion",
+    "East Mereford Community Hub",
+    "Kingsmead Swimming Centre",
+    "Mereford Central",
+    "Mereford Civic Centre",
+    "Mereford Library",
+    "Mereford Showground",
+    "Northgate Food Hall",
+    "Riverside Sports Centre",
+    "South Mereford",
+    "Wensley Community Hospital",
+    "Wensley Cross",
+    "Wensley Leisure Centre",
+    "Wensley Park",
+    "Wensley Town Hall",
+    "West Wensley Foodstore"
+  ]
+
   next()
 }
 
diff --git a/app/routes/create-capacity-from-zero.js b/app/routes/create-capacity-from-zero.js
index 95ef28d7..84ce5b6d 100644
--- a/app/routes/create-capacity-from-zero.js
+++ b/app/routes/create-capacity-from-zero.js
@@ -8,6 +8,347 @@ const router = express.Router()
 
 */
 
+// Slot/held totals per session template, matching select-session-template.html
+const sessionTemplates = {
+  'Standard': { totalSlots: 42, heldSlots: 8 },
+  'Special appointments': { totalSlots: 42, heldSlots: 42 },
+  'Rubie default': { totalSlots: 42, heldSlots: 0 }
+}
+
+const isWholeNumber = str => /^\d+$/.test(str)
+
+// Checks a { day, month, year } object has numeric values for each field, regardless of whether they form a real date
+const hasDateFields = (dateObj) =>
+  Boolean(dateObj) && isWholeNumber(dateObj.day) && isWholeNumber(dateObj.month) && isWholeNumber(dateObj.year)
+
+// Formats a Date as a YYYY-MM-DD key, used to identify calendar days in session data
+const formatDateKey = (date) => {
+  const year = date.getFullYear()
+  const month = String(date.getMonth() + 1).padStart(2, '0')
+  const day = String(date.getDate()).padStart(2, '0')
+  return `${year}-${month}-${day}`
+}
+
+// Parses a { day, month, year } object into a Date, or null if invalid
+const parseDateFields = (dateObj) => {
+  if (!hasDateFields(dateObj)) {
+    return null
+  }
+
+  const day = parseInt(dateObj.day, 10)
+  const month = parseInt(dateObj.month, 10)
+  // Treat 2-digit years as shorthand for the 2000s, eg "26" becomes 2026
+  const year = dateObj.year.length === 2 ? parseInt(`20${dateObj.year}`, 10) : parseInt(dateObj.year, 10)
+  const date = new Date(year, month - 1, day)
+
+  if (date.getFullYear() !== year || date.getMonth() !== month - 1 || date.getDate() !== day) {
+    return null
+  }
+
+  return date
+}
+
+// Builds a { year, month, monthName, days } calendar, days is Mon-Sun padded with nulls
+const generateCalendarMonth = (year, month) => {
+  const firstDay = new Date(year, month - 1, 1)
+  const lastDay = new Date(year, month, 0)
+  const daysInMonth = lastDay.getDate()
+  const startingDayOfWeek = firstDay.getDay() // 0 = Sunday, 1 = Monday, etc.
+  const weekStartOffset = (startingDayOfWeek === 0) ? 6 : startingDayOfWeek - 1
+
+  const days = []
+
+  for (let i = 0; i < weekStartOffset; i++) {
+    days.push(null)
+  }
+
+  for (let day = 1; day <= daysInMonth; day++) {
+    const fullDate = new Date(year, month - 1, day)
+    days.push({
+      date: day,
+      fullDate,
+      dateKey: formatDateKey(fullDate)
+    })
+  }
+
+  return {
+    year,
+    month,
+    monthName: new Date(year, month - 1).toLocaleString('default', { month: 'long' }),
+    days
+  }
+}
+
+// Formats a Date as e.g. "18 June 2026"
+const formatDateLabel = (date) => {
+  const monthNames = [
+    'January', 'February', 'March', 'April', 'May', 'June',
+    'July', 'August', 'September', 'October', 'November', 'December'
+  ]
+
+  return `${date.getDate()} ${monthNames[date.getMonth()]} ${date.getFullYear()}`
+}
+
+// Finds the first existing schedule whose date range overlaps the given start/end dates
+const findOverlappingSchedule = (startDate, endDate, schedules) =>
+  schedules.find(schedule =>
+    schedule.startDate && schedule.endDate &&
+    startDate <= schedule.endDate && endDate >= schedule.startDate
+  )
+
+const findScheduleStartingOn = (date, schedules) =>
+  schedules.find(schedule => date.getTime() === schedule.startDate.getTime())
+
+const findScheduleEndingOn = (date, schedules) =>
+  schedules.find(schedule => date.getTime() === schedule.endDate.getTime())
+
+// Generates one calendar per month spanning all schedules, including any gap dates between them
+const generateScheduleCalendars = (schedules) => {
+  if (!schedules.length) {
+    return []
+  }
+
+  const overallStart = new Date(Math.min(...schedules.map(schedule => schedule.startDate)))
+  const overallEnd = new Date(Math.max(...schedules.map(schedule => schedule.endDate)))
+
+  const calendars = []
+  let currentYear = overallStart.getFullYear()
+  let currentMonth = overallStart.getMonth() + 1
+  const endYear = overallEnd.getFullYear()
+  const endMonth = overallEnd.getMonth() + 1
+
+  while (currentYear < endYear || (currentYear === endYear && currentMonth <= endMonth)) {
+    const calendar = generateCalendarMonth(currentYear, currentMonth)
+
+    calendar.days = calendar.days.map(day => {
+      if (!day || day.fullDate < overallStart || day.fullDate > overallEnd) {
+        return null
+      }
+
+      const startingSchedule = findScheduleStartingOn(day.fullDate, schedules)
+      const endingSchedule = findScheduleEndingOn(day.fullDate, schedules)
+
+      return Object.assign({}, day, {
+        isScheduleStart: Boolean(startingSchedule),
+        isScheduleEnd: Boolean(endingSchedule)
+      })
+    })
+
+    // Build calendar weeks and trim fully empty rows for partial months.
+    const weeks = []
+    for (let i = 0; i < calendar.days.length; i += 7) {
+      const week = calendar.days.slice(i, i + 7)
+      while (week.length < 7) {
+        week.push(null)
+      }
+      if (week.some(day => day)) {
+        weeks.push(week)
+      }
+    }
+    calendar.weeks = weeks
+
+    if (weeks.length > 0) {
+      calendars.push(calendar)
+    }
+
+    currentMonth++
+    if (currentMonth > 12) {
+      currentMonth = 1
+      currentYear++
+    }
+  }
+
+  return calendars
+}
+
+router.get('/create-capacity-from-zero/clinic-summary', function (req, res) {
+  const schedules = (req.session.data.createCapacityFromZero.schedules || [])
+    .map(schedule => ({
+      startDate: parseDateFields(schedule.scheduleStartDate),
+      endDate: parseDateFields(schedule.scheduleEndDate)
+    }))
+    .filter(schedule => schedule.startDate && schedule.endDate)
+
+  const dayTemplates = req.session.data.createCapacityFromZero.dayTemplates || {}
+
+  const calendars = generateScheduleCalendars(schedules).map(calendar => {
+    calendar.weeks = calendar.weeks.map(week => week.map(day => {
+      if (!day || !dayTemplates[day.dateKey]) {
+        return day
+      }
+
+      const templateName = dayTemplates[day.dateKey]
+      const template = sessionTemplates[templateName] || {}
+
+      return Object.assign({}, day, {
+        templateName,
+        totalSlots: template.totalSlots,
+        heldSlots: template.heldSlots
+      })
+    }))
+
+    return calendar
+  })
+
+  const totalLockedSlots = calendars
+    .flatMap(calendar => calendar.weeks.flat())
+    .filter(day => day && day.templateName)
+    .reduce((total, day) => total + (day.totalSlots || 0), 0)
+
+  res.render('create-capacity-from-zero/clinic-summary', {
+    calendars,
+    totalLockedSlots
+  })
+})
+
+router.post('/create-capacity-from-zero/select-days', function (req, res) {
+  const selectedDays = [].concat(req.body.selectedDays || [])
+
+  req.session.data.createCapacityFromZero.selectedDays = selectedDays
+
+  res.redirect('/create-capacity-from-zero/select-session-template')
+})
+
+router.post('/create-capacity-from-zero/apply-session-template', function (req, res) {
+  const templateName = (req.body.templateName || '').trim()
+  const selectedDays = req.session.data.createCapacityFromZero.selectedDays || []
+
+  if (!req.session.data.createCapacityFromZero.dayTemplates) {
+    req.session.data.createCapacityFromZero.dayTemplates = {}
+  }
+
+  if (templateName) {
+    selectedDays.forEach(dateKey => {
+      req.session.data.createCapacityFromZero.dayTemplates[dateKey] = templateName
+    })
+  }
+
+  res.redirect('/create-capacity-from-zero/clinic-summary')
+})
+
+router.post('/create-capacity-from-zero/remove-template', function (req, res) {
+  const selectedDays = [].concat(req.body.selectedDays || [])
+  const dayTemplates = req.session.data.createCapacityFromZero.dayTemplates || {}
+
+  selectedDays.forEach(dateKey => {
+    delete dayTemplates[dateKey]
+  })
+
+  req.session.data.createCapacityFromZero.dayTemplates = dayTemplates
+
+  res.redirect('/create-capacity-from-zero/clinic-summary')
+})
+
+router.post('/create-capacity-from-zero/create-clinic', function (req, res) {
+  const clinicName = (req.body.clinicName || '').trim()
+  const unit = req.body.unit || ''
+  const location = req.body.location || ''
+
+  req.session.data.createCapacityFromZero['clinicName'] = clinicName
+  req.session.data.createCapacityFromZero['unit'] = unit
+  req.session.data.createCapacityFromZero['location'] = location
+
+  const errors = {}
+
+  if (!clinicName) {
+    errors.clinicName = 'Clinic must be given a name'
+  }
+
+  if (!unit) {
+    errors.unit = 'A unit must be chosen'
+  }
+
+  if (!location) {
+    errors.location = 'A location must be chosen'
+  }
+
+  if (Object.keys(errors).length > 0) {
+    return res.render('create-capacity-from-zero/create-clinic', {
+      errors
+    })
+  }
+
+  res.redirect('/create-capacity-from-zero/clinic-summary')
+})
+
+
+router.post('/create-capacity-from-zero/create-schedule', function (req, res) {
+  // const scheduleName = (req.body.scheduleName || '').trim()
+  const scheduleStartDate = req.body.scheduleStartDate || {}
+  const scheduleEndDate = req.body.scheduleEndDate || {}
+
+  // req.session.data.createCapacityFromZero['scheduleName'] = scheduleName
+  req.session.data.createCapacityFromZero['scheduleStartDate'] = scheduleStartDate
+  req.session.data.createCapacityFromZero['scheduleEndDate'] = scheduleEndDate
+
+  const errors = {}
+
+  // if (!scheduleName) {
+  //   errors.scheduleName = 'Schedule must be given a name'
+  // }
+
+  const today = new Date()
+  today.setHours(0, 0, 0, 0)
+
+  const startDate = parseDateFields(scheduleStartDate)
+  if (!hasDateFields(scheduleStartDate)) {
+    errors.scheduleStartDate = 'Schedule start date must be given a day, month, and year'
+  } else if (!startDate) {
+    errors.scheduleStartDate = 'Schedule start date must be a real date'
+  } else if (startDate <= today) {
+    errors.scheduleStartDate = 'Schedule start date must be in the future'
+  }
+
+  const endDate = parseDateFields(scheduleEndDate)
+  if (!hasDateFields(scheduleEndDate)) {
+    errors.scheduleEndDate = 'Schedule end date must be given a day, month, and year'
+  } else if (!endDate) {
+    errors.scheduleEndDate = 'Schedule end date must be a real date'
+  } else if (endDate <= today) {
+    errors.scheduleEndDate = 'Schedule end date must be in the future'
+  } else if (startDate && endDate < startDate) {
+    errors.scheduleEndDate = 'Schedule end date must be the same as or after the schedule start date'
+  }
+
+  const existingSchedules = (req.session.data.createCapacityFromZero.schedules || [])
+    .map(schedule => ({
+      startDate: parseDateFields(schedule.scheduleStartDate),
+      endDate: parseDateFields(schedule.scheduleEndDate)
+    }))
+
+  if (!errors.scheduleStartDate && !errors.scheduleEndDate) {
+    const overlappingSchedule = findOverlappingSchedule(startDate, endDate, existingSchedules)
+
+    if (overlappingSchedule) {
+      const overlapMessage = `New dates must not overlap an existing schedule: (${formatDateLabel(overlappingSchedule.startDate)} to ${formatDateLabel(overlappingSchedule.endDate)})`
+      errors.scheduleStartDate = overlapMessage
+      errors.scheduleEndDate = overlapMessage
+    }
+  }
+
+  if (Object.keys(errors).length > 0) {
+    return res.render('create-capacity-from-zero/create-schedule', {
+      errors
+    })
+  }
+
+  if (!Array.isArray(req.session.data.createCapacityFromZero.schedules)) {
+    req.session.data.createCapacityFromZero.schedules = []
+  }
+
+  req.session.data.createCapacityFromZero.schedules.push({
+    // scheduleName,
+    scheduleStartDate,
+    scheduleEndDate
+  })
+
+  // Clear the draft fields now this schedule has been saved, ready for the next one
+  // req.session.data.createCapacityFromZero.scheduleName = ''
+  req.session.data.createCapacityFromZero.scheduleStartDate = {}
+  req.session.data.createCapacityFromZero.scheduleEndDate = {}
+
+  res.redirect('/create-capacity-from-zero/clinic-summary')
+})
 
 
 module.exports = router
\ No newline at end of file
diff --git a/app/views/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html
index f68669ec..4dfff69f 100644
--- a/app/views/_includes/primary-navigation.html
+++ b/app/views/_includes/primary-navigation.html
@@ -1,11 +1,11 @@
 {% from 'header/macro.njk' import header %}
 
-{% macro primaryNavigation(activeItem, serviceName) %}
+{% macro primaryNavigation(activeItem, serviceName, bsoName) %}
   {{ header({
     account: {
       items: [
         {
-          text: "West Sussex BSO"
+          text: bsoName
         },
         {
           href: "#",
@@ -27,7 +27,7 @@
         {
           href: "#",
           text: "Dashboard",
-          active: activeItem === "Dashboard"
+          active: activeItem === "Dashboard/home"
         },
         {
           href: "/batches/",
@@ -35,7 +35,7 @@
           active: activeItem === "Batches"
         },
         {
-          href: "/clinics/",
+          href: "/create-capacity-from-zero/",
           text: "Clinics",
           active: activeItem === "Clinics"
         },
@@ -44,6 +44,11 @@
           text: "Participants",
           active: activeItem === "Participants"
         },
+        {
+          href: "#",
+          text: "Image reading",
+          active: activeItem === "Image reading"
+        },
         {
           href: "/bso-objects/",
           text: "Organisation",
@@ -53,6 +58,16 @@
           href: "#",
           text: "Reports",
           active: activeItem === "Reports"
+        },
+        {
+          href: "#",
+          text: "Messages",
+          active: activeItem === "Messages"
+        },
+        {
+          href: "#",
+          text: "Help and support",
+          active: activeItem === "Help and support"
         }
       ]
     }
diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html
index f9d71482..562bf387 100644
--- a/app/views/batches/batch-detail-in-progress.html
+++ b/app/views/batches/batch-detail-in-progress.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Batches", serviceName) }}
+  {{ primaryNavigation("Batches", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/batches/batch-detail.html b/app/views/batches/batch-detail.html
index 40be9e23..65be9bda 100644
--- a/app/views/batches/batch-detail.html
+++ b/app/views/batches/batch-detail.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Batches", serviceName) }}
+  {{ primaryNavigation("Batches", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/batches/index.html b/app/views/batches/index.html
index f7138695..6f584f76 100644
--- a/app/views/batches/index.html
+++ b/app/views/batches/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Batches", serviceName) }}
+  {{ primaryNavigation("Batches", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/batches/participant-breakdown/special-requirements.html b/app/views/batches/participant-breakdown/special-requirements.html
index 82f4d91a..43a033f5 100644
--- a/app/views/batches/participant-breakdown/special-requirements.html
+++ b/app/views/batches/participant-breakdown/special-requirements.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Batches", serviceName) }}
+  {{ primaryNavigation("Batches", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/batches/participant-breakdown/standard.html b/app/views/batches/participant-breakdown/standard.html
index a30a1bfb..fdce28be 100644
--- a/app/views/batches/participant-breakdown/standard.html
+++ b/app/views/batches/participant-breakdown/standard.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Batches", serviceName) }}
+  {{ primaryNavigation("Batches", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/bso-objects/bso/bso-internal-details.html b/app/views/bso-objects/bso/bso-internal-details.html
index 4c16f385..71eb2e6e 100644
--- a/app/views/bso-objects/bso/bso-internal-details.html
+++ b/app/views/bso-objects/bso/bso-internal-details.html
@@ -27,7 +27,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->
diff --git a/app/views/bso-objects/bso/bso-public-details.html b/app/views/bso-objects/bso/bso-public-details.html
index db2fea9b..67d9400b 100644
--- a/app/views/bso-objects/bso/bso-public-details.html
+++ b/app/views/bso-objects/bso/bso-public-details.html
@@ -21,7 +21,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->
diff --git a/app/views/bso-objects/index.html b/app/views/bso-objects/index.html
index 09da6e40..baee73e1 100755
--- a/app/views/bso-objects/index.html
+++ b/app/views/bso-objects/index.html
@@ -21,7 +21,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 <!-- For adding a breadcrumb or back link -->
diff --git a/app/views/bso-objects/locations/index.html b/app/views/bso-objects/locations/index.html
index 224b13c8..2a439d59 100644
--- a/app/views/bso-objects/locations/index.html
+++ b/app/views/bso-objects/locations/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/bso-objects/locations/location-details.html b/app/views/bso-objects/locations/location-details.html
index b7df9626..577d2668 100644
--- a/app/views/bso-objects/locations/location-details.html
+++ b/app/views/bso-objects/locations/location-details.html
@@ -10,7 +10,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/bso-objects/locations/location-travel-and-transport.html b/app/views/bso-objects/locations/location-travel-and-transport.html
index 9b71bc4c..d2f3be07 100644
--- a/app/views/bso-objects/locations/location-travel-and-transport.html
+++ b/app/views/bso-objects/locations/location-travel-and-transport.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/bso-objects/units/index.html b/app/views/bso-objects/units/index.html
index 8b30151a..ad4e9351 100644
--- a/app/views/bso-objects/units/index.html
+++ b/app/views/bso-objects/units/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/bso-objects/units/static-internal-details.html b/app/views/bso-objects/units/static-internal-details.html
index 2718e22f..2e483ff7 100644
--- a/app/views/bso-objects/units/static-internal-details.html
+++ b/app/views/bso-objects/units/static-internal-details.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/bso-objects/units/static-public-details.html b/app/views/bso-objects/units/static-public-details.html
index e26e2982..d5ce906b 100644
--- a/app/views/bso-objects/units/static-public-details.html
+++ b/app/views/bso-objects/units/static-public-details.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Organisation", serviceName) }}
+  {{ primaryNavigation("Organisation", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/00-create-new-clinic-details.html b/app/views/clinics-schedules/00-create-new-clinic-details.html
index a7431e3d..3457535b 100644
--- a/app/views/clinics-schedules/00-create-new-clinic-details.html
+++ b/app/views/clinics-schedules/00-create-new-clinic-details.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/01-create-schedule.html b/app/views/clinics-schedules/01-create-schedule.html
index 1633b78b..e009f9b7 100644
--- a/app/views/clinics-schedules/01-create-schedule.html
+++ b/app/views/clinics-schedules/01-create-schedule.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/02-choose-session-options.html b/app/views/clinics-schedules/02-choose-session-options.html
index 3c70e001..56bfbeab 100644
--- a/app/views/clinics-schedules/02-choose-session-options.html
+++ b/app/views/clinics-schedules/02-choose-session-options.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/03-create-session.html b/app/views/clinics-schedules/03-create-session.html
index b4026207..ccd9076b 100644
--- a/app/views/clinics-schedules/03-create-session.html
+++ b/app/views/clinics-schedules/03-create-session.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/04-organise-slots.html b/app/views/clinics-schedules/04-organise-slots.html
index 91bf6749..11d5ec1d 100644
--- a/app/views/clinics-schedules/04-organise-slots.html
+++ b/app/views/clinics-schedules/04-organise-slots.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/05-save-as-template.html b/app/views/clinics-schedules/05-save-as-template.html
index 9e1e8a2b..811c33c2 100644
--- a/app/views/clinics-schedules/05-save-as-template.html
+++ b/app/views/clinics-schedules/05-save-as-template.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/05a-template-details.html b/app/views/clinics-schedules/05a-template-details.html
index 6f7d124b..66811536 100644
--- a/app/views/clinics-schedules/05a-template-details.html
+++ b/app/views/clinics-schedules/05a-template-details.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/06-apply-session.html b/app/views/clinics-schedules/06-apply-session.html
index cdf9b7c1..4ebc7f30 100644
--- a/app/views/clinics-schedules/06-apply-session.html
+++ b/app/views/clinics-schedules/06-apply-session.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-{{ primaryNavigation("Clinics", serviceName) }}
+{{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/07-schedule-details.html b/app/views/clinics-schedules/07-schedule-details.html
index e2469a50..94d0a3cd 100644
--- a/app/views/clinics-schedules/07-schedule-details.html
+++ b/app/views/clinics-schedules/07-schedule-details.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/08-publish-clinic.html b/app/views/clinics-schedules/08-publish-clinic.html
index 133603e0..2e56df70 100644
--- a/app/views/clinics-schedules/08-publish-clinic.html
+++ b/app/views/clinics-schedules/08-publish-clinic.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/09-prototype-end.html b/app/views/clinics-schedules/09-prototype-end.html
index 871063ad..ef350448 100644
--- a/app/views/clinics-schedules/09-prototype-end.html
+++ b/app/views/clinics-schedules/09-prototype-end.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html b/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html
index d7055582..8f975739 100644
--- a/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html
+++ b/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0a-clinics-clinic-added.html b/app/views/clinics-schedules/0a-clinics-clinic-added.html
index 9d4a9069..3cca7339 100644
--- a/app/views/clinics-schedules/0a-clinics-clinic-added.html
+++ b/app/views/clinics-schedules/0a-clinics-clinic-added.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html b/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html
index 8144cba2..487a5d0b 100644
--- a/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html
+++ b/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-{{ primaryNavigation("Clinics", serviceName) }}
+{{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html b/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html
index 5f29108a..90303511 100644
--- a/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html
+++ b/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html b/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html
index cbb53439..f056d86d 100644
--- a/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html
+++ b/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0b-clinic-detail.html b/app/views/clinics-schedules/0b-clinic-detail.html
index c63a607d..6c3d4ac3 100644
--- a/app/views/clinics-schedules/0b-clinic-detail.html
+++ b/app/views/clinics-schedules/0b-clinic-detail.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0c-schedule-detail-session-added.html b/app/views/clinics-schedules/0c-schedule-detail-session-added.html
index 70344137..b972fde6 100644
--- a/app/views/clinics-schedules/0c-schedule-detail-session-added.html
+++ b/app/views/clinics-schedules/0c-schedule-detail-session-added.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-{{ primaryNavigation("Clinics", serviceName) }}
+{{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/0c-schedule-detail.html b/app/views/clinics-schedules/0c-schedule-detail.html
index 21f4e947..a801afa8 100644
--- a/app/views/clinics-schedules/0c-schedule-detail.html
+++ b/app/views/clinics-schedules/0c-schedule-detail.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/index.html b/app/views/clinics-schedules/index.html
index eae468ad..f7c84eb1 100644
--- a/app/views/clinics-schedules/index.html
+++ b/app/views/clinics-schedules/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics-schedules/z-older-versions/00-clinic-details.html b/app/views/clinics-schedules/z-older-versions/00-clinic-details.html
index 3109d320..fd6ea0b9 100644
--- a/app/views/clinics-schedules/z-older-versions/00-clinic-details.html
+++ b/app/views/clinics-schedules/z-older-versions/00-clinic-details.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/01-create-schedule.html b/app/views/clinics-schedules/z-older-versions/01-create-schedule.html
index 948e1ef9..7b03c861 100644
--- a/app/views/clinics-schedules/z-older-versions/01-create-schedule.html
+++ b/app/views/clinics-schedules/z-older-versions/01-create-schedule.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html b/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html
index 3c70e001..56bfbeab 100644
--- a/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html
+++ b/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/03-create-session.html b/app/views/clinics-schedules/z-older-versions/03-create-session.html
index b4026207..ccd9076b 100644
--- a/app/views/clinics-schedules/z-older-versions/03-create-session.html
+++ b/app/views/clinics-schedules/z-older-versions/03-create-session.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/04-organise-slots.html b/app/views/clinics-schedules/z-older-versions/04-organise-slots.html
index 91bf6749..11d5ec1d 100644
--- a/app/views/clinics-schedules/z-older-versions/04-organise-slots.html
+++ b/app/views/clinics-schedules/z-older-versions/04-organise-slots.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/05-save-as-template.html b/app/views/clinics-schedules/z-older-versions/05-save-as-template.html
index d3e97f05..f0e2d2ed 100644
--- a/app/views/clinics-schedules/z-older-versions/05-save-as-template.html
+++ b/app/views/clinics-schedules/z-older-versions/05-save-as-template.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/05a-template-details.html b/app/views/clinics-schedules/z-older-versions/05a-template-details.html
index 6f7d124b..66811536 100644
--- a/app/views/clinics-schedules/z-older-versions/05a-template-details.html
+++ b/app/views/clinics-schedules/z-older-versions/05a-template-details.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/06-apply-session.html b/app/views/clinics-schedules/z-older-versions/06-apply-session.html
index b906b566..4f24bf62 100644
--- a/app/views/clinics-schedules/z-older-versions/06-apply-session.html
+++ b/app/views/clinics-schedules/z-older-versions/06-apply-session.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-{{ primaryNavigation("Clinics", serviceName) }}
+{{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/07-schedule-details.html b/app/views/clinics-schedules/z-older-versions/07-schedule-details.html
index e2469a50..94d0a3cd 100644
--- a/app/views/clinics-schedules/z-older-versions/07-schedule-details.html
+++ b/app/views/clinics-schedules/z-older-versions/07-schedule-details.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html b/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html
index 133603e0..2e56df70 100644
--- a/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html
+++ b/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/09-prototype-end.html b/app/views/clinics-schedules/z-older-versions/09-prototype-end.html
index 871063ad..ef350448 100644
--- a/app/views/clinics-schedules/z-older-versions/09-prototype-end.html
+++ b/app/views/clinics-schedules/z-older-versions/09-prototype-end.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics-schedules/z-older-versions/index.html b/app/views/clinics-schedules/z-older-versions/index.html
index 12d30603..5637cc93 100644
--- a/app/views/clinics-schedules/z-older-versions/index.html
+++ b/app/views/clinics-schedules/z-older-versions/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics/clinic-detail.html b/app/views/clinics/clinic-detail.html
index dc4324a0..cfcf2912 100644
--- a/app/views/clinics/clinic-detail.html
+++ b/app/views/clinics/clinic-detail.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics/index.html b/app/views/clinics/index.html
index b7bdbb22..ad8231f9 100644
--- a/app/views/clinics/index.html
+++ b/app/views/clinics/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics/z-older-versions/00-create-day-clinic.html b/app/views/clinics/z-older-versions/00-create-day-clinic.html
index 734b7c27..818709f3 100644
--- a/app/views/clinics/z-older-versions/00-create-day-clinic.html
+++ b/app/views/clinics/z-older-versions/00-create-day-clinic.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics/z-older-versions/01-set-date-and-time.html b/app/views/clinics/z-older-versions/01-set-date-and-time.html
index 74519292..59eca3b1 100644
--- a/app/views/clinics/z-older-versions/01-set-date-and-time.html
+++ b/app/views/clinics/z-older-versions/01-set-date-and-time.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics/z-older-versions/02-organise-slots.html b/app/views/clinics/z-older-versions/02-organise-slots.html
index 394401aa..bc6642d7 100644
--- a/app/views/clinics/z-older-versions/02-organise-slots.html
+++ b/app/views/clinics/z-older-versions/02-organise-slots.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics/z-older-versions/03-publish-clinic.html b/app/views/clinics/z-older-versions/03-publish-clinic.html
index 3626c057..f5f8181a 100644
--- a/app/views/clinics/z-older-versions/03-publish-clinic.html
+++ b/app/views/clinics/z-older-versions/03-publish-clinic.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics/z-older-versions/2026-06-day-slot-view.html b/app/views/clinics/z-older-versions/2026-06-day-slot-view.html
index f62178bd..c607d7ab 100644
--- a/app/views/clinics/z-older-versions/2026-06-day-slot-view.html
+++ b/app/views/clinics/z-older-versions/2026-06-day-slot-view.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics/z-older-versions/clinic-detail.html b/app/views/clinics/z-older-versions/clinic-detail.html
index 07b1e9f9..e382f450 100644
--- a/app/views/clinics/z-older-versions/clinic-detail.html
+++ b/app/views/clinics/z-older-versions/clinic-detail.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/clinics/z-older-versions/index.html b/app/views/clinics/z-older-versions/index.html
index a6707003..32dcf049 100644
--- a/app/views/clinics/z-older-versions/index.html
+++ b/app/views/clinics/z-older-versions/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/clinics/z-older-versions/templating-01-set-times.html b/app/views/clinics/z-older-versions/templating-01-set-times.html
index 93d45230..91cec683 100644
--- a/app/views/clinics/z-older-versions/templating-01-set-times.html
+++ b/app/views/clinics/z-older-versions/templating-01-set-times.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html b/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html
index ce439169..5331e924 100644
--- a/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html
+++ b/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html
@@ -2,28 +2,73 @@
   <div class="nhsuk-grid-column-four-fifths">
     <h1 class="nhsuk-heading-l">
       <span class="nhsuk-caption-l">Clinic</span>
-      Chichester - St Richards
+      {{ data.createCapacityFromZero.clinicName or pageVarClinicName }}
     </h1>
     <p>
-      <a href="#">Alpha van</a><br>
-      <a href="#">St Richard’s Hospital, Chichester</a>
+      <a href="#">{{ data.createCapacityFromZero.unit or pageVarUnit }}</a> at <a href="#">{{ data.createCapacityFromZero.location or pageVarLocation }}</a>
     </p>
   </div>
   <div class="nhsuk-grid-column-one-fifth">
     <ul class="nhsuk-list">
       <li>
-        <a href="#">Edit clinic name</a>
+        <a href="create-clinic">Edit clinic properties</a>
       </li>
       <li>
-        <a href="#">Change unit and location</a>
-      </li>
-      <li>
-        <a href="#" class="app-link--warning">Archive this clinic</a>
+        <a href="#" class="app-link--warning">Archive clinic</a>
       </li>
     </ul>
   </div>
 </div>
 
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-full">
+
+    <table class="nhsuk-table nhsuk-table--compact app-clinic-capacity-summary">
+      <caption class="nhsuk-u-visually-hidden">
+        Capacity summary
+      </caption>
+      <tbody class="nhsuk-table__body">
+        <tr class="nhsuk-table__row">
+          <th class="nhsuk-table__header" scope="row">
+            Slots available:
+          </th>
+          <td class="nhsuk-table__cell">
+            {{ totalAvailableSlots or 0 }}
+            <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">
+              of which {{ totalAvailableSlotsHeld or 0 }} held</span>
+          </td>
+        </tr>
+        <tr class="nhsuk-table__row">
+          <th class="nhsuk-table__header" scope="row">
+            Locked slots:
+          </th>
+          <td class="nhsuk-table__cell">
+            {{ totalLockedSlots or 0 }}
+            <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">(including held)</span>
+          </td>
+        </tr>
+        <tr class="nhsuk-table__row">
+          <th class="nhsuk-table__header" scope="row">
+            Appointments booked:
+          </th>
+          <td class="nhsuk-table__cell">
+            {{ totalAppointmentsBooked or 0 }}
+          </td>
+        </tr>
+        <tr class="nhsuk-table__row">
+          <th class="nhsuk-table__header" scope="row">
+            Total:
+          </th>
+          <td class="nhsuk-table__cell">
+            {{ (totalAvailableSlots or 0) + (totalLockedSlots or 0) + (totalAppointmentsBooked or 0) }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+  </div>
+</div>
+
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-full">
     {% set secondaryNavItems = [] %}
diff --git a/app/views/create-capacity-from-zero/clinic-summary-empty.html b/app/views/create-capacity-from-zero/clinic-summary-empty.html
index 3986768f..19d34bb4 100644
--- a/app/views/create-capacity-from-zero/clinic-summary-empty.html
+++ b/app/views/create-capacity-from-zero/clinic-summary-empty.html
@@ -4,22 +4,13 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
-  <nav>
-    <ol class="app-clinic-level-breadcrumbs nhsuk-list">
-      <li class="--item">
-        <span class="nhsuk-body-s nhsuk-u-secondary-text-colour nhsuk-u-margin-bottom-0">?</span>
-        <a href="#">Clinics</a>
-      </li>
-      <li class="--item">
-        <span class="nhsuk-body-s nhsuk-u-secondary-text-colour nhsuk-u-margin-bottom-0">Clinic</span>
-        <a href="#">Chichester - St Richards</a>
-      </li>
-    </ol>
-  </nav>
+  <a class="nhsuk-back-link" href="#">
+    Back to clinic listing
+  </a>
 {% endblock %}
 
 {% block content %}
@@ -28,7 +19,7 @@
   
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-three-quarters">
-      <p>No schedules yet</p>
+      <p>This clinic contains no schedules</p>
       <a href="create-schedule" class="nhsuk-button nhsuk-button--secondary-solid">Add a new schedule</a>
     </div>
   </div>
diff --git a/app/views/create-capacity-from-zero/clinic-summary-in-progress.html b/app/views/create-capacity-from-zero/clinic-summary-in-progress.html
index c90d0613..a4b6e3bd 100644
--- a/app/views/create-capacity-from-zero/clinic-summary-in-progress.html
+++ b/app/views/create-capacity-from-zero/clinic-summary-in-progress.html
@@ -2,24 +2,27 @@
 
 {% set pageName = "Calendar view" %}
 
+{% set pageVarClinicName = "Mereford central ongoing" %}
+{% set pageVarUnit = "Mereford and Wensley Screening Centre" %}
+{% set pageVarLocation = "Mereford and Wensley District Hospital" %}
+
+{% set totalLockedSlots = 1260 %}
+{# Sum of every "X available" link in the dummy calendar tables below #}
+{% set totalAvailableSlots = 664 %}
+{# Sum of "X held" in the same 18 cells as the available links above #}
+{% set totalAvailableSlotsHeld = 176 %}
+{# Sum of "X booked" in the same 18 cells as the available links above #}
+{% set totalAppointmentsBooked = 596 %}
+
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
-  <nav>
-    <ol class="app-clinic-level-breadcrumbs nhsuk-list">
-      <li class="--item">
-        <span class="nhsuk-body-s nhsuk-u-secondary-text-colour nhsuk-u-margin-bottom-0">?</span>
-        <a href="#">Clinics</a>
-      </li>
-      <li class="--item">
-        <span class="nhsuk-body-s nhsuk-u-secondary-text-colour nhsuk-u-margin-bottom-0">Clinic</span>
-        <a href="#">Chichester - St Richards</a>
-      </li>
-    </ol>
-  </nav>
+  <a class="nhsuk-back-link" href="/create-capacity-from-zero/">
+    Back to clinic listing
+  </a>
 {% endblock %}
 
 {% block content %}
@@ -365,40 +368,41 @@
               <td class="nhsuk-table__cell --schedule-start --session-assigned">
                 <span class="calendar-table-date">19</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
+                <span class="--schedule-name">Select schedule</span>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">20</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">21</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">22</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">23</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
@@ -413,40 +417,40 @@
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">26</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">27</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">28</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">29</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">30</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
@@ -504,40 +508,40 @@
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">2</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">3</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">4</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">5</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">6</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
@@ -552,40 +556,40 @@
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">9</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">10</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">11</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">12</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">13</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
@@ -600,40 +604,40 @@
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">16</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">17</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">18</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">19</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">20</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
@@ -648,40 +652,40 @@
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">23</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">24</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">25</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --session-assigned">
                 <span class="calendar-table-date">26</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
               <td class="nhsuk-table__cell --schedule-end --session-assigned">
                 <span class="calendar-table-date">27</span>
                 {{ padlockSvg | safe }}
-                <!-- <progress class="app-progress-bar --thin --compact --generic" value="0" max="100">0%</progress> -->
-                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">42 slots</button><br>
+                <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">Standard</button><br>
+                42 slots<br>
                 0 booked<br>
                 8 held<br>
               </td>
@@ -723,10 +727,11 @@
       <div class="side-panel" id="side-panel">
         <h3 class="nhsuk-heading-s">With selected days:</h3>
         <ul class="nhsuk-list">
-          <li><a class="panel-item">Open for booking (make live)</a></li>
+          <li><button type="submit" class="panel-item nhsuk-link app-link-button">Assign session template</button></li>
+          <li><button type="submit" formaction="/create-capacity-from-zero/remove-template" class="panel-item nhsuk-link app-link-button">Remove template</button></li>
+          <li><a class="panel-item">Unlock for booking</a></li>
+          <li><a class="panel-item">Lock to booking</a></li>
           <li><a class="panel-item">Release all held slots</a></li>
-          <li><a class="panel-item">Do something else</a></li>
-          <li><a class="panel-item">Do something wild</a></li>
         </ul>
       </div>
     </div>
diff --git a/app/views/create-capacity-from-zero/clinic-summary.html b/app/views/create-capacity-from-zero/clinic-summary.html
new file mode 100644
index 00000000..d4b945e0
--- /dev/null
+++ b/app/views/create-capacity-from-zero/clinic-summary.html
@@ -0,0 +1,114 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "" %}
+
+{% from "_includes/primary-navigation.html" import primaryNavigation %}
+{% block header %}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
+{% endblock %}
+
+{% block beforeContent %}
+  <a class="nhsuk-back-link" href="/create-capacity-from-zero/">
+    Back to clinic listing
+  </a>
+{% endblock %}
+
+{% block content %}
+
+  {% set padlockSvg %}
+  <div class="--session-locked">
+    <svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
+      <path d="M5.5 8V5.75C5.5 3.67893 7.17893 2 9.25 2C11.3211 2 13 3.67893 13 5.75V8" stroke="#4C6272" stroke-width="1.75" stroke-linecap="round"/>
+      <rect x="3" y="7" width="12.5" height="10" rx="1.5" fill="#4C6272"/>
+      <circle cx="9.25" cy="11.75" r="1.25" fill="white"/>
+      <path d="M9.25 13V14.5" stroke="white" stroke-width="1.25" stroke-linecap="round"/>
+    </svg>
+    Locked
+  </div>
+  {% endset %}
+
+  {% include "create-capacity-from-zero/_local-includes/clinic-summary.html" %}
+  
+  {% if data.createCapacityFromZero.schedules.length > 0 %}
+    <div class="nhsuk-grid-row">
+      <div class="nhsuk-grid-column-four-fifths">
+        {% for calendar in calendars %}
+        <table class="nhsuk-table nhsuk-table-responsive calendar-table">
+          <caption class="nhsuk-table__caption nhsuk-table__caption--s nhsuk-u-font-weight-normal">
+            {{ calendar.monthName }} {{ calendar.year }}
+          </caption>
+          <thead class="nhsuk-table__head">
+            <tr class="nhsuk-table__row">
+              <th scope="col" class="nhsuk-table__header">Monday</th>
+              <th scope="col" class="nhsuk-table__header">Tuesday</th>
+              <th scope="col" class="nhsuk-table__header">Wednesday</th>
+              <th scope="col" class="nhsuk-table__header">Thursday</th>
+              <th scope="col" class="nhsuk-table__header">Friday</th>
+              <th scope="col" class="nhsuk-table__header">Saturday</th>
+              <th scope="col" class="nhsuk-table__header">Sunday</th>
+            </tr>
+          </thead>
+          <tbody class="nhsuk-table__body">
+            {% for week in calendar.weeks %}
+            <tr class="nhsuk-table__row">
+              {% for dayItem in week %}
+              {% if dayItem %}
+              <td class="nhsuk-table__cell{% if dayItem.isScheduleStart %} --schedule-start{% endif %}{% if dayItem.isScheduleEnd %} --schedule-end{% endif %}" data-date="{{ dayItem.dateKey }}">
+                <span class="calendar-table-date">{{ dayItem.date }}</span>
+                {% if dayItem.templateName %}
+                  {{ padlockSvg | safe }}
+                  <button type="button" class="nhsuk-link" popovertarget="template-preview-standard">{{ dayItem.templateName }}</button><br>
+                  {{ dayItem.totalSlots }} slots<br>
+                  0 booked<br>
+                  {{ dayItem.heldSlots }} held<br>
+                {% endif %}
+                {% if dayItem.isScheduleStart %}
+                  <span class="--schedule-name">Select schedule</span>
+                {% endif %}
+              </td>
+              {% else %}
+              <td class="nhsuk-table__cell calendar-table-no-data">
+                <span class="nhsuk-u-visually-hidden">No data</span>
+              </td>
+              {% endif %}
+              {% endfor %}
+            </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+        {% endfor %}
+      </div>
+
+      <div class="nhsuk-grid-column-one-fifth" style="position: sticky; top: 0;">
+        <div class="side-panel" id="side-panel">
+          <h3 class="nhsuk-heading-s">With selected days:</h3>
+          <form method="post" action="/create-capacity-from-zero/select-days" id="select-days-form">
+            <ul class="nhsuk-list">
+              <li><button type="submit" class="panel-item nhsuk-link app-link-button">Assign session template</button></li>
+              <li><button type="submit" formaction="/create-capacity-from-zero/remove-template" class="panel-item nhsuk-link app-link-button">Remove template</button></li>
+              <li><a class="panel-item">Unlock for booking</a></li>
+              <li><a class="panel-item">Lock to booking</a></li>
+              <li><a class="panel-item">Release all held slots</a></li>
+            </ul>
+          </form>
+        </div>
+      </div>
+    </div>
+  {% endif %}
+
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full">
+      {% if data.createCapacityFromZero.schedules.length === 0 %}
+        <p>This clinic contains no schedules</p>
+      {% endif %}
+      <a href="create-schedule" class="nhsuk-button nhsuk-button--secondary-solid">Add a new schedule</a>
+    </div>
+  </div>
+
+  {% include "create-capacity-from-zero/_local-includes/template-preview.html" %}
+  
+{% endblock %}
+
+{% block pageScripts %}
+<script type="text/javascript" src="/assets/javascript/calendar-table-actions.js"></script>
+{% endblock %}
diff --git a/app/views/create-capacity-from-zero/create-clinic.html b/app/views/create-capacity-from-zero/create-clinic.html
index ce37220c..39b7cc0d 100644
--- a/app/views/create-capacity-from-zero/create-clinic.html
+++ b/app/views/create-capacity-from-zero/create-clinic.html
@@ -1,211 +1,146 @@
 {% extends 'layout.html' %}
 
-{% set errorState = "false" %}
+{% set errorState = "true" if errors else "false" %}
 
 {% set pageName = "" %}
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
-{% block beforeContent %}{% endblock %}
+{% block beforeContent %}
+  <a class="nhsuk-back-link" href="/create-capacity-from-zero/">
+    Back to clinic listing
+  </a>
+{% endblock %}
 
 {% block content %}
 
-{% set tickSvg %}
-  <svg class="app-icon app-icon--tick" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
-    <path stroke-linecap="round" d="M18.4 7.8l-8.5 8.4L5.6 12"></path>
-  </svg>
-{% endset %}
-
-<div class="nhsuk-grid-row">
-  
-  <div class="nhsuk-grid-column-full">
-    <div class="nhsuk-u-reading-width">
-
-      {% if errorState === "true" %}
-        {{ errorSummary({
-          titleText: "There is a problem",
-          errorList: [
-            {
-              text: "Clinic must be given a name",
-              href: "#"
-            },
-            {
-              text: "A unit must be chosen",
-              href: "#"
-            },
-            {
-              text: "A location must be chosen",
-              href: "#"
-            }
-          ]
-        }) }}
-      {% endif %}
-
-      <h1 class="nhsuk-heading-l">Clinic details</h1>
-
-      <form action="clinic-summary-empty" method="post">
-
-        <div class="nhsuk-form-group {% if errorState === 'true' %}nhsuk-form-group--error{% endif %}">
-          <label class="nhsuk-label nhsuk-label--m" for="clinic-name">
+<form method="post">
+
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full">
+      <div class="nhsuk-u-reading-width">
+
+        {% if errorState === "true" %}
+          {% set errorList = [] %}
+          {% if errors.clinicName %}
+            {% set errorList = errorList.concat([{ text: errors.clinicName, href: "#clinic-name" }]) %}
+          {% endif %}
+          {% if errors.unit %}
+            {% set errorList = errorList.concat([{ text: errors.unit, href: "#unit" }]) %}
+          {% endif %}
+          {% if errors.location %}
+            {% set errorList = errorList.concat([{ text: errors.location, href: "#location-0" }]) %}
+          {% endif %}
+          {{ errorSummary({
+            titleText: "There is a problem",
+            errorList: errorList
+          }) }}
+        {% endif %}
+
+        <h1 class="nhsuk-heading-l">Clinic details</h1>
+
+        <div class="nhsuk-form-group nhsuk-u-margin-bottom-3 {% if errors and errors.clinicName %}nhsuk-form-group--error{% endif %}">
+          <label class="nhsuk-label" for="clinic-name">
             Clinic name
           </label>
-          {% if errorState === "true" %}
+          {% if errors and errors.clinicName %}
             <span class="nhsuk-error-message">
-              <span class="nhsuk-u-visually-hidden">Error:</span> Clinic must be given a name
+              <span class="nhsuk-u-visually-hidden">Error:</span> {{ errors.clinicName }}
             </span>
           {% endif %}
-          <input class="nhsuk-input {% if errorState === 'true' %}nhsuk-input--error{% endif %}" id="clinic-name" name="clinicName" type="text" aria-describedby="naming-hint-text" value="{{ data.clinicName if data.clinicName else '' }}">
+          <input class="nhsuk-input {% if errors and errors.clinicName %}nhsuk-input--error{% endif %}" id="clinic-name" name="clinicName" type="text" value="{{ data.createCapacityFromZero.clinicName if data.createCapacityFromZero.clinicName else '' }}">
         </div>
 
         <div class="nhsuk-form-group">
           <label class="nhsuk-label nhsuk-u-secondary-text-colour" for="clinic-id">
             System generated clinic ID
           </label>
-          <input class="nhsuk-input nhsuk-input--width-20" id="clinic-id" name="clinicIdDisplay" type="text" aria-describedby="id-hint-text" value="{{ data.clinicId if data.clinicId else 'HWO-NNN-standard-20260501' }}" disabled>
-          <input type="hidden" name="clinicId" value="{{ data.clinicId if data.clinicId else 'HWO-NNN-standard-20260501' }}">
+          <input class="nhsuk-input nhsuk-input--width-20" id="clinic-id" name="clinicIdDisplay" type="text" aria-describedby="id-hint-text" value="NNN-NNN-systemid-20260501" disabled>
         </div>
+
+      </div>
+    </div>
+  </div>
         
-        <hr class="nhsuk-u-margin-top-6 nhsuk-u-margin-bottom-4">
-
-        <div class="nhsuk-grid-row">
-
-          <div class="nhsuk-grid-column-one-half">
-            <div class="nhsuk-form-group {% if errorState === 'true' %}nhsuk-form-group--error{% endif %}">
-              <fieldset class="nhsuk-fieldset">
-                <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
-                  Unit
-                </legend>
-                {% if errorState === "true" %}
-                  <span class="nhsuk-error-message">
-                    <span class="nhsuk-u-visually-hidden">Error:</span> A unit must be chosen
-                  </span>
-                {% endif %}
-                <div class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios">
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="unit" name="unit" type="radio" value="West Sussex Breast Care Centre" {% if data.unit == 'West Sussex Breast Care Centre' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="unit">
-                      West Sussex Breast Care Centre
-                    </label>
-                  </div>
-                  <hr class="nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-2">
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="unit-2" name="unit" type="radio" value="Alpha Van" {% if data.unit == 'Alpha Van' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="unit-2">
-                      Alpha Van
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="unit-3" name="unit" type="radio" value="Beta Van" {% if data.unit == 'Beta Van' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="unit-3">
-                      Beta Van
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="unit-4" name="unit" type="radio" value="Gamma Van" {% if data.unit == 'Gamma Van' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="unit-4">
-                      Gamma Van
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="unit-5" name="unit" type="radio" value="Delta Van" {% if data.unit == 'Delta Van' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="unit-5">
-                      Delta Van
-                    </label>
-                  </div>
-                </div>
-              </fieldset>
+  <hr class="nhsuk-u-margin-top-6 nhsuk-u-margin-bottom-4">
+
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-one-third">
+
+      <div class="nhsuk-form-group {% if errors and errors.unit %}nhsuk-form-group--error{% endif %}">
+        <fieldset class="nhsuk-fieldset">
+          <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
+            Unit
+          </legend>
+          {% if errors and errors.unit %}
+            <span class="nhsuk-error-message">
+              <span class="nhsuk-u-visually-hidden">Error:</span> {{ errors.unit }}
+            </span>
+          {% endif %}
+          <div class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios">
+            <div class="nhsuk-radios__item">
+              <input class="nhsuk-radios__input" id="unit-0" name="unit" type="radio" value="{{ staticBaseUnit }}" {% if data.createCapacityFromZero.unit == staticBaseUnit %}checked{% endif %}>
+              <label class="nhsuk-label nhsuk-radios__label" for="unit-0">
+                {{ staticBaseUnit }}
+              </label>
+            </div>
+            <hr class="nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-2">
+            {% for mobileUnit in mobileUnits %}
+            <div class="nhsuk-radios__item">
+              <input class="nhsuk-radios__input" id="unit-{{ loop.index }}" name="unit" type="radio" value="{{ mobileUnit }}" {% if data.createCapacityFromZero.unit == mobileUnit %}checked="checked"{% endif %}>
+              <label class="nhsuk-label nhsuk-radios__label" for="unit-{{ loop.index }}">
+                {{ mobileUnit }}
+              </label>
             </div>
+            {% endfor %}
           </div>
-
-          <div class="nhsuk-grid-column-one-half">
-            <div class="nhsuk-form-group {% if errorState === 'true' %}nhsuk-form-group--error{% endif %}">
-              <fieldset class="nhsuk-fieldset">
-                <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
-                  Location
-                </legend>
-                {% if errorState === "true" %}
-                  <span class="nhsuk-error-message">
-                    <span class="nhsuk-u-visually-hidden">Error:</span> A location must be chosen
-                  </span>
-                {% endif %}
-                <div class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios">
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-10" name="location" type="radio" value="Worthing hospital" {% if data.location == 'Worthing hospital' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-10">
-                      Worthing hospital
-                    </label>
-                  </div>
-                  <hr class="nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-2">
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location" name="location" type="radio" value="Bognor Regis" {% if data.location == 'Bognor Regis' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location">
-                      Bognor Regis
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-2" name="location" type="radio" value="Burgess Hill" {% if data.location == 'Burgess Hill' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-2">
-                      Burgess Hill
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-3" name="location" type="radio" value="Chichester" {% if data.location == 'Chichester' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-3">
-                      Chichester
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-4" name="location" type="radio" value="Crawley" {% if data.location == 'Crawley' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-4">
-                      Crawley
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-5" name="location" type="radio" value="Haywards Heath" {% if data.location == 'Haywards Heath' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-5">
-                      Haywards Heath
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-6" name="location" type="radio" value="Horsham" {% if data.location == 'Horsham' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-6">
-                      Horsham
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-7" name="location" type="radio" value="Littlehampton" {% if data.location == 'Littlehampton' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-7">
-                      Littlehampton
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-8" name="location" type="radio" value="Shoreham-by-Sea" {% if data.location == 'Shoreham-by-Sea' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-8">
-                      Shoreham-by-Sea
-                    </label>
-                  </div>
-                  <div class="nhsuk-radios__item">
-                    <input class="nhsuk-radios__input" id="location-9" name="location" type="radio" value="Storrington" {% if data.location == 'Storrington' %}checked{% endif %}>
-                    <label class="nhsuk-label nhsuk-radios__label" for="location-9">
-                      Storrington
-                    </label>
-                  </div>
-                </div>
-              </fieldset>
+        </fieldset>
+      </div>
+          
+    </div>
+    <div class="nhsuk-grid-column-two-thirds">
+
+      <div class="nhsuk-form-group {% if errors and errors.location %}nhsuk-form-group--error{% endif %}">
+        <fieldset class="nhsuk-fieldset">
+          <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--m">
+            Location
+          </legend>
+          {% if errors and errors.location %}
+            <span class="nhsuk-error-message">
+              <span class="nhsuk-u-visually-hidden">Error:</span> {{ errors.location }}
+            </span>
+          {% endif %}
+          <div class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios">
+            <div class="nhsuk-radios__item">
+              <input class="nhsuk-radios__input" id="location-0" name="location" type="radio" value="{{ staticLocationShort }}" {% if data.createCapacityFromZero.location == staticLocationShort %}checked="checked"{% endif %}>
+              <label class="nhsuk-label nhsuk-radios__label" for="location-0">
+                {{ staticLocationShort }}
+              </label>
+            </div>
+            <hr class="nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-2">
+            {% for locationShort in locationsShort %}
+            <div class="nhsuk-radios__item">
+              <input class="nhsuk-radios__input" id="location-{{ loop.index }}" name="location" type="radio" value="{{ locationShort }}" {% if data.createCapacityFromZero.location == locationShort %}checked{% endif %}>
+              <label class="nhsuk-label nhsuk-radios__label" for="location-{{ loop.index }}">
+                {{ locationShort }}
+              </label>
             </div>
+            {% endfor %}
           </div>
-
-        </div>
-        
-        <hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4">
-        <button class="nhsuk-button" type="submit">Continue</button>
-
-      </form>
+        </fieldset>
+      </div>
+    
     </div>
   </div>
+        
+  <hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4">
+        
+  <button class="nhsuk-button" type="submit">Create clinic</button>
+
+</form>
 
 
 
diff --git a/app/views/create-capacity-from-zero/create-schedule.html b/app/views/create-capacity-from-zero/create-schedule.html
index af04d4e3..036e4b9f 100644
--- a/app/views/create-capacity-from-zero/create-schedule.html
+++ b/app/views/create-capacity-from-zero/create-schedule.html
@@ -1,74 +1,51 @@
 {% extends 'layout.html' %}
 
-{% set errorState = "false" %}
+{% set errorState = "true" if errors else "false" %}
 
 {% set pageName = "" %}
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
-{% block beforeContent %}{% endblock %}
+{% block beforeContent %}
+  <a class="nhsuk-back-link" href="clinic-summary">
+    Back to clinic: {{ data.createCapacityFromZero.clinicName }}
+  </a>
+{% endblock %}
 
 {% block content %}
-
-{% set tickSvg %}
-  <svg class="app-icon app-icon--tick" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true">
-    <path stroke-linecap="round" d="M18.4 7.8l-8.5 8.4L5.6 12"></path>
-  </svg>
-{% endset %}
-
 <div class="nhsuk-grid-row">
-  
   <div class="nhsuk-grid-column-three-quarters">
     <div class="nhsuk-u-reading-width">
 
       {% if errorState === "true" %}
+        {% set errorList = [] %}
+        {% if errors.scheduleName %}
+          {% set errorList = errorList.concat([{ text: errors.scheduleName, href: "#schedule-name" }]) %}
+        {% endif %}
+        {% if errors.scheduleStartDate %}
+          {% set errorList = errorList.concat([{ text: errors.scheduleStartDate, href: "#schedule-start-date-day" }]) %}
+        {% endif %}
+        {% if errors.scheduleEndDate %}
+          {% set errorList = errorList.concat([{ text: errors.scheduleEndDate, href: "#schedule-end-date-day" }]) %}
+        {% endif %}
         {{ errorSummary({
           titleText: "There is a problem",
-          errorList: [
-            {
-              text: "Schedule must be given a name",
-              href: "#"
-            },
-            {
-              text: "Schedule start date must be given a day, month, and year",
-              href: "#"
-            },
-            {
-              text: "Schedule start date must be in the future",
-              href: "#"
-            },
-            {
-              text: "Schedule end date must be given a day, month, and year",
-              href: "#"
-            },
-            {
-              text: "Schedule end date must be in the future",
-              href: "#"
-            }
-          ]
+          errorList: errorList
         }) }}
       {% endif %}
 
       <h1 class="nhsuk-heading-l">Create schedule</h1>
 
-      <form action="new-schedule-empty" method="post">
+      <!-- <p>
+        Enter start and end dates for your new schedule in clinic "{{ data.createCapacityFromZero.clinicName | lower }}"
+      </p> -->
 
-        <div class="nhsuk-form-group {% if errorState === 'true' %}nhsuk-form-group--error{% endif %}">
-          <label class="nhsuk-label nhsuk-label--m" for="schedule-name">
-            Schedule name
-          </label>
-          {% if errorState === "true" %}
-            <span class="nhsuk-error-message">
-              <span class="nhsuk-u-visually-hidden">Error:</span> Schedule must be given a name
-            </span>
-          {% endif %}
-          <input class="nhsuk-input {% if errorState === 'true' %}nhsuk-input--error{% endif %}" id="schedule-name" name="scheduleName" type="text" aria-describedby="naming-hint-text" value="{{ data.scheduleName if data.scheduleName else '' }}">
-        </div>
+      <form method="post">
 
-        <div class="nhsuk-form-group {% if errorState === 'true' %}nhsuk-form-group--error{% endif %}">
+        <div class="nhsuk-form-group {% if errors and errors.scheduleStartDate %}nhsuk-form-group--error{% endif %}">
           <fieldset class="nhsuk-fieldset nhsuk-u-margin-bottom-4" role="group" aria-describedby="schedule-start-date-hint">
             <legend class="nhsuk-fieldset__legend nhsuk-label--m">
                 Start date
@@ -76,18 +53,18 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
             <div class="nhsuk-hint" id="schedule-start-date-hint">
               For example, 18 6 2026
             </div>
-            {% if errorState === "true" %}
+            {% if errors and errors.scheduleStartDate %}
               <span class="nhsuk-error-message">
-                <span class="nhsuk-u-visually-hidden">Error:</span> Start date must be given a day, month, and year
+                <span class="nhsuk-u-visually-hidden">Error:</span> {{ errors.scheduleStartDate }}
               </span>
             {% endif %}
             <div class="nhsuk-date-input" id="schedule-start-date">
               <div class="nhsuk-date-input__item">
                 <div class="nhsuk-form-group">
-                  <label class="nhsuk-label nhsuk-date-input__label" for="clinic-date-day">
+                  <label class="nhsuk-label nhsuk-date-input__label" for="schedule-start-date-day">
                     Day
                   </label>
-                  <input class="nhsuk-input nhsuk-date-input__input {% if errorState === 'true' %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-start-date-day" name="scheduleStartDate[day]" type="text" inputmode="numeric" value="{{ data.scheduleStartDate.day if data.scheduleStartDate else '' }}">
+                  <input class="nhsuk-input nhsuk-date-input__input {% if errors and errors.scheduleStartDate %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-start-date-day" name="scheduleStartDate[day]" type="text" inputmode="numeric" value="{{ data.createCapacityFromZero.scheduleStartDate.day if data.createCapacityFromZero.scheduleStartDate else '' }}">
                 </div>
               </div>
               <div class="nhsuk-date-input__item">
@@ -95,7 +72,7 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
                   <label class="nhsuk-label nhsuk-date-input__label" for="schedule-start-date-month">
                     Month
                   </label>
-                  <input class="nhsuk-input nhsuk-date-input__input {% if errorState === 'true' %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-start-date-month" name="scheduleStartDate[month]" type="text" inputmode="numeric" value="{{ data.scheduleStartDate.month if data.scheduleStartDate else '' }}">
+                  <input class="nhsuk-input nhsuk-date-input__input {% if errors and errors.scheduleStartDate %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-start-date-month" name="scheduleStartDate[month]" type="text" inputmode="numeric" value="{{ data.createCapacityFromZero.scheduleStartDate.month if data.createCapacityFromZero.scheduleStartDate else '' }}">
                 </div>
               </div>
               <div class="nhsuk-date-input__item">
@@ -103,7 +80,7 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
                   <label class="nhsuk-label nhsuk-date-input__label" for="schedule-start-date-year">
                     Year
                   </label>
-                  <input class="nhsuk-input nhsuk-date-input__input {% if errorState === 'true' %}nhsuk-input--error{% endif %} nhsuk-input--width-4" id="schedule-start-date-year" name="scheduleStartDate[year]" type="text" inputmode="numeric" value="{{ data.scheduleStartDate.year if data.scheduleStartDate else '' }}">
+                  <input class="nhsuk-input nhsuk-date-input__input {% if errors and errors.scheduleStartDate %}nhsuk-input--error{% endif %} nhsuk-input--width-4" id="schedule-start-date-year" name="scheduleStartDate[year]" type="text" inputmode="numeric" value="{{ data.createCapacityFromZero.scheduleStartDate.year if data.createCapacityFromZero.scheduleStartDate else '' }}">
                 </div>
               </div>
             </div>
@@ -111,7 +88,7 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
 
         </div>
 
-        <div class="nhsuk-form-group {% if errorState === 'true' %}nhsuk-form-group--error{% endif %}">
+        <div class="nhsuk-form-group {% if errors and errors.scheduleEndDate %}nhsuk-form-group--error{% endif %}">
           <fieldset class="nhsuk-fieldset" role="group" aria-describedby="schedule-end-date-hint">
             <legend class="nhsuk-fieldset__legend nhsuk-label--m">
                 End date
@@ -119,9 +96,9 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
             <div class="nhsuk-hint" id="schedule-end-date-hint">
               For example, 18 6 2026
             </div>
-            {% if errorState === "true" %}
+            {% if errors and errors.scheduleEndDate %}
               <span class="nhsuk-error-message">
-                <span class="nhsuk-u-visually-hidden">Error:</span> End date must be given a day, month, and year
+                <span class="nhsuk-u-visually-hidden">Error:</span> {{ errors.scheduleEndDate }}
               </span>
             {% endif %}
             <div class="nhsuk-date-input" id="schedule-end-date">
@@ -130,7 +107,7 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
                   <label class="nhsuk-label nhsuk-date-input__label" for="schedule-end-date-day">
                     Day
                   </label>
-                  <input class="nhsuk-input nhsuk-date-input__input {% if errorState === 'true' %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-start-date-day" name="scheduleEndDate[day]" type="text" inputmode="numeric" value="{{ data.scheduleEndDate.day if data.scheduleEndDate else '' }}">
+                  <input class="nhsuk-input nhsuk-date-input__input {% if errors and errors.scheduleEndDate %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-end-date-day" name="scheduleEndDate[day]" type="text" inputmode="numeric" value="{{ data.createCapacityFromZero.scheduleEndDate.day if data.createCapacityFromZero.scheduleEndDate else '' }}">
                 </div>
               </div>
               <div class="nhsuk-date-input__item">
@@ -138,7 +115,7 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
                   <label class="nhsuk-label nhsuk-date-input__label" for="schedule-end-date-month">
                     Month
                   </label>
-                  <input class="nhsuk-input nhsuk-date-input__input {% if errorState === 'true' %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-end-date-month" name="scheduleEndDate[month]" type="text" inputmode="numeric" value="{{ data.scheduleEndDate.month if data.scheduleEndDate else '' }}">
+                  <input class="nhsuk-input nhsuk-date-input__input {% if errors and errors.scheduleEndDate %}nhsuk-input--error{% endif %} nhsuk-input--width-2" id="schedule-end-date-month" name="scheduleEndDate[month]" type="text" inputmode="numeric" value="{{ data.createCapacityFromZero.scheduleEndDate.month if data.createCapacityFromZero.scheduleEndDate else '' }}">
                 </div>
               </div>
               <div class="nhsuk-date-input__item">
@@ -146,7 +123,7 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
                   <label class="nhsuk-label nhsuk-date-input__label" for="schedule-end-date-year">
                     Year
                   </label>
-                  <input class="nhsuk-input nhsuk-date-input__input {% if errorState === 'true' %}nhsuk-input--error{% endif %} nhsuk-input--width-4" id="schedule-end-date-year" name="scheduleEndDate[year]" type="text" inputmode="numeric" value="{{ data.scheduleEndDate.year if data.scheduleEndDate else '' }}">
+                  <input class="nhsuk-input nhsuk-date-input__input {% if errors and errors.scheduleEndDate %}nhsuk-input--error{% endif %} nhsuk-input--width-4" id="schedule-end-date-year" name="scheduleEndDate[year]" type="text" inputmode="numeric" value="{{ data.createCapacityFromZero.scheduleEndDate.year if data.createCapacityFromZero.scheduleEndDate else '' }}">
                 </div>
               </div>
             </div>
@@ -159,7 +136,5 @@ <h1 class="nhsuk-heading-l">Create schedule</h1>
       </form>
     </div>
   </div>
-
-
-
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/create-capacity-from-zero/index.html b/app/views/create-capacity-from-zero/index.html
index 1f15b48a..03ec45e1 100644
--- a/app/views/create-capacity-from-zero/index.html
+++ b/app/views/create-capacity-from-zero/index.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
@@ -14,9 +14,9 @@
   {% set secondaryNavItems = [] %}
 
   {% for item in [
-    { href: '/clinics/', label: 'Active clinics', selected: 'true' },
+    { href: '/create-capacity-from-zero/', label: 'Active clinics', selected: 'true' },
     { href: '#', label: 'Archived clinics' },
-    { href: '/sessions/templating-01-listing', label: 'Manage session templates' }
+    { href: '#', label: 'Manage session templates' }
   ] %}
     {% set secondaryNavItems = secondaryNavItems | push({
       text: item.label | safe,
@@ -66,12 +66,12 @@ <h1 class="nhsuk-heading-l">Active clinics</h1>
         <tbody class="nhsuk-table__body">
           <tr class="nhsuk-table__row">
             <td class="nhsuk-table__cell">
-              <a href="clinic-detail">Chichester - St Richards<br></a>
-              <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">HWO-NNN-standard-20260501</span>
+              <a href="#">Existing clinic user defined name<br></a>
+              <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">NNN-NNN-systemid-20260501</span>
             </td>
             <td class="nhsuk-table__cell">
-              Alpha van<br>
-              St Richard’s Hospital, Chichester
+              Unit label<br>
+              Location short name
             </td>
             <td class="nhsuk-table__cell">
               31 August 2026 to 9 October 2026
@@ -81,24 +81,6 @@ <h1 class="nhsuk-heading-l">Active clinics</h1>
               <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">of which 150 held</span>
             </td>
           </tr>
-
-          <tr class="nhsuk-table__row">
-            <td class="nhsuk-table__cell">
-              <a href="#">Chichester - St Richards<br></a>
-              <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">HWO-NNN-standard-20260501</span>
-            </td>
-            <td class="nhsuk-table__cell">
-              Alpha van<br>
-              St Richard’s Hospital, Chichester
-            </td>
-            <td class="nhsuk-table__cell">
-              <span class="nhsuk-u-secondary-text-colour">No active schedules</span>
-            </td>
-            <td class="nhsuk-table__cell">
-              1500 slots available<br>
-              <span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">of which 150 held</span>
-            </td>
-          </tr>
         </tbody>
       </table>
 
diff --git a/app/views/create-capacity-from-zero/new-schedule-empty.html b/app/views/create-capacity-from-zero/new-schedule-empty.html
index 3e2d23aa..076707e3 100644
--- a/app/views/create-capacity-from-zero/new-schedule-empty.html
+++ b/app/views/create-capacity-from-zero/new-schedule-empty.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/create-capacity-from-zero/new-schedule-ready.html b/app/views/create-capacity-from-zero/new-schedule-ready.html
index 539e36c6..c4669278 100644
--- a/app/views/create-capacity-from-zero/new-schedule-ready.html
+++ b/app/views/create-capacity-from-zero/new-schedule-ready.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/create-capacity-from-zero/select-session-template-full-preview.html b/app/views/create-capacity-from-zero/select-session-template-full-preview.html
index f81c9078..751a6783 100644
--- a/app/views/create-capacity-from-zero/select-session-template-full-preview.html
+++ b/app/views/create-capacity-from-zero/select-session-template-full-preview.html
@@ -76,7 +76,10 @@
   <div class="nhsuk-grid-column-full">
 
     <div class="nhsuk-u-reading-width">
-      <h1 class="nhsuk-heading-l"">Session template name</h1>
+      <h1 class="nhsuk-heading-l">
+        <span class="nhsuk-caption-m">Template details</span>
+        Standard
+      </h1>
       <h2 class="nhsuk-heading-m">
         <span class="nhsuk-caption-m">Session time</span>
         09:00 to 17:00
diff --git a/app/views/create-capacity-from-zero/select-session-template.html b/app/views/create-capacity-from-zero/select-session-template.html
index 91f28b8d..a419a9a5 100644
--- a/app/views/create-capacity-from-zero/select-session-template.html
+++ b/app/views/create-capacity-from-zero/select-session-template.html
@@ -4,10 +4,14 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
-{% block beforeContent %}{% endblock %}
+{% block beforeContent %}
+  <a class="nhsuk-back-link" href="clinic-summary">
+    Back to clinic: {{ data.createCapacityFromZero.clinicName }}
+  </a>
+{% endblock %}
 
 {% block content %}
 <div class="nhsuk-grid-row">
@@ -18,11 +22,14 @@ <h1 class="nhsuk-heading-l">Choose session template</h1>
     <div class="nhsuk-card nhsuk-u-padding-4 nhsuk-u-padding-bottom-0">
       <div class="app-card-editable">
         <h2 class="nhsuk-heading-s">
-          Standard day
+          Standard
         </h2>
-        <a href="new-schedule-ready" class="nhsuk-button nhsuk-button--secondary nhsuk-button--small">
-          Select this template
-        </a>
+        <form method="post" action="/create-capacity-from-zero/apply-session-template">
+          <input type="hidden" name="templateName" value="Standard">
+          <button type="submit" class="nhsuk-button nhsuk-button--secondary nhsuk-button--small">
+            Select this template
+          </button>
+        </form>
       </div>
       <div class="app-template-card">
         <div>
@@ -85,11 +92,14 @@ <h2 class="nhsuk-heading-s">
     <div class="nhsuk-card nhsuk-u-padding-4 nhsuk-u-padding-bottom-0">
       <div class="app-card-editable">
         <h2 class="nhsuk-heading-s">
-          Special appointments day
+          Special appointments
         </h2>
-        <a href="new-schedule-ready" class="nhsuk-button nhsuk-button--secondary nhsuk-button--small">
-          Select this template
-        </a>
+        <form method="post" action="/create-capacity-from-zero/apply-session-template">
+          <input type="hidden" name="templateName" value="Special appointments">
+          <button type="submit" class="nhsuk-button nhsuk-button--secondary nhsuk-button--small">
+            Select this template
+          </button>
+        </form>
       </div>
       <div class="app-template-card">
         <div>
@@ -152,11 +162,14 @@ <h2 class="nhsuk-heading-s">
     <div class="nhsuk-card nhsuk-u-padding-4 nhsuk-u-padding-bottom-0">
       <div class="app-card-editable">
         <h2 class="nhsuk-heading-s">
-          Default session template
+          Rubie default
         </h2>
-        <a href="new-schedule-ready" class="nhsuk-button nhsuk-button--secondary nhsuk-button--small">
-          Select this template
-        </a>
+        <form method="post" action="/create-capacity-from-zero/apply-session-template">
+          <input type="hidden" name="templateName" value="Rubie default">
+          <button type="submit" class="nhsuk-button nhsuk-button--secondary nhsuk-button--small">
+            Select this template
+          </button>
+        </form>
       </div>
       <div class="app-template-card">
         <div>
diff --git a/app/views/index.html b/app/views/index.html
index 96e9174d..8ffa432e 100755
--- a/app/views/index.html
+++ b/app/views/index.html
@@ -47,7 +47,10 @@ <h2 class="nhsuk-heading-m">August &ndash; September 2026</h2>
       <p>Clinics with schedules ideation</p>
       <ol>
         <li>
-          <a href="/clinics-schedules">Create a new clinic (containers)</a>
+          <a href="/create-capacity-from-zero/">Create a new clinic (containers)</a>
+          <strong class="nhsuk-tag nhsuk-tag--green">
+            ready to test
+          </strong>
         </li>
         <li>
           <a href="/clinics-schedules/z-older-versions">Create a new clinic (transaction)</a>
diff --git a/app/views/sessions/01-set-timings.html b/app/views/sessions/01-set-timings.html
index a4bcebcc..2341d90f 100644
--- a/app/views/sessions/01-set-timings.html
+++ b/app/views/sessions/01-set-timings.html
@@ -7,7 +7,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/sessions/02-organise-slots.html b/app/views/sessions/02-organise-slots.html
index b90868a1..d1dbb4db 100644
--- a/app/views/sessions/02-organise-slots.html
+++ b/app/views/sessions/02-organise-slots.html
@@ -6,7 +6,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/sessions/03-prototype-end.html b/app/views/sessions/03-prototype-end.html
index 5eeecc51..36a6e2d1 100644
--- a/app/views/sessions/03-prototype-end.html
+++ b/app/views/sessions/03-prototype-end.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/sessions/day-slot-view.html b/app/views/sessions/day-slot-view.html
index 316129e1..5375dd93 100644
--- a/app/views/sessions/day-slot-view.html
+++ b/app/views/sessions/day-slot-view.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}
diff --git a/app/views/sessions/templating-01-listing.html b/app/views/sessions/templating-01-listing.html
index f9d6ae87..8edc6baf 100644
--- a/app/views/sessions/templating-01-listing.html
+++ b/app/views/sessions/templating-01-listing.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/sessions/templating-03-name-and-description.html b/app/views/sessions/templating-03-name-and-description.html
index 0eba11ba..61ae2021 100644
--- a/app/views/sessions/templating-03-name-and-description.html
+++ b/app/views/sessions/templating-03-name-and-description.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}
diff --git a/app/views/sessions/templating-04-check-answers.html b/app/views/sessions/templating-04-check-answers.html
index ae91bca6..62e0df7a 100644
--- a/app/views/sessions/templating-04-check-answers.html
+++ b/app/views/sessions/templating-04-check-answers.html
@@ -4,7 +4,7 @@
 
 {% from "_includes/primary-navigation.html" import primaryNavigation %}
 {% block header %}
-  {{ primaryNavigation("Clinics", serviceName) }}
+  {{ primaryNavigation("Clinics", serviceName, bsoName) }}
 {% endblock %}
 
 {% block beforeContent %}{% endblock %}