diff --git a/assets/styles/base/_typography.scss b/assets/styles/base/_typography.scss
index 5a6e79aed8..bbe8468180 100644
--- a/assets/styles/base/_typography.scss
+++ b/assets/styles/base/_typography.scss
@@ -45,6 +45,7 @@ H6 {
 
 P {
   font-size: 1.4em;
+  line-height: 1.75em;
   font-weight: 400;
   font-style: normal;
   letter-spacing: 0em;
diff --git a/assets/styles/themes/_dark.scss b/assets/styles/themes/_dark.scss
index 81c432cee8..5025dc058e 100644
--- a/assets/styles/themes/_dark.scss
+++ b/assets/styles/themes/_dark.scss
@@ -55,7 +55,7 @@
   --scrollbar-thumb-dropdown   : #{$darker};
   --disabled-bg                : #{$disabled};
   --header-bg                  : #{$dark};
-  --box-bg                     : #{$darker};
+  --box-bg                     : #{$darkest};
   --border                     : #{$medium};
   --nav-select                 : #{$darker};
 
diff --git a/components/ResourceYaml.vue b/components/ResourceYaml.vue
index d130b43cc1..2f0583decc 100644
--- a/components/ResourceYaml.vue
+++ b/components/ResourceYaml.vue
@@ -279,16 +279,6 @@ export default {
             {{ schema.attributes.kind }}
           </nuxt-link>: {{ obj.id }}
         </span>
-        <p>
-          <span v-if="isPreview" v-trim-whitespace class="btn-group btn-xs mode">
-            <button type="button" :class="{'btn': true, 'btn-xs': true, 'bg-default': true, 'active': diffMode !== 'split'}" @click="diffMode='unified'">
-              Unified
-            </button>
-            <button type="button" :class="{'btn': true, 'btn-xs': true, 'bg-default': true, 'active': diffMode === 'split'}" @click="diffMode='split'">
-              Split
-            </button>
-          </span>
-        </p>
       </h1>
       <div class="actions">
         <button v-if="!isView" type="button" class="btn bg-transparent" @click="cancel">
@@ -315,6 +305,16 @@ export default {
         {{ err }}
       </div>
     </header>
+    <div class="text-right">
+      <span v-if="isPreview" v-trim-whitespace class="btn-group btn-sm mode">
+        <button type="button" :class="{'btn': true, 'btn-sm': true, 'bg-default': true, 'active': diffMode !== 'split'}" @click="diffMode='unified'">
+          Unified
+        </button>
+        <button type="button" :class="{'btn': true, 'btn-sm': true, 'bg-default': true, 'active': diffMode === 'split'}" @click="diffMode='split'">
+          Split
+        </button>
+      </span>
+    </div>
     <CodeMirror
       v-if="!isPreview"
       :value="currentValue"
diff --git a/pages/auth/setup.vue b/pages/auth/setup.vue
index efa62d2ed9..b4f77f5e1d 100644
--- a/pages/auth/setup.vue
+++ b/pages/auth/setup.vue
@@ -513,7 +513,7 @@ export default {
       <div class="row">
         <div class="col span-6">
           <h1>GitHub Integration, Part Deux</h1>
-          <p class="text-muted">
+          <p class="text-muted mb-20 mt-20">
             Who should be able to login?
           </p>
           <div>
@@ -551,7 +551,9 @@ export default {
 <style lang="scss" scoped>
   .principal {
     display: block;
+    background: var(--box-bg);
     border: 1px solid var(--border);
+    border-radius: 3px;
     margin: 10px 0;
     padding: 10px;
     line-height: 40px;