diff --git a/flows.json b/flows.json
index 284c529..fe4c2b5 100644
--- a/flows.json
+++ b/flows.json
@@ -102,6 +102,14 @@
         "info": "",
         "env": []
     },
+    {
+        "id": "b73eb220c60f9f8b",
+        "type": "tab",
+        "label": "[Kitchen] Espresso Machine",
+        "disabled": false,
+        "info": "",
+        "env": []
+    },
     {
         "id": "e52c44dc.71cb5",
         "type": "subflow",
@@ -21397,14 +21405,6 @@
             []
         ]
     },
-    {
-        "type": "tab",
-        "label": "[Kitchen] Espresso Machine",
-        "id": "b73eb220c60f9f8b",
-        "info": "",
-        "disabled": false,
-        "env": []
-    },
     {
         "id": "b1b0a80b.d1f6cf",
         "type": "api-current-state",
@@ -21647,7 +21647,7 @@
         "scope": null,
         "uncaught": false,
         "x": 120,
-        "y": 320,
+        "y": 400,
         "wires": [
             [
                 "f12242c7d3a27af5"
@@ -21666,8 +21666,8 @@
         "initialize": "",
         "finalize": "",
         "libs": [],
-        "x": 390,
-        "y": 320,
+        "x": 370,
+        "y": 400,
         "wires": [
             [
                 "4abcaba467c1d59d"
@@ -21697,8 +21697,8 @@
         "blockInputOverrides": false,
         "domain": "notify",
         "service": "gotify_nodered",
-        "x": 640,
-        "y": 320,
+        "x": 600,
+        "y": 400,
         "wires": [
             []
         ]
@@ -21720,24 +21720,14 @@
         "topic": "",
         "payload": "5",
         "payloadType": "num",
-        "x": 410,
-        "y": 260,
+        "x": 130,
+        "y": 280,
         "wires": [
             [
                 "espresso_fn_001"
             ]
         ]
     },
-    {
-        "id": "espresso_cmt_sync",
-        "type": "comment",
-        "z": "b73eb220c60f9f8b",
-        "name": "Keep flow.espresso_standby in sync (fixes race condition)",
-        "info": "",
-        "x": 250,
-        "y": 320,
-        "wires": []
-    },
     {
         "id": "espresso_ssc_standby",
         "type": "server-state-changed",
@@ -21776,8 +21766,8 @@
                 "valueType": "entityState"
             }
         ],
-        "x": 140,
-        "y": 420,
+        "x": 160,
+        "y": 220,
         "wires": [
             [
                 "b1b0a80b.d1f6cf"