diff --git a/app/assets/javascripts/supplier/app/adapters/application.js.coffee b/app/assets/javascripts/supplier/app/adapters/application.js.coffee
new file mode 100644
index 00000000..7cf86371
--- /dev/null
+++ b/app/assets/javascripts/supplier/app/adapters/application.js.coffee
@@ -0,0 +1,4 @@
+App.ApplicationAdapter = DS.ActiveModelAdapter.extend
+  namespace: 'supplier'
+  headers:
+    "Accept": "application/json, text/javascript; q=0.01"
diff --git a/app/assets/javascripts/supplier/app/application.js.coffee b/app/assets/javascripts/supplier/app/application.js.coffee
index 85fec239..2c56a7ae 100644
--- a/app/assets/javascripts/supplier/app/application.js.coffee
+++ b/app/assets/javascripts/supplier/app/application.js.coffee
@@ -3,6 +3,7 @@
 #= require handlebars
 #= require ember
 #= require ember-data
+#= require active-model-adapter
 #= require ember-validations
 #= require ember-template-compiler
 #= require_directory ./modifications
diff --git a/app/assets/javascripts/supplier/app/components/number-field.js.coffee b/app/assets/javascripts/supplier/app/components/number-field.js.coffee
index 6b48417f..b8c8d2f0 100644
--- a/app/assets/javascripts/supplier/app/components/number-field.js.coffee
+++ b/app/assets/javascripts/supplier/app/components/number-field.js.coffee
@@ -2,12 +2,14 @@ App.NumberFieldComponent = Ember.TextField.extend
   type: 'number'
   attributeBindings: ['min', 'max', 'step']
   focusIn: -> @$().select()
-  numericValue: Ember.computed 'value', (key, value) ->
-    if arguments.length > 1
+  numericValue: Ember.computed 'value',
+    get: ->
+      value = @get 'value'
+      if value? then String(value) else ''
+    set: (key, value)->
       if value?
         setValue = parseFloat(value)
         @set "value", if isFinite(setValue) then setValue else null
       else
         @set 'value', null
-    value = @get 'value'
-    if value? then String(value) else ''
+      value
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 f98cd397..2265442c 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,2 @@
 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 339a9850..4960e64a 100644
--- a/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/index_controller.js.coffee
@@ -1,5 +1,4 @@
 App.IndexController = Ember.Controller.extend
-  needs: ['application']
   show_lists: true
   show_orders: true
   lists: (-> @store.peekAll('list')).property()
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 5932250e..91656c7e 100644
--- a/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/list_controller.js.coffee
@@ -1,5 +1,4 @@
 App.ListController = Ember.Controller.extend
-  needs: ['application', 'lists', 'list'] #wtf? list, otherwise an Ember error
   list: (-> @get('model')).property('model')
   showTotal: (->
     if @get('list.orders.length') && @get('list.orders.length') > 1 then true else false
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 017643be..c24eaf32 100644
--- a/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/menu_controller.js.coffee
@@ -1,5 +1,4 @@
 App.MenuController = Ember.Controller.extend
-  needs: ['application']
   product_code_filter: ''
   product_categories: (-> @store.peekAll('product_category')).property()
   filter: null
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 ecd1738e..a76d195b 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,5 +1,4 @@
 @App.modals.BaseController = Ember.Controller.extend
-  needs: ['application']
   alert_message: ""
   modal_options: {}
   title: (->
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 5954624f..3b1f48f5 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,5 +1,4 @@
 App.OrdersDisplayController = Ember.Controller.extend
-  needs: ['application']
   active_section: null
   sections: (-> @store.peekAll('section') ).property()
   orders: Ember.computed 'model.[]', 'active_section.id', ->
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 29ff1e9a..98352c0b 100644
--- a/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/section_controller.js.coffee
@@ -1,5 +1,5 @@
 App.SectionController = Ember.Controller.extend
-  needs: ['application', 'sections', 'section'] #wtf? section, otherwise an Ember error
+  #needs: ['application', 'sections', 'section'] #wtf? section, otherwise an Ember error
   actions:
     makeEditable: -> @set('model.editmode', true)
     finishEditable: ->
@@ -54,4 +54,6 @@ App.SectionController = Ember.Controller.extend
             section_area.rollback()
   textures: ['wood1', 'wood2']
 
-  sections: (-> @get('controllers.sections.model')).property('controllers.sections.model')
+  #sections: (-> @get('controllers.sections.model')).property('controllers.sections.model')
+  sections_controller: Ember.inject.controller('sections')
+  sections: Ember.computed.alias 'sections_controller.model'
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 bf3fe8ac..cfdfcee4 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 @@
-App.SectionsController = Ember.Controller.extend
-  needs: ['application']
+App.SectionsController = Ember.Controller.extend {}
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 200db8e2..d6a09a01 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,12 +1,9 @@
 App.SectionsIndexController = Ember.Controller.extend
-  needs: ['application', 'sections', 'index']
-  sections: (-> @get('controllers.sections.model')).property('controllers.sections.model')
-  sectionQrCodesUrl: ((a,b,c)->
-    Routes.qr_codes_suppliers_tables_path()
-  ).property()
+  #needs: ['application', 'sections', 'index']
+  #sections: Ember.computed.alias 'controllers.sections.model'
+  sections_controller: Ember.inject.controller('sections')
+  sections: Ember.computed.alias 'sections_controller.model'
   newPath: Routes.new_suppliers_section_path()
-  qrPath: (section_id)->
-    Routes.qr_codes_suppliers_tables_path section_id: section_id
   actions:
     addSection: -> @modal 'add_section', model: @get('model')
     goToSection: (section)->
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 77418803..bc055852 100644
--- a/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee
+++ b/app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee
@@ -1,7 +1,5 @@
 App.SettingsController = Ember.Controller.extend
-  needs: ['application']
   supplier: Ember.computed.alias 'globals.current_supplier'
-  # model: (-> @get('controllers.application.supplier')).property('controllers.application.supplier')
   time_zones: (-> window.time_zones ).property()
   countries: (-> window.countries ).property()
   saving: false
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 a939e917..4851c542 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,5 +1,4 @@
 App.TablesIndexController = Ember.Controller.extend
-  needs: ['application']
   tables: (-> @get('model').sortBy('casted_number')).property('model.@each.number')
   actions:
     newTable: ->
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 0cb6efeb..e7fb1d41 100644
--- a/app/assets/javascripts/supplier/app/modifications/controller_modifications.js.coffee
+++ b/app/assets/javascripts/supplier/app/modifications/controller_modifications.js.coffee
@@ -11,7 +11,6 @@ ControllerExtensions = Ember.Mixin.create
     @send "openModal", name, options
 
   all_sections: (-> @store.peekAll('section')).property()
-  #current_employee: (-> @get('controllers.application.employee') ).property('controllers.application.employee')
 
 Ember.Controller.reopen ControllerExtensions
 Ember.ArrayController.reopen ControllerExtensions # Added for auto generated employeesController Ember 1,13.5
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 dadbbe37..52ca4eaf 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
@@ -1,8 +1,16 @@
 App.ApplicationRoute = Ember.Route.extend
   beforeModel: ->
     # Preload only active lists and orders
-    @supplier = @store.push 'supplier', supplier_object
-    @employee = @store.push 'employee', employee_object
+    @supplier = @store.push
+      data:
+        id: supplier_object.id
+        type: 'supplier'
+        attributes: supplier_object
+    @employee = @store.push
+      data:
+        id: employee_object.id
+        type: 'employee'
+        attributes: employee_object
     #@product_categories = @store.findAll 'product_category'
     #@sections = @store.findAll 'section'
     #Ember.RSVP.all([@product_categories, @sections]).then (results)=>
diff --git a/app/assets/javascripts/supplier/app/store.js.coffee b/app/assets/javascripts/supplier/app/store.js.coffee
index 6400d6d7..91ceef32 100644
--- a/app/assets/javascripts/supplier/app/store.js.coffee
+++ b/app/assets/javascripts/supplier/app/store.js.coffee
@@ -1,12 +1,12 @@
 App.ApplicationSerializer = DS.ActiveModelSerializer
 
-App.ApplicationStore = DS.Store
+#App.ApplicationStore = DS.Store
 #adapter: DS.ActiveModelAdapter.extend
   #namespace: 'supplier'
   ## user underscored paths
   #pathForType: (type)->
     #Ember.String.pluralize(Ember.String.decamelize(type))
-App.ApplicationAdapter = DS.ActiveModelAdapter.extend
-  namespace: 'supplier'
-  headers:
-    "Accept": "application/json, text/javascript; q=0.01"
+#App.ApplicationAdapter = DS.ActiveModelAdapter.extend
+#  namespace: 'supplier'
+#  headers:
+#    "Accept": "application/json, text/javascript; q=0.01"
diff --git a/app/assets/javascripts/supplier/app/templates/modals/section_add_tables.emblem b/app/assets/javascripts/supplier/app/templates/modals/section_add_tables.emblem
index 7325bbef..ea3d3885 100644
--- a/app/assets/javascripts/supplier/app/templates/modals/section_add_tables.emblem
+++ b/app/assets/javascripts/supplier/app/templates/modals/section_add_tables.emblem
@@ -5,12 +5,12 @@ form.form-horizontal
     .form-label
       label for='add-tables-number-start'
         =t 'section.add_tables.modal.number_start'
-    .form-field= number-field value=number_start
+    .form-field= number-field numericValue=number_start
   .form-row
     .form-label
       label for='add-tables-number-end'
         =t 'section.add_tables.modal.number_end'
-    .form-field= number-field value=number_end
+    .form-field= number-field numericValue=number_end
 hr
 button.modal-close{action "close"}=t 'section.add_tables.modal.close_button'
 button.modal-confirm.right{action "addTables"}=t 'section.add_tables.modal.add_button'
diff --git a/app/assets/stylesheets/supplier/foundation1/_qstructure.sass b/app/assets/stylesheets/supplier/foundation1/_qstructure.sass
index f791a141..da542f72 100644
--- a/app/assets/stylesheets/supplier/foundation1/_qstructure.sass
+++ b/app/assets/stylesheets/supplier/foundation1/_qstructure.sass
@@ -16,7 +16,6 @@ header.top-menu
   .main-section
     @media #{$xlarge-up}
       padding-top: 130px
-      min-height: 900px
   .main-section-header
     position: fixed
     top: 90px