diff --git a/assets/scripts/app/templates/env_vars.hbs b/assets/scripts/app/templates/env_vars.hbs
index aba20052..5f4566de 100644
--- a/assets/scripts/app/templates/env_vars.hbs
+++ b/assets/scripts/app/templates/env_vars.hbs
@@ -2,19 +2,17 @@
   {{outlet}}
 </div>
 
-{{#link-to "env_vars.new"}}Add a new variable{{/link-to}}
+{{#link-to "env_vars.new" class="env_var_add"}}Add a new variable{{/link-to}}
 
 {{#each controller itemController="envVar"}}
   {{#if isEditing}}
     {{! TODO: reuse it with "new", it's almost identical }}
     <form {{action "save" on="submit"}}>
-      <p>Name: {{input value=name}}</p>
-      {{#if public}}<p>Value: {{input value=value}}</p>{{/if}}
-      <p>Public: {{input type="checkbox" checked=public}}</p>
+      {{label value=name}}: {{input value=name}}
+      {{#if public}}{{label value=value}}: {{input value=value}}{{/if}}
+      {{label value=public}}: {{input type="checkbox" checked=public}}
 
-      <p>
-        {{input type="submit" value="Save"}} or <a href="#" {{action "cancel"}}>Cancel</a>
-      </p>
+      {{input type="submit" value="Wat"}} or <a href="#" {{action "cancel"}}>Cancel</a>
     </form>
   {{else}}
     <p>
diff --git a/assets/styles/settings.sass b/assets/styles/settings.sass
index e442cdd5..f1e29040 100644
--- a/assets/styles/settings.sass
+++ b/assets/styles/settings.sass
@@ -30,4 +30,23 @@
       border-color: #ffb6c1
       background: rgb(252, 227, 230)
 
+a.env_var_add
+  color: #ffffff
+  background-color: #97a3aa
+  border: 1px solid #818e91
+  border-radius: 4px
+  padding: 8px 12px 8px 12px
+  font-size: 13px
+  line-height: 70px
 
+input
+  display: inline-block
+  width: 260px
+  height: 20px
+  padding: 5px
+  background-color: #fff
+  border: 1px solid #ddd
+  line-height: 17px
+  font-size: 13px
+  color: #999999
+  text-align: left
\ No newline at end of file