diff --git a/app/config.js b/app/config.js
index 333f187..f060dcd 100644
--- a/app/config.js
+++ b/app/config.js
@@ -2,7 +2,7 @@
module.exports = {
// Service name
- serviceName: 'Search and evaluate medtech',
+ serviceName: 'Search and evaluate medical technologies',
// Port to run nodemon on locally
port: 2000,
diff --git a/app/views/current/business-case-shared.html b/app/views/current/business-case-shared.html
index ac672f8..9d8de38 100644
--- a/app/views/current/business-case-shared.html
+++ b/app/views/current/business-case-shared.html
@@ -1,7 +1,7 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Business case shared" %}
-{% set serviceHeader = "Medical product evaluations" %}
+
{% block content %}
diff --git a/app/views/current/categories.html b/app/views/current/categories.html
index 9de24b6..d8070dd 100644
--- a/app/views/current/categories.html
+++ b/app/views/current/categories.html
@@ -1,7 +1,7 @@
{% extends prototypeVersion + '/layouts/layout-search.html' %}
{% set pageName = "Browse all categories" %}
-{% set serviceHeader = "NHS medtech procurement" %}
+
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/category-wound-care.html b/app/views/current/category-wound-care.html
index e72ac52..f4da5bc 100644
--- a/app/views/current/category-wound-care.html
+++ b/app/views/current/category-wound-care.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Search medical technologies" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/check-submit.html b/app/views/current/check-submit.html
index 91f9d10..49262b5 100755
--- a/app/views/current/check-submit.html
+++ b/app/views/current/check-submit.html
@@ -8,7 +8,7 @@
- add custom CSS and JavaScript
-->
{% set pageName = "Search and evaluate medtech - " %}
-{% set serviceHeader = "Search and evaluate medtech" %}
+
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/cookies.html b/app/views/current/cookies.html
index ff470ec..cef9118 100644
--- a/app/views/current/cookies.html
+++ b/app/views/current/cookies.html
@@ -7,8 +7,8 @@
- change the header and footer
- add custom CSS and JavaScript
-->
-{% set pageName = "Compass - " %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Cookies - " %}
+
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/dashboard.html b/app/views/current/dashboard.html
index 843d1bd..94d28e9 100755
--- a/app/views/current/dashboard.html
+++ b/app/views/current/dashboard.html
@@ -3,7 +3,7 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Dashboard - Welcome back" %}
-{% set serviceHeader = "Medical product evaluations" %}
+
{% set pageName = "Value-Based Procurement for Medical Technologies" %}
-{% set serviceHeader = "Homepage" %}
+
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/product-page-v2.html b/app/views/current/product-page-v2.html
index 1ae9a22..f92891f 100644
--- a/app/views/current/product-page-v2.html
+++ b/app/views/current/product-page-v2.html
@@ -1,7 +1,7 @@
{% extends 'layout-signed-out.html' %}
{% set pageName = "SmartPump 300 Infusion System - Compass" %}
-{% set serviceHeader = "Compass" %}
+
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/product-page-wound-care.html b/app/views/current/product-page-wound-care.html
index 283cb05..219d979 100644
--- a/app/views/current/product-page-wound-care.html
+++ b/app/views/current/product-page-wound-care.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "AquaSeal Foam Dressing System - Compass" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/product-page.html b/app/views/current/product-page.html
index 25318fc..1afcafb 100644
--- a/app/views/current/product-page.html
+++ b/app/views/current/product-page.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% set pageName = "SmartPump 300 Infusion System" %}
diff --git a/app/views/current/quick-share-upload-multiple.html b/app/views/current/quick-share-upload-multiple.html
index 5b4c8da..159ac46 100644
--- a/app/views/current/quick-share-upload-multiple.html
+++ b/app/views/current/quick-share-upload-multiple.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Upload your documents" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{{ breadcrumb({
diff --git a/app/views/current/quick-share-upload-v1.html b/app/views/current/quick-share-upload-v1.html
index 8960733..8a00d0a 100644
--- a/app/views/current/quick-share-upload-v1.html
+++ b/app/views/current/quick-share-upload-v1.html
@@ -1,7 +1,7 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
-{% set pageName = "Compass - Quick share evaluation" %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Quick share evaluation" %}
+
{% block beforeContent %}
{{ breadcrumb({
diff --git a/app/views/current/quick-share-upload.html b/app/views/current/quick-share-upload.html
index a5dc670..267e884 100644
--- a/app/views/current/quick-share-upload.html
+++ b/app/views/current/quick-share-upload.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Search medical product evaluations" %}
-{% set serviceHeader = "Search medical product evaluations" %}
{% block beforeContent %}
{{ breadcrumb({
diff --git a/app/views/current/review-business-case.html b/app/views/current/review-business-case.html
index 4104aa9..6b5a5f5 100644
--- a/app/views/current/review-business-case.html
+++ b/app/views/current/review-business-case.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Review your business case" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{{ breadcrumb({
diff --git a/app/views/current/search-results-dashboard.html b/app/views/current/search-results-dashboard.html
index 7a64466..981d170 100644
--- a/app/views/current/search-results-dashboard.html
+++ b/app/views/current/search-results-dashboard.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
-{% set pageName = "Search medical technologies - Compass" %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Search medical technologies" %}
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/search-results-table.html b/app/views/current/search-results-table.html
index 5069d7a..7bb9ee5 100755
--- a/app/views/current/search-results-table.html
+++ b/app/views/current/search-results-table.html
@@ -1,7 +1,7 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
-{% set pageName = "Search medical technologies - Compass" %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Search medical technologies" %}
+
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/search-results-viz-all.html b/app/views/current/search-results-viz-all.html
index 502bd75..34cbdd1 100644
--- a/app/views/current/search-results-viz-all.html
+++ b/app/views/current/search-results-viz-all.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Search and evaluate medical technologies" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/search-results-viz-sub-cat.html b/app/views/current/search-results-viz-sub-cat.html
index af6dc48..15c6f9d 100644
--- a/app/views/current/search-results-viz-sub-cat.html
+++ b/app/views/current/search-results-viz-sub-cat.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Search and evaluate medical technologies" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/search-results.html b/app/views/current/search-results.html
index d222e2e..848a6ae 100755
--- a/app/views/current/search-results.html
+++ b/app/views/current/search-results.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Search results" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/search-sticky.html b/app/views/current/search-sticky.html
index 83f0e8d..b0f453d 100755
--- a/app/views/current/search-sticky.html
+++ b/app/views/current/search-sticky.html
@@ -4,8 +4,6 @@
{% extends prototypeVersion + '/layouts/layout-search-sticky.html' %}
{% set pageName = "Search and evaluate medical technologies" %}
-{% set serviceHeader = "NHS medtech procurement" %}
-{% set serviceDescription = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/search.html b/app/views/current/search.html
index fa6112f..600db16 100755
--- a/app/views/current/search.html
+++ b/app/views/current/search.html
@@ -4,8 +4,7 @@
{% extends prototypeVersion + '/layouts/layout-search-sticky.html' %}
{% set pageName = "Search and evaluate medical technologies" %}
-{% set serviceHeader = "NHS medtech procurement" %}
-{% set serviceDescription = "Search and evaluate medical technologies" %}
+
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/share-evaluation.html b/app/views/current/share-evaluation.html
index e570d04..d0f9ad4 100755
--- a/app/views/current/share-evaluation.html
+++ b/app/views/current/share-evaluation.html
@@ -7,8 +7,8 @@
- change the header and footer
- add custom CSS and JavaScript
-->
-{% set pageName = "Compass - " %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Share an evaluation" %}
+{
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/sign-in-nhs.html b/app/views/current/sign-in-nhs.html
index c336264..6490dbb 100755
--- a/app/views/current/sign-in-nhs.html
+++ b/app/views/current/sign-in-nhs.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-out.html' %}
{% set pageName = "Search and evaluate medical technologies" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block pageTitle %}
Sign in - {{ serviceName }}
{% endblock %}
diff --git a/app/views/current/sign-up-trusts-1.html b/app/views/current/sign-up-trusts-1.html
index 5ccdbc3..cea1dc4 100644
--- a/app/views/current/sign-up-trusts-1.html
+++ b/app/views/current/sign-up-trusts-1.html
@@ -1,7 +1,7 @@
{% extends prototypeVersion + '/layouts/layout-signed-out.html' %}
{% set pageName = "Register your NHS trust" %}
-{% set serviceHeader = "" %}
+
diff --git a/app/views/current/sign-up-trusts-2.html b/app/views/current/sign-up-trusts-2.html
index edd7026..d8a29a8 100644
--- a/app/views/current/sign-up-trusts-2.html
+++ b/app/views/current/sign-up-trusts-2.html
@@ -1,6 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-out.html' %}
-{% set pageName = "Confirm your trust - Compass" %}
-{% set serviceHeader = "" %}
+{% set pageName = "Confirm your trust" %}
+
{% block content %}
diff --git a/app/views/current/sign-up-trusts-3.html b/app/views/current/sign-up-trusts-3.html
index a533da4..0ae2c81 100644
--- a/app/views/current/sign-up-trusts-3.html
+++ b/app/views/current/sign-up-trusts-3.html
@@ -1,6 +1,5 @@
{% extends prototypeVersion + '/layouts/layout-signed-out.html' %}
{% set pageName = "Your details - Compass" %}
-{% set serviceHeader = "" %}
{% block content %}
diff --git a/app/views/current/sign-up-trusts-4.html b/app/views/current/sign-up-trusts-4.html
index b9c172c..8268384 100644
--- a/app/views/current/sign-up-trusts-4.html
+++ b/app/views/current/sign-up-trusts-4.html
@@ -1,6 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-out.html' %}
{% set pageName = "Check your email - Compass" %}
-{% set serviceHeader = "" %}
+
{% block content %}
diff --git a/app/views/current/supplier-info.html b/app/views/current/supplier-info.html
index 7953af8..862886c 100755
--- a/app/views/current/supplier-info.html
+++ b/app/views/current/supplier-info.html
@@ -7,8 +7,8 @@
- change the header and footer
- add custom CSS and JavaScript
-->
-{% set pageName = "Compass - " %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Supplier information" %}
+
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/supplier-registration.html b/app/views/current/supplier-registration.html
index 8a69dde..410f12d 100644
--- a/app/views/current/supplier-registration.html
+++ b/app/views/current/supplier-registration.html
@@ -1,7 +1,7 @@
{% extends "layout.html" %}
{% block pageTitle %}
- Register Your Company - Supplier Portal - Compass
+ Register Your Company - Supplier Portal
{% endblock %}
diff --git a/app/views/current/template.html b/app/views/current/template.html
index f0e4a3c..0b5a340 100755
--- a/app/views/current/template.html
+++ b/app/views/current/template.html
@@ -7,8 +7,8 @@
- change the header and footer
- add custom CSS and JavaScript
-->
-{% set pageName = "Compass - " %}
-{% set serviceHeader = "Compass" %}
+{% set pageName = "Page Title" %}
+
{% block beforeContent %}
{% endblock %}
diff --git a/app/views/current/terms.html b/app/views/current/terms.html
index d02bd21..8b43657 100644
--- a/app/views/current/terms.html
+++ b/app/views/current/terms.html
@@ -1,7 +1,7 @@
{% extends 'layout-signed-out.html' %}
{% set pageName = "Terms and conditions" %}
-{% set serviceHeader = "" %}
+
{% block beforeContent %}
{% from "breadcrumb/macro.njk" import breadcrumb %}
diff --git a/app/views/current/upload-business-case.html b/app/views/current/upload-business-case.html
index a728356..2f3045e 100644
--- a/app/views/current/upload-business-case.html
+++ b/app/views/current/upload-business-case.html
@@ -1,7 +1,6 @@
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
{% set pageName = "Upload a business case" %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{{ breadcrumb({
diff --git a/app/views/current/upload-document.html b/app/views/current/upload-document.html
index 5819a62..f909997 100644
--- a/app/views/current/upload-document.html
+++ b/app/views/current/upload-document.html
@@ -8,7 +8,6 @@
- add custom CSS and JavaScript
-->
{% set pageName = "Upload a document - " %}
-{% set serviceHeader = "Search and evaluate medical technologies" %}
{% block beforeContent %}
{% endblock %}