diff --git a/app/assets/javascripts/supplier/app/components/schedule_view.js.coffee b/app/assets/javascripts/supplier/app/components/schedule.js.coffee
similarity index 100%
rename from app/assets/javascripts/supplier/app/components/schedule_view.js.coffee
rename to app/assets/javascripts/supplier/app/components/schedule.js.coffee
diff --git a/app/assets/javascripts/supplier/app/models/employee-shift.js.coffee b/app/assets/javascripts/supplier/app/models/employee-shift.js.coffee
index d76db434..70fa408b 100644
--- a/app/assets/javascripts/supplier/app/models/employee-shift.js.coffee
+++ b/app/assets/javascripts/supplier/app/models/employee-shift.js.coffee
@@ -5,13 +5,12 @@ App.EmployeeShift = DS.Model.extend
   description: attr('string')
   employee: DS.belongsTo 'employee', async: false
   supplier: DS.belongsTo 'supplier', async: false
-  calendar_event: (->
+  calendar_event: Ember.computed 'start_from', 'end_on', 'title', 'employee.color', ->
     id: @id
     title: @get('title')
     start: @get('start_from')
     end: @get('end_on')
     color: @get('employee.color')
-  ).property('start_from', 'end_on', 'title')
 
   title: Ember.computed 'employee.name', 'description', ->
     if @get('description')
diff --git a/app/assets/javascripts/supplier/app/routes/employees.js.coffee b/app/assets/javascripts/supplier/app/routes/employees.js.coffee
index e7038425..6e8d9ee9 100644
--- a/app/assets/javascripts/supplier/app/routes/employees.js.coffee
+++ b/app/assets/javascripts/supplier/app/routes/employees.js.coffee
@@ -1,2 +1,2 @@
 App.EmployeesRoute = Ember.Route.extend App.EmployeeActionsMixin,
-  model: ->  @store.findAll 'employee'
+  model: ->  @store.findAll 'employee', reload: false
diff --git a/app/assets/javascripts/supplier/app/routes/schedule_route.js.coffee b/app/assets/javascripts/supplier/app/routes/schedule.js.coffee
similarity index 56%
rename from app/assets/javascripts/supplier/app/routes/schedule_route.js.coffee
rename to app/assets/javascripts/supplier/app/routes/schedule.js.coffee
index 24cb582c..1004a0d5 100644
--- a/app/assets/javascripts/supplier/app/routes/schedule_route.js.coffee
+++ b/app/assets/javascripts/supplier/app/routes/schedule.js.coffee
@@ -1,2 +1,4 @@
 App.ScheduleRoute = Ember.Route.extend
+  beforeModel: ->
+    @store.findAll 'employee', reload: false
   model: -> @store.findAll 'employee-shift'
diff --git a/app/controllers/suppliers/employee_shifts_controller.rb b/app/controllers/suppliers/employee_shifts_controller.rb
index f3beb0cf..0364499c 100644
--- a/app/controllers/suppliers/employee_shifts_controller.rb
+++ b/app/controllers/suppliers/employee_shifts_controller.rb
@@ -2,19 +2,19 @@ module Suppliers
   class EmployeeShiftsController < Suppliers::ApplicationController
     def index
       @employee_shifts = EmployeeShift.for_supplier(current_supplier, relevant_from: 1.week.ago)
-      @employee_shifts.include_relations(:employee, :supplier)
+      #@employee_shifts.include_relations(:employee, :supplier)
       # Only select shifts from currently linked and employees
       @employee_shifts.select! do |shift|
         return false unless current_supplier.employee_ids.include?(shift.employee.try(:id))
         shift.employee.enrich_with_settings current_supplier.settings_for(shift.employee)
         true
       end
-      render json: @employee_shifts, include: %w[employee]
+      render json: @employee_shifts
     end
     def create
       @employee_shift.supplier = current_supplier
       @employee_shift.save
-      render json: @employee_shift, include: %w[employee]
+      render json: @employee_shift
     end
 
     def update
diff --git a/wip.md b/wip.md
index f333925d..d6d883b7 100644
--- a/wip.md
+++ b/wip.md
@@ -3,15 +3,12 @@ Release
 
 Release todos:
 --------------
-- Drag drop on tablet persisting
-- Release android version of MozoUser
 - Printer paperclip 5 minute setup story
-- Maybe responsive supplier dashboard
 - facebook api integration on homepage share picture and js
 - Signup explanation better and link to current supplier when already
   signed in
 - Add got it button to bottom of supplier User info modal
-- User move table alert flash_message
+- User move table alert flash_message for suppliers
 - When an employee schedule is added the color is not immediate taken
   from the selected employee
 - User app authorizations