diff --git a/assets/scripts/app/templates/env_vars.hbs b/assets/scripts/app/templates/env_vars.hbs
index 42500ac1..0de51dc8 100644
--- a/assets/scripts/app/templates/env_vars.hbs
+++ b/assets/scripts/app/templates/env_vars.hbs
@@ -6,20 +6,13 @@
       {{partial 'env_vars/form'}}
     {{else}}
       <li class="env-var">
-        <div class="row env-var-name">
-          <span class="label">Name:</span>
-          <span class="value">{{name}}</span>
-        </div>
-        <div class="row env-var-value">
-          <span class="label">Value:</span>
-          <span class="value value-display">{{value}}</span>
-        </div>
-        <div class="actions">
-          <a href="#" class="edit-var" {{action "edit"}}>Edit</a>
-          <a href="#" {{action "delete"}} {{bind-attr class=":delete-var isDeleting:deleting"}}>
-            Delete
-          </a>
-        </div>
+        <span class="name">{{name}}</span>
+        <span class="equals">=</span>
+        <span class="value value-display">{{value}}</span>
+        <a href="#" class="edit-var" {{action "edit"}}>Edit</a>
+        <a href="#" {{action "delete"}} {{bind-attr class=":delete-var isDeleting:deleting"}}>
+          Delete
+        </a>
       </li>
     {{/if}}
   {{/each}}
diff --git a/assets/styles/settings.sass b/assets/styles/settings.sass
index ff21bb73..5dce674e 100644
--- a/assets/styles/settings.sass
+++ b/assets/styles/settings.sass
@@ -158,7 +158,7 @@
 
   .edit-var
     display: inline-block
-    margin: 6px 0 15px 0
+    margin: 6px 0 7px 0
     color: #ffffff
     background-color: #bcbcbb
     border-radius: 4px
@@ -171,7 +171,7 @@
 
   .delete-var, .delete-ssh-key
     display: inline-block
-    margin: 6px 0 15px 0
+    margin: 6px 0 7px 0
     color: #ffffff
     background-color: #932828
     border-radius: 4px
@@ -179,6 +179,10 @@
     font-size: 13px
     cursor: pointer
 
+  .delete-var, .edit-var
+    float: right
+    margin-right: 10px
+
   .delete-var:hover, .delete-ssh-key:hover
     background-color: #820b0b
 
@@ -186,6 +190,12 @@
     display: block
   li.env-var
     margin: 20px 40px 0 0
+    overflow: auto
+    display: flex
+    align-items: center
+    justify-content: center
+    border-bottom: 1px dotted #bbb
+    max-width: 800px
 
     .var
       font-size: 13px
@@ -197,3 +207,20 @@
         display: inline-block
         text-align: left
         margin-right: 5px
+
+    .name, .value, .equals
+      display: block
+      float: left
+      position: relative
+      font-size: 15px
+
+    .equals
+      margin: 0 10px
+
+    .name
+      width: 30%
+      text-align: right
+
+    .value
+      width: 45%
+      text-align: left