diff --git a/app/components/form-key-value/template.hbs b/app/components/form-key-value/template.hbs
index f5e7268a7..8655e3b45 100644
--- a/app/components/form-key-value/template.hbs
+++ b/app/components/form-key-value/template.hbs
@@ -7,13 +7,12 @@
 {{#if ary.length}}
   <table class="table fixed no-lines small mb-10">
     <tr class="hidden-xs hidden-sm">
-      <th>{{t keyLabel}}{{#if editing}}{{field-required}}{{/if}}</th>
+      <th class="acc-label">{{t keyLabel}}{{#if editing}}{{field-required}}{{/if}}</th>
       <th width="30">&nbsp;</th>
-      <th>{{t valueLabel}}</th>
+      <th class="acc-label">{{t valueLabel}}</th>
       <th width="30">&nbsp;</th>
     </tr>
     {{#each ary as |row|}}
-      <div class="pt-10"></div>
       <tr>
         <td data-title="{{t keyLabel}}:">
           {{#if editing}}
@@ -47,6 +46,7 @@
           {{/if}}
         </td>
       </tr>
+      <div class="pb-10"></div>
     {{/each}}
   </table>
 {{else}}
diff --git a/app/components/form-value-array/template.hbs b/app/components/form-value-array/template.hbs
index 9d6e7e826..002630175 100644
--- a/app/components/form-value-array/template.hbs
+++ b/app/components/form-value-array/template.hbs
@@ -1,11 +1,10 @@
 {{#if ary.length}}
   <table class="table fixed no-lines mb-10">
     <tr class="hidden-xs hidden-sm">
-      <th>{{t valueLabel}}</th>
+      <th class="acc-label">{{t valueLabel}}</th>
       <th width="30">&nbsp;</th>
     </tr>
     {{#each ary as |row|}}
-    <div class="pt-10"></div>
       <tr>
         <td data-title="{{t valueLabel}}">
           {{input-paste pasted="pastedValues" class="form-control input-sm value" type="text" value=row.value placeholder=valuePlaceholder}}
@@ -15,6 +14,7 @@
           <button class="btn bg-primary btn-sm" {{action "remove" row}}><i class="icon icon-minus"/><span class="sr-only">{{t 'generic.remove'}}</span></button>
         </td>
       </tr>
+      <div class="pb-10"></div>
     {{/each}}
   </table>
 {{/if}}
diff --git a/app/components/modal-edit-host/template.hbs b/app/components/modal-edit-host/template.hbs
index 3bab4d734..55addf889 100644
--- a/app/components/modal-edit-host/template.hbs
+++ b/app/components/modal-edit-host/template.hbs
@@ -41,11 +41,9 @@
     </div>
   </div>
 
-  <div class="row inline-form">
-    <div class="col span-2">
-      <label>{{t 'editHost.ips.label'}}</label>
-    </div>
-    <div class="col span-8">
+  <div class="row box ">
+    <h4>{{t 'editHost.ips.label'}}</h4>
+
       {{form-value-array
         initialValues=ips
         changed=(action (mut ips))
@@ -53,15 +51,12 @@
         valueLabel="editHost.ips.valueLabel"
         valuePlaceholder="editHost.ips.valuePlaceholder"
       }}
-      <p class="text-info">{{t 'editHost.ips.help'}}</p>
-    </div>
+      <p class="help-block">{{t 'editHost.ips.help'}}</p>
   </div>
 
-  <div class="row form-group">
-    <div class="col span-2 form-label form-control-static">
-      <label>{{t 'editHost.requireAny.label'}}</label>
-    </div>
-    <div class="col span-8">
+  <div class="row box mt-30">
+  <h4>{{t 'editHost.requireAny.label'}}</h4>
+
       {{form-key-value
           initialStr=requireAny
           changedStr=(action (mut requireAny))
@@ -70,7 +65,6 @@
           allowEmptyValue=true
       }}
       <p class="help-block">{{t 'editHost.requireAny.help' htmlSafe=true}}</p>
-    </div>
   </div>
 </section>