diff --git a/app/assets/javascripts/user/app/models/list.js.coffee b/app/assets/javascripts/user/app/models/list.js.coffee
index 3fa42301..cdfef1c9 100644
--- a/app/assets/javascripts/user/app/models/list.js.coffee
+++ b/app/assets/javascripts/user/app/models/list.js.coffee
@@ -10,11 +10,13 @@ App.List = DS.Model.extend
   extended_version: attr('boolean')
   supplier_orders_in_process_count: attr('number')
   supplier_orders_placed_count: attr('number')
+  cached_supplier_name: attr('string')
 
   supplier: DS.belongsTo('supplier')
   table: DS.belongsTo('table')
   join_requests: DS.hasMany('join_request')
   users: DS.hasMany('user')
+  supplier_name: (-> @get('cached_supplier_name') or @get('supplier.name')).property('cached_supplier_name', 'supplier.name')
 
   is_extended_version: ->
     @get('extended_version')
diff --git a/app/assets/javascripts/user/app/modules/reset_scroll.js.coffee b/app/assets/javascripts/user/app/modules/reset_scroll.js.coffee
new file mode 100644
index 00000000..37494100
--- /dev/null
+++ b/app/assets/javascripts/user/app/modules/reset_scroll.js.coffee
@@ -0,0 +1,4 @@
+App.ResetScroll = Ember.Mixin.create
+  activate: ->
+    @_super()
+    window.scrollTo 0, 0
diff --git a/app/assets/javascripts/user/app/routes/active_list_route.js.coffee b/app/assets/javascripts/user/app/routes/active_list_route.js.coffee
index 2827dc3d..2881aa4b 100644
--- a/app/assets/javascripts/user/app/routes/active_list_route.js.coffee
+++ b/app/assets/javascripts/user/app/routes/active_list_route.js.coffee
@@ -1,4 +1,4 @@
-App.ActiveListRoute = Ember.Route.extend {}
+App.ActiveListRoute = Ember.Route.extend App.ResetScroll
   #model: ->
     #@get('controllers.application.list')
   #afterModel: ->
diff --git a/app/assets/javascripts/user/app/routes/index_route.js.coffee b/app/assets/javascripts/user/app/routes/index_route.js.coffee
new file mode 100644
index 00000000..4480cf4d
--- /dev/null
+++ b/app/assets/javascripts/user/app/routes/index_route.js.coffee
@@ -0,0 +1 @@
+App.IndexRoute = Ember.Route.extend  App.ResetScroll
diff --git a/app/assets/javascripts/user/app/routes/list_route.js.coffee b/app/assets/javascripts/user/app/routes/list_route.js.coffee
index c0bf0904..9fe14bb0 100644
--- a/app/assets/javascripts/user/app/routes/list_route.js.coffee
+++ b/app/assets/javascripts/user/app/routes/list_route.js.coffee
@@ -1,4 +1,4 @@
-App.ListRoute = Ember.Route.extend
+App.ListRoute = Ember.Route.extend App.ResetScroll,
   model: (options)->
     @store.find 'list', options.list_id
   afterModel: (model)->
diff --git a/app/assets/javascripts/user/app/routes/lists_route.js.coffee b/app/assets/javascripts/user/app/routes/lists_route.js.coffee
index 7b8e864f..522742fe 100644
--- a/app/assets/javascripts/user/app/routes/lists_route.js.coffee
+++ b/app/assets/javascripts/user/app/routes/lists_route.js.coffee
@@ -1,4 +1,4 @@
-App.ListsRoute = Ember.Route.extend
+App.ListsRoute = Ember.Route.extend App.ResetScroll,
   model: ->
     @store.find 'list'
   setupController: (controller, model)->
diff --git a/app/assets/javascripts/user/app/templates/lists/list_entry.emblem b/app/assets/javascripts/user/app/templates/lists/list_entry.emblem
index 7da66084..652a1a7d 100644
--- a/app/assets/javascripts/user/app/templates/lists/list_entry.emblem
+++ b/app/assets/javascripts/user/app/templates/lists/list_entry.emblem
@@ -1,3 +1,3 @@
 span.created_at=time list.created_at
 span.price.currency= currency list.price
-span.name= list.supplier.name
+span.name= list.supplier_name
diff --git a/app/assets/javascripts/user/app/views/application_view.js.coffee b/app/assets/javascripts/user/app/views/application_view.js.coffee
index c6c2632c..49fc1e73 100644
--- a/app/assets/javascripts/user/app/views/application_view.js.coffee
+++ b/app/assets/javascripts/user/app/views/application_view.js.coffee
@@ -1,6 +1,6 @@
 App.ApplicationView = Ember.View.extend
   didInsertElement: ->
-    $('.main-section').css 'min-height', ($(window).height() - $('.tab-bar:first').outerHeight())
+    $('.main-section').css 'min-height', $(window).height() - $('.top-menu').outerHeight()
 
     $('.toggle-side-menu,.side-menu').click ->
       menu = $('aside.side-menu')
diff --git a/app/assets/stylesheets/user/foundation/_structure.css.sass b/app/assets/stylesheets/user/foundation/_structure.css.sass
index 5a3cc71c..df72adf5 100644
--- a/app/assets/stylesheets/user/foundation/_structure.css.sass
+++ b/app/assets/stylesheets/user/foundation/_structure.css.sass
@@ -1,8 +1,8 @@
 html, body
-  overflow-x: hidden
   margin: 0
   padding: 0
 body
+  overflow-x: hidden
   @media #{$small-only}
     font-size: 14px
 #ember-app-container
@@ -12,9 +12,11 @@ body
 
 main.main-section
   +panel($bg:rgba(200,200,200,0.8))
-  height: 100%
+  // height: 100%
   padding: 0
   margin: 0
+  .main-section-content
+    min-height: calc(100% - #{$top-menu-height})
 span.icon
   @extend .fa
   @extend .fa-lg
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 36618e4d..88b3fcdb 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -18,7 +18,7 @@ class DashboardController < ApplicationController
     if Rails.env.test?
       @tables = Table.all
     else
-      @tables = (current_supplier || Supplier.first).tables.sample(5) | List.active.map(&:table)
+      @tables = (current_supplier || Supplier.first).tables.sample(5) | List.active.map(&:table) | Supplier.find_by_email('supplier2@mozo.bar').tables.sample(3)
     end
     respond_to do |format|
       format.html { render layout: 'phone' }
diff --git a/app/serializers/user_list_serializer.rb b/app/serializers/user_list_serializer.rb
index b1871764..f8cd233c 100644
--- a/app/serializers/user_list_serializer.rb
+++ b/app/serializers/user_list_serializer.rb
@@ -1,15 +1,21 @@
 class UserListSerializer < Qwaiter::Serializer
   # user ids for facebook pictures
   embed :ids, include: true
-  attributes :state, :needs_help, :needs_payment, :user_requests_closing, :is_paid, :price, :table_id, :table_number, :section_id, :user_ids, :supplier_name, :closed_at, :supplier_id
+  attributes :state, :needs_help, :needs_payment, :user_requests_closing,
+    :is_paid, :price, :table_id, :table_number, :section_id, :user_ids,
+    :cached_supplier_name, :closed_at, :supplier_id, :extended_version
 
   #def has_active_orders
     #object.has_active_orders?
   #end
-  def supplier_name
+  def cached_supplier_name
     object.supplier.name
   end
-  has_many :users, serializer: UserUserSerializer
-  has_many :orders
-  has_one :supplier, serializer: UserSupplierSerializer
+
+  def extended_version
+    false
+  end
+  # has_many :users, serializer: UserUserSerializer
+  # has_many :orders
+  # has_one :supplier, serializer: UserSupplierSerializer
 end
diff --git a/app/views/suppliers/product_categories/_form.html.slim b/app/views/suppliers/product_categories/_form.html.slim
index 8c729752..b16b11da 100644
--- a/app/views/suppliers/product_categories/_form.html.slim
+++ b/app/views/suppliers/product_categories/_form.html.slim
@@ -19,9 +19,13 @@
       = label_tag nil, ProductCategory.human_attribute_name(:week_days), class: 'control-label'
     .form-field.full
       ul#week_days-group.button-group
-        - day_names = week_days.dup; day_names << day_names.shift if current_supplier.week_starts_on_monday?
-        - day_names.each do |day_name|
-          li: button.week-day-toggle.tiny type="button" data-day=day_name data-t="product_category.week_days.abbreviation.#{day_name}"
+        - day_titles = (t('date.day_names') || []).dup
+        - day_names = week_days.dup
+        - if current_supplier.week_starts_on_monday?
+          - day_names << day_names.shift
+          - day_titles << day_titles.shift
+        - day_names.each.with_index do |day_name, i|
+          li: button.week-day-toggle.tiny type="button" data-day=day_name data-t="product_category.week_days.abbreviation.#{day_name}" title=day_titles[i]
 
 
       span#full_day-controller: span