diff --git a/auto_push.sh b/auto_push.sh
index c20622a..06d36f4 100755
--- a/auto_push.sh
+++ b/auto_push.sh
@@ -2,6 +2,6 @@
 while inotifywait -r -e modify,create,delete .; do
   git add .
   git commit -m "Auto-commit on file change"
-  git push origin main
+  git push -uf origin main
 done
 
diff --git a/com.inductiveautomation.perspective/session-props/props.json b/com.inductiveautomation.perspective/session-props/props.json
index 9d7a5a9..c61e204 100644
--- a/com.inductiveautomation.perspective/session-props/props.json
+++ b/com.inductiveautomation.perspective/session-props/props.json
@@ -219,7 +219,7 @@
     },
     "device": {},
     "geolocation": {},
-    "locale": "en-GB",
+    "locale": "en-US",
     "timeZoneId": "Etc/UTC"
   }
 }
\ No newline at end of file
diff --git a/com.inductiveautomation.perspective/session-props/resource.json b/com.inductiveautomation.perspective/session-props/resource.json
index 9696c53..f0dd197 100644
--- a/com.inductiveautomation.perspective/session-props/resource.json
+++ b/com.inductiveautomation.perspective/session-props/resource.json
@@ -9,8 +9,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-04-07T08:48:38Z"
+      "timestamp": "2025-04-07T08:56:37Z"
     },
-    "lastModificationSignature": "cc6529dd87e420a6881c71246d5cbc083790b2bf59bf4b3460292259ddbec12e"
+    "lastModificationSignature": "88634ee6b3f91efd1ddc6affdaa75677f0c7235d4bc443ce5d2d2a5cec07b947"
   }
 }
\ No newline at end of file
diff --git a/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json b/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json
index 10dba92..27a067c 100644
--- a/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json	
+++ b/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/resource.json	
@@ -10,8 +10,8 @@
   "attributes": {
     "lastModification": {
       "actor": "admin",
-      "timestamp": "2025-04-07T08:48:46Z"
+      "timestamp": "2025-04-07T08:56:47Z"
     },
-    "lastModificationSignature": "a2a30e7ad9d5b6e3f1a7936d96c66290b9b837fc6c3652ac22d57c1ab6f147df"
+    "lastModificationSignature": "cdbda015e3e16cb06761deca28f976cdd7455eee98e69a5ac4034e65804f6ad9"
   }
 }
\ No newline at end of file
diff --git a/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/view.json b/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/view.json
index 63fbb24..a10a53b 100644
--- a/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/view.json	
+++ b/com.inductiveautomation.perspective/views/Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve/view.json	
@@ -23,6 +23,7 @@
               "config": {
                 "expression": "if({session.custom.local},\r\n\"http://127.0.0.1:5500/MCM04_Bulk_Inbound_Problem_Solve.svg?var\" + toMillis(now(100)),\r\n\"http://192.168.5.204:39741/MCM04_Bulk_Inbound_Problem_Solve.svg?var\" + toMillis(now(100)))\r\n"
               },
+              "enabled": false,
               "type": "expr"
             }
           }
@@ -31,6 +32,7 @@
           "fit": {
             "mode": "fill"
           },
+          "source": "http://127.0.0.1:5500/MCM04_Bulk_Inbound_Problem_Solve.svg?var1744016199754",
           "style": {
             "backgroundColor": "#EEEEEE"
           }
@@ -227,20 +229,20 @@
           "forcedPrefix": "CON",
           "id": "rect1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "PS10-3",
+          "name": "PS10-4CH",
           "originalName": "PS10-3"
         },
         "position": {
           "height": 20.05,
           "rotate": {
-            "angle": 180
+            "angle": 220
           },
           "width": 19.98,
-          "x": 179.76,
-          "y": 638.9
+          "x": 71.7812,
+          "y": 633.699
         },
         "props": {
-          "path": "Symbol-Views/Equipment-Views/Status"
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
         },
         "type": "ia.display.view"
       },
@@ -4030,6 +4032,190 @@
           "path": "Symbol-Views/Equipment-Views/Status"
         },
         "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "PS10-6CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": 220
+          },
+          "width": 19.98,
+          "x": 59.993,
+          "y": 401.327
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "ULC8-2CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": -90
+          },
+          "width": 19.98,
+          "x": 312.17,
+          "y": 746.956
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "ULC7-2CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": -90
+          },
+          "width": 19.98,
+          "x": 419.944,
+          "y": 745.96
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "ULC6-2CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": -90
+          },
+          "width": 19.98,
+          "x": 531.416,
+          "y": 745.96
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "UL5C-2CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": -90
+          },
+          "width": 19.98,
+          "x": 626.663,
+          "y": 745.96
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "PS11-5CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": -40
+          },
+          "width": 19.98,
+          "x": 739.41,
+          "y": 469.75
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "PS11-10CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": 45
+          },
+          "width": 19.98,
+          "x": 1741.41,
+          "y": 471.251
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6",
+          "inheritedGroupPrefix": "CON",
+          "name": "PS1-12CH",
+          "originalName": "PS10-3"
+        },
+        "position": {
+          "height": 20.05,
+          "rotate": {
+            "angle": 45
+          },
+          "width": 19.98,
+          "x": 1752.41,
+          "y": 668.25
+        },
+        "props": {
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {
diff --git a/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json b/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json
deleted file mode 100644
index 7f2c3c5..0000000
--- a/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/resource.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "scope": "G",
-  "version": 1,
-  "restricted": false,
-  "overridable": true,
-  "files": [
-    "view.json",
-    "thumbnail.png"
-  ],
-  "attributes": {
-    "lastModification": {
-      "actor": "admin",
-      "timestamp": "2025-04-07T08:48:46Z"
-    },
-    "lastModificationSignature": "6a5a9fce6f402f71b5f251b523a75130a5a3d363c9492f669a470e1f2e25de11"
-  }
-}
\ No newline at end of file
diff --git a/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/thumbnail.png b/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/thumbnail.png
index 1f7ee4d..9cea2e8 100644
Binary files a/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/thumbnail.png and b/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/thumbnail.png differ
diff --git a/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json b/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json
index 443f9c6..6c4ac21 100644
--- a/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json	
+++ b/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json	
@@ -2217,7 +2217,7 @@
             "angle": 180
           },
           "width": 19.98,
-          "x": 733.08,
+          "x": 734.08,
           "y": 475.96
         },
         "props": {