diff --git a/flows/main.json b/flows/main.json
index 538cec2..72f6509 100644
--- a/flows/main.json
+++ b/flows/main.json
@@ -762,87 +762,6 @@
         "width": 10,
         "height": 1
     },
-    {
-        "id": "10cbc233.b5ddf6",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 5,
-        "width": 12,
-        "height": 1
-    },
-    {
-        "id": "a862072d.0ec1e8",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 6,
-        "width": 3,
-        "height": 1
-    },
-    {
-        "id": "ac09f674.27d14",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 8,
-        "width": 3,
-        "height": 1
-    },
-    {
-        "id": "bbc09199.173ee",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 9,
-        "width": 12,
-        "height": 1
-    },
-    {
-        "id": "4b444d98.a84854",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 10,
-        "width": 12,
-        "height": 1
-    },
-    {
-        "id": "5b88d5d8.baac64",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 11,
-        "width": 4,
-        "height": 1
-    },
-    {
-        "id": "df135e23.9d5ba",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 13,
-        "width": 4,
-        "height": 1
-    },
-    {
-        "id": "6d0cfbad.fb566c",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 14,
-        "width": 12,
-        "height": 1
-    },
-    {
-        "id": "7d988743.b75b",
-        "type": "ui_spacer",
-        "name": "spacer",
-        "group": "1be83144.4fe4bf",
-        "order": 16,
-        "width": 8,
-        "height": 1
-    },
     {
         "id": "cfe2288f.a8862",
         "type": "ui_group",
@@ -974,6 +893,66 @@
         "width": 1,
         "height": 1
     },
+    {
+        "id": "9b6dc1eeb6aacf25",
+        "type": "ui_spacer",
+        "z": "9daf9e2b.019fc",
+        "name": "spacer",
+        "group": "1be83144.4fe4bf",
+        "order": 5,
+        "width": 12,
+        "height": 1
+    },
+    {
+        "id": "39d7981eebaf1b17",
+        "type": "ui_spacer",
+        "z": "9daf9e2b.019fc",
+        "name": "spacer",
+        "group": "1be83144.4fe4bf",
+        "order": 6,
+        "width": 12,
+        "height": 1
+    },
+    {
+        "id": "603f43d66f25966f",
+        "type": "ui_spacer",
+        "z": "9daf9e2b.019fc",
+        "name": "spacer",
+        "group": "1be83144.4fe4bf",
+        "order": 7,
+        "width": 4,
+        "height": 1
+    },
+    {
+        "id": "02a0c4c401619cb8",
+        "type": "ui_spacer",
+        "z": "9daf9e2b.019fc",
+        "name": "spacer",
+        "group": "1be83144.4fe4bf",
+        "order": 9,
+        "width": 4,
+        "height": 1
+    },
+    {
+        "id": "1b7e5b6e265fe27d",
+        "type": "ui_spacer",
+        "z": "9daf9e2b.019fc",
+        "name": "spacer",
+        "group": "1be83144.4fe4bf",
+        "order": 11,
+        "width": 8,
+        "height": 1
+    },
+    {
+        "id": "d9622026ef2d9e0c",
+        "type": "ui_spacer",
+        "z": "9daf9e2b.019fc",
+        "name": "spacer",
+        "group": "1be83144.4fe4bf",
+        "order": 14,
+        "width": 8,
+        "height": 1
+    },
     {
         "id": "4e78af2d.90be7",
         "type": "ui_ui_control",
@@ -5521,7 +5500,7 @@
         "z": "9daf9e2b.019fc",
         "name": "",
         "group": "1be83144.4fe4bf",
-        "order": 15,
+        "order": 10,
         "width": 2,
         "height": 1,
         "passthru": false,
@@ -5566,7 +5545,7 @@
         "z": "9daf9e2b.019fc",
         "name": "",
         "group": "1be83144.4fe4bf",
-        "order": 17,
+        "order": 12,
         "width": 2,
         "height": 1,
         "passthru": false,
@@ -5651,7 +5630,7 @@
         "z": "9daf9e2b.019fc",
         "name": "Restart Python",
         "group": "1be83144.4fe4bf",
-        "order": 12,
+        "order": 8,
         "width": 4,
         "height": 1,
         "passthru": true,
@@ -5725,7 +5704,7 @@
         "fwdInMessages": false,
         "resendOnRefresh": false,
         "templateScope": "local",
-        "x": 1700,
+        "x": 1580,
         "y": 640,
         "wires": [
             []
@@ -5742,7 +5721,7 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1500,
+        "x": 1400,
         "y": 560,
         "wires": [
             [
@@ -5769,7 +5748,7 @@
         "payloadType": "str",
         "topic": "",
         "topicType": "str",
-        "x": 1340,
+        "x": 1240,
         "y": 720,
         "wires": [
             [
@@ -5784,7 +5763,7 @@
         "name": "Catch Errors",
         "scope": null,
         "uncaught": false,
-        "x": 1090,
+        "x": 1050,
         "y": 660,
         "wires": [
             [
@@ -5802,7 +5781,7 @@
         "noerr": 0,
         "initialize": "",
         "finalize": "",
-        "x": 1260,
+        "x": 1220,
         "y": 660,
         "wires": [
             [
@@ -5821,7 +5800,7 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 1500,
+        "x": 1400,
         "y": 720,
         "wires": [
             [
@@ -6048,8 +6027,8 @@
         "d": true,
         "name": "Update",
         "group": "1be83144.4fe4bf",
-        "order": 7,
-        "width": 6,
+        "order": 13,
+        "width": 4,
         "height": 1,
         "passthru": false,
         "label": "System Update",
@@ -7515,7 +7494,7 @@
         "topic": "",
         "payload": "start",
         "payloadType": "str",
-        "x": 1190,
+        "x": 1090,
         "y": 720,
         "wires": [
             [
@@ -8658,7 +8637,7 @@
         "noerr": 0,
         "initialize": "",
         "finalize": "",
-        "x": 420,
+        "x": 410,
         "y": 1260,
         "wires": [
             [
@@ -10350,8 +10329,6 @@
         "mode": "number",
         "delay": "0",
         "topic": "sample_speed_through_water",
-        "sendOnBlur": true,
-        "className": "",
         "topicType": "str",
         "x": 610,
         "y": 520,
@@ -10857,8 +10834,6 @@
         "mode": "number",
         "delay": 300,
         "topic": "acq_minimum_mesh",
-        "sendOnBlur": true,
-        "className": "",
         "topicType": "str",
         "x": 640,
         "y": 360,
@@ -10883,8 +10858,6 @@
         "mode": "number",
         "delay": 300,
         "topic": "acq_maximum_mesh",
-        "sendOnBlur": true,
-        "className": "",
         "topicType": "str",
         "x": 640,
         "y": 400,