diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss
index 93a4631c3..0d774388a 100644
--- a/app/assets/stylesheets/views/users.scss
+++ b/app/assets/stylesheets/views/users.scss
@@ -1,6 +1,7 @@
 .user-list {
 
   @include core-16;
+  margin-bottom: $gutter * 1.5;
 
   &-item {
 
diff --git a/app/templates/views/api-keys.html b/app/templates/views/api-keys.html
index 22d3cc12d..7e7ad0b30 100644
--- a/app/templates/views/api-keys.html
+++ b/app/templates/views/api-keys.html
@@ -8,7 +8,7 @@
 
 {% block maincolumn_content %}
 
-  <div class="grid-row">
+  <div class="grid-row bottom-gutter-1-2">
     <div class="column-two-thirds">
       <h1 class="heading-large">
         API integration
@@ -54,11 +54,11 @@
     {% endif %}
   {% endcall %}
 
-  <div class="bottom-gutter">
+  <div class="bottom-gutter-2">
     {{ api_key(current_service.id, "Service ID", thing="service ID") }}
   </div>
 
-  <h2 class="heading-small">API clients</h2>
+  <h2 class="heading-medium">API clients</h2>
   <ul class="list list-bullet">
     {% for name, url in [
       ('Java', 'https://github.com/alphagov/notifications-java-client'),
diff --git a/app/templates/views/api-keys/revoke.html b/app/templates/views/api-keys/revoke.html
index 4fe3880b9..847436035 100644
--- a/app/templates/views/api-keys/revoke.html
+++ b/app/templates/views/api-keys/revoke.html
@@ -8,22 +8,16 @@
 
 {% block maincolumn_content %}
 
-    <div class="grid-row">
-      <div class="column-two-thirds">
+    <h1 class="heading-large">
+      Revoke API key
+    </h1>
 
-        <h1 class="heading-large">
-          Revoke API key
-        </h1>
-
-        <p>
-          ‘{{ key_name }}’ will no longer let you connect to GOV.UK Notify.
-        </p>
-        <p>
-          You can’t undo this.
-        </p>
-
-      </div>
-    </div>
+    <p>
+      ‘{{ key_name }}’ will no longer let you connect to GOV.UK Notify.
+    </p>
+    <p>
+      You can’t undo this.
+    </p>
 
     <form method="post">
       {{ page_footer(
diff --git a/app/templates/views/api-keys/show.html b/app/templates/views/api-keys/show.html
index 75cd189ae..3191f8b31 100644
--- a/app/templates/views/api-keys/show.html
+++ b/app/templates/views/api-keys/show.html
@@ -8,20 +8,15 @@
 
 {% block maincolumn_content %}
 
-    <div class="grid-row">
-      <div class="column-two-thirds">
 
-        <h1 class="heading-large">
-          New API key
-        </h1>
+    <h1 class="heading-large">
+      New API key
+    </h1>
 
-        <p>
-          Copy your key to somewhere safe. You won’t be able to see it again
-          once you leave this page.
-        </p>
-
-      </div>
-    </div>
+    <p>
+      Copy your key to somewhere safe. You won’t be able to see it again
+      once you leave this page.
+    </p>
 
     {{ api_key(secret, key_name) }}
 
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 34dc100ab..00e955044 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -17,7 +17,7 @@ Manage users – GOV.UK Notify
 
 {% block maincolumn_content %}
 
-  <div class="grid-row">
+  <div class="grid-row bottom-gutter">
     <div class="column-two-thirds">
       <h1 class="heading-large">
         Team members
@@ -30,7 +30,7 @@ Manage users – GOV.UK Notify
     {% endif %}
   </div>
 
-  <h2 class="heading-medium">
+  <h2 class="visually-hidden">
     Active
   </h2>
   <div class="user-list">
diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html
index f25a9baa5..ae5124491 100644
--- a/app/templates/views/service-settings/request-to-go-live.html
+++ b/app/templates/views/service-settings/request-to-go-live.html
@@ -8,9 +8,6 @@
 
 {% block maincolumn_content %}
 
-  <div class="grid-row">
-    <div class="column-three-quarters">
-
       <h1 class="heading-large">Request to go live</h1>
 
       <p>
@@ -60,7 +57,5 @@
         {{ page_footer('Request to go live') }}
       </form>
 
-    </div>
-  </div>
 
 {% endblock %}
diff --git a/app/templates/views/trial-mode.html b/app/templates/views/trial-mode.html
index a7de3fb7c..79f649253 100644
--- a/app/templates/views/trial-mode.html
+++ b/app/templates/views/trial-mode.html
@@ -35,7 +35,7 @@
 
     <p>
       When you’re ready we can
-      {% if current_service %}
+      {% if current_service and current_user.has_permissions(['manage_settings'], admin_override=True) %}
         <a href="{{ url_for('main.service_request_to_go_live', service_id=current_service.id) }}">remove these restrictions</a>.
       {% else %}
         remove these restrictions.