diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json
index e548308..56ca101 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Header/Header/view.json
@@ -6,9 +6,9 @@
         "$": [
           "ts",
           192,
-          1750766217642
+          1750943397562
         ],
-        "$ts": 1750766217641
+        "$ts": 1750943397562
       }
     }
   },
@@ -251,7 +251,7 @@
             "height": 30,
             "mode": "fill"
           },
-          "source": "/system/images/Builtin/amazon_rme_logo.png"
+          "source": null
         },
         "type": "ia.display.image"
       },
@@ -823,7 +823,7 @@
                   },
                   "transforms": [
                     {
-                      "code": "\tdata \u003d value\n\trows \u003d system.dataset.toPyDataSet(data)\n\t\n\ttotal \u003d sum(row[\"Count\"] for row in rows)\n\t\n\treturn total",
+                      "code": "\tif value is None or not hasattr(system.dataset, \"toPyDataSet\"):\n\t\treturn \n\t\t\n\trows \u003d system.dataset.toPyDataSet(value)\n\t\n\ttotal \u003d sum(row[\"Count\"] for row in rows)\n\t\n\treturn total",
                       "type": "script"
                     }
                   ],
@@ -882,158 +882,178 @@
         "type": "ia.display.label"
       },
       {
-        "custom": {
-          "covert": true
-        },
-        "events": {
-          "dom": {
-            "onClick": {
-              "config": {
-                "script": "\tdevice_list \u003d tags.tag_utilities.get_devices(self.session.custom.fc)\n\ttags.tag_utilities.reset_disconnect_tags(self.session.custom.fc, device_list)\n\tAWS.wbsckt_abort.close_websckt()"
-              },
-              "scope": "G",
-              "type": "script"
-            }
-          }
-        },
-        "meta": {
-          "name": "Icon_2",
-          "tooltip": {
-            "enabled": true
-          }
-        },
-        "position": {
-          "basis": "30px"
-        },
-        "propConfig": {
-          "custom.heartbeat_received": {
-            "binding": {
-              "config": {
-                "fallbackDelay": 2.5,
-                "mode": "indirect",
-                "references": {
-                  "fc": "{session.custom.fc}"
-                },
-                "tagPath": "[{fc}_SCADA_TAG_PROVIDER]System/wbsckt_heartbeat_interval"
-              },
-              "transforms": [
-                {
-                  "expression": "if(secondsBetween(todate({value}),todate(now())) \u003e 70, False, True)",
-                  "type": "expression"
+        "children": [
+          {
+            "custom": {
+              "covert": true
+            },
+            "events": {
+              "dom": {
+                "onClick": {
+                  "config": {
+                    "script": "\tdevice_list \u003d tags.tag_utilities.get_devices(self.session.custom.fc)\n\ttags.tag_utilities.reset_disconnect_tags(self.session.custom.fc, device_list)\n\tAWS.wbsckt_abort.close_websckt()"
+                  },
+                  "scope": "G",
+                  "type": "script"
                 }
-              ],
-              "type": "tag"
-            }
-          },
-          "custom.wbsckt_running": {
-            "binding": {
-              "config": {
-                "fallbackDelay": 2.5,
-                "mode": "indirect",
-                "references": {
-                  "fc": "{session.custom.fc}"
-                },
-                "tagPath": "[{fc}_SCADA_TAG_PROVIDER]System/wbsckt_running"
-              },
-              "transforms": [
-                {
-                  "expression": "if({value} \u003d True \u0026\u0026 ({this.custom.heartbeat_received} \u003d True) , True, False)",
-                  "type": "expression"
-                }
-              ],
-              "type": "tag"
-            }
-          },
-          "meta.tooltip.text": {
-            "binding": {
-              "config": {
-                "path": "this.custom.wbsckt_running"
-              },
-              "transforms": [
-                {
-                  "fallback": "",
-                  "inputType": "scalar",
-                  "mappings": [
-                    {
-                      "input": true,
-                      "output": "websocket running"
+              }
+            },
+            "meta": {
+              "name": "Icon_2",
+              "tooltip": {
+                "enabled": true
+              }
+            },
+            "position": {
+              "basis": "30px"
+            },
+            "propConfig": {
+              "custom.heartbeat_received": {
+                "binding": {
+                  "config": {
+                    "fallbackDelay": 2.5,
+                    "mode": "indirect",
+                    "references": {
+                      "fc": "{session.custom.fc}"
                     },
+                    "tagPath": "[{fc}_SCADA_TAG_PROVIDER]System/wbsckt_heartbeat_interval"
+                  },
+                  "transforms": [
                     {
-                      "input": false,
-                      "output": "websocket disconnected"
+                      "expression": "if(secondsBetween(todate({value}),todate(now())) \u003e 70, False, True)",
+                      "type": "expression"
                     }
                   ],
-                  "outputType": "scalar",
-                  "type": "map"
+                  "type": "tag"
                 }
-              ],
-              "type": "property"
-            }
-          },
-          "props.color": {
-            "binding": {
-              "config": {
-                "path": "this.custom.wbsckt_running"
               },
-              "transforms": [
-                {
-                  "fallback": "#000000",
-                  "inputType": "scalar",
-                  "mappings": [
-                    {
-                      "input": false,
-                      "output": "#FF4747"
+              "custom.wbsckt_running": {
+                "binding": {
+                  "config": {
+                    "fallbackDelay": 2.5,
+                    "mode": "indirect",
+                    "references": {
+                      "fc": "{session.custom.fc}"
                     },
+                    "tagPath": "[{fc}_SCADA_TAG_PROVIDER]System/wbsckt_running"
+                  },
+                  "transforms": [
                     {
-                      "input": true,
-                      "output": "#FFFFFF"
+                      "expression": "if({value} \u003d True \u0026\u0026 ({this.custom.heartbeat_received} \u003d True) , True, False)",
+                      "type": "expression"
                     }
                   ],
-                  "outputType": "color",
-                  "type": "map"
+                  "type": "tag"
                 }
-              ],
-              "type": "property"
-            }
+              },
+              "meta.tooltip.text": {
+                "binding": {
+                  "config": {
+                    "path": "this.custom.wbsckt_running"
+                  },
+                  "transforms": [
+                    {
+                      "fallback": "",
+                      "inputType": "scalar",
+                      "mappings": [
+                        {
+                          "input": true,
+                          "output": "websocket running"
+                        },
+                        {
+                          "input": false,
+                          "output": "websocket disconnected"
+                        }
+                      ],
+                      "outputType": "scalar",
+                      "type": "map"
+                    }
+                  ],
+                  "type": "property"
+                }
+              },
+              "props.color": {
+                "binding": {
+                  "config": {
+                    "path": "this.custom.wbsckt_running"
+                  },
+                  "transforms": [
+                    {
+                      "fallback": "#000000",
+                      "inputType": "scalar",
+                      "mappings": [
+                        {
+                          "input": false,
+                          "output": "#FF4747"
+                        },
+                        {
+                          "input": true,
+                          "output": "#FFFFFF"
+                        }
+                      ],
+                      "outputType": "color",
+                      "type": "map"
+                    }
+                  ],
+                  "type": "property"
+                }
+              }
+            },
+            "props": {
+              "path": "material/location_city",
+              "style": {
+                "cursor": "pointer"
+              }
+            },
+            "type": "ia.display.icon"
+          },
+          {
+            "meta": {
+              "name": "Label"
+            },
+            "position": {
+              "basis": "50px",
+              "shrink": 0
+            },
+            "propConfig": {
+              "props.text": {
+                "binding": {
+                  "config": {
+                    "fallbackDelay": 2.5,
+                    "mode": "direct",
+                    "tagPath": "Configuration/FC"
+                  },
+                  "type": "tag"
+                }
+              }
+            },
+            "props": {
+              "icon": "material/building",
+              "style": {
+                "borderWidth": "0.25px",
+                "color": "#FFFFFF",
+                "textAlign": "",
+                "textIndent": 10
+              },
+              "textStyle": {
+                "lineBreak": "auto"
+              }
+            },
+            "type": "ia.display.label"
           }
-        },
-        "props": {
-          "path": "material/location_city",
-          "style": {
-            "cursor": "pointer"
-          }
-        },
-        "type": "ia.display.icon"
-      },
-      {
+        ],
         "meta": {
-          "name": "Label"
+          "name": "FlexContainer_2"
         },
         "position": {
-          "basis": "50px"
-        },
-        "propConfig": {
-          "props.text": {
-            "binding": {
-              "config": {
-                "fallbackDelay": 2.5,
-                "mode": "direct",
-                "tagPath": "Configuration/FC"
-              },
-              "type": "tag"
-            }
-          }
+          "basis": "200px"
         },
         "props": {
-          "icon": "material/building",
           "style": {
-            "borderWidth": "0.25px",
-            "color": "#FFFFFF",
-            "textAlign": "",
-            "textIndent": 10
+            "overflow": "hidden"
           }
         },
-        "type": "ia.display.label"
+        "type": "ia.container.flex"
       },
       {
         "meta": {
@@ -1094,6 +1114,7 @@
           "name": "Sign In"
         },
         "position": {
+          "basis": "50px",
           "shrink": 0
         },
         "propConfig": {