diff --git a/apps/collection/fields/index.js b/apps/collection/fields/index.js
index 8836b404..685b7295 100644
--- a/apps/collection/fields/index.js
+++ b/apps/collection/fields/index.js
@@ -5,24 +5,21 @@ const countries = [''].concat(require('../../../assets/countries').allCountries)
 
 module.exports = {
   'collection-where-radio': {
+    isPageHeading: true,
     mixin: 'radio-group',
     validate: ['required'],
-    className: ['inline', 'form-group'],
-    legend: {
-      className: 'visuallyhidden'
-    },
+    className: ['govuk-radios--inline', 'govuk-form-group'],
     options: [{
-      value: 'Post Office',
-      toggle: 'collection-date-group'
+      value: 'Post Office'
     }, {
-      value: 'Sponsor',
-      toggle: 'collection-date-group'
+      value: 'Sponsor'
     }]
   },
   'collection-date': date('collection-date', {
     validate: ['before']
   }),
   'reason-radio': {
+    isPageHeading: true,
     mixin: 'radio-group',
     validate: ['required'],
     options: [{
@@ -53,12 +50,10 @@ module.exports = {
     },
     {
       value: 'no-brp'
-    }],
-    legend: {
-      className: 'visuallyhidden'
-    }
+    }]
   },
   'nominated-fullname': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required']
   },
   'nominated-nationality': {
@@ -68,6 +63,7 @@ module.exports = {
     hint: 'fields.nominated-nationality.hint'
   },
   'nominated-id-number': {
+    className: ['govuk-input govuk-!-width-two-thirds'],
     validate: ['required']
   },
   'nominated-date': date('nominated-date', {
@@ -75,6 +71,7 @@ module.exports = {
     validate: ['required', 'before']
   }),
   fullname: {
+    className: ['govuk-input govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl']
   },
   'date-of-birth': date('date-of-birth', {
@@ -87,6 +84,10 @@ module.exports = {
     hint: 'fields.nationality.hint'
   },
   passport: {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl']
+  },
+  'org-help-radio': {
+    className: ['govuk-radios--inline']
   }
 };
diff --git a/apps/collection/translations/src/en/fields.json b/apps/collection/translations/src/en/fields.json
index 96c6e68e..e50abf03 100644
--- a/apps/collection/translations/src/en/fields.json
+++ b/apps/collection/translations/src/en/fields.json
@@ -14,6 +14,8 @@
     "label": "Year"
   },
   "collection-where-radio": {
+    "legend": "From where were you asked to collect your BRP?",
+    "hint": "This could have been from a Post Office branch or a sponsor, such as your legal representative, employer, university or school.",
     "options": {
       "Post Office": {
         "label": "Post Office"
@@ -24,6 +26,7 @@
     }
   },
   "reason-radio": {
+    "legend": "Why couldn't you collect your BRP?",
     "options": {
       "under-age": {
         "legend": "I am under 18 and attempted collection without my responsible adult",
diff --git a/apps/collection/translations/src/en/pages.json b/apps/collection/translations/src/en/pages.json
index 30af868d..01ec0d02 100644
--- a/apps/collection/translations/src/en/pages.json
+++ b/apps/collection/translations/src/en/pages.json
@@ -1,14 +1,11 @@
 {
   "reasons": {
-    "header": "Why couldn't you collect your BRP?"
   },
   "nominated": {
     "header": "Who was supposed to collect your BRP on your behalf?",
     "description": "Provide details of the person who tried to collect the BRP on your behalf"
   },
   "where": {
-    "header": "From where were you asked to collect your BRP?",
-    "description": "This could have been from a Post Office branch or a sponsor, such as your legal representative, employer, university or school.",
     "date-question": "If you have attempted to collect your BRP, when was it? (optional)"
   },
   "contact-details": {
@@ -23,7 +20,7 @@
     "subheader": "We need these details to process your request."
   },
   "check-details": {
-    "header": "Check the details you have provided",
+    "legend": "Check the details you have provided",
     "subheader": "If any information is incorrect, you can change it here.",
     "table": {
       "headers": {
@@ -46,6 +43,7 @@
     },
     "org-details-group": {
       "header": "What are your details?",
+      "subheader": "We will attempt to contact the BRP holder directly. We will only use these details to contact you if needed.",
       "type": "Type of support"
     },
     "footer": {
@@ -101,4 +99,5 @@
   "someone-else-confirmation": {
     "paragraph": "We will review the information you have provided and investigate the situation."
   }
+
 }
diff --git a/apps/collection/views/confirm.html b/apps/collection/views/confirm.html
index 0ad65b2e..5c6f2a38 100644
--- a/apps/collection/views/confirm.html
+++ b/apps/collection/views/confirm.html
@@ -13,19 +13,10 @@
   {{> partials-navigation}}
 {{/propositionHeader}}
 
-{{$title}}
-  {{#t}}journeys.collection.pages.check-details.header{{/t}}
-{{/title}}
-
-{{$header}}
-  {{<partials-page-header}}
-    {{$page-header}}
-      {{#t}}journeys.collection.pages.check-details.header{{/t}}
-    {{/page-header}}
-  {{/partials-page-header}}
-{{/header}}
-
 {{$content}}
+
+<header><h1 class="govuk-heading-l">{{#t}}pages.check-details-error.header{{/t}}</h1></header>
+
   <p>{{#t}}journeys.collection.pages.check-details.subheader{{/t}}</p>
 
   {{<partials-form}}
diff --git a/apps/collection/views/contact-details.html b/apps/collection/views/contact-details.html
index 6622494a..47c78d5f 100644
--- a/apps/collection/views/contact-details.html
+++ b/apps/collection/views/contact-details.html
@@ -54,7 +54,7 @@
 
         {{#input-text}}contact-address-county{{/input-text}}
 
-        {{#input-text-code}}contact-address-postcode{{/input-text-code}}
+        {{#input-text}}contact-address-postcode{{/input-text}}
 
         <div class="notice">
           <i class="icon icon-important">
diff --git a/apps/collection/views/partials/collection-date.html b/apps/collection/views/partials/collection-date.html
new file mode 100644
index 00000000..5791392b
--- /dev/null
+++ b/apps/collection/views/partials/collection-date.html
@@ -0,0 +1,20 @@
+<div id="{{toggle}}" class="panel-indent{{#errors.collection-date}}validation-error{{/errors.collection-date}}">
+
+    <legend class="visuallyhidden">
+      <span class="form-label-bold">{{#t}}fields.collection-date.legend{{/t}}</span>
+    </legend>
+    <fieldset>
+      {{#errors.collection-date}}
+      <span id="collection-date-error" class="error-message">
+        {{errors.collection-date.message}}
+      </span>
+    {{/errors.collection-date}}
+
+    <div class="form-group form-date">
+      <p>{{#t}}pages.where.date-question{{/t}}</p>
+      <p id="collection-date-hint" class="form-hint">{{#t}}fields.collection-date.hint{{/t}}</p>
+      {{#input-date}}collection-date{{/input-date}}
+    </div>
+    </fieldset>
+
+  </div>"
\ No newline at end of file
diff --git a/apps/collection/views/personal-details.html b/apps/collection/views/personal-details.html
index be773ec0..80b02483 100644
--- a/apps/collection/views/personal-details.html
+++ b/apps/collection/views/personal-details.html
@@ -17,13 +17,9 @@
     {{#t}}journeys.collection.pages.personal-details.header{{/t}}
   {{/title}}
 
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
+  {{$pageTitle}}}
         {{#t}}journeys.collection.pages.personal-details.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
+  {{/pageTitle}}
 
   {{$content}}
     <p>{{#t}}journeys.collection.pages.personal-details.subheader{{/t}}</p>
diff --git a/apps/collection/views/reasons.html b/apps/collection/views/reasons.html
index b1f02128..506f617b 100644
--- a/apps/collection/views/reasons.html
+++ b/apps/collection/views/reasons.html
@@ -13,18 +13,6 @@
     {{> partials-navigation}}
   {{/propositionHeader}}
 
-  {{$title}}
-    {{#t}}pages.reasons.header{{/t}}
-  {{/title}}
-
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
-        {{#t}}pages.reasons.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
-
   {{$content}}
     {{<partials-form}}
 
diff --git a/apps/collection/views/where.html b/apps/collection/views/where.html
index b6a90b40..f6cf1b60 100644
--- a/apps/collection/views/where.html
+++ b/apps/collection/views/where.html
@@ -13,20 +13,7 @@
     {{> partials-navigation}}
   {{/propositionHeader}}
 
-  {{$title}}
-    {{#t}}pages.where.header{{/t}}
-  {{/title}}
-
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
-        {{#t}}pages.where.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
-
   {{$content}}
-    <p>{{#t}}pages.where.description{{/t}}</p>
 
     {{<partials-form}}
 
diff --git a/apps/common/fields/contact-details.js b/apps/common/fields/contact-details.js
index 7ab78178..3645f84c 100644
--- a/apps/common/fields/contact-details.js
+++ b/apps/common/fields/contact-details.js
@@ -3,17 +3,22 @@
 module.exports = {
   email: {
     validate: ['required', 'email'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     type: 'email',
     dependent: {
       value: '',
       field: 'use-address'
     }
   },
+  phone: {
+    className: ['govuk-input', 'govuk-!-width-two-thirds']
+  },
   'use-address': {
     toggle: 'address-group'
   },
   'contact-address-house-number': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-house-number.label',
     dependent: {
       value: 'true',
@@ -22,6 +27,7 @@ module.exports = {
   },
   'contact-address-street': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-street.label',
     dependent: {
       value: 'true',
@@ -30,6 +36,7 @@ module.exports = {
   },
   'contact-address-town': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-town.label',
     dependent: {
       value: 'true',
@@ -37,10 +44,12 @@ module.exports = {
     }
   },
   'contact-address-county': {
-    label: 'fields.address-county.label'
+    label: 'fields.address-county.label',
+    className: ['govuk-input', 'govuk-!-width-two-thirds']
   },
   'contact-address-postcode': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-postcode.label',
     dependent: {
       value: 'true',
diff --git a/apps/common/fields/organisation-details.js b/apps/common/fields/organisation-details.js
index 8ca6e2d8..4b6a3c12 100644
--- a/apps/common/fields/organisation-details.js
+++ b/apps/common/fields/organisation-details.js
@@ -3,9 +3,8 @@
 module.exports = {
   'org-help': {
     validate: ['required'],
-    className: 'inline',
+    className: ['govuk-radios--inline'],
     legend: {
-      className: 'visuallyhidden',
       value: 'pages.check-details.org-help.title'
     },
     options: [
@@ -18,6 +17,7 @@ module.exports = {
   },
   'rep-name': {
     validate: ['required', 'notUrl'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     dependent: {
       field: 'org-help',
       value: 'yes'
@@ -25,6 +25,7 @@ module.exports = {
   },
   'rep-email': {
     validate: ['email'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     dependent: {
       field: 'org-help',
       value: 'yes'
diff --git a/apps/common/fields/personal-details.js b/apps/common/fields/personal-details.js
index a3067920..7858fa64 100644
--- a/apps/common/fields/personal-details.js
+++ b/apps/common/fields/personal-details.js
@@ -4,6 +4,7 @@ const date = require('hof').components.date;
 
 module.exports = {
   fullname: {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl']
   },
   'date-of-birth': date('date-of-birth', {
@@ -18,6 +19,7 @@ module.exports = {
     hint: 'fields.nationality.hint'
   },
   passport: {
+    className: ['govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl']
   },
   'brp-card': {
diff --git a/apps/correct-mistakes/fields/about-error.js b/apps/correct-mistakes/fields/about-error.js
index 9c55d1cf..1c0ca94c 100644
--- a/apps/correct-mistakes/fields/about-error.js
+++ b/apps/correct-mistakes/fields/about-error.js
@@ -11,6 +11,7 @@ module.exports = {
     toggle: 'first-name-error-container'
   },
   'first-name-error': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl'],
     dependent: {
       field: 'first-name-error-checkbox',
@@ -21,6 +22,7 @@ module.exports = {
     toggle: 'last-name-error-container'
   },
   'last-name-error': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl'],
     dependent: {
       field: 'last-name-error-checkbox',
@@ -41,6 +43,7 @@ module.exports = {
     toggle: 'birth-place-error-container'
   },
   'birth-place-error': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required'],
     dependent: {
       field: 'birth-place-error-checkbox',
@@ -66,6 +69,7 @@ module.exports = {
     toggle: 'sponsor-details-error-container'
   },
   'sponsor-details-error': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required'],
     dependent: {
       field: 'sponsor-details-error-checkbox',
diff --git a/apps/correct-mistakes/fields/location-applied.js b/apps/correct-mistakes/fields/location-applied.js
index 3c1452b0..7eacc706 100644
--- a/apps/correct-mistakes/fields/location-applied.js
+++ b/apps/correct-mistakes/fields/location-applied.js
@@ -2,11 +2,9 @@
 
 module.exports = {
   'location-applied': {
+    isPageHeading: true,
     validate: ['required'],
-    legend: {
-      className: 'visuallyhidden'
-    },
-    className: ['inline', 'form-group'],
+    className: ['govuk-radios--inline', 'form-group'],
     options: ['yes', 'no']
   }
 };
diff --git a/apps/correct-mistakes/fields/personal-details.js b/apps/correct-mistakes/fields/personal-details.js
index 9651b689..a12e9923 100644
--- a/apps/correct-mistakes/fields/personal-details.js
+++ b/apps/correct-mistakes/fields/personal-details.js
@@ -2,6 +2,7 @@
 
 module.exports = {
   'brp-card': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', {type: 'regex', arguments: /^[a-z][a-z](\d|X)\d{6}$/gi }],
     formatter: ['uppercase'],
     hint: 'fields.brp-card.hint'
diff --git a/apps/correct-mistakes/fields/same-address.js b/apps/correct-mistakes/fields/same-address.js
index 395ab697..f246dd80 100644
--- a/apps/correct-mistakes/fields/same-address.js
+++ b/apps/correct-mistakes/fields/same-address.js
@@ -2,12 +2,9 @@
 
 module.exports = {
   'same-address-radio': {
+    isPageHeading: true,
     validate: ['required'],
-    className: ['inline', 'form-group'],
-    legend: {
-      className: 'visuallyhidden',
-      value: 'pages.same-address.address.title'
-    },
+    className: ['govuk-radios--inline', 'form-group'],
     options: [
       'yes',
       {
@@ -18,6 +15,7 @@ module.exports = {
   },
   'same-address-house-number': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-house-number.label',
     dependent: {
       value: 'no',
@@ -26,6 +24,7 @@ module.exports = {
   },
   'same-address-street': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-street.label',
     dependent: {
       value: 'no',
@@ -34,6 +33,7 @@ module.exports = {
   },
   'same-address-town': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-town.label',
     dependent: {
       value: 'no',
@@ -41,10 +41,12 @@ module.exports = {
     }
   },
   'same-address-county': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-county.label'
   },
   'same-address-postcode': {
     validate: ['required'],
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     label: 'fields.address-postcode.label',
     dependent: {
       value: 'no',
diff --git a/apps/correct-mistakes/translations/src/en/fields.json b/apps/correct-mistakes/translations/src/en/fields.json
index ff0fcd2c..4804a77c 100644
--- a/apps/correct-mistakes/translations/src/en/fields.json
+++ b/apps/correct-mistakes/translations/src/en/fields.json
@@ -1,7 +1,4 @@
 {
-  "location-applied": {
-    "legend": "Where did you make your application?"
-  },
   "date-of-birth": {
     "legend": "Date of birth",
     "hint": "For example, 31  3  1970"
@@ -16,6 +13,7 @@
     "label": "Year"
   },
   "same-address-radio": {
+    "legend": "Is your address the same as the address on the delivery letter?",
     "options": {
       "yes": {
         "label": "Yes"
@@ -193,6 +191,8 @@
     }
   },
   "location-applied": {
+    "legend": "Where did you apply for your visa?",
+    "hint": "Was the application made from in the UK or from outside the UK?",
     "options": {
       "yes": {
         "label": "UK"
diff --git a/apps/correct-mistakes/translations/src/en/pages.json b/apps/correct-mistakes/translations/src/en/pages.json
index 05a61448..198f53f9 100644
--- a/apps/correct-mistakes/translations/src/en/pages.json
+++ b/apps/correct-mistakes/translations/src/en/pages.json
@@ -16,9 +16,6 @@
       "title": "If you need a replacement BRP, we will post it to a UK address of your preference. If you don't have a suitable UK address, we will deliver it to a Post Office for collection."
     }
   },
-  "same-address": {
-    "header": "Is your address the same as the address on the delivery letter?"
-  },
   "personal-details": {
     "header": "How do your personal details appear on your BRP?",
     "subheader": "These must be entered exactly as they are printed on your BRP so we can review the problem."
diff --git a/apps/correct-mistakes/views/confirm.html b/apps/correct-mistakes/views/confirm.html
index 69a1866e..cf1ead77 100644
--- a/apps/correct-mistakes/views/confirm.html
+++ b/apps/correct-mistakes/views/confirm.html
@@ -13,26 +13,16 @@
   {{> partials-navigation}}
 {{/propositionHeader}}
 
-{{$title}}
-  {{#t}}pages.check-details-error.header{{/t}}
-{{/title}}
-
-{{$header}}
-  {{<partials-page-header}}
-    {{$page-header}}
-      {{#t}}pages.check-details-error.header{{/t}}
-    {{/page-header}}
-  {{/partials-page-header}}
-{{/header}}
-
 {{$content}}
+<header><h1 class="govuk-heading-l">{{#t}}pages.check-details-error.header{{/t}}</h1></header>
+
   <p>{{#t}}pages.check-details-error.subheader{{/t}}</p>
 
   {{<partials-form}}
 
     {{$form}}
 
-      <h2 class="details-header">{{#t}}pages.check-details-error.corrected-details-table.title{{/t}}</h2>
+      <h1 class="details-header">{{#t}}pages.check-details-error.corrected-details-table.title{{/t}}</h1>
       <table id="check-details" class="table-details">
         <tbody>
         {{#values.first-name-error}}
diff --git a/apps/correct-mistakes/views/location-applied.html b/apps/correct-mistakes/views/location-applied.html
index 336a7341..a969b3d7 100644
--- a/apps/correct-mistakes/views/location-applied.html
+++ b/apps/correct-mistakes/views/location-applied.html
@@ -14,21 +14,7 @@
   {{> partials-navigation}}
 {{/propositionHeader}}
 
-  {{$title}}
-    {{#t}}journeys.error.location-applied.header{{/t}}
-  {{/title}}
-  
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
-        {{#t}}journeys.error.location-applied.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
-
   {{$content}}
-
-    <p>{{#t}}journeys.error.location-applied.subheader{{/t}}</p>
     {{<partials-form}}
 
       {{$form}}
diff --git a/apps/correct-mistakes/views/same-address.html b/apps/correct-mistakes/views/same-address.html
index ba52166b..bc569183 100644
--- a/apps/correct-mistakes/views/same-address.html
+++ b/apps/correct-mistakes/views/same-address.html
@@ -13,18 +13,6 @@
   {{> partials-navigation}}
 {{/propositionHeader}}
 
-{{$title}}
-  {{#t}}pages.same-address.header{{/t}}
-{{/title}}
-
-{{$header}}
-  {{<partials-page-header}}
-    {{$page-header}}
-      {{#t}}pages.same-address.header{{/t}}
-    {{/page-header}}
-  {{/partials-page-header}}
-{{/header}}
-
 {{$content}}
 
   {{<partials-form}}
diff --git a/apps/lost-stolen/fields/personal-details.js b/apps/lost-stolen/fields/personal-details.js
index bf599246..14f79d6e 100644
--- a/apps/lost-stolen/fields/personal-details.js
+++ b/apps/lost-stolen/fields/personal-details.js
@@ -11,9 +11,11 @@ const beforeTodayValidator = {
 
 module.exports = {
   fullname: {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: 'notUrl'
   },
   'brp-card': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: [{type: 'regex', arguments: /(^[a-z][a-z](\d|X)\d{6}$)|(^$)/gi }],
     formatter: ['uppercase'],
     hint: 'fields.brp-card.hint'
diff --git a/apps/lost-stolen/index.js b/apps/lost-stolen/index.js
index a2ceeb50..55fe6649 100644
--- a/apps/lost-stolen/index.js
+++ b/apps/lost-stolen/index.js
@@ -7,6 +7,7 @@ module.exports = {
   behaviours: [require('../common/behaviours/location')],
   steps: {
     '/where': {
+      isPageHeading: true,
       fields: ['inside-uk', 'country'],
       next: '/date-lost'
     },
diff --git a/apps/lost-stolen/translations/src/en/fields.json b/apps/lost-stolen/translations/src/en/fields.json
index a6babe5f..7b34fce0 100644
--- a/apps/lost-stolen/translations/src/en/fields.json
+++ b/apps/lost-stolen/translations/src/en/fields.json
@@ -37,6 +37,7 @@
     "label": "Phone number (optional)"
   },
   "inside-uk": {
+    "legend": "Where are you now?",
     "options": {
       "yes": {
         "label": "UK"
diff --git a/apps/lost-stolen/translations/src/en/pages.json b/apps/lost-stolen/translations/src/en/pages.json
index b7ca8904..4d6f791f 100644
--- a/apps/lost-stolen/translations/src/en/pages.json
+++ b/apps/lost-stolen/translations/src/en/pages.json
@@ -1,6 +1,6 @@
 {
   "contact-details": {
-    "header": "How should we contact you about your BRP?",
+    "header": "How should we contact you to tell you what to do next?",
     "address": {
       "title": "What address should we contact you at?"
     },
diff --git a/apps/lost-stolen/views/confirm.html b/apps/lost-stolen/views/confirm.html
index 3b7bc0b7..2f2163d5 100644
--- a/apps/lost-stolen/views/confirm.html
+++ b/apps/lost-stolen/views/confirm.html
@@ -26,6 +26,7 @@
   {{/header}}
 
   {{$content}}
+  <header><h1 class="govuk-heading-l">{{#t}}pages.check-details.header{{/t}}</h1></header>
     <p>{{#t}}pages.check-details.subheader{{/t}}</p>
 
     {{<partials-form}}
diff --git a/apps/lost-stolen/views/where.html b/apps/lost-stolen/views/where.html
index 49e79704..57f7e262 100644
--- a/apps/lost-stolen/views/where.html
+++ b/apps/lost-stolen/views/where.html
@@ -26,10 +26,12 @@
   {{/header}}
 
   {{$content}}
+ 
 
     {{<partials-form}}
 
       {{$form}}
+      <header><h1 class="govuk-heading-l">{{#t}}pages.inside-uk.header{{/t}}</h1></header>
         {{#radio-group}}inside-uk{{/radio-group}}
 
         <fieldset id="country-group" class="panel-indent {{#errors.country}}validation-error{{/errors.country}}">
diff --git a/apps/not-arrived/behaviours/change-path.js b/apps/not-arrived/behaviours/change-path.js
index b876a5a3..6e812cec 100644
--- a/apps/not-arrived/behaviours/change-path.js
+++ b/apps/not-arrived/behaviours/change-path.js
@@ -3,7 +3,7 @@
 module.exports = superclass =>
   class LetterRecieved extends superclass {
     saveValues(req, res, next) {
-      if(req.form.values.collection === 'yes') {
+      if(req.form.values['post-office-collect-radio'] === 'yes') {
         res.redirect('/collection/where');
         res.end();
       }else{
diff --git a/apps/not-arrived/fields/consignment-number.js b/apps/not-arrived/fields/consignment-number.js
index 9ef744da..ae71a29c 100644
--- a/apps/not-arrived/fields/consignment-number.js
+++ b/apps/not-arrived/fields/consignment-number.js
@@ -2,9 +2,10 @@
 
 module.exports = {
   'consignment-number-radio': {
+    isPageHeading: true,
     mixin: 'radio-group',
     validate: ['required'],
-    className: ['inline', 'form-group'],
+    className: ['govuk-radios--inline', 'form-group'],
     legend: {
       className: 'visuallyhidden'
     },
@@ -17,6 +18,7 @@ module.exports = {
     ]
   },
   'consignment-number': {
+    className: ['govuk-input govuk-!-width-two-thirds'],
     validate: [{type: 'maxlength', arguments: 22}, 'notUrl'],
     dependent: {
       field: 'consignment-number-radio',
diff --git a/apps/not-arrived/fields/index.js b/apps/not-arrived/fields/index.js
index 2702f3da..7a4b859e 100644
--- a/apps/not-arrived/fields/index.js
+++ b/apps/not-arrived/fields/index.js
@@ -5,5 +5,6 @@ const _ = require('underscore');
 module.exports = _.extend(
   require('./letter-received'),
   require('./address-match'),
-  require('./consignment-number')
+  require('./consignment-number'),
+  require('./post-office-collect')
 );
diff --git a/apps/not-arrived/fields/post-office-collect.js b/apps/not-arrived/fields/post-office-collect.js
new file mode 100644
index 00000000..10679772
--- /dev/null
+++ b/apps/not-arrived/fields/post-office-collect.js
@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = {
+  'post-office-collect-radio': {
+    isPageHeading: true,
+    mixin: 'radio-group',
+    className: ['govuk-radios--inline', 'form-group'],
+    options: [{
+      value: 'yes'
+    }, {
+      value: 'no'
+    }]
+  }
+};
diff --git a/apps/not-arrived/index.js b/apps/not-arrived/index.js
index a2fadab4..2a17dd84 100644
--- a/apps/not-arrived/index.js
+++ b/apps/not-arrived/index.js
@@ -8,9 +8,9 @@ module.exports = {
     '/post-office-collect': {
       next: '/consignment-number',
       behaviours: [require('./behaviours/change-path')],
-      template: 'collection.html',
+      // template: 'collection.html',
       fields: [
-        'collection'
+        'post-office-collect-radio'
       ]
     },
     '/consignment-number': {
diff --git a/apps/not-arrived/translations/src/en/fields.json b/apps/not-arrived/translations/src/en/fields.json
index d62b66c9..3228debe 100644
--- a/apps/not-arrived/translations/src/en/fields.json
+++ b/apps/not-arrived/translations/src/en/fields.json
@@ -1,5 +1,6 @@
 {
-  "collection": {
+  "post-office-collect-radio": {
+    "legend": "Were you due to collect your document from the Post Office?",
     "options": {
       "yes": {
         "label": "Yes"
@@ -10,6 +11,7 @@
     }
   },
   "consignment-number-radio": {
+    "legend": "Do you have a consignment number?",
     "options": {
       "yes": {
         "label": "Yes"
@@ -20,7 +22,6 @@
     }
   },
   "consignment-number": {
-    "legend": "Consignment number",
     "label": "What is your consignment number?"
   },
   "delivery-date": {
diff --git a/apps/not-arrived/translations/src/en/pages.json b/apps/not-arrived/translations/src/en/pages.json
index c8d45bfa..ed62a5c9 100644
--- a/apps/not-arrived/translations/src/en/pages.json
+++ b/apps/not-arrived/translations/src/en/pages.json
@@ -1,7 +1,4 @@
 {
-  "post-office-collect": {
-    "header": "Were you due to collect your document from the Post Office?"
-  },
   "consignment-number": {
     "header": "Do you have a consignment number?"
   },
diff --git a/apps/not-arrived/views/confirm.html b/apps/not-arrived/views/confirm.html
index 63c54028..656bbd3f 100644
--- a/apps/not-arrived/views/confirm.html
+++ b/apps/not-arrived/views/confirm.html
@@ -13,19 +13,8 @@
     {{> partials-navigation}}
   {{/propositionHeader}}
 
-  {{$title}}
-    {{#t}}pages.check-details.header{{/t}}
-  {{/title}}
-
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
-        {{#t}}pages.check-details.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
-
   {{$content}}
+  <header><h1 class="govuk-heading-l">{{#t}}pages.check-details-error.header{{/t}}</h1></header>
     <p>{{#t}}pages.check-details.subheader{{/t}}</p>
 
     {{<partials-form}}
diff --git a/apps/not-arrived/views/collection.html b/apps/not-arrived/views/post-office-collect.html
similarity index 58%
rename from apps/not-arrived/views/collection.html
rename to apps/not-arrived/views/post-office-collect.html
index 4a69b08e..0f717602 100644
--- a/apps/not-arrived/views/collection.html
+++ b/apps/not-arrived/views/post-office-collect.html
@@ -12,23 +12,12 @@
     {{> partials-navigation}}
   {{/propositionHeader}}
 
-  {{$title}}
-    {{#t}}pages.collection.header{{/t}}
-  {{/title}}
-
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
-        {{#t}}pages.post-office-collect.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
 
   {{$content}}
   {{<partials-form}}
   {{$form}}
 
-  {{#radio-group}}collection{{/radio-group}}
+  {{#radio-group}}post-office-collect-radio{{/radio-group}}
   {{#input-submit}}continue{{/input-submit}}
   {{/form}}
 
diff --git a/apps/someone-else/fields/arrange.js b/apps/someone-else/fields/arrange.js
index ba3045f2..37a97a5e 100644
--- a/apps/someone-else/fields/arrange.js
+++ b/apps/someone-else/fields/arrange.js
@@ -4,6 +4,7 @@ const date = require('hof').components.date;
 
 module.exports = {
   'someone-else-fullname': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl']
   },
   'someone-else-date': date('someone-else-date', {
@@ -26,6 +27,7 @@ module.exports = {
     ]
   },
   'someone-else-id-number': {
+    className: ['govuk-input', 'govuk-!-width-two-thirds'],
     validate: ['required', 'notUrl']
   }
 };
diff --git a/apps/someone-else/fields/reason.js b/apps/someone-else/fields/reason.js
index e29616fd..125a2224 100644
--- a/apps/someone-else/fields/reason.js
+++ b/apps/someone-else/fields/reason.js
@@ -9,11 +9,8 @@ module.exports = {
     }
   },
   'someone-else-reason-radio': {
+    isPageHeading: true,
     validate: ['required'],
-    legend: {
-      className: 'visuallyhidden',
-      value: ''
-    },
     options: [
       {
         value: 'incapable',
diff --git a/apps/someone-else/translations/src/en/fields.json b/apps/someone-else/translations/src/en/fields.json
index 8636f0d4..2ca3017c 100644
--- a/apps/someone-else/translations/src/en/fields.json
+++ b/apps/someone-else/translations/src/en/fields.json
@@ -37,6 +37,7 @@
     "label": "Nominated person's identity document number"
   },
   "someone-else-reason-radio": {
+    "legend": "Why do you need someone else to collect your BRP?",
     "options": {
       "incapable": {
         "label": "I have a medical condition"
diff --git a/apps/someone-else/views/arrange.html b/apps/someone-else/views/arrange.html
index 5ed71b86..6772c29a 100644
--- a/apps/someone-else/views/arrange.html
+++ b/apps/someone-else/views/arrange.html
@@ -13,19 +13,8 @@
     {{> partials-navigation}}
   {{/propositionHeader}}
 
-  {{$title}}
-    {{#t}}pages.arrange-collection.header{{/t}}
-  {{/title}}
-
-  {{$header}}
-    {{<partials-page-header}}
-      {{$page-header}}
-        {{#t}}pages.arrange-collection.header{{/t}}
-      {{/page-header}}
-    {{/partials-page-header}}
-  {{/header}}
-
   {{$content}}
+  <header><h1 class="govuk-heading-l">{{#t}}pages.arrange-collection.header{{/t}}</h1></header>
     {{<partials-form}}
 
       {{$form}}
diff --git a/apps/someone-else/views/confirm.html b/apps/someone-else/views/confirm.html
index c62fdb03..ef3912fe 100644
--- a/apps/someone-else/views/confirm.html
+++ b/apps/someone-else/views/confirm.html
@@ -26,6 +26,7 @@
 {{/header}}
 
 {{$content}}
+<header><h1 class="govuk-heading-l">{{#t}}pages.check-details.header{{/t}}</h1></header>
   <p>{{#t}}pages.someone-else-check-details.subheader{{/t}}</p>
 
   {{<partials-form}}
diff --git a/apps/someone-else/views/personal-details.html b/apps/someone-else/views/personal-details.html
index cd45e5dd..aa499f22 100644
--- a/apps/someone-else/views/personal-details.html
+++ b/apps/someone-else/views/personal-details.html
@@ -26,6 +26,7 @@
   {{/header}}
 
   {{$content}}
+  <header><h1 class="govuk-heading-l">{{#t}}journeys.someone-else.personal-details.header{{/t}}</h1></header>
     <p>{{#t}}journeys.someone-else.personal-details.subheader{{/t}}</p>
 
     {{<partials-form}}
diff --git a/assets/scss/app.scss b/assets/scss/app.scss
index 2e16b815..1997492e 100644
--- a/assets/scss/app.scss
+++ b/assets/scss/app.scss
@@ -34,6 +34,7 @@
     display: inline-block;
     margin-top: $gutter-half;
     color: $secondary-text-colour;
+    font-family: "GDS Transport", arial, sans-serif;
   }
 }
 
diff --git a/package.json b/package.json
index b4beb859..9a2a9a88 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "author": "HomeOffice",
   "dependencies": {
     "express": "^4.17.1",
-    "hof": "^19.14.15",
+    "hof": "20.0.4",
     "hogan.js": "^3.0.2",
     "hot-shots": "^5.9.0",
     "i18n-future": "^2.0.1",
diff --git a/test/_features/brp/not_arrived.feature b/test/_features/brp/not_arrived.feature
index 351f7680..2fc5118f 100644
--- a/test/_features/brp/not_arrived.feature
+++ b/test/_features/brp/not_arrived.feature
@@ -4,14 +4,14 @@ Feature: I should be able to log that my BRP has not arrived
   Scenario: Due to collect the document from the postcode
     Given I start the 'not-arrived' application journey
     Then I should be on the 'post-office-collect' page showing 'Were you due to collect your document from the Post Office?'
-    Then I check 'collection-yes'
+    Then I check 'post-office-collect-radio-yes'
     Then I select 'Continue'
     Then I should be redirected to the 'collection' journey on the 'where' page showing 'From where were you asked to collect your BRP?'
 
   Scenario: Letter not received from the home office
     Given I start the 'not-arrived' application journey
     Then I should be on the 'post-office-collect' page showing 'Were you due to collect your document from the Post Office?'
-    Then I check 'collection-no'
+    Then I check 'post-office-collect-radio-no'
     Then I select 'Continue'
     Then I should be on the 'consignment-number' page showing 'Do you have a consignment number?'
     Then I check 'consignment-number-radio-no'
@@ -24,7 +24,7 @@ Feature: I should be able to log that my BRP has not arrived
   Scenario: BRP resent to same address
     Given I start the 'not-arrived' application journey
     Then I should be on the 'post-office-collect' page showing 'Were you due to collect your document from the Post Office?'
-    Then I check 'collection-no'
+    Then I check 'post-office-collect-radio-no'
     Then I select 'Continue'
     Then I should be on the 'consignment-number' page showing 'Do you have a consignment number?'
     Then I check 'consignment-number-radio-no'
@@ -51,7 +51,7 @@ Feature: I should be able to log that my BRP has not arrived
   Scenario: BRP resent to different address
     Given I start the 'not-arrived' application journey
     Then I should be on the 'post-office-collect' page showing 'Were you due to collect your document from the Post Office?'
-    Then I check 'collection-no'
+    Then I check 'post-office-collect-radio-no'
     Then I select 'Continue'
     Then I should be on the 'consignment-number' page showing 'Do you have a consignment number?'
     Then I check 'consignment-number-radio-no'
@@ -87,7 +87,7 @@ Feature: I should be able to log that my BRP has not arrived
   Scenario: Not Arrived application Personal Details not a URL validation
     Given I start the 'not-arrived' application journey
     Then I should be on the 'post-office-collect' page showing 'Were you due to collect your document from the Post Office?'
-    Then I check 'collection-no'
+    Then I check 'post-office-collect-radio-no'
     Then I select 'Continue'
     Then I should be on the 'consignment-number' page showing 'Do you have a consignment number?'
     Then I check 'consignment-number-radio-no'
@@ -111,7 +111,7 @@ Feature: I should be able to log that my BRP has not arrived
   Scenario: Not Arrived application Representative Personal Details not a URL validation
     Given I start the 'not-arrived' application journey
     Then I should be on the 'post-office-collect' page showing 'Were you due to collect your document from the Post Office?'
-    Then I check 'collection-no'
+    Then I check 'post-office-collect-radio-no'
     Then I select 'Continue'
     Then I should be on the 'consignment-number' page showing 'Do you have a consignment number?'
     Then I check 'consignment-number-radio-no'
diff --git a/test/_features/step_definitions/steps.js b/test/_features/step_definitions/steps.js
index 90428550..a5bd3367 100644
--- a/test/_features/step_definitions/steps.js
+++ b/test/_features/step_definitions/steps.js
@@ -93,5 +93,5 @@ Then('I should see {string} on the page', async function (content) {
 
 Then('I should see the {string} error', async function (content) {
   await this.page.waitForSelector('body', { timeout: 15000 });
-  expect(await this.page.innerText('.validation-summary.error-summary')).to.include(content);
+  expect(await this.page.innerText('.govuk-error-summary')).to.include(content);
 }.bind(World));
diff --git a/yarn.lock b/yarn.lock
index 6b8537b8..0971a51c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2693,6 +2693,11 @@ govuk-elements-sass@^3.1.3:
   dependencies:
     govuk_frontend_toolkit "^7.1.0"
 
+govuk-frontend@3.14:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/govuk-frontend/-/govuk-frontend-3.14.0.tgz#d3a9c54437c08f5188f87b1f4480ba60e95c8eb6"
+  integrity sha512-y7FTuihCSA8Hty+e9h0uPhCoNanCAN+CLioNFlPmlbeHXpbi09VMyxTcH+XfnMPY4Cp++7096v0rLwwdapTXnA==
+
 govuk_frontend_toolkit@^7.1.0:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/govuk_frontend_toolkit/-/govuk_frontend_toolkit-7.6.0.tgz#b09a60631afbba4bfac76a8b7c02e72419c29cf5"
@@ -2843,10 +2848,10 @@ hmac-drbg@^1.0.1:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hof@^19.14.15:
-  version "19.14.15"
-  resolved "https://registry.yarnpkg.com/hof/-/hof-19.14.15.tgz#af180239cb92c38341c8ed24c2e7082178927572"
-  integrity sha512-GdZHQyqqgyzxfIta9PYHIw7aWTnyqpdeQnBFMdisrzDyLGwcWcYvLJ+y0BCY5wndhnuSApVX0pviPDNIAf9z2A==
+hof@20.0.4:
+  version "20.0.4"
+  resolved "https://registry.yarnpkg.com/hof/-/hof-20.0.4.tgz#57bc266ec9dac407a485c440d651bcf8e333aca9"
+  integrity sha512-Mg+65IOJpZiHFvsTjWmDeJ7kkdV5YhBhMottANo6S9mElzD0U2xcdZbJt9L4ONkGbM4lEXpeb3Mqv/Ure9c4gQ==
   dependencies:
     aliasify "^2.1.0"
     bluebird "^3.7.2"
@@ -2870,6 +2875,7 @@ hof@^19.14.15:
     findup "^0.1.5"
     glob "^7.2.0"
     govuk-elements-sass "^3.1.3"
+    govuk-frontend "3.14"
     govuk_template_mustache "^0.26.0"
     helmet "^3.22.0"
     hogan-express-strict "^0.5.4"