From b296a4e4d99b3243ead46f688310cfff5351aa51 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Thu, 15 Aug 2024 10:51:02 +0100
Subject: [PATCH] Adjust metric pages:

- put the previous/next metric controls inside the 3/4 width container,
  so long sidebars don't hide the bottom control
- don't repeat the question title

Also fix some HTML escape codes for questions.
---
 codegen/area_check.py                         |   2 -
 codegen/common.py                             |   3 +
 codegen/path_check.py                         |   1 -
 codegen/path_placemaking_check.py             |   1 -
 codegen/planning.py                           |   1 -
 codegen/safety_check.py                       |   1 -
 codegen/street_check.py                       |   1 -
 codegen/street_placemaking_check.py           |   1 -
 src/lib/nav/index.ts                          | 309 ++++++++++--------
 .../area_check/scorecard/Question.svelte      |   9 +-
 .../area_check/scorecard/q01/+page.svelte     |   1 -
 .../area_check/scorecard/q02/+page.svelte     |   1 -
 .../area_check/scorecard/q03/+page.svelte     |   1 -
 .../area_check/scorecard/q04/+page.svelte     |   1 -
 .../area_check/scorecard/q05/+page.svelte     |   3 +-
 .../area_check/scorecard/q06/+page.svelte     |   1 -
 .../area_check/scorecard/q07/+page.svelte     |   1 -
 .../area_check/scorecard/q08/+page.svelte     |   1 -
 .../area_check/scorecard/q09/+page.svelte     |   3 +-
 .../area_check/scorecard/q10/+page.svelte     |   1 -
 .../area_check/scorecard/q11/+page.svelte     |   1 -
 .../area_check/scorecard/q12/+page.svelte     |   1 -
 .../area_check/scorecard/q13/+page.svelte     |   1 -
 src/routes/planning/scorecard/Question.svelte |   9 +-
 .../planning/scorecard/q01/+page.svelte       |   2 +-
 .../planning/scorecard/q02/+page.svelte       |   2 +-
 .../planning/scorecard/q03/+page.svelte       |   2 +-
 .../planning/scorecard/q04/+page.svelte       |   2 +-
 .../planning/scorecard/q05/+page.svelte       |   2 +-
 .../planning/scorecard/q06/+page.svelte       |   2 +-
 .../planning/scorecard/q07/+page.svelte       |   2 +-
 .../planning/scorecard/q08/+page.svelte       |   2 +-
 .../planning/scorecard/q09/+page.svelte       |   2 +-
 .../planning/scorecard/q10/+page.svelte       |   2 +-
 .../route_check/path_check/Question.svelte    |  19 +-
 .../route_check/path_check/pa17/+page.svelte  |   1 -
 .../route_check/path_check/pa18/+page.svelte  |   1 -
 .../route_check/path_check/pa19/+page.svelte  |   5 +-
 .../route_check/path_check/pa20/+page.svelte  |   1 -
 .../route_check/path_check/pa21/+page.svelte  |   1 -
 .../route_check/path_check/pa22/+page.svelte  |   1 -
 .../route_check/path_check/pa23/+page.svelte  |   5 +-
 .../route_check/path_check/pa24/+page.svelte  |   5 +-
 .../route_check/path_check/pa25/+page.svelte  |   5 +-
 .../route_check/path_check/pa26/+page.svelte  |   1 -
 .../route_check/path_check/pa27/+page.svelte  |   1 -
 .../route_check/path_check/pa28/+page.svelte  |   1 -
 .../route_check/path_check/pa29/+page.svelte  |   1 -
 .../route_check/path_check/pa30/+page.svelte  |   1 -
 .../route_check/path_check/pa31/+page.svelte  |   1 -
 .../route_check/path_check/pa32/+page.svelte  |   1 -
 .../route_check/path_check/pa33/+page.svelte  |   1 -
 .../route_check/path_check/pa34/+page.svelte  |   1 -
 .../route_check/path_check/pa35/+page.svelte  |   1 -
 .../route_check/path_check/pa36/+page.svelte  |   1 -
 .../route_check/path_check/pa37/+page.svelte  |   5 +-
 .../route_check/path_check/pa38/+page.svelte  |   5 +-
 .../route_check/path_check/pa39/+page.svelte  |   1 -
 .../route_check/path_check/pa40/+page.svelte  |   1 -
 .../route_check/path_check/pa41/+page.svelte  |   1 -
 .../route_check/path_check/pa42/+page.svelte  |   1 -
 .../route_check/path_check/pa43/+page.svelte  |   1 -
 .../route_check/path_check/pa44/+page.svelte  |   1 -
 .../route_check/path_check/pa45/+page.svelte  |   1 -
 .../route_check/path_check/pa46/+page.svelte  |   1 -
 .../path_placemaking_check/Question.svelte    |  13 +-
 .../path_placemaking_check/pp01/+page.svelte  |   1 -
 .../path_placemaking_check/pp02/+page.svelte  |   5 +-
 .../path_placemaking_check/pp03/+page.svelte  |   1 -
 .../path_placemaking_check/pp04/+page.svelte  |   1 -
 .../path_placemaking_check/pp05/+page.svelte  |   1 -
 .../path_placemaking_check/pp06/+page.svelte  |   1 -
 .../path_placemaking_check/pp07/+page.svelte  |   1 -
 .../path_placemaking_check/pp08/+page.svelte  |   1 -
 .../path_placemaking_check/pp09/+page.svelte  |   1 -
 .../path_placemaking_check/pp10/+page.svelte  |   1 -
 .../path_placemaking_check/pp11/+page.svelte  |   1 -
 .../path_placemaking_check/pp12/+page.svelte  |   1 -
 .../path_placemaking_check/pp13/+page.svelte  |   1 -
 .../path_placemaking_check/pp14/+page.svelte  |   1 -
 .../path_placemaking_check/pp15/+page.svelte  |   1 -
 .../path_placemaking_check/pp16/+page.svelte  |   1 -
 .../path_placemaking_check/pp17/+page.svelte  |   5 +-
 .../path_placemaking_check/pp18/+page.svelte  |   1 -
 .../path_placemaking_check/pp19/+page.svelte  |   5 +-
 .../route_check/safety_check/Question.svelte  |   9 +-
 .../safety_check/sa01/+page.svelte            |   7 +-
 .../safety_check/sa02/+page.svelte            |   3 +-
 .../safety_check/sa03/+page.svelte            |   1 -
 .../safety_check/sa04/+page.svelte            |   1 -
 .../safety_check/sa05/+page.svelte            |   1 -
 .../safety_check/sa06/+page.svelte            |   9 +-
 .../safety_check/sa07/+page.svelte            |   9 +-
 .../safety_check/sa08/+page.svelte            |   1 -
 .../safety_check/sa09/+page.svelte            |   5 +-
 .../safety_check/sa10/+page.svelte            |   1 -
 .../safety_check/sa11/+page.svelte            |   9 +-
 .../safety_check/sa12/+page.svelte            |   5 +-
 .../safety_check/sa13/+page.svelte            |   1 -
 .../safety_check/sa14/+page.svelte            |   3 +-
 .../safety_check/sa15/+page.svelte            |   7 +-
 .../safety_check/sa16/+page.svelte            |   1 -
 .../route_check/street_check/Question.svelte  |  29 +-
 .../street_check/st17/+page.svelte            |   5 +-
 .../street_check/st18/+page.svelte            |   1 -
 .../street_check/st19/+page.svelte            |   1 -
 .../street_check/st20/+page.svelte            |   1 -
 .../street_check/st21/+page.svelte            |   1 -
 .../street_check/st22/+page.svelte            |   1 -
 .../street_check/st23/+page.svelte            |   1 -
 .../street_check/st24/+page.svelte            |   1 -
 .../street_check/st25/+page.svelte            |   1 -
 .../street_check/st26/+page.svelte            |   1 -
 .../street_check/st27/+page.svelte            |   1 -
 .../street_check/st28/+page.svelte            |   1 -
 .../street_check/st29/+page.svelte            |   1 -
 .../street_check/st30/+page.svelte            |   1 -
 .../street_check/st31/+page.svelte            |   1 -
 .../street_check/st32/+page.svelte            |   1 -
 .../street_check/st33/+page.svelte            |   1 -
 .../street_check/st34/+page.svelte            |   5 +-
 .../street_check/st35/+page.svelte            |   5 +-
 .../street_check/st36/+page.svelte            |   1 -
 .../street_check/st37/+page.svelte            |   1 -
 .../street_check/st38/+page.svelte            |   1 -
 .../street_check/st39/+page.svelte            |   1 -
 .../street_check/st40/+page.svelte            |   1 -
 .../street_check/st41/+page.svelte            |   1 -
 .../street_check/st42/+page.svelte            |   1 -
 .../street_placemaking_check/Question.svelte  |  17 +-
 .../sp01/+page.svelte                         |   1 -
 .../sp02/+page.svelte                         |   5 +-
 .../sp03/+page.svelte                         |   1 -
 .../sp04/+page.svelte                         |   1 -
 .../sp05/+page.svelte                         |   1 -
 .../sp06/+page.svelte                         |   1 -
 .../sp07/+page.svelte                         |   1 -
 .../sp08/+page.svelte                         |   1 -
 .../sp09/+page.svelte                         |   1 -
 .../sp10/+page.svelte                         |   1 -
 .../sp11/+page.svelte                         |   1 -
 .../sp12/+page.svelte                         |   1 -
 .../sp13/+page.svelte                         |   1 -
 .../sp14/+page.svelte                         |   1 -
 .../sp15/+page.svelte                         |   1 -
 .../sp16/+page.svelte                         |   1 -
 .../sp17/+page.svelte                         |   1 -
 .../sp18/+page.svelte                         |   1 -
 .../sp19/+page.svelte                         |   1 -
 .../sp20/+page.svelte                         |   1 -
 .../sp21/+page.svelte                         |   1 -
 .../sp22/+page.svelte                         |   1 -
 .../sp23/+page.svelte                         |   1 -
 .../sp24/+page.svelte                         |   5 +-
 .../sp25/+page.svelte                         |   1 -
 .../sp26/+page.svelte                         |   5 +-
 156 files changed, 300 insertions(+), 387 deletions(-)

diff --git a/codegen/area_check.py b/codegen/area_check.py
index a3bb8c11f13..1c0f8a62438 100644
--- a/codegen/area_check.py
+++ b/codegen/area_check.py
@@ -27,7 +27,6 @@
 
             questions.append(
                 {
-                    "Label": label,
                     "Description": description,
                     "Cases": [],
                 }
@@ -47,7 +46,6 @@
 
         f.write("""<Question\n""")
         f.write("  idx={" + str(idx + 1) + "}\n")
-        f.write("""  label="{}"\n""".format(question["Label"]))
 
         f.write("""  cases={[\n""")
         for score, answer in question["Cases"]:
diff --git a/codegen/common.py b/codegen/common.py
index d3cbbcd26e5..e870a67d433 100644
--- a/codegen/common.py
+++ b/codegen/common.py
@@ -4,6 +4,9 @@
 def html(x):
     x = x.replace('"', '\\"')
     x = x.replace("<", "&lt;")
+    x = x.replace(">", "&gt;")
+    x = x.replace("≤", "&le;")
+    x = x.replace("≥", "&ge;")
 
     y = ""
     is_list = False
diff --git a/codegen/path_check.py b/codegen/path_check.py
index 74803dcddd8..a38dca7ca3c 100644
--- a/codegen/path_check.py
+++ b/codegen/path_check.py
@@ -56,7 +56,6 @@
 
             f.write("""<Question\n""")
             f.write("  idx={" + str(idx) + "}\n")
-            f.write("""  label="{}"\n""".format(row["Metric"]))
 
             f.write("""  cases={[\n""")
             f.write("""    ["2", "{}"],\n""".format(html(row["Green"])))
diff --git a/codegen/path_placemaking_check.py b/codegen/path_placemaking_check.py
index 4739b867fff..825e783814d 100644
--- a/codegen/path_placemaking_check.py
+++ b/codegen/path_placemaking_check.py
@@ -32,7 +32,6 @@
 
             f.write("""<Question\n""")
             f.write("  idx={" + str(idx) + "}\n")
-            f.write("""  label="{}"\n""".format(row["Metric"]))
 
             f.write("""  cases={[\n""")
             f.write("""    ["2", "{}"],\n""".format(html(row["Green"])))
diff --git a/codegen/planning.py b/codegen/planning.py
index 31935f38a8d..da06f2bb587 100644
--- a/codegen/planning.py
+++ b/codegen/planning.py
@@ -35,7 +35,6 @@ def htmlList(x):
 
             f.write("""<Question\n""")
             f.write("  idx={" + str(idx) + "}\n")
-            f.write("""  label="{}"\n""".format(row["Criterion"].strip()))
             f.write(""">\n""")
 
             f.write(
diff --git a/codegen/safety_check.py b/codegen/safety_check.py
index f7afafca73d..4d7604e1c07 100644
--- a/codegen/safety_check.py
+++ b/codegen/safety_check.py
@@ -39,7 +39,6 @@
 
             f.write("""<Question\n""")
             f.write("  idx={" + str(idx) + "}\n")
-            f.write("""  label="{}"\n""".format(row["Metric"]))
 
             f.write("""  cases={[\n""")
             f.write("""    ["2", "{}"],\n""".format(html(row["Green"])))
diff --git a/codegen/street_check.py b/codegen/street_check.py
index 80a1e826a6e..b480a68b4b0 100644
--- a/codegen/street_check.py
+++ b/codegen/street_check.py
@@ -39,7 +39,6 @@
 
             f.write("""<Question\n""")
             f.write("  idx={" + str(idx) + "}\n")
-            f.write("""  label="{}"\n""".format(row["Metric"]))
 
             f.write("""  cases={[\n""")
             f.write("""    ["2", "{}"],\n""".format(html(row["Green"])))
diff --git a/codegen/street_placemaking_check.py b/codegen/street_placemaking_check.py
index 46d20789498..bc65e71c43f 100644
--- a/codegen/street_placemaking_check.py
+++ b/codegen/street_placemaking_check.py
@@ -32,7 +32,6 @@
 
             f.write("""<Question\n""")
             f.write("  idx={" + str(idx) + "}\n")
-            f.write("""  label="{}"\n""".format(row["Metric"]))
 
             f.write("""  cases={[\n""")
             f.write("""    ["2", "{}"],\n""".format(html(row["Green"])))
diff --git a/src/lib/nav/index.ts b/src/lib/nav/index.ts
index d04e35d4694..953b053487f 100644
--- a/src/lib/nav/index.ts
+++ b/src/lib/nav/index.ts
@@ -11,16 +11,16 @@ let pages: [string, string][] = [
   ["/planning/overview", "Overview"],
   ["/planning/app_details", "Application details"],
   ["/planning/scorecard", "Scorecard"],
-  ["/planning/scorecard/q01", "Trip generation and assignment"],
-  ["/planning/scorecard/q02", "Active travel route audit"],
-  ["/planning/scorecard/q03", "Pedestrian access to local amenities"],
-  ["/planning/scorecard/q04", "Cycling accessibility"],
-  ["/planning/scorecard/q05", "Access to public transport"],
-  ["/planning/scorecard/q06", "Off-site transport infrastructure"],
-  ["/planning/scorecard/q07", "Site permeability"],
-  ["/planning/scorecard/q08", "Placemaking"],
-  ["/planning/scorecard/q09", "Cycle parking and trip-end facilities"],
-  ["/planning/scorecard/q10", "Travel planning"],
+  ["/planning/scorecard/q01", "1. Trip generation and assignment"],
+  ["/planning/scorecard/q02", "2. Active travel route audit"],
+  ["/planning/scorecard/q03", "3. Pedestrian access to local amenities"],
+  ["/planning/scorecard/q04", "4. Cycling accessibility"],
+  ["/planning/scorecard/q05", "5. Access to public transport"],
+  ["/planning/scorecard/q06", "6. Off-site transport infrastructure"],
+  ["/planning/scorecard/q07", "7. Site permeability"],
+  ["/planning/scorecard/q08", "8. Placemaking"],
+  ["/planning/scorecard/q09", "9. Cycle parking and trip-end facilities"],
+  ["/planning/scorecard/q10", "10. Travel planning"],
   ["/planning/report", "Report"],
 
   ["/cross_section", "Route cross-section tool"],
@@ -58,183 +58,228 @@ let pages: [string, string][] = [
   ["/route_check/safety_check", "Safety Check"],
   [
     "/route_check/safety_check/sa01",
-    "Conflict at Side Roads and Priority Junctions",
+    "SA01: Conflict at Side Roads and Priority Junctions",
   ],
   [
     "/route_check/safety_check/sa02",
-    "Conflict at Roundabouts and Signal Junctions",
-  ],
-  ["/route_check/safety_check/sa03", "Lane Widths"],
-  ["/route_check/safety_check/sa04", "Trip Hazards"],
-  ["/route_check/safety_check/sa05", "Kerbside Activity"],
-  ["/route_check/safety_check/sa06", "Provision of Crossings"],
-  ["/route_check/safety_check/sa07", "Standard of Crossings"],
-  ["/route_check/safety_check/sa08", "Motor Traffic Speed"],
-  ["/route_check/safety_check/sa09", "Motor Traffic Volume"],
-  ["/route_check/safety_check/sa10", "Pedestrian Crossing Speed"],
-  ["/route_check/safety_check/sa11", "Footway Widths"],
-  ["/route_check/safety_check/sa12", "Effective Width next to Tram Lines"],
-  ["/route_check/safety_check/sa13", "Crossing Angle of Tram/Train Rails"],
-  ["/route_check/safety_check/sa14", "Cycling Surface and Maintenance Defects"],
+    "SA02: Conflict at Roundabouts and Signal Junctions",
+  ],
+  ["/route_check/safety_check/sa03", "SA03: Lane Widths"],
+  ["/route_check/safety_check/sa04", "SA04: Trip Hazards"],
+  ["/route_check/safety_check/sa05", "SA05: Kerbside Activity"],
+  ["/route_check/safety_check/sa06", "SA06: Provision of Crossings"],
+  ["/route_check/safety_check/sa07", "SA07: Standard of Crossings"],
+  ["/route_check/safety_check/sa08", "SA08: Motor Traffic Speed"],
+  ["/route_check/safety_check/sa09", "SA09: Motor Traffic Volume"],
+  ["/route_check/safety_check/sa10", "SA10: Pedestrian Crossing Speed"],
+  ["/route_check/safety_check/sa11", "SA11: Footway Widths"],
+  [
+    "/route_check/safety_check/sa12",
+    "SA12: Effective Width next to Tram Lines",
+  ],
+  [
+    "/route_check/safety_check/sa13",
+    "SA13: Crossing Angle of Tram/Train Rails",
+  ],
+  [
+    "/route_check/safety_check/sa14",
+    "SA14: Cycling Surface and Maintenance Defects",
+  ],
   [
     "/route_check/safety_check/sa15",
-    "Walking/Wheeling Surface and Maintenance Defects",
+    "SA15: Walking/Wheeling Surface and Maintenance Defects",
   ],
-  ["/route_check/safety_check/sa16", "Guard Railing"],
+  ["/route_check/safety_check/sa16", "SA16: Guard Railing"],
   ["/route_check/problems_map", "Problems Mapping Page"],
   ["/route_check/street_check", "Street Check"],
-  ["/route_check/street_check/st17", "Gradient"],
+  ["/route_check/street_check/st17", "ST17: Gradient"],
   [
     "/route_check/street_check/st18",
-    "Tactile Information and Signal Equipment",
-  ],
-  ["/route_check/street_check/st19", "Barriers"],
-  ["/route_check/street_check/st20", "Bus Stops"],
-  ["/route_check/street_check/st21", "Wheelchair Access"],
-  ["/route_check/street_check/st22", "Access to Taxis and Blue Badge Parking"],
-  ["/route_check/street_check/st23", "Access to Toilets"],
-  ["/route_check/street_check/st24", "Cycling Surface Material"],
-  ["/route_check/street_check/st25", "Walking/Wheeling Surface Material"],
-  ["/route_check/street_check/st26", "Effective Width for Cyclists"],
-  ["/route_check/street_check/st27", "Deviation of Cycle Route"],
-  ["/route_check/street_check/st28", "Pedestrian Crossing Locations"],
-  ["/route_check/street_check/st29", "Cyclist Delay at Junctions"],
-  ["/route_check/street_check/st30", "Cyclist Delay on Links"],
-  ["/route_check/street_check/st31", "Pedestrian Delay at Junctions"],
+    "ST18: Tactile Information and Signal Equipment",
+  ],
+  ["/route_check/street_check/st19", "ST19: Barriers"],
+  ["/route_check/street_check/st20", "ST20: Bus Stops"],
+  ["/route_check/street_check/st21", "ST21: Wheelchair Access"],
+  [
+    "/route_check/street_check/st22",
+    "ST22: Access to Taxis and Blue Badge Parking",
+  ],
+  ["/route_check/street_check/st23", "ST23: Access to Toilets"],
+  ["/route_check/street_check/st24", "ST24: Cycling Surface Material"],
+  ["/route_check/street_check/st25", "ST25: Walking/Wheeling Surface Material"],
+  ["/route_check/street_check/st26", "ST26: Effective Width for Cyclists"],
+  ["/route_check/street_check/st27", "ST27: Deviation of Cycle Route"],
+  ["/route_check/street_check/st28", "ST28: Pedestrian Crossing Locations"],
+  ["/route_check/street_check/st29", "ST29: Cyclist Delay at Junctions"],
+  ["/route_check/street_check/st30", "ST30: Cyclist Delay on Links"],
+  ["/route_check/street_check/st31", "ST31: Pedestrian Delay at Junctions"],
   [
     "/route_check/street_check/st32",
-    "Pedestrian Delay at Standalone Signal Crossings",
+    "ST32: Pedestrian Delay at Standalone Signal Crossings",
   ],
-  ["/route_check/street_check/st33", "Wayfinding"],
-  ["/route_check/street_check/st34", "Places to Rest"],
-  ["/route_check/street_check/st35", "Places to Shelter"],
-  ["/route_check/street_check/st36", "Lighting"],
-  ["/route_check/street_check/st37", "Cycle Parking"],
-  ["/route_check/street_check/st38", "Impact of Cycling on Walking"],
+  ["/route_check/street_check/st33", "ST33: Wayfinding"],
+  ["/route_check/street_check/st34", "ST34: Places to Rest"],
+  ["/route_check/street_check/st35", "ST35: Places to Shelter"],
+  ["/route_check/street_check/st36", "ST36: Lighting"],
+  ["/route_check/street_check/st37", "ST37: Cycle Parking"],
+  ["/route_check/street_check/st38", "ST38: Impact of Cycling on Walking"],
   [
     "/route_check/street_check/st39",
-    "Impact of Motor Traffic on Pedestrians and Cyclists",
+    "ST39: Impact of Motor Traffic on Pedestrians and Cyclists",
   ],
-  ["/route_check/street_check/st40", "Transitions for Cyclists"],
-  ["/route_check/street_check/st41", "Route Continuity"],
-  ["/route_check/street_check/st42", "Consistency of Route"],
+  ["/route_check/street_check/st40", "ST40: Transitions for Cyclists"],
+  ["/route_check/street_check/st41", "ST41: Route Continuity"],
+  ["/route_check/street_check/st42", "ST42: Consistency of Route"],
   ["/route_check/street_placemaking_check", "Street Placemaking Check"],
   [
     "/route_check/street_placemaking_check/sp01",
-    "Street Engagement for Children",
+    "SP01: Street Engagement for Children",
+  ],
+  ["/route_check/street_placemaking_check/sp02", "SP02: Social Space"],
+  [
+    "/route_check/street_placemaking_check/sp03",
+    "SP03: Diversity of Activities",
+  ],
+  [
+    "/route_check/street_placemaking_check/sp04",
+    "SP04: Surveillance and Activity",
   ],
-  ["/route_check/street_placemaking_check/sp02", "Social Space"],
-  ["/route_check/street_placemaking_check/sp03", "Diversity of Activities"],
-  ["/route_check/street_placemaking_check/sp04", "Surveillance and Activity"],
   [
     "/route_check/street_placemaking_check/sp05",
-    "Forward Visibility and Escape Routes",
+    "SP05: Forward Visibility and Escape Routes",
   ],
-  ["/route_check/street_placemaking_check/sp06", "Visibility of Others"],
-  ["/route_check/street_placemaking_check/sp07", "Maintenance and Upkeep"],
-  ["/route_check/street_placemaking_check/sp08", "Street Network Layout"],
-  ["/route_check/street_placemaking_check/sp09", "Place and Movement"],
+  ["/route_check/street_placemaking_check/sp06", "SP06: Visibility of Others"],
+  [
+    "/route_check/street_placemaking_check/sp07",
+    "SP07: Maintenance and Upkeep",
+  ],
+  ["/route_check/street_placemaking_check/sp08", "SP08: Street Network Layout"],
+  ["/route_check/street_placemaking_check/sp09", "SP09: Place and Movement"],
   [
     "/route_check/street_placemaking_check/sp10",
-    "Impact of Street Design on Behaviour",
+    "SP10: Impact of Street Design on Behaviour",
   ],
   [
     "/route_check/street_placemaking_check/sp11",
-    "Enforcement of Loading and Parking",
+    "SP11: Enforcement of Loading and Parking",
   ],
-  ["/route_check/street_placemaking_check/sp12", "Street Clutter"],
+  ["/route_check/street_placemaking_check/sp12", "SP12: Street Clutter"],
   [
     "/route_check/street_placemaking_check/sp13",
-    "Consistency of Materials and Street Furniture",
+    "SP13: Consistency of Materials and Street Furniture",
   ],
-  ["/route_check/street_placemaking_check/sp14", "Visual Interest"],
-  ["/route_check/street_placemaking_check/sp15", "Cultural Significance"],
+  ["/route_check/street_placemaking_check/sp14", "SP14: Visual Interest"],
+  ["/route_check/street_placemaking_check/sp15", "SP15: Cultural Significance"],
   [
     "/route_check/street_placemaking_check/sp16",
-    "Street Features that Support Walking, Wheeling and Cycling",
+    "SP16: Street Features that Support Walking, Wheeling and Cycling",
   ],
-  ["/route_check/street_placemaking_check/sp17", "Drainage and Water"],
-  ["/route_check/street_placemaking_check/sp18", "Trees"],
-  ["/route_check/street_placemaking_check/sp19", "Planting"],
+  ["/route_check/street_placemaking_check/sp17", "SP17: Drainage and Water"],
+  ["/route_check/street_placemaking_check/sp18", "SP18: Trees"],
+  ["/route_check/street_placemaking_check/sp19", "SP19: Planting"],
   [
     "/route_check/street_placemaking_check/sp20",
-    "Ancillary Features to Support Fauna",
-  ],
-  ["/route_check/street_placemaking_check/sp21", "Sustainable Materials"],
-  ["/route_check/street_placemaking_check/sp22", "Air Pollution - Exposure"],
-  ["/route_check/street_placemaking_check/sp23", "Air Pollution - Proximity"],
-  ["/route_check/street_placemaking_check/sp24", "Noise Pollution"],
-  ["/route_check/street_placemaking_check/sp25", "Light Pollution"],
-  ["/route_check/street_placemaking_check/sp26", "Sunlight"],
+    "SP20: Ancillary Features to Support Fauna",
+  ],
+  ["/route_check/street_placemaking_check/sp21", "SP21: Sustainable Materials"],
+  [
+    "/route_check/street_placemaking_check/sp22",
+    "SP22: Air Pollution - Exposure",
+  ],
+  [
+    "/route_check/street_placemaking_check/sp23",
+    "SP23: Air Pollution - Proximity",
+  ],
+  ["/route_check/street_placemaking_check/sp24", "SP24: Noise Pollution"],
+  ["/route_check/street_placemaking_check/sp25", "SP25: Light Pollution"],
+  ["/route_check/street_placemaking_check/sp26", "SP26: Sunlight"],
   ["/route_check/path_check", "Path Check"],
-  ["/route_check/path_check/pa17", "Barriers"],
-  ["/route_check/path_check/pa18", "Steps"],
-  ["/route_check/path_check/pa19", "Gradient"],
-  ["/route_check/path_check/pa20", "Tactile Information and Signal Equipment"],
-  ["/route_check/path_check/pa21", "Ability to Turn Around"],
-  ["/route_check/path_check/pa22", "Width of Shared Use Spaces"],
-  ["/route_check/path_check/pa23", "Width of Walking and Wheeling Spaces"],
-  ["/route_check/path_check/pa24", "Width of Cycling Spaces"],
-  ["/route_check/path_check/pa25", "Width of Horse Riding Spaces"],
-  ["/route_check/path_check/pa26", "Shared Use Surface"],
-  ["/route_check/path_check/pa27", "Walking and Wheeling Surface"],
-  ["/route_check/path_check/pa28", "Cycling Surface"],
-  ["/route_check/path_check/pa29", "Horse Riding Surface"],
-  ["/route_check/path_check/pa30", "Suitability of Crossings"],
-  ["/route_check/path_check/pa31", "Accessibility of Access Points"],
-  ["/route_check/path_check/pa32", "Drainage"],
-  ["/route_check/path_check/pa33", "Deviation of Path Against Straight Line"],
+  ["/route_check/path_check/pa17", "PA17: Barriers"],
+  ["/route_check/path_check/pa18", "PA18: Steps"],
+  ["/route_check/path_check/pa19", "PA19: Gradient"],
+  [
+    "/route_check/path_check/pa20",
+    "PA20: Tactile Information and Signal Equipment",
+  ],
+  ["/route_check/path_check/pa21", "PA21: Ability to Turn Around"],
+  ["/route_check/path_check/pa22", "PA22: Width of Shared Use Spaces"],
+  [
+    "/route_check/path_check/pa23",
+    "PA23: Width of Walking and Wheeling Spaces",
+  ],
+  ["/route_check/path_check/pa24", "PA24: Width of Cycling Spaces"],
+  ["/route_check/path_check/pa25", "PA25: Width of Horse Riding Spaces"],
+  ["/route_check/path_check/pa26", "PA26: Shared Use Surface"],
+  ["/route_check/path_check/pa27", "PA27: Walking and Wheeling Surface"],
+  ["/route_check/path_check/pa28", "PA28: Cycling Surface"],
+  ["/route_check/path_check/pa29", "PA29: Horse Riding Surface"],
+  ["/route_check/path_check/pa30", "PA30: Suitability of Crossings"],
+  ["/route_check/path_check/pa31", "PA31: Accessibility of Access Points"],
+  ["/route_check/path_check/pa32", "PA32: Drainage"],
+  [
+    "/route_check/path_check/pa33",
+    "PA33: Deviation of Path Against Straight Line",
+  ],
   [
     "/route_check/path_check/pa34",
-    "Deviation of Path Against Nearest Alternative Route",
-  ],
-  ["/route_check/path_check/pa35", "Crossing Locations"],
-  ["/route_check/path_check/pa36", "Delay at Crossings"],
-  ["/route_check/path_check/pa37", "Places to Rest"],
-  ["/route_check/path_check/pa38", "Places to Shelter"],
-  ["/route_check/path_check/pa39", "Lighting"],
-  ["/route_check/path_check/pa40", "Cycle Parking"],
-  ["/route_check/path_check/pa41", "Impact of Users on Each Other"],
-  ["/route_check/path_check/pa42", "Ease of Navigation"],
-  ["/route_check/path_check/pa43", "Wayfinding"],
-  ["/route_check/path_check/pa44", "Proximity to Destinations"],
-  ["/route_check/path_check/pa45", "Quality of Connections"],
+    "PA34: Deviation of Path Against Nearest Alternative Route",
+  ],
+  ["/route_check/path_check/pa35", "PA35: Crossing Locations"],
+  ["/route_check/path_check/pa36", "PA36: Delay at Crossings"],
+  ["/route_check/path_check/pa37", "PA37: Places to Rest"],
+  ["/route_check/path_check/pa38", "PA38: Places to Shelter"],
+  ["/route_check/path_check/pa39", "PA39: Lighting"],
+  ["/route_check/path_check/pa40", "PA40: Cycle Parking"],
+  ["/route_check/path_check/pa41", "PA41: Impact of Users on Each Other"],
+  ["/route_check/path_check/pa42", "PA42: Ease of Navigation"],
+  ["/route_check/path_check/pa43", "PA43: Wayfinding"],
+  ["/route_check/path_check/pa44", "PA44: Proximity to Destinations"],
+  ["/route_check/path_check/pa45", "PA45: Quality of Connections"],
   [
     "/route_check/path_check/pa46",
-    "Connectivity with Other Horse Riding Routes",
+    "PA46: Connectivity with Other Horse Riding Routes",
   ],
   ["/route_check/path_placemaking_check", "Path Placemaking Check"],
-  ["/route_check/path_placemaking_check/pp01", "Engagement for Children"],
-  ["/route_check/path_placemaking_check/pp02", "Social Space"],
-  ["/route_check/path_placemaking_check/pp03", "Points of Interest"],
-  ["/route_check/path_placemaking_check/pp04", "Surveillance and Activity"],
+  ["/route_check/path_placemaking_check/pp01", "PP01: Engagement for Children"],
+  ["/route_check/path_placemaking_check/pp02", "PP02: Social Space"],
+  ["/route_check/path_placemaking_check/pp03", "PP03: Points of Interest"],
+  [
+    "/route_check/path_placemaking_check/pp04",
+    "PP04: Surveillance and Activity",
+  ],
   [
     "/route_check/path_placemaking_check/pp05",
-    "Forward Visibility and Escape Routes",
+    "PP05: Forward Visibility and Escape Routes",
   ],
-  ["/route_check/path_placemaking_check/pp06", "Visibility of Others"],
-  ["/route_check/path_placemaking_check/pp07", "Maintenance and Upkeep"],
+  ["/route_check/path_placemaking_check/pp06", "PP06: Visibility of Others"],
+  ["/route_check/path_placemaking_check/pp07", "PP07: Maintenance and Upkeep"],
   [
     "/route_check/path_placemaking_check/pp08",
-    "Consistency of Materials and Path Furniture",
+    "PP08: Consistency of Materials and Path Furniture",
   ],
-  ["/route_check/path_placemaking_check/pp09", "Visual Interest"],
+  ["/route_check/path_placemaking_check/pp09", "PP09: Visual Interest"],
   [
     "/route_check/path_placemaking_check/pp10",
-    "Features to Support Walking, Wheeling and Cycling",
+    "PP10: Features to Support Walking, Wheeling and Cycling",
   ],
-  ["/route_check/path_placemaking_check/pp11", "Trees"],
-  ["/route_check/path_placemaking_check/pp12", "Planting"],
+  ["/route_check/path_placemaking_check/pp11", "PP11: Trees"],
+  ["/route_check/path_placemaking_check/pp12", "PP12: Planting"],
   [
     "/route_check/path_placemaking_check/pp13",
-    "Ancillary Features to Support Fauna",
-  ],
-  ["/route_check/path_placemaking_check/pp14", "Sustainable Materials"],
-  ["/route_check/path_placemaking_check/pp15", "Air Pollution - Exposure"],
-  ["/route_check/path_placemaking_check/pp16", "Air Pollution - Proximity"],
-  ["/route_check/path_placemaking_check/pp17", "Noise Pollution"],
-  ["/route_check/path_placemaking_check/pp18", "Light Pollution"],
-  ["/route_check/path_placemaking_check/pp19", "Sunlight"],
+    "PP13: Ancillary Features to Support Fauna",
+  ],
+  ["/route_check/path_placemaking_check/pp14", "PP14: Sustainable Materials"],
+  [
+    "/route_check/path_placemaking_check/pp15",
+    "PP15: Air Pollution - Exposure",
+  ],
+  [
+    "/route_check/path_placemaking_check/pp16",
+    "PP16: Air Pollution - Proximity",
+  ],
+  ["/route_check/path_placemaking_check/pp17", "PP17: Noise Pollution"],
+  ["/route_check/path_placemaking_check/pp18", "PP18: Light Pollution"],
+  ["/route_check/path_placemaking_check/pp19", "PP19: Sunlight"],
   ["/route_check/jat_check", "JAT Check"],
   ["/route_check/results_summary", "Results Summary"],
   ["/route_check/results_analysis", "Results Further Analysis"],
diff --git a/src/routes/area_check/scorecard/Question.svelte b/src/routes/area_check/scorecard/Question.svelte
index 0ee0239d7c4..55e55c19d3f 100644
--- a/src/routes/area_check/scorecard/Question.svelte
+++ b/src/routes/area_check/scorecard/Question.svelte
@@ -4,7 +4,6 @@
   import { state } from "../data";
 
   export let idx: number;
-  export let label: string;
   export let cases: [number, string][];
 
   // Note these are different than the ones used in route check
@@ -27,15 +26,13 @@
   );
 </script>
 
-<PrevNext {idx} total={13} urlPath="area_check/scorecard/q" />
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>{label}</h2>
+    <PrevNext {idx} total={13} urlPath="area_check/scorecard/q" />
 
     <slot />
 
@@ -46,7 +43,7 @@
       bind:existingNotes={$state.existingScoreNotes[idx - 1]}
       bind:proposedNotes={$state.proposedScoreNotes[idx - 1]}
     />
+
+    <PrevNext {idx} total={13} urlPath="area_check/scorecard/q" />
   </div>
 </div>
-
-<PrevNext {idx} total={13} urlPath="area_check/scorecard/q" />
diff --git a/src/routes/area_check/scorecard/q01/+page.svelte b/src/routes/area_check/scorecard/q01/+page.svelte
index caff4e4f00b..d491c939f49 100644
--- a/src/routes/area_check/scorecard/q01/+page.svelte
+++ b/src/routes/area_check/scorecard/q01/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={1}
-  label="Porosity - Walking and Wheeling"
   cases={[
     [
       4,
diff --git a/src/routes/area_check/scorecard/q02/+page.svelte b/src/routes/area_check/scorecard/q02/+page.svelte
index 2e5da5fcf7d..7494f0f3da2 100644
--- a/src/routes/area_check/scorecard/q02/+page.svelte
+++ b/src/routes/area_check/scorecard/q02/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={2}
-  label="Porosity - Cycling"
   cases={[
     [
       4,
diff --git a/src/routes/area_check/scorecard/q03/+page.svelte b/src/routes/area_check/scorecard/q03/+page.svelte
index 6bb1e531432..0ecd755215d 100644
--- a/src/routes/area_check/scorecard/q03/+page.svelte
+++ b/src/routes/area_check/scorecard/q03/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={3}
-  label="Crossings - Walking and Wheeling"
   cases={[
     [
       4,
diff --git a/src/routes/area_check/scorecard/q04/+page.svelte b/src/routes/area_check/scorecard/q04/+page.svelte
index 23bc07d7709..8ed76977b15 100644
--- a/src/routes/area_check/scorecard/q04/+page.svelte
+++ b/src/routes/area_check/scorecard/q04/+page.svelte
@@ -5,7 +5,6 @@
 
 <Question
   idx={4}
-  label="Crossings - Cycling"
   cases={[
     [
       4,
diff --git a/src/routes/area_check/scorecard/q05/+page.svelte b/src/routes/area_check/scorecard/q05/+page.svelte
index b3c6b1b3885..f479150c7ea 100644
--- a/src/routes/area_check/scorecard/q05/+page.svelte
+++ b/src/routes/area_check/scorecard/q05/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={5}
-  label="Permeability - Walking and Wheeling"
   cases={[
     [
       4,
@@ -43,7 +42,7 @@
       Suitable footway widths as defined in DfT’s Inclusive Mobility guidance.
     </li>
     <li>Suitable tactile paving surfaces.</li>
-    <li>Acceptable footway camber (≤2.5%).</li>
+    <li>Acceptable footway camber (&le;2.5%).</li>
     <li>Minimal street clutter.</li>
     <li>Appropriate street lighting.</li>
   </ul>
diff --git a/src/routes/area_check/scorecard/q06/+page.svelte b/src/routes/area_check/scorecard/q06/+page.svelte
index 96c26cd72c7..1374dd14768 100644
--- a/src/routes/area_check/scorecard/q06/+page.svelte
+++ b/src/routes/area_check/scorecard/q06/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={6}
-  label="Permeability - Cycling"
   cases={[
     [
       4,
diff --git a/src/routes/area_check/scorecard/q07/+page.svelte b/src/routes/area_check/scorecard/q07/+page.svelte
index 166ebe5966c..7b2ef98461a 100644
--- a/src/routes/area_check/scorecard/q07/+page.svelte
+++ b/src/routes/area_check/scorecard/q07/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={7}
-  label="Mesh Density - Walking and Wheeling"
   cases={[
     [4, "<p>The area has an average mesh density of 100m</p>"],
     [3, "<p>The area has an average mesh density of 101-250m</p>"],
diff --git a/src/routes/area_check/scorecard/q08/+page.svelte b/src/routes/area_check/scorecard/q08/+page.svelte
index d57d4feca67..4be688d224c 100644
--- a/src/routes/area_check/scorecard/q08/+page.svelte
+++ b/src/routes/area_check/scorecard/q08/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={8}
-  label="Mesh Density - Cycling"
   cases={[
     [4, "<p>The area has an average mesh density of 250m.</p>"],
     [3, "<p>The area has an average mesh density of 251-400m.</p>"],
diff --git a/src/routes/area_check/scorecard/q09/+page.svelte b/src/routes/area_check/scorecard/q09/+page.svelte
index 07753a604f0..04ad53169e0 100644
--- a/src/routes/area_check/scorecard/q09/+page.svelte
+++ b/src/routes/area_check/scorecard/q09/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={9}
-  label="Motorised Through-Traffic"
   cases={[
     [
       8,
@@ -12,7 +11,7 @@
     ],
     [
       6,
-      "<p>Most motorised through traffic routes are closed in the area. However, local access for motor traffic is still maintained for residents and businesses.</p><p>There are good reasons why motor traffic through routes are in place, and there are measures to mitigate any potential issues relating to them.</p>",
+      "<p>Most motorised through traffic routes are closed in the area. However, local access for motor traffic is still maintained for residents and businesses.</p><p>There are good reasons why  motor traffic through routes are in place, and there are measures to mitigate any potential issues relating to them.</p>",
     ],
     [
       4,
diff --git a/src/routes/area_check/scorecard/q10/+page.svelte b/src/routes/area_check/scorecard/q10/+page.svelte
index 01d9f1ef1aa..4ffe92f2ec1 100644
--- a/src/routes/area_check/scorecard/q10/+page.svelte
+++ b/src/routes/area_check/scorecard/q10/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={10}
-  label="Perimeter Treatment Design"
   cases={[
     [
       16,
diff --git a/src/routes/area_check/scorecard/q11/+page.svelte b/src/routes/area_check/scorecard/q11/+page.svelte
index c255dc270a9..9cc09440ae8 100644
--- a/src/routes/area_check/scorecard/q11/+page.svelte
+++ b/src/routes/area_check/scorecard/q11/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={11}
-  label="Green Infrastructure Design"
   cases={[
     [
       12,
diff --git a/src/routes/area_check/scorecard/q12/+page.svelte b/src/routes/area_check/scorecard/q12/+page.svelte
index 9ca0d019a39..719994b11c0 100644
--- a/src/routes/area_check/scorecard/q12/+page.svelte
+++ b/src/routes/area_check/scorecard/q12/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={12}
-  label="Other Internal Treatment Design"
   cases={[
     [
       16,
diff --git a/src/routes/area_check/scorecard/q13/+page.svelte b/src/routes/area_check/scorecard/q13/+page.svelte
index 01628621e26..c90609337b0 100644
--- a/src/routes/area_check/scorecard/q13/+page.svelte
+++ b/src/routes/area_check/scorecard/q13/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={13}
-  label="Engagement Practice"
   cases={[
     [
       16,
diff --git a/src/routes/planning/scorecard/Question.svelte b/src/routes/planning/scorecard/Question.svelte
index b6915731725..3beadfd64a6 100644
--- a/src/routes/planning/scorecard/Question.svelte
+++ b/src/routes/planning/scorecard/Question.svelte
@@ -6,7 +6,6 @@
   import { state } from "../data";
 
   export let idx: number;
-  export let label: string;
 
   let choices: [string, string, string, string][] = [
     [
@@ -48,15 +47,13 @@
   ];
 </script>
 
-<PrevNext {idx} total={10} urlPath="planning/scorecard/q" />
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>{idx}. {label}</h2>
+    <PrevNext {idx} total={10} urlPath="planning/scorecard/q" />
 
     <slot name="description" />
 
@@ -77,7 +74,7 @@
 
     <h3>Policy & Guidance</h3>
     <slot name="guidance" />
+
+    <PrevNext {idx} total={10} urlPath="planning/scorecard/q" />
   </div>
 </div>
-
-<PrevNext {idx} total={10} urlPath="planning/scorecard/q" />
diff --git a/src/routes/planning/scorecard/q01/+page.svelte b/src/routes/planning/scorecard/q01/+page.svelte
index d5519ad7c7b..3bd177609a1 100644
--- a/src/routes/planning/scorecard/q01/+page.svelte
+++ b/src/routes/planning/scorecard/q01/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={1} label="Trip generation and assignment">
+<Question idx={1}>
   <div slot="description">
     <p>
       Does the application appropriately forecast all day trips to, from and
diff --git a/src/routes/planning/scorecard/q02/+page.svelte b/src/routes/planning/scorecard/q02/+page.svelte
index 40736075229..4aa2b94cf17 100644
--- a/src/routes/planning/scorecard/q02/+page.svelte
+++ b/src/routes/planning/scorecard/q02/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={2} label="Active travel route audit">
+<Question idx={2}>
   <div slot="description">
     <p>
       Has an appropriate assessment on the design and accessibility of existing
diff --git a/src/routes/planning/scorecard/q03/+page.svelte b/src/routes/planning/scorecard/q03/+page.svelte
index ea04cdbfb88..2a3942f9610 100644
--- a/src/routes/planning/scorecard/q03/+page.svelte
+++ b/src/routes/planning/scorecard/q03/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={3} label="Pedestrian access to local amenities">
+<Question idx={3}>
   <div slot="description">
     <p>
       Are most buildings within 800m from a range of amenities (such as primary
diff --git a/src/routes/planning/scorecard/q04/+page.svelte b/src/routes/planning/scorecard/q04/+page.svelte
index 2a2beaf74b3..d7480a13a68 100644
--- a/src/routes/planning/scorecard/q04/+page.svelte
+++ b/src/routes/planning/scorecard/q04/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={4} label="Cycling accessibility">
+<Question idx={4}>
   <div slot="description">
     <p>
       Are a range of local amenities, and town centres, railway stations,
diff --git a/src/routes/planning/scorecard/q05/+page.svelte b/src/routes/planning/scorecard/q05/+page.svelte
index ade92e2eb57..5494f8f85ff 100644
--- a/src/routes/planning/scorecard/q05/+page.svelte
+++ b/src/routes/planning/scorecard/q05/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={5} label="Access to public transport">
+<Question idx={5}>
   <div slot="description">
     <p>
       Are all buildings within 400m of a high-frequency bus stop or 800m of a
diff --git a/src/routes/planning/scorecard/q06/+page.svelte b/src/routes/planning/scorecard/q06/+page.svelte
index 183a75efce1..c53938340ba 100644
--- a/src/routes/planning/scorecard/q06/+page.svelte
+++ b/src/routes/planning/scorecard/q06/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={6} label="Off-site transport infrastructure">
+<Question idx={6}>
   <div slot="description">
     <p>
       Does the application include proposals to enhance local active travel and
diff --git a/src/routes/planning/scorecard/q07/+page.svelte b/src/routes/planning/scorecard/q07/+page.svelte
index ee59d51c21c..292e9408bde 100644
--- a/src/routes/planning/scorecard/q07/+page.svelte
+++ b/src/routes/planning/scorecard/q07/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={7} label="Site permeability">
+<Question idx={7}>
   <div slot="description">
     <p>
       Does the development prioritise pedestrian and cycle movements within the
diff --git a/src/routes/planning/scorecard/q08/+page.svelte b/src/routes/planning/scorecard/q08/+page.svelte
index 45a388df8b9..34c7f3068a4 100644
--- a/src/routes/planning/scorecard/q08/+page.svelte
+++ b/src/routes/planning/scorecard/q08/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={8} label="Placemaking">
+<Question idx={8}>
   <div slot="description">
     <p>
       Does the development establish a strong sense of place, with well-designed
diff --git a/src/routes/planning/scorecard/q09/+page.svelte b/src/routes/planning/scorecard/q09/+page.svelte
index c0d030e4083..5b91e45538f 100644
--- a/src/routes/planning/scorecard/q09/+page.svelte
+++ b/src/routes/planning/scorecard/q09/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={9} label="Cycle parking and trip-end facilities">
+<Question idx={9}>
   <div slot="description">
     <p>
       Does the application provide the requisite amount and quality of cycle
diff --git a/src/routes/planning/scorecard/q10/+page.svelte b/src/routes/planning/scorecard/q10/+page.svelte
index 5b3a1d3ccf6..c51a8816c16 100644
--- a/src/routes/planning/scorecard/q10/+page.svelte
+++ b/src/routes/planning/scorecard/q10/+page.svelte
@@ -2,7 +2,7 @@
   import Question from "../Question.svelte";
 </script>
 
-<Question idx={10} label="Travel planning">
+<Question idx={10}>
   <div slot="description">
     <p>
       Does the travel plan outline ambitious mode share targets and measures to
diff --git a/src/routes/route_check/path_check/Question.svelte b/src/routes/route_check/path_check/Question.svelte
index 9f75fc727d5..4b349ab05d7 100644
--- a/src/routes/route_check/path_check/Question.svelte
+++ b/src/routes/route_check/path_check/Question.svelte
@@ -5,7 +5,6 @@
   import { scoreToColor } from "$lib/colors";
 
   export let idx: number;
-  export let label: string;
   export let cases: ["0" | "1" | "2" | "N/A", string][];
 
   let choices: [string, string, string, string][] = cases.map(
@@ -18,15 +17,18 @@
   );
 </script>
 
-<PrevNext {idx} total={30} startIdx={17} urlPath="route_check/path_check/pa" />
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>PA{16 + idx}: {label}</h2>
+    <PrevNext
+      {idx}
+      total={30}
+      startIdx={17}
+      urlPath="route_check/path_check/pa"
+    />
 
     <slot />
 
@@ -37,7 +39,12 @@
       bind:existingNotes={$state.pathCheck.existingScoreNotes[idx - 1]}
       bind:proposedNotes={$state.pathCheck.proposedScoreNotes[idx - 1]}
     />
+
+    <PrevNext
+      {idx}
+      total={30}
+      startIdx={17}
+      urlPath="route_check/path_check/pa"
+    />
   </div>
 </div>
-
-<PrevNext {idx} total={30} startIdx={17} urlPath="route_check/path_check/pa" />
diff --git a/src/routes/route_check/path_check/pa17/+page.svelte b/src/routes/route_check/path_check/pa17/+page.svelte
index 42a7075be25..4ef3c2165a2 100644
--- a/src/routes/route_check/path_check/pa17/+page.svelte
+++ b/src/routes/route_check/path_check/pa17/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={1}
-  label="Barriers"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa18/+page.svelte b/src/routes/route_check/path_check/pa18/+page.svelte
index e83a2d61ad9..a38dc647388 100644
--- a/src/routes/route_check/path_check/pa18/+page.svelte
+++ b/src/routes/route_check/path_check/pa18/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={2}
-  label="Steps"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa19/+page.svelte b/src/routes/route_check/path_check/pa19/+page.svelte
index d9c3d295d8f..ffa98f902b6 100644
--- a/src/routes/route_check/path_check/pa19/+page.svelte
+++ b/src/routes/route_check/path_check/pa19/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={3}
-  label="Gradient"
   cases={[
-    ["2", "<p><3%.</p>"],
+    ["2", "<p>&lt;3%.</p>"],
     ["1", "<p>3-5%.</p>"],
-    ["0", "<p>>5%.</p>"],
+    ["0", "<p>&gt;5%.</p>"],
   ]}
 >
   <p>Steepest gradient due to underlying terrain.</p>
diff --git a/src/routes/route_check/path_check/pa20/+page.svelte b/src/routes/route_check/path_check/pa20/+page.svelte
index 62187443248..d66b27e557b 100644
--- a/src/routes/route_check/path_check/pa20/+page.svelte
+++ b/src/routes/route_check/path_check/pa20/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={4}
-  label="Tactile Information and Signal Equipment"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa21/+page.svelte b/src/routes/route_check/path_check/pa21/+page.svelte
index 07a580f2c25..10bc01a37f2 100644
--- a/src/routes/route_check/path_check/pa21/+page.svelte
+++ b/src/routes/route_check/path_check/pa21/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={5}
-  label="Ability to Turn Around"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa22/+page.svelte b/src/routes/route_check/path_check/pa22/+page.svelte
index ee68e220c15..7407d1e00ce 100644
--- a/src/routes/route_check/path_check/pa22/+page.svelte
+++ b/src/routes/route_check/path_check/pa22/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={6}
-  label="Width of Shared Use Spaces"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa23/+page.svelte b/src/routes/route_check/path_check/pa23/+page.svelte
index 32562442429..4310b78850e 100644
--- a/src/routes/route_check/path_check/pa23/+page.svelte
+++ b/src/routes/route_check/path_check/pa23/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={7}
-  label="Width of Walking and Wheeling Spaces"
   cases={[
-    ["2", "<p>>2m.</p>"],
+    ["2", "<p>&gt;2m.</p>"],
     ["1", "<p>1.5-2m.</p>"],
-    ["0", "<p><1.5m.</p>"],
+    ["0", "<p>&lt;1.5m.</p>"],
     ["N/A", ""],
   ]}
 >
diff --git a/src/routes/route_check/path_check/pa24/+page.svelte b/src/routes/route_check/path_check/pa24/+page.svelte
index df812fe2c6e..ac64c2fb487 100644
--- a/src/routes/route_check/path_check/pa24/+page.svelte
+++ b/src/routes/route_check/path_check/pa24/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={8}
-  label="Width of Cycling Spaces"
   cases={[
-    ["2", "<p>>3m.</p>"],
+    ["2", "<p>&gt;3m.</p>"],
     ["1", "<p>2.5-3m</p>"],
-    ["0", "<p><2.5m.</p>"],
+    ["0", "<p>&lt;2.5m.</p>"],
     ["N/A", ""],
   ]}
 >
diff --git a/src/routes/route_check/path_check/pa25/+page.svelte b/src/routes/route_check/path_check/pa25/+page.svelte
index a8a8025a17b..dae35fdbc47 100644
--- a/src/routes/route_check/path_check/pa25/+page.svelte
+++ b/src/routes/route_check/path_check/pa25/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={9}
-  label="Width of Horse Riding Spaces"
   cases={[
     [
       "2",
-      "<p>>3.5m (excluding pinch points where an absolute minimum width of 2m is maintained over a short distance).</p>",
+      "<p>&gt;3.5m (excluding pinch points where an absolute minimum width of 2m is maintained over a short distance).</p>",
     ],
     [
       "1",
@@ -16,7 +15,7 @@
     ],
     [
       "0",
-      "<p><3m (excluding pinch points where an absolute minimum width of 2m is maintained over a short distance).</p>",
+      "<p>&lt;3m (excluding pinch points where an absolute minimum width of 2m is maintained over a short distance).</p>",
     ],
     ["N/A", ""],
   ]}
diff --git a/src/routes/route_check/path_check/pa26/+page.svelte b/src/routes/route_check/path_check/pa26/+page.svelte
index 087bbcec3fe..f881bd811f1 100644
--- a/src/routes/route_check/path_check/pa26/+page.svelte
+++ b/src/routes/route_check/path_check/pa26/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={10}
-  label="Shared Use Surface"
   cases={[
     ["2", "<p>Bound and porous surface (e.g. Flexipave).</p>"],
     [
diff --git a/src/routes/route_check/path_check/pa27/+page.svelte b/src/routes/route_check/path_check/pa27/+page.svelte
index 011aa5b1f99..aa37f4feb5e 100644
--- a/src/routes/route_check/path_check/pa27/+page.svelte
+++ b/src/routes/route_check/path_check/pa27/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={11}
-  label="Walking and Wheeling Surface"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa28/+page.svelte b/src/routes/route_check/path_check/pa28/+page.svelte
index 7c689de6e55..d5a087067af 100644
--- a/src/routes/route_check/path_check/pa28/+page.svelte
+++ b/src/routes/route_check/path_check/pa28/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={12}
-  label="Cycling Surface"
   cases={[
     ["2", "<p>Machine-laid asphalt or smooth and firm blocks.</p>"],
     ["1", "<p>Hand-laid asphalt or smooth blocks.</p>"],
diff --git a/src/routes/route_check/path_check/pa29/+page.svelte b/src/routes/route_check/path_check/pa29/+page.svelte
index bc15a42cb05..866a03f91da 100644
--- a/src/routes/route_check/path_check/pa29/+page.svelte
+++ b/src/routes/route_check/path_check/pa29/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={13}
-  label="Horse Riding Surface"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa30/+page.svelte b/src/routes/route_check/path_check/pa30/+page.svelte
index d9d9f759233..24b810c384a 100644
--- a/src/routes/route_check/path_check/pa30/+page.svelte
+++ b/src/routes/route_check/path_check/pa30/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={14}
-  label="Suitability of Crossings"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa31/+page.svelte b/src/routes/route_check/path_check/pa31/+page.svelte
index ef4349e5f40..73d5527b414 100644
--- a/src/routes/route_check/path_check/pa31/+page.svelte
+++ b/src/routes/route_check/path_check/pa31/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={15}
-  label="Accessibility of Access Points"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa32/+page.svelte b/src/routes/route_check/path_check/pa32/+page.svelte
index cf3394cd63f..fc6bf734766 100644
--- a/src/routes/route_check/path_check/pa32/+page.svelte
+++ b/src/routes/route_check/path_check/pa32/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={16}
-  label="Drainage"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa33/+page.svelte b/src/routes/route_check/path_check/pa33/+page.svelte
index c7eebb767c3..713976bdea3 100644
--- a/src/routes/route_check/path_check/pa33/+page.svelte
+++ b/src/routes/route_check/path_check/pa33/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={17}
-  label="Deviation of Path Against Straight Line"
   cases={[
     ["2", "<p>Deviation factor against straight line less than 1.2.</p>"],
     ["1", "<p>Deviation factor against straight line 1.2-1.4.</p>"],
diff --git a/src/routes/route_check/path_check/pa34/+page.svelte b/src/routes/route_check/path_check/pa34/+page.svelte
index ce0cc047b34..06c52522e73 100644
--- a/src/routes/route_check/path_check/pa34/+page.svelte
+++ b/src/routes/route_check/path_check/pa34/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={18}
-  label="Deviation of Path Against Nearest Alternative Route"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa35/+page.svelte b/src/routes/route_check/path_check/pa35/+page.svelte
index eab7acc0653..c11984cf40e 100644
--- a/src/routes/route_check/path_check/pa35/+page.svelte
+++ b/src/routes/route_check/path_check/pa35/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={19}
-  label="Crossing Locations"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa36/+page.svelte b/src/routes/route_check/path_check/pa36/+page.svelte
index 4020ee0c48a..b7549233980 100644
--- a/src/routes/route_check/path_check/pa36/+page.svelte
+++ b/src/routes/route_check/path_check/pa36/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={20}
-  label="Delay at Crossings"
   cases={[
     ["2", "<p>Maximum waiting time up to 40 seconds.</p>"],
     ["1", "<p>Maximum waiting time 40-60 seconds.</p>"],
diff --git a/src/routes/route_check/path_check/pa37/+page.svelte b/src/routes/route_check/path_check/pa37/+page.svelte
index 497e1c353d3..93cd7ab1d2a 100644
--- a/src/routes/route_check/path_check/pa37/+page.svelte
+++ b/src/routes/route_check/path_check/pa37/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={21}
-  label="Places to Rest"
   cases={[
-    ["2", "<p><50m.</p>"],
+    ["2", "<p>&lt;50m.</p>"],
     ["1", "<p>50-150m.</p>"],
-    ["0", "<p>>150m.</p>"],
+    ["0", "<p>&gt;150m.</p>"],
   ]}
 >
   <p>Distance between resting points.</p>
diff --git a/src/routes/route_check/path_check/pa38/+page.svelte b/src/routes/route_check/path_check/pa38/+page.svelte
index 425b78a99d3..f02de81c88d 100644
--- a/src/routes/route_check/path_check/pa38/+page.svelte
+++ b/src/routes/route_check/path_check/pa38/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={22}
-  label="Places to Shelter"
   cases={[
-    ["2", "<p><50m.</p>"],
+    ["2", "<p>&lt;50m.</p>"],
     ["1", "<p>50-150m.</p>"],
-    ["0", "<p>>150m.</p>"],
+    ["0", "<p>&gt;150m.</p>"],
   ]}
 >
   <p>Distance between shelter points.</p>
diff --git a/src/routes/route_check/path_check/pa39/+page.svelte b/src/routes/route_check/path_check/pa39/+page.svelte
index 5a3345f4f2e..8c09d63c227 100644
--- a/src/routes/route_check/path_check/pa39/+page.svelte
+++ b/src/routes/route_check/path_check/pa39/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={23}
-  label="Lighting"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa40/+page.svelte b/src/routes/route_check/path_check/pa40/+page.svelte
index ff1a315dfc5..8010454c245 100644
--- a/src/routes/route_check/path_check/pa40/+page.svelte
+++ b/src/routes/route_check/path_check/pa40/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={24}
-  label="Cycle Parking"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa41/+page.svelte b/src/routes/route_check/path_check/pa41/+page.svelte
index 374697333b1..4d97f323bf1 100644
--- a/src/routes/route_check/path_check/pa41/+page.svelte
+++ b/src/routes/route_check/path_check/pa41/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={25}
-  label="Impact of Users on Each Other"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa42/+page.svelte b/src/routes/route_check/path_check/pa42/+page.svelte
index 22dc1897bcc..c46aef62af3 100644
--- a/src/routes/route_check/path_check/pa42/+page.svelte
+++ b/src/routes/route_check/path_check/pa42/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={26}
-  label="Ease of Navigation"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa43/+page.svelte b/src/routes/route_check/path_check/pa43/+page.svelte
index b0909334bf5..7fa19151d26 100644
--- a/src/routes/route_check/path_check/pa43/+page.svelte
+++ b/src/routes/route_check/path_check/pa43/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={27}
-  label="Wayfinding"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa44/+page.svelte b/src/routes/route_check/path_check/pa44/+page.svelte
index d4128830500..dc87bd77950 100644
--- a/src/routes/route_check/path_check/pa44/+page.svelte
+++ b/src/routes/route_check/path_check/pa44/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={28}
-  label="Proximity to Destinations"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa45/+page.svelte b/src/routes/route_check/path_check/pa45/+page.svelte
index 1351a909262..1cc8079c556 100644
--- a/src/routes/route_check/path_check/pa45/+page.svelte
+++ b/src/routes/route_check/path_check/pa45/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={29}
-  label="Quality of Connections"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_check/pa46/+page.svelte b/src/routes/route_check/path_check/pa46/+page.svelte
index c18415d95d5..0061f7cdc95 100644
--- a/src/routes/route_check/path_check/pa46/+page.svelte
+++ b/src/routes/route_check/path_check/pa46/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={30}
-  label="Connectivity with Other Horse Riding Routes"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/Question.svelte b/src/routes/route_check/path_placemaking_check/Question.svelte
index 00807beddca..9107624cec2 100644
--- a/src/routes/route_check/path_placemaking_check/Question.svelte
+++ b/src/routes/route_check/path_placemaking_check/Question.svelte
@@ -5,7 +5,6 @@
   import { scoreToColor } from "$lib/colors";
 
   export let idx: number;
-  export let label: string;
   export let cases: ["0" | "1" | "2", string][];
 
   let choices: [string, string, string, string][] = cases.map(
@@ -18,15 +17,17 @@
   );
 </script>
 
-<PrevNext {idx} total={19} urlPath="route_check/path_placemaking_check/pp" />
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>PP{idx.toString().padStart(2, "0")}: {label}</h2>
+    <PrevNext
+      {idx}
+      total={19}
+      urlPath="route_check/path_placemaking_check/pp"
+    />
 
     <slot />
 
@@ -42,6 +43,6 @@
       ]}
     />
   </div>
-</div>
 
-<PrevNext {idx} total={19} urlPath="route_check/path_placemaking_check/pp" />
+  <PrevNext {idx} total={19} urlPath="route_check/path_placemaking_check/pp" />
+</div>
diff --git a/src/routes/route_check/path_placemaking_check/pp01/+page.svelte b/src/routes/route_check/path_placemaking_check/pp01/+page.svelte
index a0b358031c5..1383c72445d 100644
--- a/src/routes/route_check/path_placemaking_check/pp01/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp01/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={1}
-  label="Engagement for Children"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp02/+page.svelte b/src/routes/route_check/path_placemaking_check/pp02/+page.svelte
index 8845f27c47a..a06ee25d5e1 100644
--- a/src/routes/route_check/path_placemaking_check/pp02/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp02/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={2}
-  label="Social Space"
   cases={[
-    ["2", "<p><400m.</p>"],
+    ["2", "<p>&lt;400m.</p>"],
     ["1", "<p>400-800m.</p>"],
-    ["0", "<p>>800m.</p>"],
+    ["0", "<p>&gt;800m.</p>"],
   ]}
 >
   <p>Proximity to places where people might stop and have a conversation.</p>
diff --git a/src/routes/route_check/path_placemaking_check/pp03/+page.svelte b/src/routes/route_check/path_placemaking_check/pp03/+page.svelte
index f70cae014aa..1af8a6b88c6 100644
--- a/src/routes/route_check/path_placemaking_check/pp03/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp03/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={3}
-  label="Points of Interest"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp04/+page.svelte b/src/routes/route_check/path_placemaking_check/pp04/+page.svelte
index 1ad5b6d68dd..6a0a9e7b6d9 100644
--- a/src/routes/route_check/path_placemaking_check/pp04/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp04/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={4}
-  label="Surveillance and Activity"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp05/+page.svelte b/src/routes/route_check/path_placemaking_check/pp05/+page.svelte
index 3d7813711af..15762428531 100644
--- a/src/routes/route_check/path_placemaking_check/pp05/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp05/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={5}
-  label="Forward Visibility and Escape Routes"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp06/+page.svelte b/src/routes/route_check/path_placemaking_check/pp06/+page.svelte
index 6a6a7c1c021..fb6ee859db6 100644
--- a/src/routes/route_check/path_placemaking_check/pp06/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp06/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={6}
-  label="Visibility of Others"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp07/+page.svelte b/src/routes/route_check/path_placemaking_check/pp07/+page.svelte
index 9d589189934..23a6599de6d 100644
--- a/src/routes/route_check/path_placemaking_check/pp07/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp07/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={7}
-  label="Maintenance and Upkeep"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp08/+page.svelte b/src/routes/route_check/path_placemaking_check/pp08/+page.svelte
index 1ff7fd37032..e166f7e5ba0 100644
--- a/src/routes/route_check/path_placemaking_check/pp08/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp08/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={8}
-  label="Consistency of Materials and Path Furniture"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp09/+page.svelte b/src/routes/route_check/path_placemaking_check/pp09/+page.svelte
index e1aabf47313..6d4cbb96bc4 100644
--- a/src/routes/route_check/path_placemaking_check/pp09/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp09/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={9}
-  label="Visual Interest"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp10/+page.svelte b/src/routes/route_check/path_placemaking_check/pp10/+page.svelte
index a0e7771256f..a78fed5d17f 100644
--- a/src/routes/route_check/path_placemaking_check/pp10/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp10/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={10}
-  label="Features to Support Walking, Wheeling and Cycling"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp11/+page.svelte b/src/routes/route_check/path_placemaking_check/pp11/+page.svelte
index 19203cde3c8..ca4a3db8aba 100644
--- a/src/routes/route_check/path_placemaking_check/pp11/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp11/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={11}
-  label="Trees"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp12/+page.svelte b/src/routes/route_check/path_placemaking_check/pp12/+page.svelte
index d76d9df424d..28e95eb0aa9 100644
--- a/src/routes/route_check/path_placemaking_check/pp12/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp12/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={12}
-  label="Planting"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp13/+page.svelte b/src/routes/route_check/path_placemaking_check/pp13/+page.svelte
index afc8df72f7d..7d39777375e 100644
--- a/src/routes/route_check/path_placemaking_check/pp13/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp13/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={13}
-  label="Ancillary Features to Support Fauna"
   cases={[
     ["2", "<p>Multiple features.</p>"],
     ["1", "<p>One feature.</p>"],
diff --git a/src/routes/route_check/path_placemaking_check/pp14/+page.svelte b/src/routes/route_check/path_placemaking_check/pp14/+page.svelte
index 2cc00edf3ef..c02fa361fb4 100644
--- a/src/routes/route_check/path_placemaking_check/pp14/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp14/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={14}
-  label="Sustainable Materials"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp15/+page.svelte b/src/routes/route_check/path_placemaking_check/pp15/+page.svelte
index 06dc7cc65ae..747c430e995 100644
--- a/src/routes/route_check/path_placemaking_check/pp15/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp15/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={15}
-  label="Air Pollution - Exposure"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp16/+page.svelte b/src/routes/route_check/path_placemaking_check/pp16/+page.svelte
index 192b5a7b41a..b1c3d637e42 100644
--- a/src/routes/route_check/path_placemaking_check/pp16/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp16/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={16}
-  label="Air Pollution - Proximity"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp17/+page.svelte b/src/routes/route_check/path_placemaking_check/pp17/+page.svelte
index 9c51e0751a0..e646a636614 100644
--- a/src/routes/route_check/path_placemaking_check/pp17/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp17/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={17}
-  label="Noise Pollution"
   cases={[
-    ["2", "<p>Comfortable noise levels (<65dB).</p>"],
+    ["2", "<p>Comfortable noise levels (&lt;65dB).</p>"],
     ["1", "<p>Slightly noisy (65-78dB).</p>"],
-    ["0", "<p>Excessively noisy (>78dB).</p>"],
+    ["0", "<p>Excessively noisy (&gt;78dB).</p>"],
   ]}
 >
   <p>Effect of noise pollution from traffic on user experience.</p>
diff --git a/src/routes/route_check/path_placemaking_check/pp18/+page.svelte b/src/routes/route_check/path_placemaking_check/pp18/+page.svelte
index 588fd99607b..8e1c05a03a2 100644
--- a/src/routes/route_check/path_placemaking_check/pp18/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp18/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={18}
-  label="Light Pollution"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/path_placemaking_check/pp19/+page.svelte b/src/routes/route_check/path_placemaking_check/pp19/+page.svelte
index 6ddb27f92c8..01130658e12 100644
--- a/src/routes/route_check/path_placemaking_check/pp19/+page.svelte
+++ b/src/routes/route_check/path_placemaking_check/pp19/+page.svelte
@@ -4,10 +4,9 @@
 
 <Question
   idx={19}
-  label="Sunlight"
   cases={[
-    ["2", "<p>>2 hours direct sunlight on shortest day of year.</p>"],
-    ["1", "<p><2 hours direct sunlight on shortest day of year.</p>"],
+    ["2", "<p>&gt;2 hours direct sunlight on shortest day of year.</p>"],
+    ["1", "<p>&lt;2 hours direct sunlight on shortest day of year.</p>"],
     ["0", "<p>No sunlight penetration.</p>"],
   ]}
 >
diff --git a/src/routes/route_check/safety_check/Question.svelte b/src/routes/route_check/safety_check/Question.svelte
index 88cb9dea1de..def5cf462fd 100644
--- a/src/routes/route_check/safety_check/Question.svelte
+++ b/src/routes/route_check/safety_check/Question.svelte
@@ -7,7 +7,6 @@
   import { defaultCriticalType } from "../lists";
 
   export let idx: number;
-  export let label: string;
   export let cases: ["C" | "0" | "1" | "2" | "N/A", string][];
 
   let choices: [string, string, string, string][] = cases.map(
@@ -20,15 +19,13 @@
   );
 </script>
 
-<PrevNext {idx} total={16} urlPath="route_check/safety_check/sa" />
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>SA{idx.toString().padStart(2, "0")}: {label}</h2>
+    <PrevNext {idx} total={16} urlPath="route_check/safety_check/sa" />
 
     <slot />
 
@@ -51,7 +48,7 @@
         </a>
       </p>
     {/if}
+
+    <PrevNext {idx} total={16} urlPath="route_check/safety_check/sa" />
   </div>
 </div>
-
-<PrevNext {idx} total={16} urlPath="route_check/safety_check/sa" />
diff --git a/src/routes/route_check/safety_check/sa01/+page.svelte b/src/routes/route_check/safety_check/sa01/+page.svelte
index 95f9391ce3f..f63cdd2887f 100644
--- a/src/routes/route_check/safety_check/sa01/+page.svelte
+++ b/src/routes/route_check/safety_check/sa01/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={1}
-  label="Conflict at Side Roads and Priority Junctions"
   cases={[
     [
       "2",
@@ -12,15 +11,15 @@
     ],
     [
       "1",
-      "<p><2,500vpd cut across main walking, wheeling or cycling streams and side roads and priority junctions have entry treatments.</p>",
+      "<p>&lt;2,500vpd cut across main walking, wheeling or cycling streams and side roads and priority junctions have entry treatments.</p>",
     ],
     [
       "0",
-      "<p><2,500vpd cut across main walking, wheeling or cycling streams, but side roads and priority junctions are untreated.</p>",
+      "<p>&lt;2,500vpd cut across main walking, wheeling or cycling streams, but side roads and priority junctions are untreated.</p>",
     ],
     [
       "C",
-      "<p>>2,500vpd cut across main walking, wheeling or cycling streams.</p>",
+      "<p>&gt;2,500vpd cut across main walking, wheeling or cycling streams.</p>",
     ],
     ["N/A", ""],
   ]}
diff --git a/src/routes/route_check/safety_check/sa02/+page.svelte b/src/routes/route_check/safety_check/sa02/+page.svelte
index fcf4361cc58..1c5a20abf13 100644
--- a/src/routes/route_check/safety_check/sa02/+page.svelte
+++ b/src/routes/route_check/safety_check/sa02/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={2}
-  label="Conflict at Roundabouts and Signal Junctions"
   cases={[
     [
       "2",
@@ -20,7 +19,7 @@
     ],
     [
       "C",
-      "<p>>2,500vpd cut across main walking, wheeling or cycling streams.</p>",
+      "<p>&gt;2,500vpd cut across main walking, wheeling or cycling streams.</p>",
     ],
     ["N/A", ""],
   ]}
diff --git a/src/routes/route_check/safety_check/sa03/+page.svelte b/src/routes/route_check/safety_check/sa03/+page.svelte
index 78858bf3c57..7af1f3c4265 100644
--- a/src/routes/route_check/safety_check/sa03/+page.svelte
+++ b/src/routes/route_check/safety_check/sa03/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={3}
-  label="Lane Widths"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/safety_check/sa04/+page.svelte b/src/routes/route_check/safety_check/sa04/+page.svelte
index 857f55eeda2..8d1bea3753c 100644
--- a/src/routes/route_check/safety_check/sa04/+page.svelte
+++ b/src/routes/route_check/safety_check/sa04/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={4}
-  label="Trip Hazards"
   cases={[
     ["2", "<p>No trip hazards, level clear surface.</p>"],
     ["1", "<p>Few trip hazards.</p>"],
diff --git a/src/routes/route_check/safety_check/sa05/+page.svelte b/src/routes/route_check/safety_check/sa05/+page.svelte
index 1b07a5e24bd..68621e820d1 100644
--- a/src/routes/route_check/safety_check/sa05/+page.svelte
+++ b/src/routes/route_check/safety_check/sa05/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={5}
-  label="Kerbside Activity"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/safety_check/sa06/+page.svelte b/src/routes/route_check/safety_check/sa06/+page.svelte
index f8ea0a099b7..1e4b04867a2 100644
--- a/src/routes/route_check/safety_check/sa06/+page.svelte
+++ b/src/routes/route_check/safety_check/sa06/+page.svelte
@@ -4,23 +4,22 @@
 
 <Question
   idx={6}
-  label="Provision of Crossings"
   cases={[
     [
       "2",
-      "<p>On very busy streets (>8,000vpd), controlled crossings (including zebra crossings) are provided every 50-100m.</p><p>On quieter streets (<8,000vpd), there are controlled crossings or only one lane of traffic to cross.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), controlled crossings (including zebra crossings) are provided every 50-100m.</p><p>On quieter streets (&lt;8,000vpd), there are controlled crossings or only one lane of traffic to cross.</p>",
     ],
     [
       "1",
-      "<p>On very busy streets (>8,000vpd), controlled crossings (including zebra crossings) are provided every 100-200m.</p><p>On quieter streets (<8,000vpd), loading/parking is formalised with gaps for pedestrians to cross on desire lines.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), controlled crossings (including zebra crossings) are provided every 100-200m.</p><p>On quieter streets (&lt;8,000vpd), loading/parking is formalised with gaps for pedestrians to cross on desire lines.</p>",
     ],
     [
       "0",
-      "<p>On very busy streets (>8,000vpd), controlled crossings (including zebra crossings) are provided every 200-400m.</p><p>On quieter streets (<8,000vpd), loading/parking is formalised with gaps for pedestrians to cross.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), controlled crossings (including zebra crossings) are provided every 200-400m.</p><p>On quieter streets (&lt;8,000vpd), loading/parking is formalised with gaps for pedestrians to cross.</p>",
     ],
     [
       "C",
-      "<p>On very busy streets (>8,000vpd) controlled crossings (including zebra crossings) are not present or more than 400m apart.</p><p>On quieter streets (<8,000vpd), desire lines are blocked by parking and loading.</p>",
+      "<p>On very busy streets (&gt;8,000vpd) controlled crossings (including zebra crossings) are not present or more than 400m apart.</p><p>On quieter streets (&lt;8,000vpd), desire lines are blocked by parking and loading.</p>",
     ],
   ]}
 >
diff --git a/src/routes/route_check/safety_check/sa07/+page.svelte b/src/routes/route_check/safety_check/sa07/+page.svelte
index 9dd70ccada6..0ed721b8da6 100644
--- a/src/routes/route_check/safety_check/sa07/+page.svelte
+++ b/src/routes/route_check/safety_check/sa07/+page.svelte
@@ -4,23 +4,22 @@
 
 <Question
   idx={7}
-  label="Standard of Crossings"
   cases={[
     [
       "2",
-      "<p>On very busy streets (>8,000vpd), signal crossings rest on green for pedestrians or have rapid response.</p><p>On quieter streets (<8,000vpd), crossing points are controlled crossings.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), signal crossings rest on green for pedestrians or have rapid response.</p><p>On quieter streets (&lt;8,000vpd), crossing points are controlled crossings.</p>",
     ],
     [
       "1",
-      "<p>On very busy streets (>8,000vpd), signal crossings are provided for pedestrians.</p><p>On quieter streets (<8,000vpd), crossing points have effective implied priority for pedestrians.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), signal crossings are provided for pedestrians.</p><p>On quieter streets (&lt;8,000vpd), crossing points have effective implied priority for pedestrians.</p>",
     ],
     [
       "0",
-      "<p>On very busy streets (>8,000vpd), there are uncontrolled crossings or zebra/parallel crossings.</p><p>On quieter streets (<8,000vpd), crossing points have no implied priority or there are no crossing points.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), there are uncontrolled crossings or zebra/parallel crossings.</p><p>On quieter streets (&lt;8,000vpd), crossing points have no implied priority or there are no crossing points.</p>",
     ],
     [
       "C",
-      "<p>On very busy streets (>8,000vpd), there are uncontrolled crossings of two or more lanes with no gaps in traffic.</p><p>At signal junctions there are arms with dropped kerbs and tactile paving but no green pedestrian symbol.</p>",
+      "<p>On very busy streets (&gt;8,000vpd), there are uncontrolled crossings of two or more lanes with no gaps in traffic.</p><p>At signal junctions there are arms with dropped kerbs and tactile paving but no green pedestrian symbol.</p>",
     ],
     ["N/A", ""],
   ]}
diff --git a/src/routes/route_check/safety_check/sa08/+page.svelte b/src/routes/route_check/safety_check/sa08/+page.svelte
index f0fb6fa15be..05bb36f2d1e 100644
--- a/src/routes/route_check/safety_check/sa08/+page.svelte
+++ b/src/routes/route_check/safety_check/sa08/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={8}
-  label="Motor Traffic Speed"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/safety_check/sa09/+page.svelte b/src/routes/route_check/safety_check/sa09/+page.svelte
index 9d35a1ee434..a2ea8ae6558 100644
--- a/src/routes/route_check/safety_check/sa09/+page.svelte
+++ b/src/routes/route_check/safety_check/sa09/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={9}
-  label="Motor Traffic Volume"
   cases={[
     [
       "2",
-      "<p><200 vehicles in the busiest hour.</p><p>Or, cyclists are protected from motor traffic or off-road entirely and controlled crossings are provided for pedestrians wherever needed.</p>",
+      "<p>&lt;200 vehicles in the busiest hour.</p><p>Or, cyclists are protected from motor traffic or off-road entirely and controlled crossings are provided for pedestrians wherever needed.</p>",
     ],
     [
       "1",
@@ -20,7 +19,7 @@
     ],
     [
       "C",
-      "<p>>1,000 vehicles in the busiest hour.</p><p>Or, over 5% of traffic is HGVs where there are over 500 vehicles in the busiest hour.</p>",
+      "<p>&gt;1,000 vehicles in the busiest hour.</p><p>Or, over 5% of traffic is HGVs where there are over 500 vehicles in the busiest hour.</p>",
     ],
   ]}
 >
diff --git a/src/routes/route_check/safety_check/sa10/+page.svelte b/src/routes/route_check/safety_check/sa10/+page.svelte
index de18ef61340..da80b8cbefc 100644
--- a/src/routes/route_check/safety_check/sa10/+page.svelte
+++ b/src/routes/route_check/safety_check/sa10/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={10}
-  label="Pedestrian Crossing Speed"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/safety_check/sa11/+page.svelte b/src/routes/route_check/safety_check/sa11/+page.svelte
index e4d619988ad..62762875b64 100644
--- a/src/routes/route_check/safety_check/sa11/+page.svelte
+++ b/src/routes/route_check/safety_check/sa11/+page.svelte
@@ -4,23 +4,22 @@
 
 <Question
   idx={11}
-  label="Footway Widths"
   cases={[
     [
       "2",
-      "<p>>3m clear footway width and pedestrian comfort is good (PCL of A-C).</p>",
+      "<p>&gt;3m clear footway width and pedestrian comfort is good (PCL of A-C).</p>",
     ],
     [
       "1",
-      "<p>Where the footway is next to the carriageway, there is:</p><ul><li>2m-3m clear footway width and pedestrian comfort is good (PCL of A-C).</li><li>>3m clear footway width and pedestrian comfort is poor (PCL of D-E).</li></ul><p>Where the footway is not next to the carriageway, the clear footway width is 1.5m-3m.</p>",
+      "<p>Where the footway is next to the carriageway, there is:</p><ul><li>2m-3m clear footway width and pedestrian comfort is good (PCL of A-C).</li><li>&gt;3m clear footway width and pedestrian comfort is poor (PCL of D-E).</li></ul><p>Where the footway is not next to the carriageway, the clear footway width is 1.5m-3m.</p>",
     ],
     [
       "0",
-      "<p>Where the footway is next to the carriageway, there is:</p><ul><li><2m clear footway width but pedestrian comfort is good (PCL of A-C)</li><li>2m-3m clear footway width and pedestrian comfort is poor (PCL of D-E).</li></ul><p>Where the footway is not next to the carriageway, the clear footway width is <1.5m.</p>",
+      "<p>Where the footway is next to the carriageway, there is:</p><ul><li>&lt;2m clear footway width but pedestrian comfort is good (PCL of A-C)</li><li>2m-3m clear footway width and pedestrian comfort is poor (PCL of D-E).</li></ul><p>Where the footway is not next to the carriageway, the clear footway width is &lt;1.5m.</p>",
     ],
     [
       "C",
-      "<p>Where the footway is next to the carriageway, there is:</p><ul><li><1m clear footway width on any footway</li><li><1.5m clear footway width for over 6m</li><li>1m-2m clear footway width with a Pedestrian Comfort Level of D-E</li></ul><p>Or there is no footway.</p>",
+      "<p>Where the footway is next to the carriageway, there is:</p><ul><li>&lt;1m clear footway width on any footway</li><li>&lt;1.5m clear footway width for over 6m</li><li>1m-2m clear footway width with a Pedestrian Comfort Level of D-E</li></ul><p>Or there is no footway.</p>",
     ],
   ]}
 >
diff --git a/src/routes/route_check/safety_check/sa12/+page.svelte b/src/routes/route_check/safety_check/sa12/+page.svelte
index 0cf434fb7c5..69010ddc7dd 100644
--- a/src/routes/route_check/safety_check/sa12/+page.svelte
+++ b/src/routes/route_check/safety_check/sa12/+page.svelte
@@ -4,14 +4,13 @@
 
 <Question
   idx={12}
-  label="Effective Width next to Tram Lines"
   cases={[
     ["2", "<p>Physical protection is provided for cyclists.</p>"],
-    ["1", "<p>>2.4m from tramline edge to kerb.</p>"],
+    ["1", "<p>&gt;2.4m from tramline edge to kerb.</p>"],
     ["0", "<p>2.4m from tramline edge to kerb.</p>"],
     [
       "C",
-      "<p><2.4m from tramline edge to kerb on a straight run.</p><p>Insufficient clearance on a curve.</p>",
+      "<p>&lt;2.4m from tramline edge to kerb on a straight run.</p><p>Insufficient clearance on a curve.</p>",
     ],
     ["N/A", ""],
   ]}
diff --git a/src/routes/route_check/safety_check/sa13/+page.svelte b/src/routes/route_check/safety_check/sa13/+page.svelte
index 4144f74203e..0d6f44e0652 100644
--- a/src/routes/route_check/safety_check/sa13/+page.svelte
+++ b/src/routes/route_check/safety_check/sa13/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={13}
-  label="Crossing Angle of Tram/Train Rails"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/safety_check/sa14/+page.svelte b/src/routes/route_check/safety_check/sa14/+page.svelte
index dd4ecea96b0..aff40dd1476 100644
--- a/src/routes/route_check/safety_check/sa14/+page.svelte
+++ b/src/routes/route_check/safety_check/sa14/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={14}
-  label="Cycling Surface and Maintenance Defects"
   cases={[
     ["2", "<p>No defects.</p>"],
     ["1", "<p>Few minor defects.</p>"],
@@ -14,7 +13,7 @@
 >
   <p>Cycling surface and maintenance defects:</p>
   <ul>
-    <li>sharp gradients (≥12.5%)</li>
+    <li>sharp gradients (&ge;12.5%)</li>
     <li>non cycle friendly ironworks</li>
     <li>raised/sunken covers or gullies</li>
     <li>potholes</li>
diff --git a/src/routes/route_check/safety_check/sa15/+page.svelte b/src/routes/route_check/safety_check/sa15/+page.svelte
index 3979f6dd738..1097c001e4f 100644
--- a/src/routes/route_check/safety_check/sa15/+page.svelte
+++ b/src/routes/route_check/safety_check/sa15/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={15}
-  label="Walking/Wheeling Surface and Maintenance Defects"
   cases={[
     ["2", "<p>No defects.</p>"],
     ["1", "<p>Few minor defects.</p>"],
@@ -14,8 +13,10 @@
 >
   <p>Walking/wheeling surface and maintenance defects:</p>
   <ul>
-    <li>steep camber (horizontal gradient >2.5% )</li>
-    <li>steep longitudinal gradients (≥8% if under 1m, ≥5% if 1m or over)</li>
+    <li>steep camber (horizontal gradient &gt;2.5% )</li>
+    <li>
+      steep longitudinal gradients (&ge;8% if under 1m, &ge;5% if 1m or over)
+    </li>
     <li>missing dropped kerbs</li>
     <li>non flush tables</li>
     <li>misleading tactile information</li>
diff --git a/src/routes/route_check/safety_check/sa16/+page.svelte b/src/routes/route_check/safety_check/sa16/+page.svelte
index 2af9bd575b0..8af402fc274 100644
--- a/src/routes/route_check/safety_check/sa16/+page.svelte
+++ b/src/routes/route_check/safety_check/sa16/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={16}
-  label="Guard Railing"
   cases={[
     ["2", "<p>No guard railing anywhere on the route.</p>"],
     [
diff --git a/src/routes/route_check/street_check/Question.svelte b/src/routes/route_check/street_check/Question.svelte
index d873532b9de..50d319cf70b 100644
--- a/src/routes/route_check/street_check/Question.svelte
+++ b/src/routes/route_check/street_check/Question.svelte
@@ -5,7 +5,6 @@
   import { scoreToColor } from "$lib/colors";
 
   export let idx: number;
-  export let label: string;
   export let cases: ["0" | "1" | "2" | "N/A", string][];
 
   let choices: [string, string, string, string][] = cases.map(
@@ -18,20 +17,18 @@
   );
 </script>
 
-<PrevNext
-  {idx}
-  total={26}
-  startIdx={17}
-  urlPath="route_check/street_check/st"
-/>
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>ST{16 + idx}: {label}</h2>
+    <PrevNext
+      {idx}
+      total={26}
+      startIdx={17}
+      urlPath="route_check/street_check/st"
+    />
 
     <slot />
 
@@ -42,12 +39,12 @@
       bind:existingNotes={$state.streetCheck.existingScoreNotes[idx - 1]}
       bind:proposedNotes={$state.streetCheck.proposedScoreNotes[idx - 1]}
     />
+
+    <PrevNext
+      {idx}
+      total={26}
+      startIdx={17}
+      urlPath="route_check/street_check/st"
+    />
   </div>
 </div>
-
-<PrevNext
-  {idx}
-  total={26}
-  startIdx={17}
-  urlPath="route_check/street_check/st"
-/>
diff --git a/src/routes/route_check/street_check/st17/+page.svelte b/src/routes/route_check/street_check/st17/+page.svelte
index bcf2bf8f392..0553a9cc433 100644
--- a/src/routes/route_check/street_check/st17/+page.svelte
+++ b/src/routes/route_check/street_check/st17/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={1}
-  label="Gradient"
   cases={[
-    ["2", "<p><3%.</p>"],
+    ["2", "<p>&lt;3%.</p>"],
     ["1", "<p>3-5%.</p>"],
-    ["0", "<p>>5%.</p>"],
+    ["0", "<p>&gt;5%.</p>"],
   ]}
 >
   <p>Steepest gradient due to underlying terrain.</p>
diff --git a/src/routes/route_check/street_check/st18/+page.svelte b/src/routes/route_check/street_check/st18/+page.svelte
index b30ea29e027..b365bb6de65 100644
--- a/src/routes/route_check/street_check/st18/+page.svelte
+++ b/src/routes/route_check/street_check/st18/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={2}
-  label="Tactile Information and Signal Equipment"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st19/+page.svelte b/src/routes/route_check/street_check/st19/+page.svelte
index b2f83799d28..4a5dc6c2e11 100644
--- a/src/routes/route_check/street_check/st19/+page.svelte
+++ b/src/routes/route_check/street_check/st19/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={3}
-  label="Barriers"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st20/+page.svelte b/src/routes/route_check/street_check/st20/+page.svelte
index bd7bdbd173e..920aac083b7 100644
--- a/src/routes/route_check/street_check/st20/+page.svelte
+++ b/src/routes/route_check/street_check/st20/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={4}
-  label="Bus Stops"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st21/+page.svelte b/src/routes/route_check/street_check/st21/+page.svelte
index d8558a51c5d..4439c9fa878 100644
--- a/src/routes/route_check/street_check/st21/+page.svelte
+++ b/src/routes/route_check/street_check/st21/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={5}
-  label="Wheelchair Access"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st22/+page.svelte b/src/routes/route_check/street_check/st22/+page.svelte
index 239edececab..40aeb557250 100644
--- a/src/routes/route_check/street_check/st22/+page.svelte
+++ b/src/routes/route_check/street_check/st22/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={6}
-  label="Access to Taxis and Blue Badge Parking"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st23/+page.svelte b/src/routes/route_check/street_check/st23/+page.svelte
index 4be43b22124..9a8a5e41ee9 100644
--- a/src/routes/route_check/street_check/st23/+page.svelte
+++ b/src/routes/route_check/street_check/st23/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={7}
-  label="Access to Toilets"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st24/+page.svelte b/src/routes/route_check/street_check/st24/+page.svelte
index 0cec7241977..a2a32dc11e4 100644
--- a/src/routes/route_check/street_check/st24/+page.svelte
+++ b/src/routes/route_check/street_check/st24/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={8}
-  label="Cycling Surface Material"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st25/+page.svelte b/src/routes/route_check/street_check/st25/+page.svelte
index 514da0b730c..f35d7097999 100644
--- a/src/routes/route_check/street_check/st25/+page.svelte
+++ b/src/routes/route_check/street_check/st25/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={9}
-  label="Walking/Wheeling Surface Material"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st26/+page.svelte b/src/routes/route_check/street_check/st26/+page.svelte
index b027fc2ab94..dcf7ad0c790 100644
--- a/src/routes/route_check/street_check/st26/+page.svelte
+++ b/src/routes/route_check/street_check/st26/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={10}
-  label="Effective Width for Cyclists"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st27/+page.svelte b/src/routes/route_check/street_check/st27/+page.svelte
index 5d10b783111..99ea1263feb 100644
--- a/src/routes/route_check/street_check/st27/+page.svelte
+++ b/src/routes/route_check/street_check/st27/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={11}
-  label="Deviation of Cycle Route"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st28/+page.svelte b/src/routes/route_check/street_check/st28/+page.svelte
index 7bded508918..82dcefbc1df 100644
--- a/src/routes/route_check/street_check/st28/+page.svelte
+++ b/src/routes/route_check/street_check/st28/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={12}
-  label="Pedestrian Crossing Locations"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st29/+page.svelte b/src/routes/route_check/street_check/st29/+page.svelte
index 4186b140c6d..748718b91d7 100644
--- a/src/routes/route_check/street_check/st29/+page.svelte
+++ b/src/routes/route_check/street_check/st29/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={13}
-  label="Cyclist Delay at Junctions"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st30/+page.svelte b/src/routes/route_check/street_check/st30/+page.svelte
index e43acd24576..90ee5922655 100644
--- a/src/routes/route_check/street_check/st30/+page.svelte
+++ b/src/routes/route_check/street_check/st30/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={14}
-  label="Cyclist Delay on Links"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st31/+page.svelte b/src/routes/route_check/street_check/st31/+page.svelte
index a1f4cfeab57..ea0d5dbf3f5 100644
--- a/src/routes/route_check/street_check/st31/+page.svelte
+++ b/src/routes/route_check/street_check/st31/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={15}
-  label="Pedestrian Delay at Junctions"
   cases={[
     ["2", "<p>Maximum waiting time up to 40 seconds.</p>"],
     ["1", "<p>Maximum waiting time 40-60 seconds.</p>"],
diff --git a/src/routes/route_check/street_check/st32/+page.svelte b/src/routes/route_check/street_check/st32/+page.svelte
index 29f5f167cd2..57d3d2e9629 100644
--- a/src/routes/route_check/street_check/st32/+page.svelte
+++ b/src/routes/route_check/street_check/st32/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={16}
-  label="Pedestrian Delay at Standalone Signal Crossings"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st33/+page.svelte b/src/routes/route_check/street_check/st33/+page.svelte
index 80298071dca..c485a9a93db 100644
--- a/src/routes/route_check/street_check/st33/+page.svelte
+++ b/src/routes/route_check/street_check/st33/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={17}
-  label="Wayfinding"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st34/+page.svelte b/src/routes/route_check/street_check/st34/+page.svelte
index 27b968ea437..7b854d8d990 100644
--- a/src/routes/route_check/street_check/st34/+page.svelte
+++ b/src/routes/route_check/street_check/st34/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={18}
-  label="Places to Rest"
   cases={[
-    ["2", "<p><50m.</p>"],
+    ["2", "<p>&lt;50m.</p>"],
     ["1", "<p>50-150m.</p>"],
-    ["0", "<p>>150m.</p>"],
+    ["0", "<p>&gt;150m.</p>"],
   ]}
 >
   <p>Distance between resting points.</p>
diff --git a/src/routes/route_check/street_check/st35/+page.svelte b/src/routes/route_check/street_check/st35/+page.svelte
index 82fe5a4c1a3..04f25929e7e 100644
--- a/src/routes/route_check/street_check/st35/+page.svelte
+++ b/src/routes/route_check/street_check/st35/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={19}
-  label="Places to Shelter"
   cases={[
-    ["2", "<p><50m.</p>"],
+    ["2", "<p>&lt;50m.</p>"],
     ["1", "<p>50-150m.</p>"],
-    ["0", "<p>>150m.</p>"],
+    ["0", "<p>&gt;150m.</p>"],
   ]}
 >
   <p>Distance between shelter points.</p>
diff --git a/src/routes/route_check/street_check/st36/+page.svelte b/src/routes/route_check/street_check/st36/+page.svelte
index 565d6772261..9f91c2d2032 100644
--- a/src/routes/route_check/street_check/st36/+page.svelte
+++ b/src/routes/route_check/street_check/st36/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={20}
-  label="Lighting"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st37/+page.svelte b/src/routes/route_check/street_check/st37/+page.svelte
index 0278b2566c2..13891ecf2b5 100644
--- a/src/routes/route_check/street_check/st37/+page.svelte
+++ b/src/routes/route_check/street_check/st37/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={21}
-  label="Cycle Parking"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st38/+page.svelte b/src/routes/route_check/street_check/st38/+page.svelte
index 46f44d814ce..31005367c9f 100644
--- a/src/routes/route_check/street_check/st38/+page.svelte
+++ b/src/routes/route_check/street_check/st38/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={22}
-  label="Impact of Cycling on Walking"
   cases={[
     ["2", "<p>There are no shared use cycle tracks.</p>"],
     [
diff --git a/src/routes/route_check/street_check/st39/+page.svelte b/src/routes/route_check/street_check/st39/+page.svelte
index c455b8cab67..8a83a5d1126 100644
--- a/src/routes/route_check/street_check/st39/+page.svelte
+++ b/src/routes/route_check/street_check/st39/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={23}
-  label="Impact of Motor Traffic on Pedestrians and Cyclists"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st40/+page.svelte b/src/routes/route_check/street_check/st40/+page.svelte
index 499a68b1c6d..6af576ead57 100644
--- a/src/routes/route_check/street_check/st40/+page.svelte
+++ b/src/routes/route_check/street_check/st40/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={24}
-  label="Transitions for Cyclists"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st41/+page.svelte b/src/routes/route_check/street_check/st41/+page.svelte
index 6ce9ca3f29f..21525350aea 100644
--- a/src/routes/route_check/street_check/st41/+page.svelte
+++ b/src/routes/route_check/street_check/st41/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={25}
-  label="Route Continuity "
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_check/st42/+page.svelte b/src/routes/route_check/street_check/st42/+page.svelte
index c4ef355ab75..0f3a1acbe49 100644
--- a/src/routes/route_check/street_check/st42/+page.svelte
+++ b/src/routes/route_check/street_check/st42/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={26}
-  label="Consistency of Route"
   cases={[
     ["2", "<p>Provision is consistent throughout the route.</p>"],
     ["1", "<p>Some changes of provision on the route.</p>"],
diff --git a/src/routes/route_check/street_placemaking_check/Question.svelte b/src/routes/route_check/street_placemaking_check/Question.svelte
index cb989ad1b17..58b18f05fda 100644
--- a/src/routes/route_check/street_placemaking_check/Question.svelte
+++ b/src/routes/route_check/street_placemaking_check/Question.svelte
@@ -5,7 +5,6 @@
   import { scoreToColor } from "$lib/colors";
 
   export let idx: number;
-  export let label: string;
   export let cases: ["0" | "1" | "2", string][];
 
   let choices: [string, string, string, string][] = cases.map(
@@ -18,15 +17,17 @@
   );
 </script>
 
-<PrevNext {idx} total={26} urlPath="route_check/street_placemaking_check/sp" />
-
 <div class="govuk-grid-row" style="margin: 1em">
   <div class="govuk-grid-column-one-quarter">
     <Progress currentIdx={idx} />
   </div>
 
   <div class="govuk-grid-column-three-quarters">
-    <h2>SP{idx.toString().padStart(2, "0")}: {label}</h2>
+    <PrevNext
+      {idx}
+      total={26}
+      urlPath="route_check/street_placemaking_check/sp"
+    />
 
     <slot />
 
@@ -41,7 +42,11 @@
         idx - 1
       ]}
     />
+
+    <PrevNext
+      {idx}
+      total={26}
+      urlPath="route_check/street_placemaking_check/sp"
+    />
   </div>
 </div>
-
-<PrevNext {idx} total={26} urlPath="route_check/street_placemaking_check/sp" />
diff --git a/src/routes/route_check/street_placemaking_check/sp01/+page.svelte b/src/routes/route_check/street_placemaking_check/sp01/+page.svelte
index d017737805e..76bb320f483 100644
--- a/src/routes/route_check/street_placemaking_check/sp01/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp01/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={1}
-  label="Street Engagement for Children"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp02/+page.svelte b/src/routes/route_check/street_placemaking_check/sp02/+page.svelte
index 8845f27c47a..a06ee25d5e1 100644
--- a/src/routes/route_check/street_placemaking_check/sp02/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp02/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={2}
-  label="Social Space"
   cases={[
-    ["2", "<p><400m.</p>"],
+    ["2", "<p>&lt;400m.</p>"],
     ["1", "<p>400-800m.</p>"],
-    ["0", "<p>>800m.</p>"],
+    ["0", "<p>&gt;800m.</p>"],
   ]}
 >
   <p>Proximity to places where people might stop and have a conversation.</p>
diff --git a/src/routes/route_check/street_placemaking_check/sp03/+page.svelte b/src/routes/route_check/street_placemaking_check/sp03/+page.svelte
index 74812f086aa..95bedfc2a2b 100644
--- a/src/routes/route_check/street_placemaking_check/sp03/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp03/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={3}
-  label="Diversity of Activities"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp04/+page.svelte b/src/routes/route_check/street_placemaking_check/sp04/+page.svelte
index b07a5f0f712..ea06e6bd451 100644
--- a/src/routes/route_check/street_placemaking_check/sp04/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp04/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={4}
-  label="Surveillance and Activity"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp05/+page.svelte b/src/routes/route_check/street_placemaking_check/sp05/+page.svelte
index d8c370ca6cd..407d0ae130d 100644
--- a/src/routes/route_check/street_placemaking_check/sp05/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp05/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={5}
-  label="Forward Visibility and Escape Routes"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp06/+page.svelte b/src/routes/route_check/street_placemaking_check/sp06/+page.svelte
index 28d51a41299..e4995234e01 100644
--- a/src/routes/route_check/street_placemaking_check/sp06/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp06/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={6}
-  label="Visibility of Others"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp07/+page.svelte b/src/routes/route_check/street_placemaking_check/sp07/+page.svelte
index 199d79d1255..2dd5cc7903e 100644
--- a/src/routes/route_check/street_placemaking_check/sp07/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp07/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={7}
-  label="Maintenance and Upkeep"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp08/+page.svelte b/src/routes/route_check/street_placemaking_check/sp08/+page.svelte
index b21ff7709c6..807ad3a6bfd 100644
--- a/src/routes/route_check/street_placemaking_check/sp08/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp08/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={8}
-  label="Street Network Layout"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp09/+page.svelte b/src/routes/route_check/street_placemaking_check/sp09/+page.svelte
index 799cb90eefe..ac766120cb7 100644
--- a/src/routes/route_check/street_placemaking_check/sp09/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp09/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={9}
-  label="Place and Movement"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp10/+page.svelte b/src/routes/route_check/street_placemaking_check/sp10/+page.svelte
index f3e44f66d54..e589b74894a 100644
--- a/src/routes/route_check/street_placemaking_check/sp10/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp10/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={10}
-  label="Impact of Street Design on Behaviour"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp11/+page.svelte b/src/routes/route_check/street_placemaking_check/sp11/+page.svelte
index 51841dd879c..d0e7197b495 100644
--- a/src/routes/route_check/street_placemaking_check/sp11/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp11/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={11}
-  label="Enforcement of Loading and Parking"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp12/+page.svelte b/src/routes/route_check/street_placemaking_check/sp12/+page.svelte
index 390c5012af5..fd49ca2051f 100644
--- a/src/routes/route_check/street_placemaking_check/sp12/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp12/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={12}
-  label="Street Clutter"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp13/+page.svelte b/src/routes/route_check/street_placemaking_check/sp13/+page.svelte
index aa2c3467731..a170d3fcfc8 100644
--- a/src/routes/route_check/street_placemaking_check/sp13/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp13/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={13}
-  label="Consistency of Materials and Street Furniture"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp14/+page.svelte b/src/routes/route_check/street_placemaking_check/sp14/+page.svelte
index fdde9a8acce..b57437ffe45 100644
--- a/src/routes/route_check/street_placemaking_check/sp14/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp14/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={14}
-  label="Visual Interest"
   cases={[
     ["2", "<p>Lots of variety in the streetscape, unique features.</p>"],
     ["1", "<p>Some variety in the streetscape.</p>"],
diff --git a/src/routes/route_check/street_placemaking_check/sp15/+page.svelte b/src/routes/route_check/street_placemaking_check/sp15/+page.svelte
index 1711728c50f..85c72480815 100644
--- a/src/routes/route_check/street_placemaking_check/sp15/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp15/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={15}
-  label="Cultural Significance"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp16/+page.svelte b/src/routes/route_check/street_placemaking_check/sp16/+page.svelte
index 209756cf944..13e7302c0e1 100644
--- a/src/routes/route_check/street_placemaking_check/sp16/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp16/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={16}
-  label="Street Features that Support Walking, Wheeling and Cycling"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp17/+page.svelte b/src/routes/route_check/street_placemaking_check/sp17/+page.svelte
index 98187f17ca2..709263027e0 100644
--- a/src/routes/route_check/street_placemaking_check/sp17/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp17/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={17}
-  label="Drainage and Water"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp18/+page.svelte b/src/routes/route_check/street_placemaking_check/sp18/+page.svelte
index ad678925092..e474cb89bc8 100644
--- a/src/routes/route_check/street_placemaking_check/sp18/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp18/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={18}
-  label="Trees"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp19/+page.svelte b/src/routes/route_check/street_placemaking_check/sp19/+page.svelte
index 0470360a323..196ae6c52b4 100644
--- a/src/routes/route_check/street_placemaking_check/sp19/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp19/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={19}
-  label="Planting"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp20/+page.svelte b/src/routes/route_check/street_placemaking_check/sp20/+page.svelte
index 93e848cd12c..2baa47b12cf 100644
--- a/src/routes/route_check/street_placemaking_check/sp20/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp20/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={20}
-  label="Ancillary Features to Support Fauna"
   cases={[
     ["2", "<p>Multiple features.</p>"],
     ["1", "<p>One feature.</p>"],
diff --git a/src/routes/route_check/street_placemaking_check/sp21/+page.svelte b/src/routes/route_check/street_placemaking_check/sp21/+page.svelte
index 79615cf3f94..e07ee1c037f 100644
--- a/src/routes/route_check/street_placemaking_check/sp21/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp21/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={21}
-  label="Sustainable Materials"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp22/+page.svelte b/src/routes/route_check/street_placemaking_check/sp22/+page.svelte
index c41dbdc41c1..2919417aec4 100644
--- a/src/routes/route_check/street_placemaking_check/sp22/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp22/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={22}
-  label="Air Pollution - Exposure"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp23/+page.svelte b/src/routes/route_check/street_placemaking_check/sp23/+page.svelte
index 11b85d9c724..f4249fa467b 100644
--- a/src/routes/route_check/street_placemaking_check/sp23/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp23/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={23}
-  label="Air Pollution - Proximity"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp24/+page.svelte b/src/routes/route_check/street_placemaking_check/sp24/+page.svelte
index 4837ac61c8d..b31fac45cb6 100644
--- a/src/routes/route_check/street_placemaking_check/sp24/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp24/+page.svelte
@@ -4,11 +4,10 @@
 
 <Question
   idx={24}
-  label="Noise Pollution"
   cases={[
-    ["2", "<p>Comfortable noise levels (<65dB).</p>"],
+    ["2", "<p>Comfortable noise levels (&lt;65dB).</p>"],
     ["1", "<p>Slightly noisy (65-78dB).</p>"],
-    ["0", "<p>Excessively noisy (>78dB).</p>"],
+    ["0", "<p>Excessively noisy (&gt;78dB).</p>"],
   ]}
 >
   <p>Effect of noise pollution from traffic on user experience.</p>
diff --git a/src/routes/route_check/street_placemaking_check/sp25/+page.svelte b/src/routes/route_check/street_placemaking_check/sp25/+page.svelte
index 03ac33ee5e2..8a5fa5bae6b 100644
--- a/src/routes/route_check/street_placemaking_check/sp25/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp25/+page.svelte
@@ -4,7 +4,6 @@
 
 <Question
   idx={25}
-  label="Light Pollution"
   cases={[
     [
       "2",
diff --git a/src/routes/route_check/street_placemaking_check/sp26/+page.svelte b/src/routes/route_check/street_placemaking_check/sp26/+page.svelte
index f673cc8f809..3464cc82b3b 100644
--- a/src/routes/route_check/street_placemaking_check/sp26/+page.svelte
+++ b/src/routes/route_check/street_placemaking_check/sp26/+page.svelte
@@ -4,10 +4,9 @@
 
 <Question
   idx={26}
-  label="Sunlight"
   cases={[
-    ["2", "<p>>2 hours direct sunlight on shortest day of year.</p>"],
-    ["1", "<p><2 hours direct sunlight on shortest day of year.</p>"],
+    ["2", "<p>&gt;2 hours direct sunlight on shortest day of year.</p>"],
+    ["1", "<p>&lt;2 hours direct sunlight on shortest day of year.</p>"],
     ["0", "<p>No sunlight penetration.</p>"],
   ]}
 >