diff --git a/app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee b/app/assets/javascripts/supplier/app/components/button/close_list.js.coffee
similarity index 56%
rename from app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee
rename to app/assets/javascripts/supplier/app/components/button/close_list.js.coffee
index 816868bc..27d8e89d 100644
--- a/app/assets/javascripts/supplier/app/views/close_list_button_view.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/button/close_list.js.coffee
@@ -1,7 +1,7 @@
-App.CloseListButtonView = Ember.View.extend
+App.ButtonCloseListComponent = Ember.Component.extend
   templateName: 'close_list_button'
   classNames: ['close-list-button']
   classNameBindings: ['content.active:show:hide']
   tagName: 'button'
   click: (e)->
-    @get('controller').modal 'close_list', model: @get('content')
+    @get('targetObject').modal 'close_list', model: @get('content')
diff --git a/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee b/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee
index cece9719..c3eb5ce5 100644
--- a/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/edit_currency_component.js.coffee
@@ -6,27 +6,27 @@ App.EditCurrencyComponent = Ember.Component.extend
   placeholder: '0.00'
   validatePresence: false
 
-  inputValue: Ember.computed (key, value, previousValue)->
-    key = "value"
-    if arguments.length > 1
+  inputValue: Ember.computed "value",
+    get: ->
+      return_value = @get "value"
+      @set 'has_error', true if @validatePresence and !return_value
+      return_value = return_value.toFixed(2) if typeof return_value is 'number'
+      return_value
+    set: (key, value, previousValue)->
       if value
         # if typeof value is 'number'
         #   return_value = value.toPrecision()
         #   @set key, value
         if typeof value is 'string' and value.match(/^[+-]?\d+(\.?\d?\d)?$/)
           @set 'has_error', false
-          @set key, parseFloat(value)
+          @set "value", parseFloat(value)
         else
           @set 'has_error', true
 
       else
-        @set key, 0.0 # empty
+        @set "value", 0.0 # empty
         @set 'has_error', false
-      return_value = value
-    return_value ||= @get key
-    @set 'has_error', true if @validatePresence and !return_value
-    return_value = return_value.toFixed(2) if typeof return_value is 'number'
-    return_value
+      value
 
   actions:
     action: ->
diff --git a/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee b/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee
deleted file mode 100644
index 8af996d7..00000000
--- a/app/assets/javascripts/supplier/app/components/modal_dialog_component.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-App.ModalDialogComponent = Ember.Component.extend
-  actions:
-    close: ->
-      @sendAction()
diff --git a/app/assets/javascripts/supplier/app/components/sections_header_component.js.coffee b/app/assets/javascripts/supplier/app/components/sections-header.js.coffee
similarity index 72%
rename from app/assets/javascripts/supplier/app/components/sections_header_component.js.coffee
rename to app/assets/javascripts/supplier/app/components/sections-header.js.coffee
index 855accaf..bfc2ca53 100644
--- a/app/assets/javascripts/supplier/app/components/sections_header_component.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/sections-header.js.coffee
@@ -1,11 +1,12 @@
 App.SectionsHeaderComponent = Ember.Component.extend
-  sections: (-> @get('targetObject.store').all('section') ).property()
+  sections: (-> @get('targetObject.store').peekAll('section') ).property()
   actions:
     setSection: (section)->
       if section and section is @get('section')
         # click on already active section
         #return @transitionTo('section', section.id)
-        return App.Router.router.transitionTo('section', section)
+        #return App.Router.router.transitionTo('section', section)
+        return @get('targetObject').transitionToRoute('section', section)
       @$('dd').removeClass('active')
       @$("[data-section=#{if section then section.id else 'all'}]").addClass('active')
       @set('section', section)
diff --git a/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee
index 6225e7e2..e2464728 100644
--- a/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/application_controller.js.coffee
@@ -15,7 +15,7 @@ App.ApplicationController = Ember.Controller.extend
       #@set 'supplier', null
     #@store.find('supplier', 'current').then success, error
     # @set 'supplier', @store.find('supplier', supplier_id)
-  current_employee: (-> @get('employee') ).property('employee')
+  #current_employee: (-> @get('employee') ).property('employee')
   actions:
     signOut: ->
       window.location = Routes.destroy_employee_session_path()
diff --git a/app/assets/javascripts/supplier/app/controllers/employees_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/employees_index_controller.js.coffee
index 0cab3470..f98cd397 100644
--- a/app/assets/javascripts/supplier/app/controllers/employees_index_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/employees_index_controller.js.coffee
@@ -1,3 +1,3 @@
-App.EmployeesIndexController = Ember.ArrayController.extend
+App.EmployeesIndexController = Ember.Controller.extend
   needs: ['application']
   employees: (-> @get('model').sortBy('name')).property('model.@each.name')
diff --git a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee
index e29d442b..04d877b0 100644
--- a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee
@@ -1,4 +1,4 @@
-App.IndexController = Ember.ObjectController.extend
+App.IndexController = Ember.Controller.extend
   needs: ['application']
   show_lists: true
   show_orders: true
diff --git a/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee
index b53a719c..5932250e 100644
--- a/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee
@@ -1,4 +1,4 @@
-App.ListController = Ember.ObjectController.extend
+App.ListController = Ember.Controller.extend
   needs: ['application', 'lists', 'list'] #wtf? list, otherwise an Ember error
   list: (-> @get('model')).property('model')
   showTotal: (->
diff --git a/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee
index d4861ded..c5a7dcfe 100644
--- a/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/lists_index_controller.js.coffee
@@ -1,4 +1,4 @@
-App.ListsIndexController = Ember.ArrayController.extend
+App.ListsIndexController = Ember.Controller.extend
   loading: true
   dateChanged: (->
     @set 'loading', true
diff --git a/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee
index 713c5714..fe88db43 100644
--- a/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee
@@ -1,4 +1,4 @@
-App.MenuController = Ember.ObjectController.extend
+App.MenuController = Ember.Controller.extend
   needs: ['application']
   product_code_filter: ''
   product_categories: (-> @store.all('product_category')).property()
diff --git a/app/assets/javascripts/supplier/app/controllers/modals/base_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modals/base_controller.js.coffee
index c722c533..493cdae5 100644
--- a/app/assets/javascripts/supplier/app/controllers/modals/base_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/modals/base_controller.js.coffee
@@ -1,4 +1,4 @@
-@App.modals.BaseController = Ember.ObjectController.extend
+@App.modals.BaseController = Ember.Controller.extend
   needs: ['application']
   alert_message: ""
   modal_options: {}
diff --git a/app/assets/javascripts/supplier/app/controllers/modals/employee_edit.js.coffee b/app/assets/javascripts/supplier/app/controllers/modals/employee_edit.js.coffee
index 216172d2..cd1a7aab 100644
--- a/app/assets/javascripts/supplier/app/controllers/modals/employee_edit.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/modals/employee_edit.js.coffee
@@ -1,6 +1,6 @@
 App.modals.EmployeeEditController = App.modals.BaseController.extend
   isNotSelf: (->
-    @get('model.id') isnt @get('current_employee.id')
+    @get('model.id') isnt @get('globals.current_employee.id')
   ).property('model.id')
 
   colors: (->
diff --git a/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee
index 5312f5c4..4ca776d7 100644
--- a/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/orders_display_controller.js.coffee
@@ -1,4 +1,4 @@
-App.OrdersDisplayController = Ember.ObjectController.extend
+App.OrdersDisplayController = Ember.Controller.extend
   needs: ['application']
   active_section: null
   sections: (-> @store.all('section') ).property()
diff --git a/app/assets/javascripts/supplier/app/controllers/schedule_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/schedule_controller.js.coffee
index c0936f50..91f5420f 100644
--- a/app/assets/javascripts/supplier/app/controllers/schedule_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/schedule_controller.js.coffee
@@ -1,4 +1,4 @@
-App.ScheduleController = Ember.ArrayController.extend
+App.ScheduleController = Ember.Controller.extend
   event_changed: (event)->
     @store.find('employee-shift', event.id).then (employee_shift)->
       employee_shift.set 'start_from', event.start
diff --git a/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee
index c1b8d4c3..c672ca7f 100644
--- a/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee
@@ -1,4 +1,4 @@
-App.SectionController = Ember.ObjectController.extend
+App.SectionController = Ember.Controller.extend
   needs: ['application', 'sections', 'section'] #wtf? section, otherwise an Ember error
   editmode: false
   actions:
diff --git a/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee
index d67017cd..bf3fe8ac 100644
--- a/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/sections_controller.js.coffee
@@ -1,2 +1,2 @@
-App.SectionsController = Ember.ArrayController.extend
+App.SectionsController = Ember.Controller.extend
   needs: ['application']
diff --git a/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee
index dff8ef54..3434f5c6 100644
--- a/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/sections_index_controller.js.coffee
@@ -1,4 +1,4 @@
-App.SectionsIndexController = Ember.ArrayController.extend
+App.SectionsIndexController = Ember.Controller.extend
   needs: ['application', 'sections', 'index']
   sections: (-> @get('controllers.sections.model')).property('controllers.sections.model')
   sectionQrCodesUrl: ((a,b,c)->
diff --git a/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee
index be8d757a..e477f6d0 100644
--- a/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee
@@ -1,4 +1,4 @@
-App.SettingsController = Ember.ObjectController.extend
+App.SettingsController = Ember.Controller.extend
   needs: ['application']
   # model: (-> @get('controllers.application.supplier')).property('controllers.application.supplier')
   time_zones: (-> window.time_zones ).property()
diff --git a/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee
index 60d0c343..11407997 100644
--- a/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/table_controller.js.coffee
@@ -1,2 +1,2 @@
-App.TableController = Ember.ObjectController.extend
+App.TableController = Ember.Controller.extend
   table: (-> @get('model')).property('model')
diff --git a/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee
index 967b37c1..a939e917 100644
--- a/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/tables_index_controller.js.coffee
@@ -1,4 +1,4 @@
-App.TablesIndexController = Ember.ArrayController.extend
+App.TablesIndexController = Ember.Controller.extend
   needs: ['application']
   tables: (-> @get('model').sortBy('casted_number')).property('model.@each.number')
   actions:
diff --git a/app/assets/javascripts/supplier/app/helpers/can.js.coffee b/app/assets/javascripts/supplier/app/helpers/can.js.coffee
index 59008723..60b25419 100644
--- a/app/assets/javascripts/supplier/app/helpers/can.js.coffee
+++ b/app/assets/javascripts/supplier/app/helpers/can.js.coffee
@@ -1,7 +1,8 @@
-Ember.Handlebars.registerHelper 'can', (operation, resource, options)->
-  #if operation is 'manage' and @get('current_employee.manager')
-  #App.__container__.lookup('globals:current').get('employee.manager')
-  if operation is 'manage' and options.data.view and options.data.view.get('controller.current_employee.manager')
-    options.fn @
+Ember.Handlebars.registerHelper 'can', (permission, resource, options)->
+  if employee = App.__container__.lookup('global:variables').get('current_employee')
+    if permission is "read" or (permission is "manage" and employee.isManager())
+      options.fn @
+    else
+      options.inverse @ if options.inverse
   else
     options.inverse @ if options.inverse
diff --git a/app/assets/javascripts/supplier/app/initializers/current.js.coffee b/app/assets/javascripts/supplier/app/initializers/current.js.coffee
index aad4e8cf..3abc1a06 100644
--- a/app/assets/javascripts/supplier/app/initializers/current.js.coffee
+++ b/app/assets/javascripts/supplier/app/initializers/current.js.coffee
@@ -1,8 +1,10 @@
+Globals = Ember.Object.extend
+  current_employee: null
 App.initializer
   name: 'injectCurrent'
   initialize: (container, app)->
-    container.optionsForType 'globals', instantiate: false, singleton: true
-    container.register 'globals:current', Em.Object.create()
+    #container.optionsForType 'globals', instantiate: false, singleton: true
+    app.register 'global:variables', Globals, singleton: true
 
-    container.typeInjection 'controller', 'current', 'globals:current'
-    container.typeInjection 'route', 'current', 'globals:current'
+    app.inject 'controller', 'globals', 'global:variables'
+    app.inject 'route', 'globals', 'global:variables'
diff --git a/app/assets/javascripts/supplier/app/models/employee.js.coffee b/app/assets/javascripts/supplier/app/models/employee.js.coffee
index 367e06a3..877e1608 100644
--- a/app/assets/javascripts/supplier/app/models/employee.js.coffee
+++ b/app/assets/javascripts/supplier/app/models/employee.js.coffee
@@ -7,6 +7,8 @@ App.Employee= DS.Model.extend Ember.Validations.Mixin,
   color: attr 'string', defaultValue: '#3a87ad'
   employee_shifts: DS.hasMany('employee-shift')
 
+  isManager: -> @get('manager')
+
   validations:
     name: {presence: true}
     email: {format: /.+@.+\..{2,4}/}
diff --git a/app/assets/javascripts/supplier/app/modifications/controller_modifications.js.coffee b/app/assets/javascripts/supplier/app/modifications/controller_modifications.js.coffee
index 4c473428..b02268b8 100644
--- a/app/assets/javascripts/supplier/app/modifications/controller_modifications.js.coffee
+++ b/app/assets/javascripts/supplier/app/modifications/controller_modifications.js.coffee
@@ -11,8 +11,6 @@ ControllerExtensions = Ember.Mixin.create
     @send "openModal", name, options
 
   all_sections: (-> @store.all('section')).property()
-  current_employee: (-> @get('controllers.application.employee') ).property('controllers.application.employee')
+  #current_employee: (-> @get('controllers.application.employee') ).property('controllers.application.employee')
 
 Ember.Controller.reopen ControllerExtensions
-Ember.ArrayController.reopen ControllerExtensions
-Ember.ObjectController.reopen ControllerExtensions
diff --git a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb
index 383d9bfe..350002e6 100644
--- a/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb
+++ b/app/assets/javascripts/supplier/app/routes/application_route.js.coffee.erb
@@ -13,8 +13,7 @@ App.ApplicationRoute = Ember.Route.extend
     #@store.find 'order', state: 'active' included in list
   setupController: (controller)->
     controller.set 'supplier', @supplier
-    controller.set 'employee', @employee
-    controller.set 'current.employee', @employee
+    controller.set 'globals.current_employee', @employee
     # @set 'supplier', @store.find('supplier', supplier_id)
     #controller.set 'sections', @sections
     #controller.set 'product_categories', @product_categories
diff --git a/app/assets/javascripts/supplier/app/templates/_list_content.emblem b/app/assets/javascripts/supplier/app/templates/_list_content.emblem
index 37592de0..c12dc249 100644
--- a/app/assets/javascripts/supplier/app/templates/_list_content.emblem
+++ b/app/assets/javascripts/supplier/app/templates/_list_content.emblem
@@ -11,7 +11,7 @@ if list.closed_at
     =state 'list' list.state
 .display-row
   .display-label  
-  .display-field= view "close-list-button" content=list
+  .display-field= button-close-list content=list
 .user-info-container
   each user in list.users
     =user.avatar_tag
diff --git a/app/assets/javascripts/supplier/app/templates/active_list.emblem b/app/assets/javascripts/supplier/app/templates/active_list.emblem
index 2739d009..fb28c412 100644
--- a/app/assets/javascripts/supplier/app/templates/active_list.emblem
+++ b/app/assets/javascripts/supplier/app/templates/active_list.emblem
@@ -19,6 +19,7 @@ td.actions
   /= view "mark-list-helped-button" content=view.content
   = button-mark-list-helped content=view.content
   /= view "remove-list-needs-payment" content=view.content
-  = view "close-list-button" content=view.content
+  /= view "close-list-button" content=view.content
+  = button-close-list content=view.content
 
   button.show-list.button{action "showList" view.content.id}: span
diff --git a/app/assets/javascripts/supplier/app/templates/application.emblem b/app/assets/javascripts/supplier/app/templates/application.emblem
index de28b901..f3d5ebc4 100644
--- a/app/assets/javascripts/supplier/app/templates/application.emblem
+++ b/app/assets/javascripts/supplier/app/templates/application.emblem
@@ -4,5 +4,5 @@ else
   = partial "global/top_menu"
   = partial "global/side_menu"
   .main-section= outlet
-  = view flash_message
-  = outlet modal
+  = view "flash_message"
+  = outlet "modal"
diff --git a/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem b/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem
index c251772a..73bd1813 100644
--- a/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem
+++ b/app/assets/javascripts/supplier/app/templates/components/language-switcher-button.emblem
@@ -1 +1 @@
-= flag locale
+= flag view.locale
diff --git a/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem b/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem
index 1296ac56..6fba9d5c 100644
--- a/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem
+++ b/app/assets/javascripts/supplier/app/templates/components/language-switcher.emblem
@@ -1,2 +1,2 @@
 each locale in locales
-  view language-switcher-button locale=locale
+  view "language-switcher-button" locale=locale
diff --git a/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem b/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem
index 7726e4ef..03f0206e 100644
--- a/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem
+++ b/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem
@@ -13,7 +13,7 @@ if editMode
       a.save-product-action{action "save"}: span
   .row
     .small-3.columns= t 'attributes.product.active'
-    .small-9.columns: view boolean-switch value=product.active
+    .small-9.columns: view "boolean-switch" value=product.active
   .row.menu-product-container
     .small-12.medium-6.columns
       = descriptionPlaceholder
diff --git a/app/assets/javascripts/supplier/app/templates/modal.emblem b/app/assets/javascripts/supplier/app/templates/modal.emblem
deleted file mode 100644
index 7bd6e23d..00000000
--- a/app/assets/javascripts/supplier/app/templates/modal.emblem
+++ /dev/null
@@ -1,4 +0,0 @@
-modal-dialog action="close"
-  h3.flush--top Alert
-  p= body
-  button{action "close"} Done
diff --git a/app/assets/javascripts/supplier/app/templates/page.emblem b/app/assets/javascripts/supplier/app/templates/page.emblem
index 1e861fd6..ea674fe1 100644
--- a/app/assets/javascripts/supplier/app/templates/page.emblem
+++ b/app/assets/javascripts/supplier/app/templates/page.emblem
@@ -1,4 +1,4 @@
 .row: .small-12.columns
   h2=model.title
   /= page-body model.body
-  view page-body templateBody=model.body
+  view "page-body" templateBody=model.body
diff --git a/app/assets/javascripts/supplier/app/templates/section.emblem b/app/assets/javascripts/supplier/app/templates/section.emblem
index 5048291f..69859cf3 100644
--- a/app/assets/javascripts/supplier/app/templates/section.emblem
+++ b/app/assets/javascripts/supplier/app/templates/section.emblem
@@ -24,5 +24,4 @@
           li= qr-codes-link section=content: span.qr-icon= t 'table.print_qr_codes'
           li: a.section-destroy{action "destroySection"}: span.section-remove-icon=t 'helpers.links.destroy'
       a.section-edit-mode-button{ action "makeEditable" }: span
-= view "section-tables" contentBinding="tables"
-
+= view "section-tables" content=model.tables
diff --git a/app/assets/javascripts/supplier/app/templates/section/table.emblem b/app/assets/javascripts/supplier/app/templates/section/table.emblem
index 1a635faf..a5359aeb 100644
--- a/app/assets/javascripts/supplier/app/templates/section/table.emblem
+++ b/app/assets/javascripts/supplier/app/templates/section/table.emblem
@@ -1,23 +1,24 @@
-.table-number= table.number
+.table-number= view.content.number
 unless editmode
   .status-icons
     span.needs_payment
     span.needs_help
     span.active_order
-if table.active_list
+if view.content.active_list
   div.table-actions
     .title= table.number
-    if table.active_list
+    if view.content.active_list
       .table-action-row
-        /= view "mark-list-helped-button" contentBinding="table.active_list"
-        = button-mark-list-helped content=table.active_list
-        = view "close-list-button" contentBinding="table.active_list"
-    each order in table.active_list.active_orders
+        /= view "mark-list-helped-button" view.contentBinding="table.active_list"
+        = button-mark-list-helped content=view.content.active_list
+        /= view "close-list-button" view.contentBinding="table.active_list"
+        = button-close-list content=view.content.active_list
+    each order in view.content.active_list.active_orders
       .table-action-row= order.display_tag
     .table-action-row.total
-      = link-to "list" table.active_list
-        =currency table.active_list.total
+      = link-to "list" view.content.active_list
+        =currency view.content.active_list.total
     /.table-action-row
       a{action "editTable" table}: span.fa.fa-lg.fa-wrench
-    each user in table.active_list.users
+    each user in view.content.active_list.users
       = user.avatar_tag
diff --git a/app/assets/javascripts/supplier/app/templates/section/tables.emblem b/app/assets/javascripts/supplier/app/templates/section/tables.emblem
index 3a88396a..43320a44 100644
--- a/app/assets/javascripts/supplier/app/templates/section/tables.emblem
+++ b/app/assets/javascripts/supplier/app/templates/section/tables.emblem
@@ -1,6 +1,6 @@
-each section_element in section_elements
+each section_element in view.section_elements
   view "section-element" content=section_element
-each section_area in section_areas
+each section_area in view.section_areas
   = section-area section_area=section_area
-each table in tables
+each table in view.tables
   = view "section-table" content=table