diff --git a/Gemfile b/Gemfile
index 871398b9..af8fd368 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,7 +48,7 @@ gem 'couch_potato' , github: 'bterkuile/couch_potato'
 gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored'
 gem 'orm_adapter', github: 'bterkuile/orm_adapter'
 gem 'devise' #, '3.1.0' #, '2.0.4'
-gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
+#gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
 gem "omniauth-facebook"
 gem 'simple_form'
 gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
diff --git a/Gemfile.lock b/Gemfile.lock
index 58e9431b..9855102e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,13 +16,6 @@ GIT
       couchbase-docstore (>= 0.1.2)
       couchbase-settings (>= 0.1.0)
 
-GIT
-  remote: git://github.com/bterkuile/devise_simply_stored.git
-  revision: 8fdaed396a7e9566fe6cb59b64d950953c8506a6
-  specs:
-    devise_simply_stored (0.1.0)
-      devise
-
 GIT
   remote: git://github.com/bterkuile/orm_adapter.git
   revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450
@@ -37,6 +30,7 @@ PATH
       email_validator
       haml-rails
       jquery-rails
+      rails (>= 4.1.0)
       slim-rails
       tinymce-rails
 
@@ -90,7 +84,7 @@ GEM
       barber (>= 0.4.1)
       emblem-source
     bcrypt (3.1.7)
-    bourbon (3.2.0)
+    bourbon (3.2.1)
       sass (~> 3.2)
       thor
     builder (3.2.2)
@@ -160,7 +154,7 @@ GEM
       handlebars-source
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (1.5.0)
+    ember-source (1.5.1.1)
       handlebars-source (~> 1.0)
     emblem-rails (0.2.1)
       barber-emblem (~> 0.1.1)
@@ -184,10 +178,10 @@ GEM
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.3.0)
-    faye-websocket (0.7.2)
+    faye-websocket (0.7.3)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.3.1)
-    font-awesome-rails (4.0.3.1)
+    font-awesome-rails (4.0.3.2)
       railties (>= 3.2, < 5.0)
     foundation-rails (5.2.2.0)
       railties (>= 3.1.0)
@@ -237,7 +231,7 @@ GEM
       subexec (~> 0.2.1)
     mini_portile (0.5.3)
     minitest (5.3.3)
-    multi_json (1.9.2)
+    multi_json (1.9.3)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.1)
@@ -368,7 +362,7 @@ GEM
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
-    websocket-driver (0.3.2)
+    websocket-driver (0.3.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yaji (0.3.5)
@@ -388,7 +382,6 @@ DEPENDENCIES
   couchbase-structures!
   database_cleaner
   devise
-  devise_simply_stored!
   ember-rails
   ember-source
   emblem-rails
diff --git a/app/assets/images/icons/order-check.png b/app/assets/images/icons/order-check.png
index 719338eb..a4ff69da 100644
Binary files a/app/assets/images/icons/order-check.png and b/app/assets/images/icons/order-check.png differ
diff --git a/app/assets/images/icons/order-check.svg b/app/assets/images/icons/order-check.svg
index 1975595b..c991a9f8 100644
--- a/app/assets/images/icons/order-check.svg
+++ b/app/assets/images/icons/order-check.svg
@@ -351,16 +351,6 @@
        y1="73.737183"
        x2="86.24353"
        y2="2.4637082" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3871"
-       id="linearGradient3891"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
-       x1="8"
-       y1="73.737183"
-       x2="86.24353"
-       y2="2.4637082" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -370,8 +360,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="4.6911765"
-     inkscape:cx="50.233542"
-     inkscape:cy="82.053291"
+     inkscape:cx="12.503135"
+     inkscape:cy="73.526645"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -379,7 +369,7 @@
      inkscape:window-height="856"
      inkscape:window-x="4"
      inkscape:window-y="0"
-     inkscape:window-maximized="0">
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid2994"
@@ -410,10 +400,11 @@
        transform="translate(-0.85266458,-1.9184948)"
        inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/order-check.png"
        inkscape:export-xdpi="24.829473"
-       inkscape:export-ydpi="24.829473">
+       inkscape:export-ydpi="24.829473"
+       style="fill:#000000;fill-opacity:1">
       <path
          transform="matrix(1.0491242,0,0,1.0491242,2.5076726,905.23429)"
-         style="opacity:0.65158374;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3895)"
+         style="opacity:0.65158373999999997;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3895)"
          d="m 20,42.362183 10,10 30,-30 10,10 -40,40 -20,-20 z"
          id="path3881"
          inkscape:connector-curvature="0"
@@ -423,7 +414,7 @@
          inkscape:connector-curvature="0"
          id="path2996"
          d="M 23.490157,949.67748 33.981399,960.16872 65.455125,928.695 75.946367,939.18624 33.981399,981.15121 12.998915,960.16872 z"
-         style="fill:url(#linearGradient3891);fill-opacity:1;stroke:none" />
+         style="fill:#000000;fill-opacity:1;stroke:none" />
     </g>
     <path
        sodipodi:type="inkscape:offset"
diff --git a/app/assets/images/icons/order-doublecheck.png b/app/assets/images/icons/order-doublecheck.png
index c69f078e..63f6f766 100644
Binary files a/app/assets/images/icons/order-doublecheck.png and b/app/assets/images/icons/order-doublecheck.png differ
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 e5c27a30..55ffee61 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,8 +1,9 @@
 Qsupplier.App.ListsIndexController = Ember.ArrayController.extend
+  loading: true
   dateChanged: (->
-    if @get('date')
-      @set('model', @store.find('list', date: @get('date')))
-    else
-      @set('model', @store.find('list'))
+    @set 'loading', true
+    lists = if @get('date') then @store.find('list', date: @get('date')) else @store.find('list')
+    lists.then => @set('loading', false)
+    @set 'model', lists
   ).observes('date')
   lists: (-> @get('model')).property('model')
diff --git a/app/assets/javascripts/supplier/app/templates/active_order.emblem b/app/assets/javascripts/supplier/app/templates/active_order.emblem
index bb0afd75..93fcc2a5 100644
--- a/app/assets/javascripts/supplier/app/templates/active_order.emblem
+++ b/app/assets/javascripts/supplier/app/templates/active_order.emblem
@@ -2,22 +2,22 @@ td.status-icons
   span.active-order.fa.fa-check.fa-lg
 td {{view.content.display}}
 td.numeric.table_number
-  view Qsupplier.App.ActiveOrderTableNumberView contextBinding=view.content
+  view Qsupplier.App.ActiveOrderTableNumberView contextBinding="view.content"
 td.section_title {{view.content.section.title}}
 td.currency {{currency view.content.total }}
 td.actions
   if view.content.placed
-    button.mark_order_active{ action markOrderActive view.content.id}
+    /button.mark_order_active{ action markOrderActive view.content.id}
       span.fa.fa-check.fa-2x
-      span.button-text=t 'order.being_processed'
-    button.hide.mark-order-active{ action markOrderActive view.content.id}
+      /span.button-text=t 'order.being_processed'
+    /button.hide.mark-order-active{ action markOrderActive view.content.id}
       span.button-icon
       span.button-text=t 'order.being_processed'
-  button.mark_order_delivered{ action markOrderDelivered view.content.id}
+  /button.mark_order_delivered{ action markOrderDelivered view.content.id}
     span.fa-shifted-stack
-      i.fa.fa-check.fa-2x
-      i.fa.fa-check.fa-2x
-    span.button-text= t 'order.being_served'
-  button.hide.mark-order-delivered{ action markOrderDelivered view.content.id}
+      i.fa.fa-check.fa-stack-2x
+      i.fa.fa-check.fa-stack-2x
+    /span.button-text= t 'order.being_served'
+  /button.hide.mark-order-delivered{ action markOrderDelivered view.content.id}
     span.button-icon
     span.button-text= t 'order.being_served'
diff --git a/app/assets/javascripts/supplier/app/templates/lists/index.emblem b/app/assets/javascripts/supplier/app/templates/lists/index.emblem
index a5aff500..e1805e72 100644
--- a/app/assets/javascripts/supplier/app/templates/lists/index.emblem
+++ b/app/assets/javascripts/supplier/app/templates/lists/index.emblem
@@ -25,4 +25,8 @@ if lists
           td.timestamp=time list.created_at
 else
   .row
-    .panel=t 'list.none_found'
+    .panel
+      if loading
+        span.loading
+      else
+        =t 'list.none_found'
diff --git a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass
index 38704154..76cc4e5f 100644
--- a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass
+++ b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass
@@ -24,11 +24,13 @@ span.icon
   background-image: image-url('icons/order-doublecheck.png')
 
 .fa-shifted-stack
+  @extend .fa-stack
+//.fa-shifted-stack
   position: relative
   display: inline-block
   width: 2.5em
   height: 2em
-  line-height: 2em
+  //line-height: 2em
   vertical-align: middle
   .fa
     position: absolute
diff --git a/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass b/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass
index 51f64c9b..3eed2242 100644
--- a/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass
+++ b/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass
@@ -50,3 +50,8 @@ main.main-section
 
 .hide, .hidden
   display: none
+span.loading
+  @extend .fa
+  @extend .fa-spinner
+  @extend .fa-lg
+  @extend .fa-spin
diff --git a/app/models/list.rb b/app/models/list.rb
index 3c3f802f..dc6229ab 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -209,6 +209,7 @@ class List
         #order.section_id = self.section_id
         #order.save
       #end
+      # user performs a client side refresh
       broadcast_users 'list_changed_table', list_id: id #, from_table_id: from_table, to_table_id: to_table.id
       broadcast_supplier supplier_id, 'list_changed_table', list: as_json, section_title: to_table.section.try(:title), from_table_id: from_table
     end
diff --git a/app/views/suppliers/lists/show.html.slim b/app/views/suppliers/lists/show.html.slim
index e70042d7..a8c6b0a6 100644
--- a/app/views/suppliers/lists/show.html.slim
+++ b/app/views/suppliers/lists/show.html.slim
@@ -35,3 +35,8 @@
     /jQuery(function(){
       /Qsupplier.load_list('#{@list.id}');
     /})
+.test-div
+  span.fa.fa-square-o.fa-2x
+  span.fa-stack
+    i.fa.fa-square-o.fa-stack-2x
+    i.fa.fa-twitter.fa-stack-1x