diff --git a/app/helpers/label.coffee b/app/helpers/label.coffee
index 843f57ac..5d733fd5 100644
--- a/app/helpers/label.coffee
+++ b/app/helpers/label.coffee
@@ -27,7 +27,7 @@ label = (options) ->
     options.hashTypes.for = 'STRING'
     options.hashContexts.for = this
     if options.hash.content
-      options.fn = Ember.Handlebars.compile("{{view.content}}")
+      view = view.extend(templateName: 'helpers/label')
 
   Ember.Handlebars.helpers.view.call(this, view, options)
 
diff --git a/app/helpers/travis-errors.coffee b/app/helpers/travis-errors.coffee
index 84df9ce2..5204fe66 100644
--- a/app/helpers/travis-errors.coffee
+++ b/app/helpers/travis-errors.coffee
@@ -2,7 +2,7 @@
 
 ErrorsView = Ember.View.extend
   tagName: 'span'
-  template: Ember.Handlebars.compile("{{#each view.errors}}{{message}}{{/each}}")
+  templateName: 'helpers/travis-errors'
   classNames: ['error']
   classNameBindings: ['codes']
   attributeBindings: ['style']
diff --git a/app/templates/accounts-list/empty.hbs b/app/templates/accounts-list/empty.hbs
new file mode 100644
index 00000000..0277cf2e
--- /dev/null
+++ b/app/templates/accounts-list/empty.hbs
@@ -0,0 +1 @@
+<div class="loading"><span>Loading</span></div>
diff --git a/app/templates/helpers/label.hbs b/app/templates/helpers/label.hbs
new file mode 100644
index 00000000..411baadd
--- /dev/null
+++ b/app/templates/helpers/label.hbs
@@ -0,0 +1 @@
+{{view.content}}
diff --git a/app/templates/helpers/travis-errors.hbs b/app/templates/helpers/travis-errors.hbs
new file mode 100644
index 00000000..58cb26ef
--- /dev/null
+++ b/app/templates/helpers/travis-errors.hbs
@@ -0,0 +1 @@
+{{#each view.errors}}{{message}}{{/each}}
diff --git a/app/templates/repos-list/empty.hbs b/app/templates/repos-list/empty.hbs
new file mode 100644
index 00000000..0277cf2e
--- /dev/null
+++ b/app/templates/repos-list/empty.hbs
@@ -0,0 +1 @@
+<div class="loading"><span>Loading</span></div>
diff --git a/app/templates/show-more-button.hbs b/app/templates/show-more-button.hbs
new file mode 100644
index 00000000..ac193f34
--- /dev/null
+++ b/app/templates/show-more-button.hbs
@@ -0,0 +1 @@
+{{view.label}}
diff --git a/app/views/accounts-list.coffee b/app/views/accounts-list.coffee
index 3594b904..20871935 100644
--- a/app/views/accounts-list.coffee
+++ b/app/views/accounts-list.coffee
@@ -7,7 +7,7 @@ View = Ember.CollectionView.extend
   tagName: 'ul'
 
   emptyView: Ember.View.extend
-    template: Ember.Handlebars.compile('<div class="loading"><span>Loading</span></div>')
+    templateName: 'accounts-list/empty'
 
   itemViewClass: Ember.View.extend
     accountBinding: 'content'
diff --git a/app/views/repos-list.coffee b/app/views/repos-list.coffee
index 1b10a33e..18cb306e 100644
--- a/app/views/repos-list.coffee
+++ b/app/views/repos-list.coffee
@@ -6,7 +6,7 @@ View = Ember.CollectionView.extend
   tagName: 'ul'
 
   emptyView: Ember.View.extend
-    template: Ember.Handlebars.compile('<div class="loading"><span>Loading</span></div>')
+    templateName: 'repos-list/empty'
 
   itemViewClass: Ember.View.extend
     repoBinding: 'content'
diff --git a/app/views/show-more-button.coffee b/app/views/show-more-button.coffee
index 41edbe71..cb6a7c53 100644
--- a/app/views/show-more-button.coffee
+++ b/app/views/show-more-button.coffee
@@ -6,7 +6,7 @@ View = Ember.View.extend
   showMore: true
   attributeBindings: ['disabled']
   isLoadingBinding: 'controller.isLoading'
-  template: Ember.Handlebars.compile('{{view.label}}')
+  templateName: 'show-more-button'
 
   disabledBinding: 'isLoading'