diff --git a/gui/dashboard/app.svelte b/gui/dashboard/app.svelte
index 3db1db5..5befafa 100644
--- a/gui/dashboard/app.svelte
+++ b/gui/dashboard/app.svelte
@@ -2,11 +2,16 @@
   import { onMount } from 'svelte';
   import TileRawValue from './tile-rawvalue.svelte';
   import Settings from './settings.svelte';
+  //import { flip } from 'svelte/animate';
+  //import { shuffle } from './lib';
 
+  //const [ send, receive ] = shuffle;
   const size = 3 * 4;
   let lastUpdated = new Date();
   let lastUpdatedFormatted = '';
-  let services = [];
+  let servicesUp = [];
+  let servicesDown = [];
+  let servicesUnknown = [];
   let pageNum = -1;
 
   function tileProps(service) {
@@ -21,7 +26,7 @@
       props.color = 'grey';
       props.sort = 20;
     }
-    if (service.lastBeat.down) {
+    else if (service.lastBeat.down) {
       props.value = 'down';
       props.color = 'red';
       props.sort = 0;
@@ -50,24 +55,7 @@
           break;
 
         case 'data':
-          const tempServices = [];
-          const d = data.data;
-          const ids = Object.keys(d);
-          ids.sort((a, b) => tileProps(d[a]).sort - tileProps(d[b]).sort);
-
-          if ((ids.length > size) || (pageNum === -1)) {
-            pageNum++;
-          }
-
-          if (pageNum * size >= ids.length) {
-            pageNum = 0;
-          }
-
-          for (let i = pageNum * size; (i < ids.length) && (i < size + size * pageNum); i++) {
-            tempServices.push(d[ids[i]]);
-          }
-
-          services = tempServices;
+          ({ servicesUp, servicesDown, servicesUnknown } = data);
           break;
 
         default:
@@ -84,9 +72,25 @@
     <div class="tiles">
       <TileRawValue title="Last updated" value={lastUpdatedFormatted} />
 
-      {#each services as service}
+      {#each servicesDown as service (service.id)}
         <TileRawValue {...tileProps(service)} />
       {/each}
+      {#each servicesUp as service (service.id)}
+        <TileRawValue {...tileProps(service)} />
+      {/each}
+      {#each servicesUnknown as service (service.id)}
+        <TileRawValue {...tileProps(service)} />
+      {/each}
+
+      <!--{#each services as service (service.id)}
+        <div
+          in:receive={{ key: service.id }}
+          out:send={{ key: service.id }}
+          animate:flip
+        >
+          <TileRawValue {...tileProps(service)} />
+        </div>
+      {/each}-->
     </div>
   </div>
 </div>
diff --git a/gui/dashboard/lib.js b/gui/dashboard/lib.js
new file mode 100644
index 0000000..540e7b2
--- /dev/null
+++ b/gui/dashboard/lib.js
@@ -0,0 +1,38 @@
+import { get, writable } from 'svelte/store';
+//import { quintOut } from 'svelte/easing';
+//import { crossfade } from 'svelte/transition';
+
+function createSettingsStore() {
+  const s = writable(0);
+
+  function updateStorage(val) {
+    window.localStorage.setItem('statusdash', JSON.stringify(val));
+    s.set(val);
+  }
+
+  return {
+    subscribe: s.subscribe,
+    set: val => updateStorage(val),
+    update: val => updateStorage({ ...get(s), val }),
+  };
+}
+
+export const settings = createSettingsStore();
+
+/*
+export const shuffle = crossfade({
+  fallback(node) {
+    const style = getComputedStyle(node);
+    const transform = style.transform === 'none' ? '' : style.transform;
+
+    return {
+      duration: 600,
+      easing: quintOut,
+      css: t => `
+        transform: ${transform} scale(${t});
+        opacity: ${t}
+      `,
+    };
+  },
+});
+*/
diff --git a/gui/dashboard/settings.svelte b/gui/dashboard/settings.svelte
index 3cb06ff..5a8a2e8 100644
--- a/gui/dashboard/settings.svelte
+++ b/gui/dashboard/settings.svelte
@@ -1,6 +1,6 @@
 <script>
   import Modal from './modal.svelte';
-  import { settings } from './stores';
+  import { settings } from './lib';
   import { onMount } from 'svelte';
   import { get } from 'svelte/store';
 
diff --git a/gui/dashboard/stores.js b/gui/dashboard/stores.js
deleted file mode 100644
index 244ec7f..0000000
--- a/gui/dashboard/stores.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { get, writable } from 'svelte/store';
-
-function createSettingsStore() {
-  const s = writable(0);
-
-  function updateStorage(val) {
-    window.localStorage.setItem('statusdash', JSON.stringify(val));
-    s.set(val);
-  }
-
-  return {
-    subscribe: s.subscribe,
-    set: val => updateStorage(val),
-    update: val => updateStorage({ ...get(s), val }),
-  };
-}
-
-export const settings = createSettingsStore();
diff --git a/lib/dashboard/socket.js b/lib/dashboard/socket.js
index 8716b45..45cb84d 100644
--- a/lib/dashboard/socket.js
+++ b/lib/dashboard/socket.js
@@ -5,6 +5,13 @@ const { makeId } = require('core/makeid');
 const decoder = new TextDecoder('utf-8');
 let uws;
 
+const mapService = (s, beat) => ({
+  id: s.id,
+  name: s.name,
+  cluster: s.cluster,
+  lastBeat: beat,
+});
+
 async function createDashboardSocket(server) {
   uws = server.ws({
     route: '/statusdashboard/socket',
@@ -34,21 +41,33 @@ async function createDashboardSocket(server) {
           .find({ webservice: { $in: services.map(s => s.id) } })
           .sort({ date: -1 })
           .toArray();
-        const mappedServices = {};
 
-        for (const s of services) {
-          const lastBeat = heartbeats.find(h => h.webservice === s.id);
-          mappedServices[s.id] = {
-            name: s.name,
-            lastBeat: lastBeat || {},
-            cluster: s.cluster,
-          };
+        const servicesUp = [];
+        const servicesDown = [];
+        const servicesUnknown = [];
+        console.log(heartbeats);
+
+        for (let service of services) {
+          const beat = heartbeats.find(b => b.webservice === service.id);
+          service = mapService(service, beat);
+
+          if (!beat) {
+            servicesUnknown.push(service);
+          }
+          else if (beat.down) {
+            servicesDown.push(service);
+          }
+          else {
+            servicesUp.push(service);
+          }
         }
 
         try {
           ws.send(JSON.stringify({
             cmd: 'data',
-            data: mappedServices,
+            servicesUp,
+            servicesDown,
+            servicesUnknown,
           }));
         }
         catch {