diff --git a/flows/main.json b/flows/main.json
index ae96e2c..cf30a9d 100644
--- a/flows/main.json
+++ b/flows/main.json
@@ -480,12 +480,13 @@
     {
         "id": "1be83144.4fe4bf",
         "type": "ui_group",
+        "z": "",
         "name": "Danger Zone (DO NOT TOUCH HERE UNLESS YOU KNOW WHAT YOU ARE DOING)",
         "tab": "d9cd733b.ab73d",
-        "order": 8,
+        "order": 9,
         "disp": true,
-        "width": 24,
-        "collapse": false
+        "width": 12,
+        "collapse": true
     },
     {
         "id": "3ca00bf9.e5cac4",
@@ -494,8 +495,8 @@
         "name": "Navigation",
         "tab": "d9cd733b.ab73d",
         "order": 7,
-        "disp": false,
-        "width": 10,
+        "disp": true,
+        "width": 6,
         "collapse": false
     },
     {
@@ -578,7 +579,7 @@
         "tab": "d9cd733b.ab73d",
         "order": 5,
         "disp": true,
-        "width": 10,
+        "width": 6,
         "collapse": false
     },
     {
@@ -650,7 +651,7 @@
         "order": 6,
         "disp": true,
         "width": "6",
-        "collapse": false
+        "collapse": true
     },
     {
         "id": "a411788e.45a8c8",
@@ -724,15 +725,6 @@
         "width": 5,
         "height": 1
     },
-    {
-        "id": "86697376.47c108",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "707d9797.c8e798",
-        "order": 5,
-        "width": 1,
-        "height": 1
-    },
     {
         "id": "226903fb.014ba4",
         "type": "ui_spacer",
@@ -757,63 +749,63 @@
         "z": "",
         "name": "Python Log",
         "tab": "d9cd733b.ab73d",
-        "order": 9,
+        "order": 8,
         "disp": true,
-        "width": 10,
-        "collapse": false
+        "width": 12,
+        "collapse": true
     },
     {
-        "id": "8859245a.6ec268",
+        "id": "537a50c5.f6f428",
         "type": "ui_spacer",
         "name": "spacer",
         "group": "3ca00bf9.e5cac4",
         "order": 2,
-        "width": 2,
+        "width": 1,
         "height": 1
     },
     {
-        "id": "8f231033.e8cd1",
+        "id": "6f9aafd7.355bf",
         "type": "ui_spacer",
         "name": "spacer",
         "group": "1be83144.4fe4bf",
         "order": 2,
-        "width": 9,
+        "width": 3,
         "height": 1
     },
     {
-        "id": "bbafae91.f93888",
+        "id": "159ba3a4.2a44dc",
         "type": "ui_spacer",
         "name": "spacer",
         "group": "1be83144.4fe4bf",
         "order": 4,
-        "width": 9,
+        "width": 3,
         "height": 1
     },
     {
-        "id": "267c6276.8e7706",
+        "id": "dc696ec2.3c15c8",
         "type": "ui_spacer",
         "name": "spacer",
         "group": "1be83144.4fe4bf",
         "order": 5,
-        "width": 9,
+        "width": 4,
         "height": 1
     },
     {
-        "id": "a2b1594f.be9aa8",
+        "id": "9ab9add1.f3b448",
         "type": "ui_spacer",
         "name": "spacer",
         "group": "1be83144.4fe4bf",
         "order": 7,
-        "width": 9,
+        "width": 4,
         "height": 1
     },
     {
-        "id": "c2b17f8e.30585",
+        "id": "68e9af01.93677",
         "type": "ui_spacer",
         "name": "spacer",
         "group": "1be83144.4fe4bf",
         "order": 9,
-        "width": 10,
+        "width": 8,
         "height": 1
     },
     {
@@ -889,7 +881,7 @@
         "name": "",
         "group": "3ca00bf9.e5cac4",
         "order": 1,
-        "width": 5,
+        "width": 4,
         "height": 1,
         "passthru": false,
         "label": "Home",
@@ -1318,7 +1310,7 @@
         "tooltip": "",
         "group": "3ca00bf9.e5cac4",
         "order": 3,
-        "width": 3,
+        "width": 1,
         "height": 1,
         "passthru": true,
         "decouple": "false",
@@ -1362,14 +1354,14 @@
         "name": "",
         "group": "1be83144.4fe4bf",
         "order": 10,
-        "width": 7,
+        "width": 2,
         "height": 1,
         "passthru": false,
         "label": "Reboot",
         "tooltip": "",
         "color": "",
         "bgcolor": "#AD1625",
-        "icon": "refresh",
+        "icon": "fa-repeat fa-2x",
         "payload": "reboot",
         "payloadType": "str",
         "topic": "reboot",
@@ -1407,14 +1399,14 @@
         "name": "",
         "group": "1be83144.4fe4bf",
         "order": 8,
-        "width": 7,
+        "width": 2,
         "height": 1,
         "passthru": false,
         "label": "Shutdown",
         "tooltip": "",
         "color": "",
         "bgcolor": "#AD1625",
-        "icon": "standby",
+        "icon": "fa-power-off fa-2x",
         "payload": "shutdown",
         "payloadType": "str",
         "topic": "shutdown",
@@ -1749,15 +1741,15 @@
         "z": "bccd1f23.87219",
         "name": "down",
         "group": "fbd92986.1028c8",
-        "order": 5,
-        "width": 0,
-        "height": 0,
+        "order": 6,
+        "width": 5,
+        "height": 1,
         "passthru": true,
         "label": "",
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "arrow_downward",
+        "icon": "fa-angle-double-down fa-3x",
         "payload": "DOWN",
         "payloadType": "str",
         "topic": "actuator/focus",
@@ -1776,14 +1768,14 @@
         "name": "up",
         "group": "fbd92986.1028c8",
         "order": 2,
-        "width": 0,
-        "height": 0,
+        "width": 5,
+        "height": 1,
         "passthru": false,
         "label": "",
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "arrow_upwards",
+        "icon": "fa-angle-double-up fa-3x",
         "payload": "UP",
         "payloadType": "str",
         "topic": "actuator/focus",
@@ -2359,7 +2351,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "arrow_back",
+        "icon": "fa-rotate-left fa-2x",
         "payload": "BACKWARD",
         "payloadType": "str",
         "topic": "actuator/pump",
@@ -2385,7 +2377,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "arrow_forward",
+        "icon": "fa-rotate-right fa-2x",
         "payload": "FORWARD",
         "payloadType": "str",
         "topic": "actuator/pump",
@@ -2861,7 +2853,7 @@
         "label": "Distance in µm",
         "tooltip": "This will be rounded to the nearest 25µm",
         "group": "fbd92986.1028c8",
-        "order": 4,
+        "order": 3,
         "width": 0,
         "height": 0,
         "passthru": true,
@@ -2934,11 +2926,11 @@
         "width": 0,
         "height": 0,
         "passthru": true,
-        "label": "STOP FOCUS",
+        "label": " STOP FOCUS",
         "tooltip": "",
         "color": "",
         "bgcolor": "#AD1625",
-        "icon": "",
+        "icon": "fa-pause fa-2x",
         "payload": "{\"action\":\"stop\"}",
         "payloadType": "json",
         "topic": "actuator/focus",
@@ -2990,14 +2982,14 @@
         "name": "",
         "group": "fbd92986.1028c8",
         "order": 1,
-        "width": 0,
-        "height": 0,
+        "width": 5,
+        "height": 1,
         "passthru": false,
         "label": "UP 1mm",
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "fa-angle-up fa-3x",
         "payload": "{\"action\":\"move\",\"direction\":\"UP\",\"distance\":1}",
         "payloadType": "json",
         "topic": "actuator/focus",
@@ -3015,15 +3007,15 @@
         "z": "bccd1f23.87219",
         "name": "",
         "group": "fbd92986.1028c8",
-        "order": 6,
-        "width": 0,
-        "height": 0,
+        "order": 5,
+        "width": 5,
+        "height": 1,
         "passthru": false,
         "label": "DOWN 1mm",
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "fa-angle-down fa-3x",
         "payload": "{\"action\":\"move\",\"direction\":\"DOWN\",\"distance\":1}",
         "payloadType": "json",
         "topic": "actuator/focus",
@@ -3043,7 +3035,7 @@
         "label": "",
         "tooltip": "in µm",
         "group": "fbd92986.1028c8",
-        "order": 3,
+        "order": 4,
         "width": 0,
         "height": 0,
         "passthru": true,
@@ -3408,7 +3400,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "system_update",
+        "icon": "mi-system_update",
         "payload": "",
         "payloadType": "str",
         "topic": "update",
@@ -3492,14 +3484,14 @@
         "name": "Restart Python",
         "group": "1be83144.4fe4bf",
         "order": 6,
-        "width": 6,
+        "width": 4,
         "height": 1,
         "passthru": true,
         "label": "Restart Python",
         "tooltip": "",
         "color": "",
         "bgcolor": "#AD1625",
-        "icon": "refresh",
+        "icon": "fa-refresh fa-2x",
         "payload": "",
         "payloadType": "str",
         "topic": "",
@@ -3585,8 +3577,8 @@
         "group": "1be83144.4fe4bf",
         "name": "Update message",
         "order": 1,
-        "width": 0,
-        "height": 0,
+        "width": 12,
+        "height": 2,
         "format": "<div><center>If you want to update to the latest code version of Node-Red and Python, please click here.\nWe are trying to save your configuration changes with git stash and restore them afterwards, but clearly, things may break!\nIf you have made changes to the flow, you will lose them. Please commit those changes from Node-Red interface, from the Project History tab.</center></div>",
         "storeOutMessages": true,
         "fwdInMessages": true,
@@ -3612,7 +3604,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "camera",
         "payload": "",
         "payloadType": "str",
         "topic": "imager/image",
@@ -3806,7 +3798,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "save",
         "payload": "",
         "payloadType": "str",
         "topic": "imager/image",
@@ -4565,15 +4557,15 @@
         "z": "bccd1f23.87219",
         "name": "stop pump",
         "group": "707d9797.c8e798",
-        "order": 6,
-        "width": 2,
+        "order": 5,
+        "width": 3,
         "height": 1,
         "passthru": true,
-        "label": "STOP PUMP",
+        "label": " STOP PUMP",
         "tooltip": "",
         "color": "",
         "bgcolor": "#AD1625",
-        "icon": "",
+        "icon": "fa-pause fa-2x",
         "payload": "{\"action\":\"stop\"}",
         "payloadType": "json",
         "topic": "actuator/pump",
@@ -6408,7 +6400,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "fa-usb fa-2x",
         "payload": "",
         "payloadType": "str",
         "topic": "",
@@ -6498,7 +6490,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "archive",
         "payload": "",
         "payloadType": "str",
         "topic": "",
@@ -6688,7 +6680,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "#AD1625",
-        "icon": "",
+        "icon": "delete_forever",
         "payload": "THIS IS GOING TO WIPE ALL THE LOCAL DATA. MAKE SURE YOU DID A BACKUP TO AN USB DRIVE BEFOREHAND.",
         "payloadType": "str",
         "topic": "BE EXTRA CAREFUL",
@@ -7084,7 +7076,7 @@
         "group": "a7d64879.38298",
         "name": "Log table",
         "order": 1,
-        "width": 10,
+        "width": 12,
         "height": 10,
         "format": "<script type=\"text/javascript\">\n    function selectElementContents(el) {\n        var body = document.body, range, sel;\n        if (document.createRange && window.getSelection) {\n            range = document.createRange();\n            sel = window.getSelection();\n            sel.removeAllRanges();\n            try {\n                range.selectNodeContents(el);\n                sel.addRange(range);\n            } catch (e) {\n                range.selectNode(el);\n                sel.addRange(range);\n            }\n            document.execCommand(\"copy\");\n            sel.removeAllRanges();\n\n        } else if (body.createTextRange) {\n            range = body.createTextRange();\n            range.moveToElementText(el);\n            range.select();\n            range.execCommand(\"Copy\");\n        }\n    }\n</script>\n\n<md-button onclick=\"selectElementContents( document.getElementById('log_table') );\">\n    <i class=\"fa fa-copy fa-1x\"></i> Copy Log\n</md-button>\n\n<table id=\"log_table\" style=\"font-family: mono;font-size: 5px;\">\n    <tr ng-repeat=\"row in msg.payload\">\n        <td>{{row}}</td>\n    </tr>\n</table>\n\n",
         "storeOutMessages": false,
@@ -7129,7 +7121,7 @@
         "tooltip": "",
         "color": "",
         "bgcolor": "",
-        "icon": "",
+        "icon": "fa-eraser",
         "payload": "",
         "payloadType": "str",
         "topic": "",