diff --git a/gui/dashboard/app.svelte b/gui/dashboard/app.svelte
index 0e13d8c..2207bef 100644
--- a/gui/dashboard/app.svelte
+++ b/gui/dashboard/app.svelte
@@ -3,13 +3,14 @@
   import TileRawValue from './tile-rawvalue.svelte';
   import Settings from './settings.svelte';
   import { flip } from 'svelte/animate';
-  import { settings, shuffle, ringBell } from './lib';
+  import { proportionalGrid, settings, shuffle, ringBell } from './lib';
 
   const [ send, receive ] = shuffle;
-  const size = ($settings.cols || 4) * ($settings.rows || 3) - 1;
+  let size = ($settings.cols || 4) * ($settings.rows || 3) - 1;
   let pageNum = -1;
   let tiles = [];
   let time = '';
+  let globalData = {};
 
   function tileProps(service) {
     let props = {
@@ -38,6 +39,31 @@
     return props;
   }
 
+  function organiseGrid() {
+    let servicesTemp = [];
+    const { servicesUp, servicesDown, servicesUnknown, total } = globalData;
+    const upOrUnknown = [ ...servicesUp, ...servicesUnknown ];
+    servicesTemp = servicesDown.slice(0, size);
+
+    if (pageNum === -1 || total >= size) {
+      pageNum++;
+
+      if (pageNum > Math.ceil(upOrUnknown.length / size)) {
+        pageNum = 0;
+      }
+    }
+
+    const placesLeft = size - servicesTemp.length;
+    const offset = placesLeft * pageNum;
+    if (placesLeft > 0) {
+      servicesTemp.push(
+        ...upOrUnknown.slice(offset, placesLeft + offset)
+      );
+    }
+
+    tiles = servicesTemp;
+  }
+
   onMount(() => {
     const ws = new WebSocket('ws://__SERVER__/statusdashboard/socket');
 
@@ -46,28 +72,8 @@
 
       switch (data.cmd) {
         case 'data':
-          let servicesTemp = [];
-          const { servicesUp, servicesDown, servicesUnknown, total } = data;
-          const upOrUnknown = [ ...servicesUp, ...servicesUnknown ];
-          servicesTemp = servicesDown.slice(0, size);
-
-          if (pageNum === -1 || total >= size) {
-            pageNum++;
-
-            if (pageNum > Math.ceil(upOrUnknown.length / size)) {
-              pageNum = 0;
-            }
-          }
-
-          const placesLeft = size - servicesTemp.length;
-          const offset = placesLeft * pageNum;
-          if (placesLeft > 0) {
-            servicesTemp.push(
-              ...upOrUnknown.slice(offset, placesLeft + offset)
-            );
-          }
-
-          tiles = servicesTemp;
+          globalData = data;
+          organiseGrid();
           break;
 
         case 'bell':
@@ -85,10 +91,16 @@
       });
     }, 100);
 
+    settings.subscribe(s => {
+      size = (s.cols || 4) * (s.rows || 3) - 1;
+      organiseGrid();
+    });
+
     return () => clearInterval(clockInterval);
   });
 </script>
 
+<svelte:window on:resize={proportionalGrid} />
 <Settings />
 
 <div
diff --git a/gui/dashboard/lib.js b/gui/dashboard/lib.js
index 5e0faa8..4eddc18 100644
--- a/gui/dashboard/lib.js
+++ b/gui/dashboard/lib.js
@@ -19,7 +19,7 @@ function createSettingsStore() {
   return {
     subscribe: s.subscribe,
     set: val => updateStorage(val),
-    update: val => updateStorage({ ...get(s), val }),
+    update: val => updateStorage({ ...get(s), ...val }),
   };
 }
 
@@ -65,3 +65,19 @@ export function formatDuration(ms) {
     .map(([ key, val ]) => `${val} ${key}`)
     .join(' ');
 }
+
+export function proportionalGrid() {
+  const container = document.querySelector('.center');
+  const w = container.clientWidth;
+  const h = container.clientHeight;
+  const tileW = 400;
+  const tileH = 300;
+  const availableCols = Math.floor(w / tileW);
+  const availableRows = Math.floor(h / tileH);
+  console.log(w, h, availableCols, availableRows);
+
+  settings.update({
+    cols: availableCols,
+    rows: availableRows,
+  });
+}