diff --git a/app/adapters/env-var.coffee b/app/adapters/env-var.coffee
index 0707bd2e..751e4488 100644
--- a/app/adapters/env-var.coffee
+++ b/app/adapters/env-var.coffee
@@ -1,5 +1,5 @@
 `import Ember from 'ember'`
-`import ApplicationAdapter from 'adapters/application'`
+`import ApplicationAdapter from 'travis/adapters/application'`
 
 Adapter = ApplicationAdapter.extend
   namespace: 'settings'
diff --git a/app/adapters/ssh-key.coffee b/app/adapters/ssh-key.coffee
index ffbb7839..68c47949 100644
--- a/app/adapters/ssh-key.coffee
+++ b/app/adapters/ssh-key.coffee
@@ -1,5 +1,5 @@
 `import Ember from 'ember'`
-`import ApplicationAdapter from 'adapters/application'`
+`import ApplicationAdapter from 'travis/adapters/application'`
 
 Adapter = ApplicationAdapter.extend
   namespace: 'settings'
diff --git a/app/app.coffee b/app/app.coffee
index 5ca3b7d3..053b2d87 100644
--- a/app/app.coffee
+++ b/app/app.coffee
@@ -3,6 +3,19 @@
 `import loadInitializers from 'ember/load-initializers'`
 `import config from './config/environment'`
 
+`import label from 'travis/helpers/label'`
+`import travisField from 'travis/helpers/travis-field'`
+`import travisErrors from 'travis/helpers/travis-errors'`
+`import tipsy from 'travis/helpers/tipsy'`
+#`import input from 'travis/helpers/input'`
+`import filterInput from 'travis/helpers/filter-input'`
+Ember.Handlebars.registerHelper('label', label)
+Ember.Handlebars.registerHelper('travis-field', travisField)
+Ember.Handlebars.registerHelper('travis-errors', travisErrors)
+Ember.Handlebars.registerHelper('tipsy', tipsy)
+#Ember.Handlebars.registerHelper('input', input)
+Ember.Handlebars.registerHelper('filter-input', filterInput)
+
 Ember.MODEL_FACTORY_INJECTIONS = true
 
 App = Ember.Application.extend(Ember.Evented,
diff --git a/app/controllers/env-var-new.coffee b/app/controllers/env-vars/new.coffee
similarity index 95%
rename from app/controllers/env-var-new.coffee
rename to app/controllers/env-vars/new.coffee
index 93bbc131..0317eeb5 100644
--- a/app/controllers/env-var-new.coffee
+++ b/app/controllers/env-vars/new.coffee
@@ -39,6 +39,7 @@ Controller = Ember.Controller.extend Validations,
           self.transitionToRoute('env_vars')
         , =>
           @set('isSaving', false)
+      else
+        @set('isSaving', false)
 
-Travis.EnvVarsNewController = Controller
 `export default Controller`
diff --git a/app/helpers/travis-errors.coffee b/app/helpers/travis-errors.coffee
index 5204fe66..34763a00 100644
--- a/app/helpers/travis-errors.coffee
+++ b/app/helpers/travis-errors.coffee
@@ -4,11 +4,7 @@ ErrorsView = Ember.View.extend
   tagName: 'span'
   templateName: 'helpers/travis-errors'
   classNames: ['error']
-  classNameBindings: ['codes']
-  attributeBindings: ['style']
-  style: (->
-    'display: none' unless @get('show')
-  ).property('show')
+  classNameBindings: ['codes', 'show']
   codes: (->
     @get('errors').mapBy('code')
   ).property('@errors')
diff --git a/app/styles/app/settings.sass b/app/styles/app/settings.sass
index 24986523..cccb4257 100644
--- a/app/styles/app/settings.sass
+++ b/app/styles/app/settings.sass
@@ -199,6 +199,10 @@
 
     span.error
       margin-left: 0
+      display: none
+
+      &.show
+        display: inline-block
 
     label.name, label.value
       display: none
diff --git a/app/templates/env-vars/_form.hbs b/app/templates/env-vars/_form.hbs
index 3042cd7c..646a6df0 100644
--- a/app/templates/env-vars/_form.hbs
+++ b/app/templates/env-vars/_form.hbs
@@ -12,7 +12,7 @@
   {{else}}
     <span class="value value-display secure">{{value}}</span>
   {{/if}}
-  <div style="clear: both"></div>
+  <div class="clear"></div>
   <div class="field">
     {{travis-switch active=public class="value"}}
     {{#label for="secure" class="public"}}Display value in build logs{{/label}}
diff --git a/app/templates/helpers/travis-errors.hbs b/app/templates/helpers/travis-errors.hbs
index 58cb26ef..741f5583 100644
--- a/app/templates/helpers/travis-errors.hbs
+++ b/app/templates/helpers/travis-errors.hbs
@@ -1 +1 @@
-{{#each view.errors}}{{message}}{{/each}}
+{{#each erorr in view.errors}}{{error.message}}{{/each}}
diff --git a/app/views/repo-show-tools.coffee b/app/views/repo-show-tools.coffee
index 49cb5eba..bd4d5770 100644
--- a/app/views/repo-show-tools.coffee
+++ b/app/views/repo-show-tools.coffee
@@ -1,6 +1,7 @@
 `import Ember from 'ember'`
+`import BasicView from 'travis/views/basic'`
 
-View = Ember.View.extend
+View = BasicView.extend
   templateName: 'repos/show/tools'
 
   repoBinding: 'controller.repo'