diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index cfb6adb7a..2b4b39223 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,12 +1,11 @@
 // The main application stylesheet
-$govuk-compatibility-govuktemplate: true;
+$govuk-compatibility-govuktemplate: false;
 $govuk-typography-use-rem: false;
 $govuk-use-legacy-palette: false;
 $govuk-new-link-styles: true;
 
 // Components from govuk_publishing_components gem
 @import 'govuk_publishing_components/govuk_frontend_support';
-@import 'govuk_publishing_components/component_support';
 @import 'govuk_publishing_components/components/attachment';
 @import 'govuk_publishing_components/components/back-link';
 @import 'govuk_publishing_components/components/breadcrumbs';
diff --git a/app/assets/stylesheets/components/_figure.scss b/app/assets/stylesheets/components/_figure.scss
index 7981e8735..f22412c21 100644
--- a/app/assets/stylesheets/components/_figure.scss
+++ b/app/assets/stylesheets/components/_figure.scss
@@ -4,6 +4,7 @@
 
   border-top: 1px solid $govuk-border-colour;
   padding-top: govuk-spacing(3);
+  margin: 0;
 }
 
 .app-c-figure__image {
@@ -37,7 +38,7 @@
 }
 
 .app-c-figure__figcaption-text {
-  margin-bottom: 0;
+  margin: 0;
 
   @include govuk-media-query($from: tablet) {
     margin-bottom: govuk-spacing(2);
diff --git a/app/assets/stylesheets/components/_published-dates.scss b/app/assets/stylesheets/components/_published-dates.scss
index cd881caa0..0db61223d 100644
--- a/app/assets/stylesheets/components/_published-dates.scss
+++ b/app/assets/stylesheets/components/_published-dates.scss
@@ -15,6 +15,10 @@
   margin: 20px 0;
 }
 
+.app-c-published-dates__list {
+  padding: 0;
+}
+
 .app-c-published-dates__change-item {
   list-style-type: none;
   margin-bottom: 10px;
@@ -33,3 +37,8 @@
   padding-top: govuk-spacing(2);
   border-top: 1px solid $govuk-border-colour;
 }
+
+.js-enabled .app-c-published-dates .js-hidden {
+  display: none;
+  visibility: hidden;
+}
diff --git a/app/assets/stylesheets/helpers/_organisation-logos.scss b/app/assets/stylesheets/helpers/_organisation-logos.scss
index 4bcbd92ed..56c889512 100644
--- a/app/assets/stylesheets/helpers/_organisation-logos.scss
+++ b/app/assets/stylesheets/helpers/_organisation-logos.scss
@@ -5,6 +5,7 @@
   justify-content: flex-start;
   list-style-type: none;
   margin-top: govuk-spacing(2);
+  padding: 0;
 }
 
 .organisation-logos__logo {
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3cee9a51a..c33601add 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,4 +1,6 @@
 class ApplicationController < ActionController::Base
+  include Slimmer::Template
+  slimmer_template "gem_layout"
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery except: :service_sign_in_options
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 274bdd347..1134f610b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -17,25 +17,7 @@ def wrapper_class
     "direction-#{page_text_direction}" if page_text_direction
   end
 
-  def active_proposition
-    # Which of the government sections is the page part of?
-    # Derive this from the request path, eg: /government/consultations => consultations
-    active = request.original_fullpath.split("/")[2]
-    active_proposition_mapping.fetch(active, active)
-  end
-
   def current_path_without_query_string
     request.original_fullpath.split("?", 2).first
   end
-
-private
-
-  def active_proposition_mapping
-    # Some paths don't map directly to the position nav
-    # eg /government/news sits under 'announcements'
-    {
-      "news" => "announcements",
-      "fatalities" => "announcements",
-    }
-  end
 end
diff --git a/app/views/components/_published-dates.html.erb b/app/views/components/_published-dates.html.erb
index f18724c15..d25e57e50 100644
--- a/app/views/components/_published-dates.html.erb
+++ b/app/views/components/_published-dates.html.erb
@@ -22,7 +22,7 @@
       data-expanded="false"
       data-toggled-text="&#45;&nbsp;<%= t('components.published_dates.hide_all_updates', locale: :en) %>">&#43;&nbsp;<%= t('components.published_dates.show_all_updates', locale: :en) %></a>
       <div class="app-c-published-dates__change-history js-hidden" id="full-history">
-        <ol>
+        <ol class="app-c-published-dates__list">
           <% history.each do |change| %>
             <li class="app-c-published-dates__change-item">
               <time class="app-c-published-dates__change-date timestamp" datetime="<%= change[:timestamp] %>"><%= change[:display_time] %></time>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 08da2fd20..f3ff56d1f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -49,7 +49,6 @@
     <main role="main" id="content" class="<%= @content_item.schema_name.dasherize %>" lang="<%= I18n.locale %>">
       <%= yield %>
     </main>
-    <%= render 'govuk_publishing_components/components/feedback' %>
   </div>
 </body>
 </html>