diff --git a/app/styles/app/settings.sass b/app/styles/app/settings.sass
index 9e8dadf1..bea3d151 100644
--- a/app/styles/app/settings.sass
+++ b/app/styles/app/settings.sass
@@ -52,7 +52,6 @@
 
     .travis-switch
       display: block
-      margin-top: 4px
 
     label
       display: inline-block
@@ -222,16 +221,15 @@
       float: left
       padding-bottom: 0
       min-height: 33px
-      line-height: 33px
+      line-height: 2
 
     span.equals
       float: left
       display: block
-      line-height: 33px
+      line-height: 2
       margin: 0 10px 0 14px
 
     .field.name
-      width: 242px
       margin-bottom: 10px
       input
         width: 97%
@@ -241,6 +239,7 @@
         width: 97%
     .actions
       margin-bottom: 10px
+      clear: both
 
   ul.env-vars
     display: block
@@ -279,7 +278,6 @@
 
     .name
       width: 250px
-      margin: 0 10px 0 20px
       text-align: left
 
     .value
@@ -294,3 +292,15 @@
       .value,
       .name
         display: inline-block
+        vertical-align: middle
+
+  .field--switch
+    display: inline-block
+    vertical-align: middle
+    label.public
+      width: auto
+      line-height: 1.8
+
+  .value--extra
+    padding: 0 !important
+    width: 250px !important
diff --git a/app/templates/env-vars/_form.hbs b/app/templates/env-vars/_form.hbs
index 646a6df0..b63210a3 100644
--- a/app/templates/env-vars/_form.hbs
+++ b/app/templates/env-vars/_form.hbs
@@ -5,16 +5,17 @@
   {{/travis-field}}
   <span class="equals">=</span>
   {{#if showValueField}}
-    <div class="field value">
+    <div class="field value value--extra">
       {{#label for="value" class="value"}}Value:{{/label}}
       {{input value=value class="env-value" placeholder="Value"}}
     </div>
   {{else}}
-    <span class="value value-display secure">{{value}}</span>
+    <div class="field name">
+      <span class="value value-display secure">{{value}}</span>
+    </div>
   {{/if}}
-  <div class="clear"></div>
-  <div class="field">
-    {{travis-switch active=public class="value"}}
+  <div class="field field--switch">
+    {{travis-switch active=public}}
     {{#label for="secure" class="public"}}Display value in build logs{{/label}}
   </div>