diff --git a/flows.json b/flows.json
index 1e53a0e..45b1b6c 100644
--- a/flows.json
+++ b/flows.json
@@ -733,30 +733,6 @@
         "id": "c398618f77baaf6f",
         "type": "ewelink-credentials"
     },
-    {
-        "id": "37bd8485e5bff627",
-        "type": "mongodb4-client",
-        "name": "",
-        "protocol": "mongodb",
-        "hostname": "",
-        "port": "",
-        "dbName": "smarthome",
-        "appName": "",
-        "authSource": "",
-        "authMechanism": "DEFAULT",
-        "tls": false,
-        "tlsCAFile": "",
-        "tlsCertificateKeyFile": "",
-        "tlsInsecure": false,
-        "connectTimeoutMS": "30000",
-        "socketTimeoutMS": "0",
-        "minPoolSize": "0",
-        "maxPoolSize": "100",
-        "maxIdleTimeMS": "0",
-        "uri": "mongodb+srv://rexfue:9JzUXgrZgy1BUqwU@cluster0.2bjs2fc.mongodb.net/?retryWrites=true&w=majority",
-        "advanced": "{}",
-        "uriTabActive": "tab-uri-advanced"
-    },
     {
         "id": "874361936f1ce815",
         "type": "mongodb4-client",
@@ -1048,37 +1024,6 @@
         "logrotatecount": "5",
         "logsize": "1000"
     },
-    {
-        "id": "18fed68ccdfeed7d",
-        "type": "ui_tab",
-        "name": "Garage",
-        "icon": "dashboard",
-        "order": 4,
-        "disabled": false,
-        "hidden": false
-    },
-    {
-        "id": "f46af736de5b6e66",
-        "type": "ui_group",
-        "name": "Tor",
-        "tab": "18fed68ccdfeed7d",
-        "order": 1,
-        "disp": true,
-        "width": "6",
-        "collapse": false,
-        "className": ""
-    },
-    {
-        "id": "bc1acb6b016af1c1",
-        "type": "ui_group",
-        "name": "Switch",
-        "tab": "",
-        "order": 1,
-        "disp": true,
-        "width": "6",
-        "collapse": false,
-        "className": ""
-    },
     {
         "id": "9a5095b780d6917f",
         "type": "ui-page",
@@ -1115,17 +1060,6 @@
         "visible": "true",
         "disabled": "false"
     },
-    {
-        "id": "group1",
-        "type": "ui_group",
-        "name": "Computer_Tisch",
-        "tab": "tab1",
-        "order": 1,
-        "disp": true,
-        "width": "6",
-        "collapse": false,
-        "className": ""
-    },
     {
         "id": "tab1",
         "type": "ui_tab",
@@ -1155,17 +1089,6 @@
         "disabled": false,
         "hidden": false
     },
-    {
-        "id": "63fd87c9bbd93a47",
-        "type": "ui_group",
-        "name": "CL_Heizung",
-        "tab": "261c60c1322869d9",
-        "order": 1,
-        "disp": true,
-        "width": "6",
-        "collapse": false,
-        "className": ""
-    },
     {
         "id": "1d0cfd7b0bb56a24",
         "type": "ui-group",
@@ -1286,6 +1209,20 @@
         "disabled": "false",
         "groupType": "default"
     },
+    {
+        "id": "d4177dcf79a5a58b",
+        "type": "ui-group",
+        "name": "Computer_Tisch_rxf",
+        "page": "9a5095b780d6917f",
+        "width": "6",
+        "height": "1",
+        "order": -1,
+        "showTitle": true,
+        "className": "",
+        "visible": "true",
+        "disabled": "false",
+        "groupType": "default"
+    },
     {
         "id": "4d2812cbd43e95b7",
         "type": "mqtt in",
@@ -10006,12 +9943,12 @@
         "z": "0ecc4a0267296324",
         "group": "ed415db654fe4777",
         "order": 1,
-        "width": "6",
+        "width": "3",
         "height": "1",
         "name": "",
         "label": "Garage ist: ",
         "format": "{{msg.payload}}",
-        "layout": "row-center",
+        "layout": "row-spread",
         "style": true,
         "font": "Arial Black,Arial Black,Gadget,sans-serif",
         "fontSize": "24",
@@ -12260,41 +12197,6 @@
             ]
         ]
     },
-    {
-        "id": "switch1",
-        "type": "ui_switch",
-        "z": "9af67c7112bb80c5",
-        "name": "Lampe",
-        "label": "Monitore",
-        "tooltip": "",
-        "group": "group1",
-        "order": 1,
-        "width": 0,
-        "height": 0,
-        "passthru": true,
-        "decouple": "false",
-        "topic": "licht/wohnzimmer",
-        "topicType": "str",
-        "style": "",
-        "onvalue": "true",
-        "onvalueType": "bool",
-        "onicon": "",
-        "oncolor": "",
-        "offvalue": "false",
-        "offvalueType": "bool",
-        "officon": "",
-        "offcolor": "",
-        "animate": true,
-        "className": "",
-        "x": 610,
-        "y": 200,
-        "wires": [
-            [
-                "debug1",
-                "cc9ef585fe86bc66"
-            ]
-        ]
-    },
     {
         "id": "debug1",
         "type": "debug",
@@ -12306,6 +12208,8 @@
         "tostatus": false,
         "complete": "payload",
         "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
         "x": 810,
         "y": 140,
         "wires": []
@@ -12325,7 +12229,7 @@
         "expiry": "",
         "broker": "c46833d59903b816",
         "x": 1140,
-        "y": 200,
+        "y": 220,
         "wires": []
     },
     {
@@ -12353,7 +12257,7 @@
         "y": 160,
         "wires": [
             [
-                "switch1"
+                "3124d27a1df4471e"
             ]
         ]
     },
@@ -12382,7 +12286,42 @@
         "y": 260,
         "wires": [
             [
-                "switch1"
+                "3124d27a1df4471e"
+            ]
+        ]
+    },
+    {
+        "id": "3124d27a1df4471e",
+        "type": "ui-switch",
+        "z": "9af67c7112bb80c5",
+        "name": "",
+        "label": "Monitore:",
+        "group": "d4177dcf79a5a58b",
+        "order": 0,
+        "width": 0,
+        "height": 0,
+        "passthru": false,
+        "decouple": false,
+        "topic": "topic",
+        "topicType": "msg",
+        "style": "",
+        "className": "",
+        "layout": "row-left",
+        "clickableArea": "switch",
+        "onvalue": "ON",
+        "onvalueType": "str",
+        "onicon": "",
+        "oncolor": "",
+        "offvalue": "OFF",
+        "offvalueType": "str",
+        "officon": "",
+        "offcolor": "",
+        "x": 620,
+        "y": 220,
+        "wires": [
+            [
+                "cc9ef585fe86bc66",
+                "debug1"
             ]
         ]
     },