diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss
index 33204ec3c..8db4a7fc7 100644
--- a/app/assets/stylesheets/globals.scss
+++ b/app/assets/stylesheets/globals.scss
@@ -1,3 +1,5 @@
+@import 'settings/typography-font-families';
+
 // needed for IE10 desktop snap mode: http://menacingcloud.com/?c=cssViewportOrMetaTag
 @-ms-viewport {
   width: device-width;
@@ -88,3 +90,10 @@ button:focus {
   outline: 3px solid $focus-colour;
   outline-offset: 0;
 }
+
+// To be removed when all buttons follow the GOV.UK Frontend conventions
+// - https://design-system.service.gov.uk/components/button/
+
+button {
+  font-family: $govuk-font-family-nta;
+}
diff --git a/app/assets/stylesheets/govuk-frontend/overrides.scss b/app/assets/stylesheets/govuk-frontend/overrides.scss
index 30ca08c30..4269c4181 100644
--- a/app/assets/stylesheets/govuk-frontend/overrides.scss
+++ b/app/assets/stylesheets/govuk-frontend/overrides.scss
@@ -11,14 +11,6 @@
 
 }
 
-// The GOV.UK Frontend header component wraps content that is `position: relative`
-// This changes its z-index position, putting it above the `<main>` section
-// We need the `<main>` section to be above it, like the default order, to hide the theme colour
-// bar on full-width pages
-.govuk-main-wrapper {
-  position: relative;
-}
-
 // Additional padding-bottom override, following the GOV.UK Frontend spacing scale:
 // https://design-system.service.gov.uk/styles/spacing/#the-responsive-spacing-scale
 .govuk-\!-padding-bottom-12 {
diff --git a/app/assets/stylesheets/views/product-page.scss b/app/assets/stylesheets/views/product-page.scss
index 21b9eff30..afc0d09bb 100644
--- a/app/assets/stylesheets/views/product-page.scss
+++ b/app/assets/stylesheets/views/product-page.scss
@@ -2,6 +2,11 @@
 
   &-intro {
 
+    // The GOV.UK Frontend header component wraps content that is `position: relative`
+    // This changes its z-index position, putting it above the `<main>` section in the stacking order
+    // We need the `<main>` section to be above it, like the default order, so when we apply the
+    // negative margin-top it overlaps the theme bar at the bottom of the header
+    position: relative;
     margin: -10px 0 $gutter * 1.5 0;
     padding: 0 0 $gutter * 2 0;
     background: $govuk-blue;
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 3f4af50d5..64d78f397 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -145,6 +145,7 @@
   {% endif %}
 
   {{ notify_footer({
+    "classes": "js-footer",
     "navigation": [
       {
         "columns": 1,