diff --git a/app/components/form-key-value/template.hbs b/app/components/form-key-value/template.hbs
index 104d1469c..04e890efc 100644
--- a/app/components/form-key-value/template.hbs
+++ b/app/components/form-key-value/template.hbs
@@ -1,12 +1,12 @@
 <div class="clearfix">
   {{#if header}}
-    <label class="pb-5">{{header}}</label>
+    <label class="acc-label">{{header}}</label>
   {{/if}}
 </div>
 
 {{#if ary.length}}
   <table class="table fixed no-lines small mb-10">
-    <tr class="text-muted hidden-xs hidden-sm">
+    <tr class="hidden-xs hidden-sm">
       <th>{{t keyLabel}}{{#if editing}}{{field-required}}{{/if}}</th>
       <th width="30">&nbsp;</th>
       <th>{{t valueLabel}}</th>
diff --git a/app/components/form-user-labels/template.hbs b/app/components/form-user-labels/template.hbs
index 840864980..03a2922e5 100644
--- a/app/components/form-user-labels/template.hbs
+++ b/app/components/form-user-labels/template.hbs
@@ -13,7 +13,7 @@
 
   {{#if userLabelArray.length}}
     <table class="table fixed no-lines mt-20">
-      <tr class="text-muted hidden-xs hidden-sm">
+      <tr class="hidden-xs hidden-sm">
         <th>{{t 'formUserLabels.key.label'}}{{field-required}}</th>
         <th width="30">&nbsp;</th>
         <th>{{t 'formUserLabels.value.label'}}</th>
diff --git a/app/components/form-value-array/template.hbs b/app/components/form-value-array/template.hbs
index 49b1a69b4..1694add75 100644
--- a/app/components/form-value-array/template.hbs
+++ b/app/components/form-value-array/template.hbs
@@ -2,7 +2,7 @@
 
 {{#if ary.length}}
   <table class="table fixed no-lines mt-20">
-    <tr class="text-muted hidden-xs hidden-sm">
+    <tr class="hidden-xs hidden-sm">
       <th>{{t valueLabel}}</th>
       <th width="30">&nbsp;</th>
     </tr>
diff --git a/app/new-stack/template.hbs b/app/new-stack/template.hbs
index d59d502e3..801041737 100644
--- a/app/new-stack/template.hbs
+++ b/app/new-stack/template.hbs
@@ -19,7 +19,7 @@
 
   {{#advanced-section}}
   <hr class="mt-40 mb-40"/>
-    <div class="pb-10">
+    <div>
       {{input-files
         accept=".yml, .yaml"
         changed=(action (mut files))
@@ -41,7 +41,7 @@
 
     <hr class="mt-40 mb-40" />
 
-    <div class="row">
+    <div class="row box">
       <div class="col span-6">
         <label class="acc-label">{{t 'newStack.startOnCreate.label'}}</label>
         <div class="radio">
diff --git a/app/styles/base/_color.scss b/app/styles/base/_color.scss
index 648591ead..aa7e9b611 100644
--- a/app/styles/base/_color.scss
+++ b/app/styles/base/_color.scss
@@ -41,7 +41,7 @@
 .help-block {
   @extend .text-muted;
   @extend .text-small;
-  margin: 0;
+  margin: 5px 0 0 0;
 
   a {
     color: $link-color;
diff --git a/app/styles/components/_forms.scss b/app/styles/components/_forms.scss
index bf5b2f182..3561c0339 100644
--- a/app/styles/components/_forms.scss
+++ b/app/styles/components/_forms.scss
@@ -302,3 +302,7 @@ input.input-lg,
   display: inline-block;
   vertical-align: middle;
 }
+
+.radio {
+  padding: 5px 0;
+}
diff --git a/app/styles/pages/_settings.scss b/app/styles/pages/_settings.scss
index c9d341b41..15cb064d2 100644
--- a/app/styles/pages/_settings.scss
+++ b/app/styles/pages/_settings.scss
@@ -33,14 +33,14 @@
   .force-wrap {
     width: calc(100% - 60px);
   }
-  
+
   p {
     margin: 0;
     @extend .text-small;
   }
 
   .help-block {
-    margin: 0;
+    margin: 5px 0 0 0;
   }
 
   .edit {