diff --git a/.dockerignore b/.dockerignore
index 9b15d0730..72424b12a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -17,3 +17,4 @@ pacts
 .project
 *.log
 *.txt
+.env
diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
index e6b0f87f9..13ebfcb2d 100644
--- a/app/assets/sass/application.scss
+++ b/app/assets/sass/application.scss
@@ -57,5 +57,4 @@ $govuk-suppressed-warnings: (
 @import "components/system-messages";
 @import "components/spinner";
 @import "components/service-settings";
-@import "components/hint-and-body-width";
 @import "components/fieldset-legend-width";
diff --git a/app/assets/sass/components/hint-and-body-width.scss b/app/assets/sass/components/hint-and-body-width.scss
deleted file mode 100644
index 1908573d5..000000000
--- a/app/assets/sass/components/hint-and-body-width.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.hint-and-body-width {
-  max-width: 630px;
-  word-wrap: break-word;
-}
diff --git a/app/assets/sass/components/service-settings.scss b/app/assets/sass/components/service-settings.scss
index c9e510140..63333dac0 100644
--- a/app/assets/sass/components/service-settings.scss
+++ b/app/assets/sass/components/service-settings.scss
@@ -34,6 +34,10 @@
   @include govuk-typography-weight-bold();
 }
 
+.service-settings-pane {
+  max-width: 630px;
+}
+
 .service-settings-inset-text--grey {
   background-color: govuk-colour("light-grey");
 }
@@ -45,6 +49,9 @@
 }
 
 .task-list {
+  .govuk-task-list__name-and-hint {
+    width: 70% !important;
+  }
   a:visited, a:link {
     color: govuk-colour("blue");
   }
diff --git a/app/assets/sass/components/system-messages.scss b/app/assets/sass/components/system-messages.scss
index afa257959..407e6a6d2 100644
--- a/app/assets/sass/components/system-messages.scss
+++ b/app/assets/sass/components/system-messages.scss
@@ -20,6 +20,8 @@
 
 .system-message__text {
   flex: 1;
+  overflow-wrap: break-word;
+  overflow: hidden;
 }
 
 .system-message__icon--success {
diff --git a/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.js b/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.js
index daf3e785b..b9c7daa92 100644
--- a/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.js
+++ b/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.js
@@ -2,7 +2,8 @@ const { response } = require('@utils/response')
 const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for')
 const paths = require('@root/paths')
 const { updateCustomParagraphByServiceIdAndAccountType } = require('@services/email.service')
-const { validateOptionalField } = require('@utils/validation/server-side-form-validations')
+const { body, validationResult } = require('express-validator')
+const formatValidationErrors = require('@utils/simplified-account/format/format-validation-errors')
 const CUSTOM_PARAGRAPH_MAX_LENGTH = 5000
 
 function get (req, res) {
@@ -10,7 +11,7 @@ function get (req, res) {
   const service = req.service
 
   response(req, res, 'simplified-account/settings/email-notifications/custom-paragraph', {
-    customParagraphText: account.rawResponse.email_notifications.PAYMENT_CONFIRMED.template_body,
+    customParagraph: account.rawResponse.email_notifications.PAYMENT_CONFIRMED.template_body,
     serviceName: service.name,
     backLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.emailNotifications.templates,
       service.externalId, account.type),
@@ -22,22 +23,31 @@ function get (req, res) {
 async function postEditCustomParagraph (req, res) {
   const serviceExternalId = req.service.externalId
   const accountType = req.account.type
-  const customParagraph = req.body['custom-paragraph']
+  const validations = [
+    body('customParagraph').trim().isLength({ max: CUSTOM_PARAGRAPH_MAX_LENGTH }).withMessage(`Custom paragraph name must be ${CUSTOM_PARAGRAPH_MAX_LENGTH} characters or fewer`)
+  ]
 
-  const validationResult = validateOptionalField(customParagraph, CUSTOM_PARAGRAPH_MAX_LENGTH, 'custom paragraph')
-  if (!validationResult.valid) {
+  await Promise.all(validations.map(validation => validation.run(req)))
+  const errors = validationResult(req)
+
+  if (!errors.isEmpty()) {
+    const formattedErrors = formatValidationErrors(errors)
     return response(req, res, 'simplified-account/settings/email-notifications/custom-paragraph', {
       errors: {
-        customParagraph: validationResult.message
+        summary: formattedErrors.errorSummary,
+        formErrors: formattedErrors.formErrors
       },
-      customParagraphText: customParagraph,
+      customParagraph: req.body.customParagraph,
       serviceName: req.service.name,
       backLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.emailNotifications.templates,
+        req.service.externalId, accountType),
+      removeCustomParagraphLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.emailNotifications.removeCustomParagraph,
         req.service.externalId, accountType)
     })
   }
 
-  await updateCustomParagraphByServiceIdAndAccountType(serviceExternalId, accountType, customParagraph)
+  const newCustomParagraph = req.body.customParagraph.trim()
+  await updateCustomParagraphByServiceIdAndAccountType(serviceExternalId, accountType, newCustomParagraph)
   req.flash('messages', { state: 'success', icon: '✓', heading: 'Custom paragraph updated' })
   res.redirect(formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.emailNotifications.templates,
     serviceExternalId, accountType))
@@ -48,6 +58,7 @@ async function postRemoveCustomParagraph (req, res) {
   const accountType = req.account.type
 
   await updateCustomParagraphByServiceIdAndAccountType(serviceExternalId, accountType, '')
+  req.flash('messages', { state: 'success', icon: '✓', heading: 'Custom paragraph removed' })
   res.redirect(formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.emailNotifications.templates,
     serviceExternalId, accountType))
 }
diff --git a/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js b/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js
index c79738037..8f6a65965 100644
--- a/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js
+++ b/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js
@@ -79,7 +79,7 @@ describe('Controller: settings/email-notifications/templates/custom-paragraph',
     })
 
     it('should pass context data to the response method', () => {
-      expect(responseStub.args[0][3]).to.have.property('customParagraphText').to.equal('Do this next')
+      expect(responseStub.args[0][3]).to.have.property('customParagraph').to.equal('Do this next')
       expect(responseStub.args[0][3]).to.have.property('serviceName').to.equal(SERVICE_NAME)
       expect(responseStub.args[0][3]).to.have.property('backLink').to.contain(paths.simplifiedAccount.settings.emailNotifications.index)
     })
@@ -87,7 +87,7 @@ describe('Controller: settings/email-notifications/templates/custom-paragraph',
 
   describe('postRemoveCustomParagraph', () => {
     before(() => {
-      const body = { 'custom-paragraph': 'a test custom paragraph' }
+      const body = { customParagraph: 'a test custom paragraph' }
       setupTest(body)
       customParagraphController.postRemoveCustomParagraph(req, res)
     })
@@ -105,7 +105,7 @@ describe('Controller: settings/email-notifications/templates/custom-paragraph',
 
   describe('postEditCustomParagraph', () => {
     before(() => {
-      const body = { 'custom-paragraph': 'a test custom paragraph' }
+      const body = { customParagraph: 'a test custom paragraph' }
       setupTest(body)
       customParagraphController.postEditCustomParagraph(req, res)
     })
@@ -125,7 +125,7 @@ describe('Controller: settings/email-notifications/templates/custom-paragraph',
     describe('with validation error', () => {
       const invalidText = 'hi'.repeat(5000)
       before(() => {
-        const body = { 'custom-paragraph': invalidText }
+        const body = { customParagraph: invalidText }
         setupTest(body)
         customParagraphController.postEditCustomParagraph(req, res)
       })
@@ -141,12 +141,23 @@ describe('Controller: settings/email-notifications/templates/custom-paragraph',
       })
 
       it('should pass context data to the response method', () => {
-        expect(responseStub.args[0][3]).to.have.property('errors').to.deep.equal({
-          customParagraph: 'Custom paragraph must be 5000 characters or fewer'
-        })
-        expect(responseStub.args[0][3]).to.have.property('customParagraphText').to.equal(invalidText)
+        const errors = responseStub.args[0][3].errors
+        expect(errors.summary).to.deep.equal(
+          [
+            {
+              text: 'Custom paragraph name must be 5000 characters or fewer',
+              href: '#custom-paragraph'
+            }
+          ])
+        expect(errors.formErrors).to.deep.equal(
+          {
+            customParagraph: 'Custom paragraph name must be 5000 characters or fewer'
+          }
+        )
+        expect(responseStub.args[0][3]).to.have.property('customParagraph').to.equal(invalidText)
         expect(responseStub.args[0][3]).to.have.property('serviceName').to.equal(SERVICE_NAME)
         expect(responseStub.args[0][3]).to.have.property('backLink').to.contain(paths.simplifiedAccount.settings.emailNotifications.index)
+        expect(responseStub.args[0][3]).to.have.property('removeCustomParagraphLink').to.contain(paths.simplifiedAccount.settings.emailNotifications.removeCustomParagraph)
       })
     })
   })
diff --git a/app/controllers/simplified-account/settings/service-name/service-name.controller.js b/app/controllers/simplified-account/settings/service-name/service-name.controller.js
index 0774bc9e7..c31d782e4 100644
--- a/app/controllers/simplified-account/settings/service-name/service-name.controller.js
+++ b/app/controllers/simplified-account/settings/service-name/service-name.controller.js
@@ -36,11 +36,11 @@ function getEditServiceName (req, res) {
 async function postEditServiceName (req, res) {
   const editCy = req.body.cy === 'true'
   const validations = [
-    body('serviceNameInput').trim().isLength({ max: SERVICE_NAME_MAX_LENGTH }).withMessage(`Service name must be ${SERVICE_NAME_MAX_LENGTH} characters or fewer`)
+    body('serviceName').trim().isLength({ max: SERVICE_NAME_MAX_LENGTH }).withMessage(`Service name must be ${SERVICE_NAME_MAX_LENGTH} characters or fewer`)
   ]
   // we don't check presence for welsh names
   if (!editCy) {
-    validations.push(body('serviceNameInput').trim().notEmpty().withMessage('Service name is required'))
+    validations.push(body('serviceName').trim().notEmpty().withMessage('Service name is required'))
   }
 
   await Promise.all(validations.map(validation => validation.run(req)))
@@ -53,13 +53,14 @@ async function postEditServiceName (req, res) {
         formErrors: formattedErrors.formErrors
       },
       editCy,
-      serviceName: req.body.serviceNameInput,
+      serviceName: req.body.serviceName,
       backLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.serviceName.index, req.service.externalId, req.account.type),
-      submitLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.serviceName.edit, req.service.externalId, req.account.type)
+      submitLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.serviceName.edit, req.service.externalId, req.account.type),
+      removeCyLink: formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.serviceName.removeCy, req.service.externalId, req.account.type)
     })
   }
 
-  const newServiceName = req.body.serviceNameInput.trim()
+  const newServiceName = req.body.serviceName.trim()
   editCy ? await updateServiceName(req.service.externalId, req.service.serviceName.en, newServiceName) : await updateServiceName(req.service.externalId, newServiceName, req.service.serviceName.cy)
   res.redirect(formatSimplifiedAccountPathsFor(paths.simplifiedAccount.settings.serviceName.index, req.service.externalId, req.account.type))
 }
diff --git a/app/controllers/simplified-account/settings/service-name/service-name.controller.test.js b/app/controllers/simplified-account/settings/service-name/service-name.controller.test.js
index 858b3e733..0ad1ba716 100644
--- a/app/controllers/simplified-account/settings/service-name/service-name.controller.test.js
+++ b/app/controllers/simplified-account/settings/service-name/service-name.controller.test.js
@@ -123,7 +123,7 @@ describe('Controller: settings/service-name', () => {
       before(() => {
         setupTest('postEditServiceName', {}, {
           body: {
-            serviceNameInput: 'New English Name',
+            serviceName: 'New English Name',
             cy: 'false'
           }
         })
@@ -143,7 +143,7 @@ describe('Controller: settings/service-name', () => {
       before(() => {
         setupTest('postEditServiceName', {}, {
           body: {
-            serviceNameInput: 'Enw Cymraeg newydd',
+            serviceName: 'Enw Cymraeg newydd',
             cy: 'true'
           }
         })
@@ -186,6 +186,7 @@ describe('Controller: settings/service-name', () => {
         expect(responseStub.calledOnce).to.be.true // eslint-disable-line
         const [, , template, context] = responseStub.args[0]
         expect(template).to.equal('simplified-account/settings/service-name/edit-service-name')
+        expect(context).to.have.property('removeCyLink').to.contain(paths.simplifiedAccount.settings.serviceName.removeCy)
         expect(context.errors).to.deep.equal({
           summary: ['Error summary'],
           formErrors: { serviceNameInput: 'Error message' }
diff --git a/app/simplified-account-routes.js b/app/simplified-account-routes.js
index 8b477b27f..1228fe226 100644
--- a/app/simplified-account-routes.js
+++ b/app/simplified-account-routes.js
@@ -75,18 +75,20 @@ simplifiedAccount.get(paths.simplifiedAccount.settings.cardTypes.index, permissi
 // stripe details
 const stripeDetailsPath = paths.simplifiedAccount.settings.stripeDetails
 const stripeDetailsRouter = new Router({ mergeParams: true })
-  .use(enforcePaymentProviderType(STRIPE), permission('stripe-account-details:update'))
+  .use(enforceLiveAccountOnly, enforcePaymentProviderType(STRIPE), permission('stripe-account-details:update'))
 stripeDetailsRouter.get(stripeDetailsPath.index, serviceSettingsController.stripeDetails.get)
+
 stripeDetailsRouter.get(stripeDetailsPath.bankAccount, serviceSettingsController.stripeDetails.bankAccount.get)
 stripeDetailsRouter.post(stripeDetailsPath.bankAccount, serviceSettingsController.stripeDetails.bankAccount.post)
-// -- new stuff
+
 stripeDetailsRouter.get(stripeDetailsPath.companyNumber, serviceSettingsController.stripeDetails.companyNumber.get)
 stripeDetailsRouter.post(stripeDetailsPath.companyNumber, serviceSettingsController.stripeDetails.companyNumber.post)
+
 stripeDetailsRouter.get(stripeDetailsPath.organisationDetails.index, serviceSettingsController.stripeDetails.organisationDetails.get)
 stripeDetailsRouter.post(stripeDetailsPath.organisationDetails.index, serviceSettingsController.stripeDetails.organisationDetails.post)
 stripeDetailsRouter.get(stripeDetailsPath.organisationDetails.update, serviceSettingsController.stripeDetails.organisationDetails.update.get)
 stripeDetailsRouter.post(stripeDetailsPath.organisationDetails.update, serviceSettingsController.stripeDetails.organisationDetails.update.post)
-// -- responsible person
+
 stripeDetailsRouter.get(stripeDetailsPath.responsiblePerson.index, serviceSettingsController.stripeDetails.responsiblePerson.get)
 stripeDetailsRouter.post(stripeDetailsPath.responsiblePerson.index, serviceSettingsController.stripeDetails.responsiblePerson.post)
 stripeDetailsRouter.get(stripeDetailsPath.responsiblePerson.homeAddress, serviceSettingsController.stripeDetails.responsiblePerson.homeAddress.get)
@@ -95,13 +97,16 @@ stripeDetailsRouter.get(stripeDetailsPath.responsiblePerson.contactDetails, serv
 stripeDetailsRouter.post(stripeDetailsPath.responsiblePerson.contactDetails, serviceSettingsController.stripeDetails.responsiblePerson.contactDetails.post)
 stripeDetailsRouter.get(stripeDetailsPath.responsiblePerson.checkYourAnswers, serviceSettingsController.stripeDetails.responsiblePerson.checkYourAnswers.get)
 stripeDetailsRouter.post(stripeDetailsPath.responsiblePerson.checkYourAnswers, serviceSettingsController.stripeDetails.responsiblePerson.checkYourAnswers.post)
-// --
+
 stripeDetailsRouter.get(stripeDetailsPath.vatNumber, serviceSettingsController.stripeDetails.vatNumber.get)
 stripeDetailsRouter.post(stripeDetailsPath.vatNumber, serviceSettingsController.stripeDetails.vatNumber.post)
+
 stripeDetailsRouter.get(stripeDetailsPath.director, serviceSettingsController.stripeDetails.director.get)
 stripeDetailsRouter.post(stripeDetailsPath.director, serviceSettingsController.stripeDetails.director.post)
+
 stripeDetailsRouter.get(stripeDetailsPath.governmentEntityDocument, serviceSettingsController.stripeDetails.governmentEntityDocument.get)
 stripeDetailsRouter.post(stripeDetailsPath.governmentEntityDocument, [upload.single(GOV_ENTITY_DOC_FORM_FIELD_NAME), ...serviceSettingsController.stripeDetails.governmentEntityDocument.post])
+
 simplifiedAccount.use(stripeDetailsRouter)
 
 module.exports = simplifiedAccount
diff --git a/app/views/simplified-account/settings/email-notifications/collect-email-page.njk b/app/views/simplified-account/settings/email-notifications/collect-email-page.njk
index c7d7960b5..c8696efbd 100644
--- a/app/views/simplified-account/settings/email-notifications/collect-email-page.njk
+++ b/app/views/simplified-account/settings/email-notifications/collect-email-page.njk
@@ -1,74 +1,61 @@
 {% extends "../settings-layout.njk" %}
 
 {% block settingsPageTitle %}
-  Email notifications - {{currentService.name}} {{currentGatewayAccount.full_type}}
+  Email notifications - {{ currentService.name }} {{ currentGatewayAccount.full_type }}
 {% endblock %}
 
 {% block settingsContent %}
+  <form id="email-collection-mode" method="post" novalidate>
+    <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
 
-    {{ govukBackLink({
-      text: "Back",
-      href: backLink
+    {{ govukRadios({
+      idPrefix: 'mode',
+      name: 'emailCollectionMode',
+      fieldset: {
+        legend: {
+          text: 'Ask users for their email address',
+          isPageHeading: true,
+          classes: 'govuk-fieldset__legend--l govuk-!-font-weight-bold'
+        }
+      },
+      items: [
+        {
+          value: emailCollectionModes.mandatory,
+          html: 'On – as a mandatory field',
+          label: {
+          classes: 'govuk-!-font-weight-bold'
+        },
+          checked: emailCollectionMode === emailCollectionModes.mandatory,
+          hint: {
+          text: 'Users must enter an email address to complete a payment – they can receive notifications'
+        }
+        },
+        {
+          value: emailCollectionModes.optional,
+          html: 'On – as an optional field',
+          label: {
+          classes: 'govuk-!-font-weight-bold'
+        },
+          checked: emailCollectionMode === emailCollectionModes.optional,
+          hint: {
+          text: 'Users can choose to enter an email address – if they do, they can receive notifications'
+        }
+        },
+        {
+          value: emailCollectionModes.no,
+          html: 'Off',
+          label: {
+          classes: 'govuk-!-font-weight-bold'
+        },
+          checked: emailCollectionMode === emailCollectionModes.no,
+          hint: {
+          text: 'Users do not have the option to enter an email address – they will not receive notifications'
+        }
+        }
+      ]
     }) }}
-
-    <form id="email-collection-mode" method="post" novalidate>
-      <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}"/>
-
-      {{
-        govukRadios({
-          idPrefix: 'mode',
-          name: 'emailCollectionMode',
-          fieldset: {
-            legend: {
-              text: 'Ask users for their email address',
-              isPageHeading: true,
-              classes: 'govuk-fieldset__legend--l govuk-!-font-weight-bold'
-            }
-          },
-          items: [
-            {
-                value: emailCollectionModes.mandatory,
-                html: 'On – as a mandatory field',
-                label: {
-                  classes: 'govuk-!-font-weight-bold'
-                },
-                checked: emailCollectionMode === emailCollectionModes.mandatory,
-                hint: {
-                  text: 'Users must enter an email address to complete a payment – they can receive notifications',
-                  classes: 'hint-and-body-width'
-                }
-            },
-            {
-                value: emailCollectionModes.optional,
-                html: 'On – as an optional field',
-                label: {
-                  classes: 'govuk-!-font-weight-bold'
-                },
-                checked: emailCollectionMode === emailCollectionModes.optional,
-                hint: {
-                  text: 'Users can choose to enter an email address – if they do, they can receive notifications',
-                  classes: 'hint-and-body-width'
-                }
-            },
-            {
-                value: emailCollectionModes.no,
-                html: 'Off',
-                label: {
-                  classes: 'govuk-!-font-weight-bold'
-                },
-                checked: emailCollectionMode === emailCollectionModes.no,
-                hint: {
-                  text: 'Users do not have the option to enter an email address – they will not receive notifications',
-                  classes: 'hint-and-body-width'
-                }
-            }
-          ]
-        })
-      }}
-      {{ govukButton({
-        text: 'Save changes'
-      }) }}
-    </form>
-
-  </div>
+    {{ govukButton({
+      text: 'Save changes'
+    }) }}
+  </form>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/email-notifications/custom-paragraph.njk b/app/views/simplified-account/settings/email-notifications/custom-paragraph.njk
index 5cbc1993e..20d277f5b 100644
--- a/app/views/simplified-account/settings/email-notifications/custom-paragraph.njk
+++ b/app/views/simplified-account/settings/email-notifications/custom-paragraph.njk
@@ -5,38 +5,20 @@
 {% endblock %}
 
 {% block settingsContent %}
-
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: [
-        {
-          text: errors.customParagraph,
-          href: "#"
-        }
-      ]
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Add a custom paragraph</h1>
 
   <p class="govuk-body">
-      You can add a custom paragraph to give users more information about your service. For example, you can tell users:
+    You can add a custom paragraph to give users more information about your service. For example, you can tell users:
   </p>
 
   <ul class="govuk-list govuk-list--bullet">
-      <li>what they need to do next</li>
-      <li>how long it will take to process the payment</li>
-      <li>about delivery dates</li>
+    <li>what they need to do next</li>
+    <li>how long it will take to process the payment</li>
+    <li>about delivery dates</li>
   </ul>
 
   <p class="govuk-body">
-      If you include a link in your custom paragraph you must:
+    If you include a link in your custom paragraph you must:
   </p>
 
   <ul class="govuk-list govuk-list--bullet">
@@ -46,38 +28,36 @@
   </ul>
 
   <p class="govuk-body">
-      Do not include contact details in the custom paragraph. If you want to provide contact details, you must link to a page on a gov.uk domain.
+    Do not include contact details in the custom paragraph. If you want to provide contact details, you must link to a
+    page on a gov.uk domain.
   </p>
 
   <p class="govuk-body">
-      You should not:
+    You should not:
   </p>
 
   <ul class="govuk-list govuk-list--bullet">
-      <li>request personal data, passwords or payment details</li>
-      <li>link directly to a sign-in page</li>
-      <li>use redirects or tracking links</li>
+    <li>request personal data, passwords or payment details</li>
+    <li>link directly to a sign-in page</li>
+    <li>use redirects or tracking links</li>
   </ul>
 
   <form id="add-custom-paragraph" method="post" novalidate>
-    <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}"/>
-
-    {{
-      govukTextarea({
-        name: "custom-paragraph",
-        id: "custom-paragraph",
-        label: {
-          text: "Enter a custom paragraph",
-          classes: "govuk-label--m"
-        },
-        classes: "qa-custom-p",
-        value: customParagraphText,
-        errorMessage: { text: errors.customParagraph } if errors.customParagraph else false
-      })
-    }}
+    <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
+
+    {{ govukTextarea({
+      name: "customParagraph",
+      id: "custom-paragraph",
+      label: {
+        text: "Enter a custom paragraph",
+        classes: "govuk-label--m"
+      },
+      errorMessage: { text: errors.formErrors['customParagraph'] } if errors.formErrors['customParagraph'] else false,
+      value: customParagraph
+    }) }}
   </form>
 
-  {% if customParagraphText %}
+  {% if customParagraph %}
     <form id="remove-custom-paragraph" action="{{ removeCustomParagraphLink }}" method="POST">
       <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
     </form>
@@ -91,7 +71,7 @@
         form: "add-custom-paragraph"
       }
     }) }}
-    {% if customParagraphText %}
+    {% if customParagraph %}
       {{ govukButton({
         text: "Remove custom paragraph",
         classes: "govuk-button--secondary",
diff --git a/app/views/simplified-account/settings/email-notifications/edit-email-collection-mode.njk b/app/views/simplified-account/settings/email-notifications/edit-email-collection-mode.njk
index 862350500..34632ebef 100644
--- a/app/views/simplified-account/settings/email-notifications/edit-email-collection-mode.njk
+++ b/app/views/simplified-account/settings/email-notifications/edit-email-collection-mode.njk
@@ -1,62 +1,52 @@
 {% extends "../settings-layout.njk" %}
 
 {% block settingsPageTitle %}
-  Email notifications - {{currentService.name}} {{currentGatewayAccount.full_type}}
+  Email notifications - {{ currentService.name }} {{ currentGatewayAccount.full_type }}
 {% endblock %}
 
 {% block settingsContent %}
+  <form id="edit-email-collection-mode" method="post" novalidate>
+    <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
 
-    {{ govukBackLink({
-      text: "Back",
-      href: backLink
+    {{ govukRadios({
+      idPrefix: 'email-collection-mode',
+      name: 'emailCollectionMode',
+      fieldset: {
+        legend: {
+          text: 'Do you want to ask users for an email address on the card payment page?',
+          isPageHeading: true,
+          classes: 'govuk-fieldset__legend--l'
+        }
+      },
+      items: [
+        {
+          value: emailCollectionModes.mandatory,
+          text: 'Yes – as a mandatory field',
+          checked: emailCollectionMode === 'MANDATORY',
+          hint: {
+          text: 'Users must enter an email address to complete a payment – they can receive notifications'
+        }
+        },
+        {
+          value: emailCollectionModes.optional,
+          text: 'Yes – as an optional field',
+          checked: emailCollectionMode === 'OPTIONAL',
+          hint: {
+          text: 'Users can choose to enter an email address – if they do, they can receive notifications'
+        }
+        },
+        {
+          value: emailCollectionModes.no,
+          text: 'No',
+          checked: emailCollectionMode === 'OFF',
+          hint: {
+          text: 'Users do not have the option to enter an email address – they will not receive notifications'
+        }
+        }
+      ]
     }) }}
-
-    <form id="edit-email-collection-mode" method="post" novalidate>
-      <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}"/>
-
-      {{
-        govukRadios({
-          idPrefix: 'email-collection-mode',
-          name: 'emailCollectionMode',
-          fieldset: {
-            legend: {
-              text: 'Do you want to ask users for an email address on the card payment page?',
-              isPageHeading: true,
-              classes: 'govuk-fieldset__legend--l'
-            }
-          },
-          items: [
-            {
-                value: emailCollectionModes.mandatory,
-                text: 'Yes – as a mandatory field',
-                checked: emailCollectionMode === 'MANDATORY',
-                hint: {
-                  text: 'Users must enter an email address to complete a payment – they can receive notifications'
-                }
-            },
-            {
-                value: emailCollectionModes.optional,
-                text: 'Yes – as an optional field',
-                checked: emailCollectionMode === 'OPTIONAL',
-                hint: {
-                  text: 'Users can choose to enter an email address – if they do, they can receive notifications'
-                }
-            },
-            {
-                value: emailCollectionModes.no,
-                text: 'No',
-                checked: emailCollectionMode === 'OFF',
-                hint: {
-                  text: 'Users do not have the option to enter an email address – they will not receive notifications'
-                }
-            }
-          ]
-        })
-      }}
-      {{ govukButton({
-        text: 'Save changes'
-      }) }}
-    </form>
-
-  </div>
+    {{ govukButton({
+      text: 'Save changes'
+    }) }}
+  </form>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/email-notifications/index.njk b/app/views/simplified-account/settings/email-notifications/index.njk
index 3faf3272f..168312fbf 100644
--- a/app/views/simplified-account/settings/email-notifications/index.njk
+++ b/app/views/simplified-account/settings/email-notifications/index.njk
@@ -5,7 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-
   {% if not isAdminUser %}
     {{ govukInsetText({
       text: "You don’t have permission to manage settings. Contact your service admin if you would like to manage 3D Secure,
@@ -38,12 +37,12 @@
       },
       {
         key: {
-          text: "Send payment confirmation emails"
-        },
+        text: "Send payment confirmation emails"
+      },
         value: {
-          text: 'On' if (confirmationEmailEnabled and emailCollectionMode !== 'OFF') else
+        text: 'On' if (confirmationEmailEnabled and emailCollectionMode !== 'OFF') else
           ('Off' if (not confirmationEmailEnabled and emailCollectionMode !== 'OFF') else 'Off (not asking users for their email address)')
-        },
+      },
         actions: {
         items: [
           {
@@ -57,12 +56,12 @@
       },
       {
         key: {
-          text: "Send refund emails"
-        },
+        text: "Send refund emails"
+      },
         value: {
-          text: 'On' if (refundEmailEnabled and emailCollectionMode !== 'OFF') else
+        text: 'On' if (refundEmailEnabled and emailCollectionMode !== 'OFF') else
           ('Off' if (not refundEmailEnabled and emailCollectionMode !== 'OFF') else 'Off (not asking users for their email address)')
-        },
+      },
         actions: {
         items: [
           {
@@ -77,8 +76,10 @@
     ]}) }}
 
   {% if isAdminUser %}
-    <p class="govuk-body"><a class="govuk-link" href="{{ templatesHref }}" id="templates-link">View email templates and add a custom paragraph</a></p>
+    <p class="govuk-body"><a class="govuk-link" href="{{ templatesHref }}" id="templates-link">View email templates
+        and add a custom paragraph</a></p>
   {% else %}
-    <p class="govuk-body"><a class="govuk-link" href="{{ templatesHref }}" id="templates-link">View email templates</a></p>
+    <p class="govuk-body"><a class="govuk-link" href="{{ templatesHref }}" id="templates-link">View email
+        templates</a></p>
   {% endif %}
 {% endblock %}
diff --git a/app/views/simplified-account/settings/email-notifications/payment-confirmation-email-toggle.njk b/app/views/simplified-account/settings/email-notifications/payment-confirmation-email-toggle.njk
index 5ed0a43cd..c5af732ca 100644
--- a/app/views/simplified-account/settings/email-notifications/payment-confirmation-email-toggle.njk
+++ b/app/views/simplified-account/settings/email-notifications/payment-confirmation-email-toggle.njk
@@ -5,15 +5,8 @@
 {% endblock %}
 
 {% block settingsContent %}
-
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
   <form id="payment-confirmation-email-toggle" method="post" novalidate>
     <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
-
     {{ govukRadios({
       idPrefix: 'toggle',
       name: 'paymentConfirmationEmailToggle',
@@ -34,20 +27,19 @@
           value: 'true',
           html: 'On',
           label: {
-            classes: 'govuk-!-font-weight-bold'
-          } if emailCollectionMode === 'OPTIONAL',
+          classes: 'govuk-!-font-weight-bold'
+        } if emailCollectionMode === 'OPTIONAL',
           checked: confirmationEnabled === true,
           hint: {
-            text: 'Entering an email address is currently optional so users might not get a payment confirmation',
-            classes: 'hint-and-body-width'
-          } if emailCollectionMode === 'OPTIONAL'
+          text: 'Entering an email address is currently optional so users might not get a payment confirmation'
+        } if emailCollectionMode === 'OPTIONAL'
         },
         {
           value: 'false',
           html: 'Off',
           label: {
-            classes: 'govuk-!-font-weight-bold'
-          } if emailCollectionMode === 'OPTIONAL',
+          classes: 'govuk-!-font-weight-bold'
+        } if emailCollectionMode === 'OPTIONAL',
           checked: confirmationEnabled === false
         }
       ]
@@ -55,6 +47,5 @@
     {{ govukButton({
       text: 'Save changes'
     }) }}
-
   </form>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/email-notifications/refund-email-toggle.njk b/app/views/simplified-account/settings/email-notifications/refund-email-toggle.njk
index 8f554e1c3..b059f5156 100644
--- a/app/views/simplified-account/settings/email-notifications/refund-email-toggle.njk
+++ b/app/views/simplified-account/settings/email-notifications/refund-email-toggle.njk
@@ -5,12 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
   <form id="refund-email-toggle" method="post" novalidate>
     <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
 
@@ -34,20 +28,19 @@
           value: 'true',
           html: 'On',
           label: {
-            classes: 'govuk-!-font-weight-bold'
-          } if emailCollectionMode === 'OPTIONAL',
+          classes: 'govuk-!-font-weight-bold'
+        } if emailCollectionMode === 'OPTIONAL',
           checked: refundEmailEnabled === true,
           hint: {
-            text: 'Entering an email address is currently optional so users might not get a refund confirmation',
-            classes: 'hint-and-body-width'
-          } if emailCollectionMode === 'OPTIONAL'
+          text: 'Entering an email address is currently optional so users might not get a refund confirmation'
+        } if emailCollectionMode === 'OPTIONAL'
         },
         {
           value: 'false',
           html: 'Off',
           label: {
-            classes: 'govuk-!-font-weight-bold'
-          } if emailCollectionMode === 'OPTIONAL',
+          classes: 'govuk-!-font-weight-bold'
+        } if emailCollectionMode === 'OPTIONAL',
           checked: refundEmailEnabled === false
         }
       ]
diff --git a/app/views/simplified-account/settings/email-notifications/templates.njk b/app/views/simplified-account/settings/email-notifications/templates.njk
index 311cd6da9..e084d1e44 100644
--- a/app/views/simplified-account/settings/email-notifications/templates.njk
+++ b/app/views/simplified-account/settings/email-notifications/templates.njk
@@ -5,12 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
   {% if not isAdminUser %}
     {{ govukInsetText({
       text: "You don’t have permission to manage settings. Contact your service admin if you would like to manage 3D Secure,
@@ -21,7 +15,7 @@
 
   <h1 class="govuk-heading-l">Email templates</h1>
 
-  <p class="govuk-body-l">
+  <p class="govuk-body govuk-!-margin-bottom-6">
     GOV.UK Pay can send notifications to users.
   </p>
 
@@ -57,7 +51,8 @@
     }) }}
 
     <div class="pay-email-template-body">
-      <h3 class="govuk-heading-m pay-email-heading">Your payment of £<span class="govuk-grey-text">[amount]</span> to <span class="govuk-grey-text">{{ serviceName }}</span> was successful</h3>
+      <h3 class="govuk-heading-m pay-email-heading">Your payment of £<span class="govuk-grey-text">[amount]</span> to
+        <span class="govuk-grey-text">{{ serviceName }}</span> was successful</h3>
       <ul class="govuk-list">
         <li>Payment for: <span class="govuk-grey-text">[description]</span></li>
         <li>Reference: <span class="govuk-grey-text">[service reference]</span></li>
@@ -71,7 +66,8 @@
         <p class="govuk-body govuk-grey-text qa-custom-p">*Optional custom paragraph - add this below*</p>
       {% endif %}
 
-      <p class="govuk-body">This email address is not monitored. If you have any questions about your payment, contact the service you made the payment to directly.</p>
+      <p class="govuk-body">This email address is not monitored. If you have any questions about your payment, contact
+        the service you made the payment to directly.</p>
     </div>
 
     <div class="pay-email-custom-paragraph">
@@ -87,6 +83,7 @@
 
         {{ govukButton({
           href: customParagraphHref,
+          classes: 'govuk-!-margin-bottom-0',
           text: 'Edit custom paragraph' if customEmailText else 'Add a custom paragraph',
           attributes: {
             id: 'add-custom-paragraph-link'
@@ -94,7 +91,8 @@
         }) }}
       {% else %}
         <p class="govuk-body">
-          Admin users can add a custom paragraph to give users extra information related to your service. For example, how long it will take to process the payment.
+          Admin users can add a custom paragraph to give users extra information related to your service. For example,
+          how long it will take to process the payment.
         </p>
       {% endif %}
     </div>
@@ -132,14 +130,16 @@
     }) }}
 
     <div class="pay-email-template-body">
-      <h3 class="govuk-heading-m email-heading">You have been refunded £<span class="govuk-grey-text">[amount]</span> by <span class="govuk-grey-text">{{ serviceName }}</span></h3>
+      <h3 class="govuk-heading-m email-heading">You have been refunded £<span class="govuk-grey-text">[amount]</span> by
+        <span class="govuk-grey-text">{{ serviceName }}</span></h3>
       <ul class="govuk-list">
         <li>Refund for: <span class="govuk-grey-text">[description]</span></li>
         <li>Reference: <span class="govuk-grey-text">[service reference]</span></li>
         <li>Date of original payment: <span class="govuk-grey-text">[date]</span></li>
       </ul>
       <p class="govuk-body">Your refund may take up to 6 days to appear in your account.</p>
-      <p class="govuk-body">This email address is not monitored. If you have any questions about your refund, contact the service you made the original payment to directly.</p>
+      <p class="govuk-body">This email address is not monitored. If you have any questions about your refund, contact
+        the service you made the original payment to directly.</p>
     </div>
   {% endset -%}
 
@@ -149,8 +149,8 @@
         label: 'Confirmation email',
         id: 'confirmation-html',
         panel: {
-          html: confirmationEmailHtml
-        }
+        html: confirmationEmailHtml
+      }
       },
       {
         label: 'Refund email',
diff --git a/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-address.njk b/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-address.njk
index bdf55dcea..37474324b 100644
--- a/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-address.njk
+++ b/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-address.njk
@@ -13,7 +13,7 @@
     hint: {
       text: "Cannot be a PO Box"
     },
-    classes: "govuk-!-width-two-thirds",
+    classes: "govuk-!-width-three-quarters",
     id: "address-line1",
     name: "addressLine1",
     autocomplete: "section-address address-line1",
@@ -25,7 +25,7 @@
     label: {
       html: '<span class="govuk-visually-hidden">Building and street line 2 of 2</span>'
     },
-    classes: "govuk-!-width-two-thirds",
+    classes: "govuk-!-width-three-quarters",
     id: "address-line2",
     name: "addressLine2",
     autocomplete: "section-address address-line2",
@@ -37,7 +37,7 @@
     label: {
       text: "Town or city"
     },
-    classes: "govuk-!-width-one-half",
+    classes: "govuk-!-width-two-thirds",
     id: "address-city",
     name: "addressCity",
     autocomplete: "section-address address-level2",
@@ -47,7 +47,7 @@
 
   {{ govukSelect({
     id: "address-country",
-    classes: "govuk-!-width-one-half",
+    classes: "govuk-!-width-two-thirds",
     name: "addressCountry",
     errorMessage: { text: errors.formErrors['addressCountry'] } if errors.formErrors['addressCountry'] else false,
     label: {
@@ -60,7 +60,7 @@
     label: {
       text: "Postcode"
     },
-    classes: "govuk-input--width-10",
+    classes: "govuk-!-width-one-quarter",
     id: "address-postcode",
     name: "addressPostcode",
     autocomplete: "section-address postal-code",
diff --git a/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-name.njk b/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-name.njk
index 415a43887..b9f5fa6fa 100644
--- a/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-name.njk
+++ b/app/views/simplified-account/settings/organisation-details/_edit-organisation-details-name.njk
@@ -1,5 +1,5 @@
 {% set organisationNameHint %}
-  <div class='hint-and-body-width'>
+  <div>
     <p>Enter the main name of your organisation, not your local office or individual department.</p>
     <p>Write the organisation name in full. Only use acronyms that are widely understood (for example, NHS).</p>
   </div>
@@ -16,6 +16,6 @@
   hint: {
     html: organisationNameHint
   },
-  classes: "govuk-!-width-two-thirds",
+  classes: "govuk-!-width-three-quarters",
   value: organisationDetails.organisationName
 }) }}
diff --git a/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk b/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk
index 4aa7b9825..72570cd47 100644
--- a/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk
+++ b/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk
@@ -5,23 +5,12 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) if backLink }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Organisation details</h1>
 
-  <p class="govuk-body govuk-!-margin-bottom-6 hint-and-body-width">Payment card schemes require the details of the organisation taking payment to be shown on payment pages.</p>
+  <p class="govuk-body govuk-!-margin-bottom-6">Payment card schemes require the details of the organisation taking
+    payment to be shown on payment pages.</p>
 
-  <form id="organisation-details-form" method="post" action="{{ submitLink }}" >
+  <form id="organisation-details-form" method="post" action="{{ submitLink }}">
     <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
 
     {% include "./_edit-organisation-details-name.njk" %}
@@ -68,7 +57,5 @@
         id: "save-merchant-details"
       }
     }) }}
-
   </form>
-
 {% endblock %}
diff --git a/app/views/simplified-account/settings/organisation-details/index.njk b/app/views/simplified-account/settings/organisation-details/index.njk
index f409e4228..3a3ec5bf7 100644
--- a/app/views/simplified-account/settings/organisation-details/index.njk
+++ b/app/views/simplified-account/settings/organisation-details/index.njk
@@ -7,7 +7,8 @@
 {% block settingsContent %}
   <h1 class="govuk-heading-l">Organisation details</h1>
 
-  <p class="govuk-body govuk-!-margin-bottom-6 hint-and-body-width">Payment card schemes require the details of the organisation taking payment to be shown on payment pages.</p>
+  <p class="govuk-body govuk-!-margin-bottom-6">Payment card schemes require the details of the organisation taking
+    payment to be shown on payment pages.</p>
 
   {{ govukSummaryList({
     classes: "govuk-!-margin-bottom-9",
@@ -27,35 +28,35 @@
     rows: [
       {
         key: {
-          text: "Name"
-        },
+        text: "Name"
+      },
         value: {
-          text: organisationDetails.organisationName
-        }
+        text: organisationDetails.organisationName
+      }
       },
       {
         key: {
-          text: "Address"
-        },
+        text: "Address"
+      },
         value: {
-          html: organisationDetails.address
-        }
+        html: organisationDetails.address
+      }
       },
       {
         key: {
-          text: "Telephone number"
-        },
+        text: "Telephone number"
+      },
         value: {
-          text: organisationDetails.telephoneNumber
-        }
+        text: organisationDetails.telephoneNumber
+      }
       },
       {
         key: {
-          text: "Website address"
-        },
+        text: "Website address"
+      },
         value: {
-          text: organisationDetails.url
-        }
+        text: organisationDetails.url
+      }
       }
     ]
   }) }}
diff --git a/app/views/simplified-account/settings/service-name/edit-service-name.njk b/app/views/simplified-account/settings/service-name/edit-service-name.njk
index 56086293b..501b95ceb 100644
--- a/app/views/simplified-account/settings/service-name/edit-service-name.njk
+++ b/app/views/simplified-account/settings/service-name/edit-service-name.njk
@@ -9,22 +9,10 @@
 {% endset %}
 
 {% block settingsPageTitle %}
-  Edit {% if editCy %}Welsh{% else %}English{% endif%} service name
+  Edit {% if editCy %}Welsh{% else %}English{% endif %} service name
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <form id="edit-service-name" method="post" action="{{ submitLink }}" novalidate>
     <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
     <input id="cy" name="cy" type="hidden" value="{{ editCy }}"/>
@@ -33,11 +21,11 @@
       label: {
         html: inputLabel
       },
-      errorMessage: { text: errors.formErrors['serviceNameInput'] } if errors.formErrors['serviceNameInput'] else false,
-      id: "service-name-input",
-      name: "serviceNameInput",
+      errorMessage: { text: errors.formErrors['serviceName'] } if errors.formErrors['serviceName'] else false,
+      id: "service-name",
+      name: "serviceName",
       value: serviceName,
-      classes: "govuk-!-width-one-half",
+      classes: "govuk-!-width-two-thirds",
       type: "text",
       spellcheck: true,
       hint: {
@@ -48,7 +36,7 @@
       }
     }) }}
 
-    <p class="govuk-body">
+    <p class="govuk-body govuk-!-margin-bottom-6">
       {% if editCy %}
         <a class="govuk-link govuk-link--no-visited-state" id="welsh-language-guidance"
            href="https://docs.payments.service.gov.uk/optional_features/welsh_language/">
diff --git a/app/views/simplified-account/settings/service-name/index.njk b/app/views/simplified-account/settings/service-name/index.njk
index cbdfa6e89..bd63c7a68 100644
--- a/app/views/simplified-account/settings/service-name/index.njk
+++ b/app/views/simplified-account/settings/service-name/index.njk
@@ -4,8 +4,6 @@
   <a class='govuk-link govuk-link--no-visited-state' href='{{ manageCy }}' data-cy="add-welsh-name">Add Welsh service name</a>
 {% endset %}
 
-
-
 {% block settingsPageTitle %}
   Service name
 {% endblock %}
diff --git a/app/views/simplified-account/settings/settings-layout.njk b/app/views/simplified-account/settings/settings-layout.njk
index 0c4c24456..924529b23 100644
--- a/app/views/simplified-account/settings/settings-layout.njk
+++ b/app/views/simplified-account/settings/settings-layout.njk
@@ -12,10 +12,23 @@
 
 {% block mainContent %}
   <div class="govuk-grid-column-three-quarters">
-    {% if messages is defined and messages is iterable and messages|length > 0 %}
-      {{ systemMessages({ messages: messages }) }}
-    {% endif %}
-
-    {% block settingsContent %}{% endblock %}
+    <div class="service-settings-pane">
+      {% if backLink %}
+        {{ govukBackLink({
+          text: "Back",
+          href: backLink
+        }) }}
+      {% endif %}
+      {% if messages is defined and messages is iterable and messages|length > 0 %}
+        {{ systemMessages({ messages: messages }) }}
+      {% endif %}
+      {% if errors %}
+        {{ govukErrorSummary({
+          titleText: "There is a problem",
+          errorList: errors.summary
+        }) }}
+      {% endif %}
+      {% block settingsContent %}{% endblock %}
+    </div>
   </div>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/stripe-details/bank-account/index.njk b/app/views/simplified-account/settings/stripe-details/bank-account/index.njk
index 1275e6763..d5093d020 100644
--- a/app/views/simplified-account/settings/stripe-details/bank-account/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/bank-account/index.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <form id="bank-account-form" autocomplete="off" method="post" action="{{ submitLink }}">
     <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
     {% call govukFieldset({
@@ -77,7 +65,7 @@
     document.getElementById('bank-account-form').addEventListener('submit', function () {
       submitButton.setAttribute('disabled', 'true')
       submitButton.setAttribute('aria-disabled', 'true')
-      submitButton.textContent = "Saving..."
+      submitButton.textContent = 'Saving...'
     })
 
     // progressively enhance the account number input to only accept digits
diff --git a/app/views/simplified-account/settings/stripe-details/company-number/index.njk b/app/views/simplified-account/settings/stripe-details/company-number/index.njk
index 3cc2a721d..ba02fa208 100644
--- a/app/views/simplified-account/settings/stripe-details/company-number/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/company-number/index.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Company registration number</h1>
 
   <form id="company-number-form" method="post" novalidate>
@@ -41,7 +29,7 @@
             label: {
               text: "Enter your Company registration number"
             },
-            classes: "govuk-!-width-one-quarter",
+            classes: "govuk-input--width-10",
             id: "company-number",
             name: "companyNumber",
             value: companyNumber,
diff --git a/app/views/simplified-account/settings/stripe-details/director/index.njk b/app/views/simplified-account/settings/stripe-details/director/index.njk
index dadf2c530..85dc4e8ee 100644
--- a/app/views/simplified-account/settings/stripe-details/director/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/director/index.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Service director</h1>
 
   <p class="govuk-body">We need the details of the director of the service or someone at director level in your
@@ -48,7 +36,7 @@
         autocomplete: "given-name",
         spellcheck: false,
         errorMessage: { text: errors.formErrors['firstName'] } if errors.formErrors['firstName'] else false,
-        classes: "govuk-input--width-20"
+        classes: "govuk-!-width-two-thirds"
       }) }}
 
       {{ govukInput({
@@ -62,7 +50,7 @@
         autocomplete: "family-name",
         spellcheck: false,
         errorMessage: { text: errors.formErrors['lastName'] } if errors.formErrors['lastName'] else false,
-        classes: "govuk-input--width-20"
+        classes: "govuk-!-width-two-thirds"
       }) }}
 
     {% endcall %}
@@ -121,7 +109,7 @@
       autocomplete: "work email",
       spellcheck: false,
       errorMessage: { text: errors.formErrors['workEmail'] } if errors.formErrors['workEmail'] else false,
-      classes: "govuk-!-width-two-thirds"
+      classes: "govuk-!-width-full"
     }) }}
 
     {{ govukButton({
diff --git a/app/views/simplified-account/settings/stripe-details/government-entity-document/index.njk b/app/views/simplified-account/settings/stripe-details/government-entity-document/index.njk
index c23a661b6..7ba83bcab 100644
--- a/app/views/simplified-account/settings/stripe-details/government-entity-document/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/government-entity-document/index.njk
@@ -6,18 +6,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l govuk-!-margin-bottom-6">Upload a government entity document</h1>
 
   <p class="govuk-body">For Stripe to verify that your organisation is a ‘government entity’, you need to upload one
@@ -54,6 +42,7 @@
     {{ govukButton({ text: "Submit and continue", id: "government-entity-document-submit" }) }}
   </form>
 
+
   <script>
     // progressively enhance the submit button to be disabled during form submission as it takes a few seconds to talk to Stripe
     const submitButton = document.getElementById('government-entity-document-submit')
diff --git a/app/views/simplified-account/settings/stripe-details/index.njk b/app/views/simplified-account/settings/stripe-details/index.njk
index 894ce64cf..2dcc4380f 100644
--- a/app/views/simplified-account/settings/stripe-details/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/index.njk
@@ -30,9 +30,9 @@
         } if value.status == false else (
           {
             tag: {
-              text: "Cannot start yet",
-              classes: "govuk-tag--grey"
-            }
+            text: "Cannot start yet",
+            classes: "govuk-tag--grey"
+          }
           } if value.status == 'disabled' else {
             text: "Completed"
           }
@@ -46,7 +46,8 @@
       classes: "task-list"
     }) }}
   {% else %}
-    <p class="govuk-body">This information has been sent to Stripe so that your service can take payments. For security
+    <p class="govuk-body">This information has been sent to Stripe so that your service can take payments. For
+      security
       reasons we cannot show all the information submitted to Stripe.</p>
 
     <p class="govuk-body">If you need to change these details or upload another Government Entity document, <a
@@ -140,5 +141,4 @@
       ]
     }) }}
   {% endif %}
-
 {% endblock %}
diff --git a/app/views/simplified-account/settings/stripe-details/organisation-details/index.njk b/app/views/simplified-account/settings/stripe-details/organisation-details/index.njk
index 79d6d4e0d..21a7eef5e 100644
--- a/app/views/simplified-account/settings/stripe-details/organisation-details/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/organisation-details/index.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Organisation details</h1>
 
   <p class="govuk-body">
@@ -61,7 +49,7 @@
       name: "confirmOrgDetails",
       fieldset: {
         legend: {
-          html: "<h2 class='govuk-heading-m'>Do these organisation details match the details on your government entity document?</h2>"
+          html: "<h2 class='govuk-heading-s'>Do these organisation details match the details on your government entity document?</h2>"
         }
       },
       items: [
diff --git a/app/views/simplified-account/settings/stripe-details/organisation-details/update-organisation-details.njk b/app/views/simplified-account/settings/stripe-details/organisation-details/update-organisation-details.njk
index cb0355b6a..0c85697c9 100644
--- a/app/views/simplified-account/settings/stripe-details/organisation-details/update-organisation-details.njk
+++ b/app/views/simplified-account/settings/stripe-details/organisation-details/update-organisation-details.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">What is the name and address of your organisation on your government entity document?</h1>
 
   <form id="update-organisation-details-form" method="post">
@@ -32,7 +20,6 @@
       }
     }) }}
   </form>
-
   <script>
     // progressively enhance the submit button to be disabled during form submission as it takes a few seconds to talk to Stripe
     const submitButton = document.getElementById('update-organisation-details-submit')
diff --git a/app/views/simplified-account/settings/stripe-details/responsible-person/check-your-answers.njk b/app/views/simplified-account/settings/stripe-details/responsible-person/check-your-answers.njk
index 9eba0fd34..5139196b0 100644
--- a/app/views/simplified-account/settings/stripe-details/responsible-person/check-your-answers.njk
+++ b/app/views/simplified-account/settings/stripe-details/responsible-person/check-your-answers.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Check your responsible person details</h1>
 
   {{ govukSummaryList({
@@ -132,7 +120,7 @@
       submitButton.setAttribute('disabled', 'true')
       submitButton.setAttribute('aria-disabled', 'true')
       submitButton.setAttribute('class', 'govuk-button govuk-button--disabled')
-      submitButton.textContent = "Saving..."
+      submitButton.textContent = 'Saving...'
     })
   </script>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/stripe-details/responsible-person/contact-details.njk b/app/views/simplified-account/settings/stripe-details/responsible-person/contact-details.njk
index 2df56e082..cd6943098 100644
--- a/app/views/simplified-account/settings/stripe-details/responsible-person/contact-details.njk
+++ b/app/views/simplified-account/settings/stripe-details/responsible-person/contact-details.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Responsible person contact details</h1>
 
   <form id="responsible-person-contact-details-form" method="post" class="govuk-!-margin-top-4" novalidate>
@@ -36,7 +24,7 @@
       type: "tel",
       autocomplete: "section-contact work tel",
       errorMessage: { text: errors.formErrors['workTelephoneNumber'] } if errors.formErrors['workTelephoneNumber'] else false,
-      classes: "govuk-!-width-two-thirds"
+      classes: "govuk-!-full-width"
     }) }}
 
     {{ govukInput({
@@ -51,7 +39,7 @@
       autocomplete: "section-contact work email",
       spellcheck: false,
       errorMessage: { text: errors.formErrors['workEmail'] } if errors.formErrors['workEmail'] else false,
-      classes: "govuk-!-width-two-thirds"
+      classes: "govuk-!-full-width"
     }) }}
 
     {{ govukButton({ text: "Save and continue" }) }}
diff --git a/app/views/simplified-account/settings/stripe-details/responsible-person/home-address.njk b/app/views/simplified-account/settings/stripe-details/responsible-person/home-address.njk
index aeb4cdd5e..23a2181c7 100644
--- a/app/views/simplified-account/settings/stripe-details/responsible-person/home-address.njk
+++ b/app/views/simplified-account/settings/stripe-details/responsible-person/home-address.njk
@@ -5,28 +5,13 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Responsible person home address</h1>
-
   <form id="responsible-person-home-address-form" method="post" novalidate>
     <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
-
     {% call govukFieldset({}) %}
-
-      <p class="govuk-body">Do not use a work address. Stripe needs the responsible person’s home address to check their
+      <p class="govuk-body">Do not use a work address. Stripe needs the responsible person’s home address to check
+        their
         identity</p>
-
       {{ govukInput({
         label: {
           html: 'Address line 1'
@@ -37,7 +22,7 @@
         type: "text",
         autocomplete: "section-address address-line1",
         errorMessage: { text: errors.formErrors['homeAddressLine1'] } if errors.formErrors['homeAddressLine1'] else false,
-        classes: "govuk-!-width-two-thirds"
+        classes: "govuk-!-width-three-quarters"
       }) }}
       {{ govukInput({
         label: {
@@ -52,7 +37,7 @@
         attributes: {
           "aria-label": "Enter address line 2"
         },
-        classes: "govuk-!-width-two-thirds"
+        classes: "govuk-!-width-three-quarters"
       }) }}
       {{ govukInput({
         label: {
@@ -64,7 +49,7 @@
         type: "text",
         autocomplete: "section-address address-level2",
         errorMessage: { text: errors.formErrors['homeAddressCity'] } if errors.formErrors['homeAddressCity'] else false,
-        classes: "govuk-input--width-20"
+        classes: "govuk-!-width-one-half"
       }) }}
       {{ govukInput({
         label: {
@@ -75,14 +60,10 @@
         value: address.homeAddressPostcode,
         type: "text",
         autocomplete: "section-address postal-code",
-        classes: "govuk-input--width-10",
+        classes: "govuk-!-width-one-third",
         errorMessage: { text: errors.formErrors['homeAddressPostcode'] } if errors.formErrors['homeAddressPostcode'] else false
       }) }}
-
     {% endcall %}
-
-
     {{ govukButton({ text: "Save and continue" }) }}
-
   </form>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/stripe-details/responsible-person/index.njk b/app/views/simplified-account/settings/stripe-details/responsible-person/index.njk
index ea89fc999..751f587b2 100644
--- a/app/views/simplified-account/settings/stripe-details/responsible-person/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/responsible-person/index.njk
@@ -7,18 +7,6 @@
 
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Responsible person</h1>
   <p class="govuk-body">We need details of a <a class="govuk-link"
                                                 href="https://www.payments.service.gov.uk/required-responsible-person-and-director-information/">responsible
@@ -54,7 +42,7 @@
         autocomplete: "section-person given-name",
         spellcheck: false,
         errorMessage: { text: errors.formErrors['firstName'] } if errors.formErrors['firstName'] else false,
-        classes: "govuk-input--width-20"
+        classes: "govuk-!-width-three-quarters"
       }) }}
 
       {{ govukInput({
@@ -68,7 +56,7 @@
         autocomplete: "section-person family-name",
         spellcheck: false,
         errorMessage: { text: errors.formErrors['lastName'] } if errors.formErrors['lastName'] else false,
-        classes: "govuk-input--width-20"
+        classes: "govuk-!-width-three-quarters"
       }) }}
 
     {% endcall %}
@@ -121,7 +109,7 @@
 
   <script>
     // progressively enhance dob input to only accept digits
-    const elementIds = [{id: 'dob-day', length: 2}, {id: 'dob-month', length: 2}, {id: 'dob-year', length: 4}]
+    const elementIds = [{ id: 'dob-day', length: 2 }, { id: 'dob-month', length: 2 }, { id: 'dob-year', length: 4 }]
     elementIds.forEach(element => {
       document.getElementById(element.id).addEventListener('input', function (e) {
         let value = e.target.value
diff --git a/app/views/simplified-account/settings/stripe-details/vat-number/index.njk b/app/views/simplified-account/settings/stripe-details/vat-number/index.njk
index dbd961581..5a31e817a 100644
--- a/app/views/simplified-account/settings/stripe-details/vat-number/index.njk
+++ b/app/views/simplified-account/settings/stripe-details/vat-number/index.njk
@@ -5,18 +5,6 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">VAT registration number</h1>
 
   <form id="vat-number-form" method="post" novalidate>
@@ -41,7 +29,7 @@
             label: {
               text: "Enter your VAT registration number"
             },
-            classes: "govuk-!-width-one-quarter",
+            classes: "govuk-input--width-10",
             id: "vat-number",
             name: "vatNumber",
             inputmode: "numeric",
diff --git a/app/views/simplified-account/settings/team-members/change-permission.njk b/app/views/simplified-account/settings/team-members/change-permission.njk
index 86cba592f..bc43d7c11 100644
--- a/app/views/simplified-account/settings/team-members/change-permission.njk
+++ b/app/views/simplified-account/settings/team-members/change-permission.njk
@@ -5,48 +5,41 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-<div class="fieldset-legend-width">
-  <form method="post" novalidate>
-    <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}"/>
-    <input type="hidden" name="userCurrentRoleName" value="{{ userCurrentRoleName }}"/>
+  <div class="fieldset-legend-width">
+    <form method="post" novalidate>
+      <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
+      <input type="hidden" name="userCurrentRoleName" value="{{ userCurrentRoleName }}"/>
 
-    {% set roleItems = [] %}
-    {% for role in availableRoles %}
-      {% set roleItem = {
-        value: role.name,
-        id: "role-" + role.name + "-input",
-        text: role.description,
-        label: { classes: "govuk-!-font-weight-bold" },
-        hint: { html: "<div class='hint-and-body-width'>" + role.explanation + "</div>" },
-        checked: userCurrentRoleName === role.name
-      } %}
-      {% set roleItems = (roleItems.push(roleItem), roleItems) %}
-    {% endfor %}
+      {% set roleItems = [] %}
+      {% for role in availableRoles %}
+        {% set roleItem = {
+          value: role.name,
+          id: "role-" + role.name + "-input",
+          text: role.description,
+          label: { classes: "govuk-!-font-weight-bold" },
+          hint: { html: "<div>" + role.explanation + "</div>" },
+          checked: userCurrentRoleName === role.name
+        } %}
+        {% set roleItems = (roleItems.push(roleItem), roleItems) %}
+      {% endfor %}
 
-    {{ govukRadios({
-      idPrefix: "newRole",
-      name: "newRole",
-      fieldset: {
-        legend: {
-          text: "Change permission for " + email,
-          isPageHeading: true,
-          classes: "govuk-fieldset__legend--l"
-        }
-      },
-      items: roleItems
-    }) }}
+      {{ govukRadios({
+        idPrefix: "newRole",
+        name: "newRole",
+        fieldset: {
+          legend: {
+            text: "Change permission for " + email,
+            isPageHeading: true,
+            classes: "govuk-fieldset__legend--l"
+          }
+        },
+        items: roleItems
+      }) }}
 
-    {{
-    govukButton({
-      text: "Save changes"
-    })
-    }}
-
-  </form>
-</div>
+      {{ govukButton({
+        text: "Save changes"
+      }) }}
 
+    </form>
+  </div>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/team-members/index.njk b/app/views/simplified-account/settings/team-members/index.njk
index af7eb5b0c..3d8d41e1c 100644
--- a/app/views/simplified-account/settings/team-members/index.njk
+++ b/app/views/simplified-account/settings/team-members/index.njk
@@ -1,7 +1,7 @@
 {% extends "../settings-layout.njk" %}
 
 {% macro teamMemberEmail(email, isCurrent, isServiceAdmin) %}
-  <p class="govuk-body">{{email}}{% if isCurrent %} (me){% endif %}</p>
+  <p class="govuk-body">{{ email }}{% if isCurrent %} (me){% endif %}</p>
 {% endmacro %}
 
 {% block settingsPageTitle %}
@@ -9,80 +9,81 @@
 {% endblock %}
 
 {% block settingsContent %}
-    <h1 class="govuk-heading-l">Team members</h1>
-    {% if isServiceAdmin %}
-      <p class="govuk-body govuk-!-margin-bottom-6">Team member changes affect both live and test environments.</p>
-    {% else %}
-      <p class="govuk-body govuk-!-margin-bottom-6">Contact an administrator to invite team members and change permissions.</p>
-    {% endif %}
-
-    {% if isServiceAdmin %}
-      {{
-      govukButton({
-        text: "Invite a team member",
-        href: inviteTeamMemberLink,
-        attributes: {
-          id: "invite-team-member-link"
-        }
-      })
-      }}
-    {% endif %}
+  <h1 class="govuk-heading-l">Team members</h1>
+  {% if isServiceAdmin %}
+    <p class="govuk-body govuk-!-margin-bottom-6">Team member changes affect both live and test environments.</p>
+  {% else %}
+    <p class="govuk-body govuk-!-margin-bottom-6">Contact an administrator to invite team members and change
+      permissions.</p>
+  {% endif %}
 
+  {% if isServiceAdmin %}
+    {{ govukButton({
+      text: "Invite a team member",
+      href: inviteTeamMemberLink,
+      attributes: {
+        id: "invite-team-member-link"
+      }
+    }) }}
+  {% endif %}
 
   {% for role, roleDetails in roles %}
-      {% if teamMembers[role].length %}
-        <div class="team-member-email-list" id="team-members-{{ role }}-list">
-          <h3 id="{{ role }}-role-header" class="govuk-heading-m">
-            {{ roleDetails.description }} <span class="govuk-!-font-weight-regular pay-text-grey">({{ teamMembers[role].length }})</span>
-          </h3>
-
-          {% set teamMembersListedForRole = [] %}
-          {% for member in teamMembers[role] %}
-
-            {% set actionItems = [] %}
-            {% if member.isCurrent %}
-              {% set actionItems = [{ href: member.link, text: "View my profile", classes: "govuk-link--no-visited-state" }] %}
-            {% else %}
-              {% if isServiceAdmin %}
-                {% set actionItems = [
-                  { href: member.changePermissionLink, text: "Change permission", classes: "govuk-link--no-visited-state" },
-                  { href: member.removeLink, text: "Remove", classes: "govuk-link--no-visited-state" }
-                ] %}
-              {% endif %}
+    {% if teamMembers[role].length %}
+      <div class="team-member-email-list" id="team-members-{{ role }}-list">
+        <h3 id="{{ role }}-role-header" class="govuk-heading-m">
+          {{ roleDetails.description }} <span
+            class="govuk-!-font-weight-regular pay-text-grey">({{ teamMembers[role].length }})</span>
+        </h3>
+
+        {% set teamMembersListedForRole = [] %}
+        {% for member in teamMembers[role] %}
+
+          {% set actionItems = [] %}
+          {% if member.isCurrent %}
+            {% set actionItems = [{ href: member.link, text: "View my profile", classes: "govuk-link--no-visited-state" }] %}
+          {% else %}
+            {% if isServiceAdmin %}
+              {% set actionItems = [
+                { href: member.changePermissionLink, text: "Change", classes: "govuk-link--no-visited-state" },
+                { href: member.removeLink, text: "Remove", classes: "govuk-link--no-visited-state" }
+              ] %}
             {% endif %}
-
-            {% set teamMemberListItem = {
-              key: {
-                text: "Email address",
-                classes: "govuk-!-display-none"
-              },
-              value: {
-                html: teamMemberEmail(member.email, member.isCurrent)
-              },
-              actions: {
-                items: actionItems
-              }
-            } %}
-
-            {% set teamMembersListedForRole = (teamMembersListedForRole.push(teamMemberListItem), teamMembersListedForRole) %}
-          {% endfor %}
-
-          {{ govukSummaryList({ rows: teamMembersListedForRole }) }}
-
-        </div>
-      {% endif %}
+          {% endif %}
+
+          {% set teamMemberListItem = {
+            key: {
+              text: "Email address",
+              classes: "govuk-!-display-none"
+            },
+            value: {
+              html: teamMemberEmail(member.email, member.isCurrent)
+            },
+            actions: {
+              items: actionItems
+            }
+          } %}
+
+          {% set teamMembersListedForRole = (teamMembersListedForRole.push(teamMemberListItem), teamMembersListedForRole) %}
+        {% endfor %}
+
+        {{ govukSummaryList({ rows: teamMembersListedForRole }) }}
+
+      </div>
+    {% endif %}
   {% endfor %}
 
 
   {% if numberInvitedMembers > 0 %}
     <h2 id="invited-team-members-heading" class="govuk-heading-m">
-      Invited <span class="govuk-!-font-weight-regular pay-text-grey">({{numberInvitedMembers}})</span>
+      Invited <span class="govuk-!-font-weight-regular pay-text-grey">({{ numberInvitedMembers }})</span>
     </h2>
     {% for role, roleDetails in roles %}
       {% if role in invitedTeamMembers %}
         {% if invitedTeamMembers[role].length %}
           <div class="team-member-email-list" id="invited-team-members-{{ role }}-list">
-            <h3 id="invited-team-members-{{ role }}-role-header" class="govuk-heading-s">{{ roleDetails.description }} <span class="govuk-!-font-weight-regular pay-text-grey">({{invitedTeamMembers[role].length}})</span></h3>
+            <h3 id="invited-team-members-{{ role }}-role-header" class="govuk-heading-s">{{ roleDetails.description }}
+              <span class="govuk-!-font-weight-regular pay-text-grey">({{ invitedTeamMembers[role].length }})</span>
+            </h3>
 
             {% set invitedTeamMembersListedForRole = [] %}
             {% for invitedMember in invitedTeamMembers[role] %}
@@ -105,5 +106,4 @@
       {% endif %}
     {% endfor %}
   {% endif %}
-  </div>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/team-members/invite.njk b/app/views/simplified-account/settings/team-members/invite.njk
index 5ee37bb4a..61b1e8ca9 100644
--- a/app/views/simplified-account/settings/team-members/invite.njk
+++ b/app/views/simplified-account/settings/team-members/invite.njk
@@ -5,70 +5,52 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Invite a team member</h1>
-  <div>
-    <form method="post" novalidate>
-      <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}"/>
-
-      {{ govukInput({
-        label: {
-          text: "Email address",
-          classes: "govuk-label--s"
-        },
-        id: "invited-user-email",
-        name: "invitedUserEmail",
-        type: "email",
-        value: invitedUserEmail,
-        spellcheck: false,
-        errorMessage: { text: errors.formErrors['invitedUserEmail'] } if errors.formErrors['invitedUserEmail'] else false,
-        classes: "govuk-!-width-two-thirds"
-      }) }}
-
-      {% set roleItems = [] %}
-      {% for role in availableRoles %}
-        {% set roleItem = {
-          value: role.name,
-          id: "role-" + role.name + "-input",
-          text: role.description,
-          label: { classes: "govuk-!-font-weight-bold" },
-          hint: { html: "<div class='hint-and-body-width'>" + role.explanation + "</div>" },
-          checked: role.name === checkedRole
-        } %}
-        {% set roleItems = (roleItems.push(roleItem), roleItems) %}
-      {% endfor %}
-
-      {{ govukRadios({
-        idPrefix: "invited-user-role",
-        name: "invitedUserRole",
-        errorMessage: { text: errors.formErrors['invitedUserRole'] } if errors.formErrors['invitedUserRole'] else false,
-        fieldset: {
-          legend: {
-            text: "Permission level",
-            classes: "govuk-fieldset__legend--s"
-          }
-        },
-        items: roleItems
-      }) }}
-
-      {{
-      govukButton({
-        text: "Send invitation email"
-      })
-      }}
+  <form method="post" novalidate>
+    <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
+
+    {{ govukInput({
+      label: {
+        text: "Email address",
+        classes: "govuk-label--s"
+      },
+      id: "invited-user-email",
+      name: "invitedUserEmail",
+      type: "email",
+      value: invitedUserEmail,
+      spellcheck: false,
+      errorMessage: { text: errors.formErrors['invitedUserEmail'] } if errors.formErrors['invitedUserEmail'] else false,
+      classes: "govuk-!-width-two-thirds"
+    }) }}
 
-    </form>
-  </div>
+    {% set roleItems = [] %}
+    {% for role in availableRoles %}
+      {% set roleItem = {
+        value: role.name,
+        id: "role-" + role.name + "-input",
+        text: role.description,
+        label: { classes: "govuk-!-font-weight-bold" },
+        hint: { html: "<div>" + role.explanation + "</div>" },
+        checked: role.name === checkedRole
+      } %}
+      {% set roleItems = (roleItems.push(roleItem), roleItems) %}
+    {% endfor %}
+
+    {{ govukRadios({
+      idPrefix: "invited-user-role",
+      name: "invitedUserRole",
+      errorMessage: { text: errors.formErrors['invitedUserRole'] } if errors.formErrors['invitedUserRole'] else false,
+      fieldset: {
+        legend: {
+          text: "Permission level",
+          classes: "govuk-fieldset__legend--s"
+        }
+      },
+      items: roleItems
+    }) }}
 
+    {{ govukButton({
+      text: "Send invitation email"
+    }) }}
+  </form>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/team-members/remove-user.njk b/app/views/simplified-account/settings/team-members/remove-user.njk
index a0334f8bc..18ce3a5bd 100644
--- a/app/views/simplified-account/settings/team-members/remove-user.njk
+++ b/app/views/simplified-account/settings/team-members/remove-user.njk
@@ -5,58 +5,41 @@
 {% endblock %}
 
 {% block settingsContent %}
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
-<div class="fieldset-legend-width">
-  <form method="post" novalidate>
-    <input id="csrf" name="csrfToken" type="hidden" value="{{csrf}}"/>
-    <input type="hidden" name="email" value="{{ email }}" />
-
-    {{ govukRadios({
-      idPrefix: "confirmRemoveUser",
-      name: "confirmRemoveUser",
-      errorMessage: { text: errors.formErrors['confirmRemoveUser'] } if errors.formErrors['confirmRemoveUser'] else false,
-      fieldset: {
-        legend: {
-          text: "Are you sure you want to remove " + email + "?",
-          isPageHeading: true,
-          classes: "govuk-fieldset__legend--l"
-        }
-      },
-      hint: {
-        text: "They will no longer have access to this service."
-      },
-      items: [
-        {
-          value: "yes",
-          text: "Yes",
-          attributes: {'data-cy': 'yes-radio'}
+  <div class="fieldset-legend-width">
+    <form method="post" novalidate>
+      <input id="csrf" name="csrfToken" type="hidden" value="{{ csrf }}"/>
+      <input type="hidden" name="email" value="{{ email }}"/>
+
+      {{ govukRadios({
+        idPrefix: "confirmRemoveUser",
+        name: "confirmRemoveUser",
+        errorMessage: { text: errors.formErrors['confirmRemoveUser'] } if errors.formErrors['confirmRemoveUser'] else false,
+        fieldset: {
+          legend: {
+            text: "Are you sure you want to remove " + email + "?",
+            isPageHeading: true,
+            classes: "govuk-fieldset__legend--l"
+          }
         },
-        {
-          value: "no",
-          text: "No",
-          attributes: {'data-cy': 'no-radio'}
-        }
-      ]
-    }) }}
-    {{
-    govukButton({
-      text: "Save changes"
-    })
-    }}
-
-  </form>
-</div>
-
-
+        hint: {
+          text: "They will no longer have access to this service."
+        },
+        items: [
+          {
+            value: "yes",
+            text: "Yes",
+            attributes: {'data-cy': 'yes-radio'}
+          },
+          {
+            value: "no",
+            text: "No",
+            attributes: {'data-cy': 'no-radio'}
+          }
+        ]
+      }) }}
+      {{ govukButton({
+        text: "Save changes"
+      }) }}
+    </form>
+  </div>
 {% endblock %}
diff --git a/app/views/simplified-account/settings/worldpay-details/credentials.njk b/app/views/simplified-account/settings/worldpay-details/credentials.njk
index 3e561245e..53b890e18 100644
--- a/app/views/simplified-account/settings/worldpay-details/credentials.njk
+++ b/app/views/simplified-account/settings/worldpay-details/credentials.njk
@@ -5,22 +5,9 @@
 {% endblock %}
 
 {% block settingsContent %}
-
-  {{ govukBackLink({
-    text: "Back",
-    href: backLink
-  }) }}
-
-  {% if errors %}
-    {{ govukErrorSummary({
-      titleText: "There is a problem",
-      errorList: errors.summary
-    }) }}
-  {% endif %}
-
   <h1 class="govuk-heading-l">Your Worldpay credentials</h1>
 
-  <p class="govuk-body govuk-!-margin-bottom-6 hint-and-body-width">
+  <p class="govuk-body govuk-!-margin-bottom-6">
     Go to your <a class="govuk-link" href="https://secure.worldpay.com/sso/public/auth/login.html">Worldpay account</a>
     to get the details you need to enter here or
     <a class="govuk-link" href="https://docs.payments.service.gov.uk/switching_to_live/set_up_a_live_worldpay_account/#connect-your-live-account-to-worldpay">read more in our documentation</a>.
diff --git a/test/cypress/integration/simplified-account/service-settings/service-name/service-name-test-helpers.js b/test/cypress/integration/simplified-account/service-settings/service-name/service-name-test-helpers.js
index 1c0b0a077..23fa7b042 100644
--- a/test/cypress/integration/simplified-account/service-settings/service-name/service-name-test-helpers.js
+++ b/test/cypress/integration/simplified-account/service-settings/service-name/service-name-test-helpers.js
@@ -25,17 +25,17 @@ const checkServiceNameValidation = (options) => {
     expectedErrorMessage
   } = options
   cy.visit(settingsUrl)
-  cy.get('input[name="serviceNameInput"]').clear({ force: true })
+  cy.get('input[name="serviceName"]').clear({ force: true })
   if (expectedInputValue) {
-    cy.get('input[name="serviceNameInput"]').type(expectedInputValue)
+    cy.get('input[name="serviceName"]').type(expectedInputValue)
   }
-  cy.get('input[name="serviceNameInput"]').should('have.value', expectedInputValue)
+  cy.get('input[name="serviceName"]').should('have.value', expectedInputValue)
   cy.get('.govuk-error-summary').should('not.exist')
   cy.get('button[form="edit-service-name"]').click()
   cy.get('.govuk-error-summary').should('exist').should('contain', expectedErrorMessage)
-  cy.get('input[name="serviceNameInput"]').should('have.class', 'govuk-input--error')
-  cy.get('#service-name-input-error').should('contain.text', expectedErrorMessage)
-  cy.get('input[name="serviceNameInput"]').should('have.value', expectedInputValue)
+  cy.get('input[name="serviceName"]').should('have.class', 'govuk-input--error')
+  cy.get('#service-name-error').should('contain.text', expectedErrorMessage)
+  cy.get('input[name="serviceName"]').should('have.value', expectedInputValue)
 }
 
 const checkServiceNameEditActionNavigation = (options) => {
diff --git a/test/cypress/integration/simplified-account/service-settings/service-name/service-name.cy.js b/test/cypress/integration/simplified-account/service-settings/service-name/service-name.cy.js
index 7687f542f..825bff576 100644
--- a/test/cypress/integration/simplified-account/service-settings/service-name/service-name.cy.js
+++ b/test/cypress/integration/simplified-account/service-settings/service-name/service-name.cy.js
@@ -229,7 +229,7 @@ describe('Service name settings', () => {
 
       it('should not show validation error when attempting to submit an empty Welsh service name', () => {
         cy.visit(SERVICE_SETTINGS_URL + '/service-name/edit?cy=true')
-        cy.get('input[name="serviceNameInput"]').clear({ force: true }).should('have.value', '')
+        cy.get('input[name="serviceName"]').clear({ force: true }).should('have.value', '')
         cy.get('.govuk-error-summary').should('not.exist')
         cy.get('button[form="edit-service-name"]').click()
         cy.get('.govuk-error-summary').should('not.exist')
@@ -253,7 +253,7 @@ describe('Service name settings', () => {
       })
       it('should show expected form elements', () => {
         cy.get('h1').should('contain.text', 'Service name (English)')
-        cy.get('input[name="serviceNameInput"]')
+        cy.get('input[name="serviceName"]')
           .should('have.value', SERVICE_NAME.en)
           .should('have.attr', 'lang', 'en')
           .should('have.attr', 'spellcheck', 'true')
@@ -261,7 +261,7 @@ describe('Service name settings', () => {
         cy.get('.govuk-button').should('not.contain.text', 'Remove Welsh service name')
       })
       it('should submit form', () => {
-        cy.get('input[name="serviceNameInput"]').clear({ force: true }).type('My New Service Name')
+        cy.get('input[name="serviceName"]').clear({ force: true }).type('My New Service Name')
           .should('have.value', 'My New Service Name')
         cy.get('button[form="edit-service-name"]').click()
         cy.title().should('eq', 'Settings - Service name - GOV.UK Pay')
@@ -285,7 +285,7 @@ describe('Service name settings', () => {
         })
         it('should show expected form elements', () => {
           cy.get('h1').should('contain.text', 'Welsh service name (Cymraeg)')
-          cy.get('input[name="serviceNameInput"]')
+          cy.get('input[name="serviceName"]')
             .should('have.value', SERVICE_NAME.cy)
             .should('have.attr', 'lang', 'cy')
             .should('have.attr', 'spellcheck', 'true')
@@ -293,7 +293,7 @@ describe('Service name settings', () => {
           cy.get('.govuk-button').should('contain.text', 'Remove Welsh service name')
         })
         it('should submit form', () => {
-          cy.get('input[name="serviceNameInput"]').clear({ force: true }).type('Fy Enw Gwasanaeth Newydd')
+          cy.get('input[name="serviceName"]').clear({ force: true }).type('Fy Enw Gwasanaeth Newydd')
             .should('have.value', 'Fy Enw Gwasanaeth Newydd')
           cy.get('button[form="edit-service-name"]').click()
           cy.title().should('eq', 'Settings - Service name - GOV.UK Pay')
@@ -316,7 +316,7 @@ describe('Service name settings', () => {
         })
         it('should show expected form elements', () => {
           cy.get('h1').should('contain.text', 'Welsh service name (Cymraeg)')
-          cy.get('input[name="serviceNameInput"]').should('have.value', SERVICE_NAME.cy)
+          cy.get('input[name="serviceName"]').should('have.value', SERVICE_NAME.cy)
           cy.get('.govuk-button-group')
             .find('button')
             .should('have.length', 2)
@@ -350,7 +350,7 @@ describe('Service name settings', () => {
         })
         it('should not show "Remove Welsh service name" button', () => {
           cy.get('h1').should('contain.text', 'Welsh service name (Cymraeg)')
-          cy.get('input[name="serviceNameInput"]').should('have.value', '')
+          cy.get('input[name="serviceName"]').should('have.value', '')
           cy.get('.govuk-button-group')
             .find('button')
             .should('have.length', 1)
diff --git a/test/cypress/integration/simplified-account/service-settings/team-members/change-permission.cy.js b/test/cypress/integration/simplified-account/service-settings/team-members/change-permission.cy.js
index da4bc310c..c4b913897 100644
--- a/test/cypress/integration/simplified-account/service-settings/team-members/change-permission.cy.js
+++ b/test/cypress/integration/simplified-account/service-settings/team-members/change-permission.cy.js
@@ -52,7 +52,7 @@ describe('Team members settings', () => {
       setStubs({})
       cy.setEncryptedCookies(ADMIN_USER_ID)
       cy.visit(TEAM_MEMBERS_SETTINGS_URL)
-      cy.get('#team-members-view-only-list').find('dl').first().find('a').contains('Change permission').click()
+      cy.get('#team-members-view-only-list').find('dl').first().find('a').contains('Change').click()
     })
 
     it('should show the show the correct heading, title and form with correct elements', () => {
diff --git a/test/cypress/integration/simplified-account/service-settings/team-members/team-members.cy.js b/test/cypress/integration/simplified-account/service-settings/team-members/team-members.cy.js
index de7863c84..e062f993e 100644
--- a/test/cypress/integration/simplified-account/service-settings/team-members/team-members.cy.js
+++ b/test/cypress/integration/simplified-account/service-settings/team-members/team-members.cy.js
@@ -82,10 +82,10 @@ describe('Team members settings', () => {
       cy.get('#team-members-admin-list').find('dd').first().contains('admin-user@example.com (me)')
       cy.get('#team-members-admin-list').find('dl').first().find('a').contains('View my profile')
       cy.get('#team-members-view-and-refund-list').find('dd').first().contains('view-and-refund-user@example.com')
-      cy.get('#team-members-view-and-refund-list').find('dl').first().find('a').first().contains('Change permission')
+      cy.get('#team-members-view-and-refund-list').find('dl').first().find('a').first().contains('Change')
       cy.get('#team-members-view-and-refund-list').find('dl').first().find('a').contains('Remove')
       cy.get('#team-members-view-only-list').find('dd').first().contains('view-only-user@example.com')
-      cy.get('#team-members-view-only-list').find('dl').first().find('a').should('have.length', 4).first().contains('Change permission')
+      cy.get('#team-members-view-only-list').find('dl').first().find('a').should('have.length', 4).first().contains('Change')
       cy.get('#team-members-view-and-refund-list').find('dl').first().find('a').contains('Remove')
       cy.get('#team-members-view-only-list').find('dl').first().find('a').contains('Remove')
     })
@@ -123,17 +123,17 @@ describe('Team members settings', () => {
       cy.get('#invite-team-member-link').should('not.exist')
     })
 
-    it('should show the current team members in the correct order without remove or change permission links', () => {
+    it('should show the current team members in the correct order without remove or change links', () => {
       cy.get('#team-members-admin-list').find('dd').first().contains('admin-user@example.com')
-      cy.get('#team-members-admin-list').contains('Change permission').should('not.exist')
+      cy.get('#team-members-admin-list').contains('Change').should('not.exist')
       cy.get('#team-members-admin-list').contains('Remove').should('not.exist')
       cy.get('#team-members-view-and-refund-list').find('dd').first().contains('view-and-refund-user@example.com')
-      cy.get('#team-members-view-and-refund-list').contains('Change permission').should('not.exist')
+      cy.get('#team-members-view-and-refund-list').contains('Change').should('not.exist')
       cy.get('#team-members-view-and-refund-list').contains('Remove').should('not.exist')
       cy.get('#team-members-view-only-list').find('dd').first().contains('view-only-user@example.com (me)')
       cy.get('#team-members-view-only-list').find('dl').first().find('a').should('have.length', 1).first().contains('View my profile')
       cy.get('#team-members-view-only-list').find('dd').eq(2).contains('another-view-only-user@example.com')
-      cy.get('#team-members-view-only-list').contains('Change permission').should('not.exist')
+      cy.get('#team-members-view-only-list').contains('Change').should('not.exist')
       cy.get('#team-members-view-only-list').contains('Remove').should('not.exist')
     })