diff --git a/assets/scripts/app/templates/env_vars.hbs b/assets/scripts/app/templates/env_vars.hbs
index 4d3c21a1..84068b52 100644
--- a/assets/scripts/app/templates/env_vars.hbs
+++ b/assets/scripts/app/templates/env_vars.hbs
@@ -8,11 +8,13 @@
   {{#if isEditing}}
     {{! TODO: reuse it with "new", it's almost identical }}
     <form {{action "save" on="submit"}}>
-      {{label value=name}}: {{input value=name}}
-      {{#if public}}{{label value=value}}: {{input value=value}}{{/if}}
-      {{label value=public}}: {{input type="checkbox" checked=public}}
+      <p>Name: {{input value=name}}</p>
+      {{#if public}}<p>Value: {{input value=value}}</p>{{/if}}
+      <p>Public: {{input type="checkbox" checked=public}}</p>
 
-      {{input type="submit" value="Wat"}} or <a href="#" {{action "cancel"}}>Cancel</a>
+      <p>
+        {{input type="submit" value="Save"}} or <a href="#" {{action "cancel"}}>Cancel</a>
+      </p>
     </form>
   {{else}}
     <p>
diff --git a/assets/styles/settings.sass b/assets/styles/settings.sass
index 02b54d6c..35f3049c 100644
--- a/assets/styles/settings.sass
+++ b/assets/styles/settings.sass
@@ -42,6 +42,9 @@ a.env_var_add
   line-height: 70px
   cursor: pointer
 
+a.env_var_add:hover
+  background-color: #7c878d
+
 input.env-name
   margin-left: 6px
 
@@ -72,10 +75,17 @@ input.submit-env-var
   height: 32px
   text-align: center
   margin-right: 6px
+  cursor: pointer
+
+input.submit-env-var:hover
+  background-color: #6f924f
 
 a.cancel-env-var
   margin-left: 3px
 
+a.cancel-env-var:hover
+  text-decoration: underline
+
 input[type="checkbox"]
   display: inline-block
   vertical-align: middle
@@ -90,6 +100,9 @@ a.edit_var
   font-size: 13px
   cursor: pointer
 
+a.edit_var:hover
+  background-color: #a4a5a4
+
 a.delete_var
   display: inline-block
   margin: 6px 0 15px 0
@@ -98,4 +111,7 @@ a.delete_var
   border-radius: 4px
   padding: 4px 15px 4px 15px
   font-size: 13px
-  cursor: pointer
\ No newline at end of file
+  cursor: pointer
+
+a.delete_var:hover
+  background-color: #820b0b
\ No newline at end of file