diff --git a/app/assets/javascripts/waiter/app/views/section_header_view.js.coffee b/app/assets/javascripts/waiter/app/components/section-header.js.coffee
similarity index 71%
rename from app/assets/javascripts/waiter/app/views/section_header_view.js.coffee
rename to app/assets/javascripts/waiter/app/components/section-header.js.coffee
index 3ba1f968..a45ab2c8 100644
--- a/app/assets/javascripts/waiter/app/views/section_header_view.js.coffee
+++ b/app/assets/javascripts/waiter/app/components/section-header.js.coffee
@@ -1,5 +1,5 @@
-App.SectionHeaderView = Ember.View.extend
-  templateName: 'section_header'
+App.SectionHeaderComponent = Ember.Component.extend
+  #templateName: 'section_header'
   tagName: 'dd'
   classNameBindings: ['active']
 
diff --git a/app/assets/javascripts/waiter/app/templates/components/section-header.emblem b/app/assets/javascripts/waiter/app/templates/components/section-header.emblem
new file mode 100644
index 00000000..842d72ce
--- /dev/null
+++ b/app/assets/javascripts/waiter/app/templates/components/section-header.emblem
@@ -0,0 +1,2 @@
+= link-to 'section' section
+  span= title
diff --git a/app/assets/javascripts/waiter/app/templates/section_header.emblem b/app/assets/javascripts/waiter/app/templates/section_header.emblem
deleted file mode 100644
index c55e588f..00000000
--- a/app/assets/javascripts/waiter/app/templates/section_header.emblem
+++ /dev/null
@@ -1,2 +0,0 @@
-= link-to 'section' this
-  = title
diff --git a/app/assets/javascripts/waiter/app/templates/sections.emblem b/app/assets/javascripts/waiter/app/templates/sections.emblem
index c2b7e027..de36d6db 100644
--- a/app/assets/javascripts/waiter/app/templates/sections.emblem
+++ b/app/assets/javascripts/waiter/app/templates/sections.emblem
@@ -1,7 +1,7 @@
 dl.sub-nav
   dt= t 'model.section'
   each model as |section|
-    view App.SectionHeaderView context=section
+    = section-header section=section
   else
     dd No available sections
 hr