diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Chutes/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Chutes/view.json
index 90480a4..76e2500 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Chutes/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 Chutes/view.json	
@@ -94,7 +94,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.0443,
+          "x": 0.0448,
           "y": 0.5973
         },
         "props": {
@@ -129,7 +129,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.0557,
+          "x": 0.0562,
           "y": 0.5973
         },
         "props": {
@@ -164,7 +164,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.067,
+          "x": 0.0675,
           "y": 0.5973
         },
         "props": {
@@ -199,7 +199,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.0892,
+          "x": 0.0897,
           "y": 0.5973
         },
         "props": {
@@ -234,7 +234,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1005,
+          "x": 0.101,
           "y": 0.5973
         },
         "props": {
@@ -269,7 +269,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1119,
+          "x": 0.1124,
           "y": 0.5973
         },
         "props": {
@@ -304,7 +304,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1232,
+          "x": 0.1239,
           "y": 0.5973
         },
         "props": {
@@ -339,7 +339,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1351,
+          "x": 0.1355,
           "y": 0.5973
         },
         "props": {
@@ -409,7 +409,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1578,
+          "x": 0.1583,
           "y": 0.5973
         },
         "props": {
@@ -444,7 +444,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1692,
+          "x": 0.1698,
           "y": 0.5973
         },
         "props": {
@@ -479,7 +479,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.1957,
+          "x": 0.196,
           "y": 0.5973
         },
         "props": {
@@ -1529,7 +1529,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.5769,
+          "x": 0.5774,
           "y": 0.8161
         },
         "props": {
@@ -1564,7 +1564,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.5882,
+          "x": 0.5887,
           "y": 0.8161
         },
         "props": {
@@ -2859,7 +2859,7 @@
             "angle": -90
           },
           "width": 0.0108,
-          "x": 0.7011,
+          "x": 0.7016,
           "y": 0.2568
         },
         "props": {
@@ -2894,7 +2894,7 @@
             "angle": -90
           },
           "width": 0.0108,
-          "x": 0.7124,
+          "x": 0.7129,
           "y": 0.2568
         },
         "props": {
@@ -3664,7 +3664,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.4402,
+          "x": 0.4397,
           "y": 0.3571
         },
         "props": {
@@ -3699,7 +3699,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.4526,
+          "x": 0.4521,
           "y": 0.3571
         },
         "props": {
@@ -3944,7 +3944,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.5806,
+          "x": 0.5801,
           "y": 0.3571
         },
         "props": {
@@ -4049,7 +4049,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.6271,
+          "x": 0.6266,
           "y": 0.3571
         },
         "props": {
@@ -4084,7 +4084,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.6385,
+          "x": 0.638,
           "y": 0.3571
         },
         "props": {
@@ -4539,7 +4539,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.8276,
+          "x": 0.8266,
           "y": 0.3571
         },
         "props": {
@@ -4574,7 +4574,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.839,
+          "x": 0.838,
           "y": 0.3571
         },
         "props": {
@@ -4609,7 +4609,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.8498,
+          "x": 0.8493,
           "y": 0.3571
         },
         "props": {
@@ -4644,7 +4644,7 @@
             "angle": 90
           },
           "width": 0.0108,
-          "x": 0.8612,
+          "x": 0.8607,
           "y": 0.3571
         },
         "props": {
@@ -4676,7 +4676,7 @@
         "position": {
           "height": 0.0146,
           "width": 0.0162,
-          "x": 0.1474,
+          "x": 0.1312,
           "y": 0.5558
         },
         "props": {
@@ -5804,7 +5804,7 @@
             "angle": "180deg"
           },
           "width": 0.007,
-          "x": 0.0578,
+          "x": 0.0583,
           "y": 0.627
         },
         "props": {
@@ -6092,7 +6092,7 @@
             "angle": "180deg"
           },
           "width": 0.007,
-          "x": 0.16,
+          "x": 0.1585,
           "y": 0.627
         },
         "props": {
@@ -6128,7 +6128,7 @@
             "angle": "180deg"
           },
           "width": 0.007,
-          "x": 0.1692,
+          "x": 0.1668,
           "y": 0.627
         },
         "props": {
@@ -12017,7 +12017,7 @@
       },
       {
         "meta": {
-          "name": "CH_DPM4_FIO6"
+          "name": "VSC_DPM1_FIO6"
         },
         "position": {
           "height": 0.0195,
@@ -12122,7 +12122,7 @@
       },
       {
         "meta": {
-          "name": "CH_DPM2_FIO6"
+          "name": "VSA_DPM2_FIO6"
         },
         "position": {
           "height": 0.0195,
@@ -13800,7 +13800,7 @@
             "angle": "180deg"
           },
           "width": 0.0081,
-          "x": 0.1297,
+          "x": 0.1299,
           "y": 0.627
         },
         "props": {
@@ -13835,8 +13835,8 @@
             "angle": "180deg"
           },
           "width": 0.007,
-          "x": 0.1773,
-          "y": 0.627
+          "x": 0.1753,
+          "y": 0.6273
         },
         "props": {
           "params": {
@@ -15156,6 +15156,41 @@
           "path": "Symbol-Views/Equipment-Views/JR_Button"
         },
         "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "VSA_DPM3_FIO6"
+        },
+        "position": {
+          "height": 0.0195,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 0.0108,
+          "x": 0.1519,
+          "y": 0.5523
+        },
+        "props": {
+          "params": {
+            "directionDown": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/DeviceStatus/VSA_DPM3_FIO3",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Device-Views/DeviceStatus"
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve/view.json
index 675bdf1..4159039 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve/view.json	
@@ -384,8 +384,8 @@
             "angle": 220
           },
           "width": 0.0108,
-          "x": 0.0388,
-          "y": 0.6164
+          "x": 0.0378,
+          "y": 0.6154
         },
         "props": {
           "params": {
@@ -2428,9 +2428,9 @@
           "rotate": {
             "angle": 90
           },
-          "width": 0.0259,
-          "x": 0.3423,
-          "y": 0.669
+          "width": 0.0254,
+          "x": 0.3426,
+          "y": 0.6695
         },
         "props": {
           "params": {
@@ -2533,9 +2533,9 @@
           "rotate": {
             "angle": 90
           },
-          "width": 0.0465,
-          "x": 0.3681,
-          "y": 0.6938
+          "width": 0.0546,
+          "x": 0.364,
+          "y": 0.6865
         },
         "props": {
           "params": {
@@ -2568,9 +2568,9 @@
           "rotate": {
             "angle": 90
           },
-          "width": 0.0168,
-          "x": 0.3829,
-          "y": 0.5984
+          "width": 0.0195,
+          "x": 0.3816,
+          "y": 0.6008
         },
         "props": {
           "params": {
@@ -4684,8 +4684,8 @@
             "angle": 220
           },
           "width": 0.0108,
-          "x": 0.0324,
-          "y": 0.3904
+          "x": 0.0319,
+          "y": 0.3884
         },
         "props": {
           "params": {
@@ -4725,7 +4725,7 @@
           },
           "width": 0.0108,
           "x": 0.3997,
-          "y": 0.457
+          "y": 0.455
         },
         "props": {
           "params": {
@@ -4764,7 +4764,7 @@
             "angle": 45
           },
           "width": 0.0108,
-          "x": 0.9413,
+          "x": 0.9418,
           "y": 0.4584
         },
         "props": {
@@ -4805,7 +4805,7 @@
           },
           "width": 0.0108,
           "x": 0.9472,
-          "y": 0.7395
+          "y": 0.7425
         },
         "props": {
           "params": {
@@ -6515,7 +6515,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC5_2",
+          "name": "ULC5_2CH",
           "originalName": "PS10-3"
         },
         "position": {
@@ -6555,7 +6555,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC6_2",
+          "name": "ULC6_2CH",
           "originalName": "PS10-3"
         },
         "position": {
@@ -6595,7 +6595,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC7_2",
+          "name": "ULC7_2CH",
           "originalName": "PS10-3"
         },
         "position": {
@@ -6635,7 +6635,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6",
           "inheritedGroupPrefix": "CON",
-          "name": "ULC8_2",
+          "name": "ULC8_2CH",
           "originalName": "PS10-3"
         },
         "position": {
@@ -6675,7 +6675,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6-0-9-7-8-5-22-5-2-0-4",
           "inheritedGroupPrefix": "CON",
-          "name": "S013003",
+          "name": "PRS3_1ACH",
           "originalName": "FL3012-2"
         },
         "position": {
@@ -6715,7 +6715,7 @@
           "forcedPrefix": "CON",
           "id": "rect1-6-0-9-7-8-5-22-5-2-0-4",
           "inheritedGroupPrefix": "CON",
-          "name": "S011001",
+          "name": "PRS3_1BCH",
           "originalName": "FL3012-2"
         },
         "position": {
@@ -7165,7 +7165,7 @@
           },
           "width": 0.0108,
           "x": 0.4941,
-          "y": 0.4005
+          "y": 0.3617
         },
         "props": {
           "params": {
@@ -9045,42 +9045,6 @@
         },
         "type": "ia.display.view"
       },
-      {
-        "meta": {
-          "name": "PS11_1_JR2"
-        },
-        "position": {
-          "height": 0.0126,
-          "rotate": {
-            "angle": "180deg"
-          },
-          "width": 0.007,
-          "x": 0.3401,
-          "y": 0.5944
-        },
-        "props": {
-          "params": {
-            "directionDown": false,
-            "directionLeft": false,
-            "forceFaultStatus": null,
-            "forceRunningStatus": null,
-            "tagProps": [
-              "System/MCM04/Estop/PS11_1_JR2",
-              "value",
-              "value",
-              "value",
-              "value",
-              "value",
-              "value",
-              "value",
-              "value",
-              "value"
-            ]
-          },
-          "path": "Symbol-Views/Equipment-Views/JR_Button"
-        },
-        "type": "ia.display.view"
-      },
       {
         "meta": {
           "name": "PS11_4_S1"
@@ -10163,8 +10127,8 @@
             "angle": 0
           },
           "width": 0.0108,
-          "x": 0.374,
-          "y": 0.6655
+          "x": 0.37,
+          "y": 0.6725
         },
         "props": {
           "params": {
@@ -11079,6 +11043,242 @@
           "path": "Symbol-Views/Equipment-Views/Status"
         },
         "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1",
+          "inheritedGroupPrefix": "CON",
+          "name": "PDP9_FIO1",
+          "originalName": "PS10-5"
+        },
+        "position": {
+          "height": 0.0195,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 0.0108,
+          "x": 0.6292,
+          "y": 0.5006
+        },
+        "props": {
+          "params": {
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/DeviceStatus/PRS3_4CH_FIO1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Device-Views/DeviceStatus"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1",
+          "inheritedGroupPrefix": "CON",
+          "name": "PDP9_FIO1H",
+          "originalName": "PS10-5"
+        },
+        "position": {
+          "height": 0.0195,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 0.0108,
+          "x": 0.6395,
+          "y": 0.5006
+        },
+        "props": {
+          "params": {
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/DeviceStatus/PRS3_4CH_FIO1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Device-Views/DeviceStatus"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1",
+          "inheritedGroupPrefix": "CON",
+          "name": "PDP10_FIO1H",
+          "originalName": "PS10-5"
+        },
+        "position": {
+          "height": 0.0195,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 0.0108,
+          "x": 0.6395,
+          "y": 0.522
+        },
+        "props": {
+          "params": {
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/DeviceStatus/PRS3_4CH_FIO1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Device-Views/DeviceStatus"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1",
+          "inheritedGroupPrefix": "CON",
+          "name": "PDP10_FIO1",
+          "originalName": "PS10-5"
+        },
+        "position": {
+          "height": 0.0195,
+          "rotate": {
+            "angle": 0
+          },
+          "width": 0.0108,
+          "x": 0.6292,
+          "y": 0.522
+        },
+        "props": {
+          "params": {
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/DeviceStatus/PRS3_4CH_FIO1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Device-Views/DeviceStatus"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "elementPrefix": "CON",
+          "forcedPrefix": "CON",
+          "id": "rect1-6-0-9-7-8-5-22-5-2-0-4",
+          "inheritedGroupPrefix": "CON",
+          "name": "PRS3_4CH",
+          "originalName": "FL3012-2"
+        },
+        "position": {
+          "height": 0.0195,
+          "rotate": {
+            "angle": 90
+          },
+          "width": 0.0108,
+          "x": 0.4939,
+          "y": 0.3992
+        },
+        "props": {
+          "params": {
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/StatusNonPowered/S013003",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/StatusNonPowered"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "PS11_2_JR2"
+        },
+        "position": {
+          "height": 0.0126,
+          "rotate": {
+            "angle": "180deg"
+          },
+          "width": 0.007,
+          "x": 0.3816,
+          "y": 0.6585
+        },
+        "props": {
+          "params": {
+            "directionDown": false,
+            "directionLeft": false,
+            "forceFaultStatus": null,
+            "forceRunningStatus": null,
+            "tagProps": [
+              "System/MCM04/Estop/ULC5_3_JR1",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "Symbol-Views/Equipment-Views/JR_Button"
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/Components/DPM_BLOCK/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/Components/DPM_BLOCK/view.json
index f9e848c..2481097 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/Components/DPM_BLOCK/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/Components/DPM_BLOCK/view.json	
@@ -14,7 +14,19 @@
     "OutDown": false,
     "OutOn": false,
     "OutRight": false,
-    "OutUp": false
+    "OutUp": false,
+    "tagProps": [
+      "value",
+      "value",
+      "value",
+      "value",
+      "value",
+      "value",
+      "value",
+      "value",
+      "value",
+      "value"
+    ]
   },
   "propConfig": {
     "params.Down1": {
@@ -72,6 +84,10 @@
     "params.OutUp": {
       "paramDirection": "input",
       "persistent": true
+    },
+    "params.tagProps": {
+      "paramDirection": "input",
+      "persistent": true
     }
   },
   "props": {
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/DPMs/MCM04-DPM/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/DPMs/MCM04-DPM/view.json
index c3b24c0..4670c93 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/DPMs/MCM04-DPM/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Windows/Tabs/Enternet Windows/DPMs/MCM04-DPM/view.json	
@@ -102,10 +102,10 @@
           "fallbackDelay": 2.5,
           "mode": "indirect",
           "references": {
-            "1": "{view.params.tagProps[1]}",
+            "11": "{view.params.tagProps[11]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{1}/STATE"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{11}/STATE"
         },
         "transforms": [
           {
@@ -168,10 +168,10 @@
           "fallbackDelay": 2.5,
           "mode": "indirect",
           "references": {
-            "8": "{view.params.tagProps[8]}",
+            "3": "{view.params.tagProps[3]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{8}/STATE"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{3}/STATE"
         },
         "transforms": [
           {
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json
index d8b4904..22dbd31 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Button/view.json
@@ -1,14 +1,6 @@
 {
   "custom": {
-    "PLC_list": [
-      "MCM01",
-      "MCM02",
-      "MCM03",
-      "MCM04",
-      "MCM05",
-      "MCM06",
-      "MCM07"
-    ],
+    "PLC_list": null,
     "running_state": -1,
     "state": 0,
     "views_data": []
@@ -465,7 +457,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Pressed"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/PR_PB_Pressed"
                                       },
                                       "transforms": [
                                         {
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-StatusNonPowered/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-StatusNonPowered/view.json
index 69a7ec8..bd81422 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-StatusNonPowered/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-StatusNonPowered/view.json
@@ -1,14 +1,6 @@
 {
   "custom": {
-    "PLC_list": [
-      "MCM01",
-      "MCM02",
-      "MCM03",
-      "MCM04",
-      "MCM05",
-      "MCM06",
-      "MCM07"
-    ],
+    "PLC_list": null,
     "running_state": -1,
     "state": 0,
     "type": 0,
@@ -1548,7 +1540,7 @@
                                   "component": {
                                     "onActionPerformed": {
                                       "config": {
-                                        "script": "\ttag_name \u003d self.view.params.tagProps[0]\n\ttag_path \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/Enable_Chute_Pressed\"\n\tsystem.tag.writeBlocking([tag_path],[True])\n\ttag_path2 \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/GS_PB\"\n\tsystem.tag.writeBlocking([tag_path2],[True])\t"
+                                        "script": "\ttag_name \u003d self.view.params.tagProps[0]\n\ttag_path \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/Enable_Chute_PB\"\n\tsystem.tag.writeBlocking([tag_path],[True])\n\ttag_path2 \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/GS_PB\"\n\tsystem.tag.writeBlocking([tag_path2],[True])\t"
                                       },
                                       "scope": "G",
                                       "type": "script"
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json
index 0e5d7d3..2344795 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/Button/view.json
@@ -114,7 +114,7 @@
             "0": "{view.params.tagProps[0]}",
             "fc": "{session.custom.fc}"
           },
-          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/Pressed"
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/PR_Pressed"
         },
         "transforms": [
           {
diff --git a/image_server/MCM04_Bulk_Inbound_Problem_Solve.svg b/image_server/MCM04_Bulk_Inbound_Problem_Solve.svg
index 02b57fc..c16041e 100644
--- a/image_server/MCM04_Bulk_Inbound_Problem_Solve.svg
+++ b/image_server/MCM04_Bulk_Inbound_Problem_Solve.svg
@@ -7,7 +7,7 @@
    version="1.1"
    id="svg118"
    sodipodi:docname="MCM04_Bulk_Inbound_Problem_Solve.svg"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
    xml:space="preserve"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -23,15 +23,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="6.98078"
-     inkscape:cx="477.16731"
-     inkscape:cy="768.32388"
+     inkscape:zoom="39.489255"
+     inkscape:cx="926.55585"
+     inkscape:cy="416.65765"
      inkscape:window-width="3840"
-     inkscape:window-height="2043"
-     inkscape:window-x="-11"
+     inkscape:window-height="2054"
+     inkscape:window-x="3829"
      inkscape:window-y="-11"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g1"
+     inkscape:current-layer="svg118"
      showgrid="true"
      showguides="true"><inkscape:grid
        id="grid2"
@@ -135,19 +135,19 @@
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="cc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
-     d="m 59.008697,416.91576 c 0,0 2.3949,0.1384 4.8483,1.9519 2.4535,1.8135 2.6298,4.0417 2.6298,4.0417 l 19.1843,0.042 c 0,0 -1.2877,-10.5083 -9.0574,-17.6276 -7.7698,-7.1193 -17.605,-7.7898 -17.605,-7.7898 z"
+     d="m 59.008697,417.0232 c 0,0 2.215837,0.0668 4.669237,1.88027 2.4535,1.8135 2.737238,3.93426 2.737238,3.93426 l 19.578239,0.11363 c 0,0 1.774278,-11.77965 -5.995422,-18.89895 -7.7698,-7.1193 -20.989292,-6.51845 -20.989292,-6.51845 z"
      id="path3-3-2"
      sodipodi:nodetypes="czcczcc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
-     d="m 93.149893,639.21225 c 0,0 -2.3949,-0.13845 -4.8483,-1.95195 -2.4535,-1.8135 -2.6298,-4.04161 -2.6298,-4.04161 l -19.1843,-0.042 c 0,0 1.2877,10.50828 9.0574,17.62757 7.7698,7.11929 17.605,7.78977 17.605,7.78977 z"
+     d="m 93.078268,639.10841 c 0,0 -1.892778,-0.12579 -4.346178,-1.93929 -2.4535,-1.8135 -2.617138,-4.07705 -2.617138,-4.07705 l -19.627459,0.0846 c 0,0 -0.932682,10.93803 6.837018,18.05732 7.7698,7.11929 19.825382,7.36002 19.825382,7.36002 z"
      id="path3-0-9"
      sodipodi:nodetypes="czcczcc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
-     d="m 752.91823,492.16401 c 0,0 0.13845,-2.3949 1.95195,-4.8483 1.8135,-2.4535 4.04161,-2.6298 4.04161,-2.6298 l 0.042,-19.1843 c 0,0 -10.50828,1.2877 -17.62757,9.0574 -7.11929,7.7698 -7.78977,17.605 -7.78977,17.605 z"
+     d="m 753.06148,492.27145 c 0,0 -0.14805,-2.50234 1.66545,-4.95574 1.8135,-2.4535 4.18486,-2.6298 4.18486,-2.6298 l 0.11363,-19.43499 c 0,0 -13.23004,-0.75362 -20.34933,7.01608 -7.11929,7.7698 -5.13964,19.89701 -5.13964,19.89701 z"
      id="path3-0"
      sodipodi:nodetypes="czcczcc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
-     d="m 1772.5334,765.97207 c 0,0 -2.3949,-0.1384 -4.8483,-1.9519 -2.4535,-1.8135 -2.6298,-4.0417 -2.6298,-4.0417 l -19.1843,-0.042 c 0,0 1.2877,10.5083 9.0574,17.6276 7.7698,7.1193 17.605,7.7898 17.605,7.7898 z"
+     d="m 1772.6347,765.66819 c 0,0 -2.1417,0.14016 -4.5951,-1.67334 -2.4535,-1.8135 -2.7057,-4.01638 -2.7057,-4.01638 l -19.4629,-0.042 c 0,0 -1.903,11.87576 5.8667,18.99506 7.7698,7.1193 20.9223,6.14378 20.9223,6.14378 z"
      id="path3-3"
      sodipodi:nodetypes="czcczcc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
@@ -867,11 +867,11 @@
        id="path37"
        sodipodi:nodetypes="ccccc" /></g><path
      style="opacity:1;fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none;image-rendering:auto"
-     d="m 914.34742,432.43882 18.97498,0.0328 c -0.002,-11.31853 7.37708,-16.43786 12.16059,-16.65275 l 0.003,-19.30793 c -20.10517,-0.0865 -21.72008,18.58541 -21.72008,18.58541 0,0 -3.58485,-18.79666 -21.84108,-18.64348 l -2e-5,19.34248 c 4.67775,0.10544 12.39117,5.31276 12.4226,16.64347 z"
+     d="m 914.34742,432.43882 18.97498,0.0328 c -0.002,-11.31853 7.37708,-16.43786 12.16059,-16.65275 l 0.003,-19.30793 c -20.91584,0 -22.37849,12.81169 -22.37849,12.81169 0,0 -1.10124,-12.86976 -21.18267,-12.86976 l -2e-5,19.34248 c 4.67775,0.10544 12.39117,5.31276 12.4226,16.64347 z"
      id="path2"
      sodipodi:nodetypes="ccccccccc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none"
-     d="m 1738.0969,484.8898 c 0,0 2.3949,0.13845 4.8483,1.95195 2.4535,1.8135 2.6298,4.04161 2.6298,4.04161 l 19.1843,0.042 c 0,0 -1.2877,-10.50828 -9.0574,-17.62757 -7.7698,-7.11929 -17.605,-7.78977 -17.605,-7.78977 z"
+     d="m 1738.0969,484.8898 c 0,0 2.3949,0.13845 4.8483,1.95195 2.4535,1.8135 2.5582,4.0058 2.5582,4.0058 l 19.5424,0.0778 c 0,0 1.5057,-12.87191 -6.264,-19.9912 -7.7698,-7.11929 -20.7923,-5.6052 -20.7923,-5.6052 z"
      id="path3"
      sodipodi:nodetypes="czcczcc" /><path
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-dashoffset:0"
diff --git a/image_server/MCM05_Bulk_Inbound_Problem_Solve_+_Fluid_Inbound.svg b/image_server/MCM05_Bulk_Inbound_Problem_Solve_+_Fluid_Inbound.svg
index 8964f18..26338f8 100644
--- a/image_server/MCM05_Bulk_Inbound_Problem_Solve_+_Fluid_Inbound.svg
+++ b/image_server/MCM05_Bulk_Inbound_Problem_Solve_+_Fluid_Inbound.svg
@@ -8,7 +8,7 @@
    version="1.1"
    id="svg1"
    xml:space="preserve"
-   inkscape:version="1.4 (86a8ad7, 2024-10-11)"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
    sodipodi:docname="MCM05_Bulk_Inbound_Problem_Solve_+_Fluid_Inbound.svg"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -23,15 +23,15 @@
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
      inkscape:document-units="px"
-     inkscape:zoom="7.9999995"
-     inkscape:cx="367.50002"
-     inkscape:cy="108.43751"
+     inkscape:zoom="31.999998"
+     inkscape:cx="221.43751"
+     inkscape:cy="526.98441"
      inkscape:window-width="3840"
-     inkscape:window-height="2043"
+     inkscape:window-height="2054"
      inkscape:window-x="-11"
      inkscape:window-y="-11"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g65"
+     inkscape:current-layer="layer1"
      showguides="false"><sodipodi:guide
        position="2817.1135,105.93272"
        orientation="0,-1"
@@ -132,15 +132,15 @@
        id="path112"
        sodipodi:nodetypes="ccccc" /><path
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1493.7517,513.23584 18.9448,0.0677 c 0.7002,16.45429 -12.8604,29.39305 -30.2172,28.20171 l 0.043,-19.00614 c 6.404,0.16342 10.8266,-3.09935 11.2143,-9.26332 z"
+       d="m 1493.7517,513.23584 18.9448,0.0677 c 0.9621,22.9891 -9.7558,29.26218 -30.2172,28.20171 l 0.043,-19.40389 c 5.7411,-0.49949 9.9869,-3.27612 11.2143,-8.86557 z"
        id="path15"
        sodipodi:nodetypes="cccccc" /><path
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
-       d="m 186.85843,512.0006 c -0.7002,16.45429 7.0418,30.48237 24.3986,29.29103 l 0.015,-18.97482 c 0,-0.0828 -5.435,-1.00346 -5.2997,-10.23295 0,0 -18.9255,-0.16092 -19.1135,-0.0833 z"
+       d="m 186.88968,513.7506 c -1.02254,18.28126 2.7637,28.0196 24.36735,27.54103 l 0.10875,-19.28732 c -0.1875,-0.1453 -5.84125,-1.22221 -5.45595,-8.3267 z"
        id="path16"
-       sodipodi:nodetypes="cccccc" /><path
+       sodipodi:nodetypes="ccccc" /><path
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1493.978,253.40872 18.9975,0.0778 c -0.095,-16.3659 -4.589,-23.42684 -21.9016,-23.00894 l 0.1839,19.00369 c 2.3176,0.80836 2.6729,2.68116 2.7202,3.92742 z"
+       d="m 1493.978,253.40872 18.9975,0.0778 c -0.095,-16.3659 -4.589,-23.42684 -21.9016,-23.00894 l 0.1839,19.22466 c 2.3176,0.80836 2.6729,2.46019 2.7202,3.70645 z"
        id="path2"
        sodipodi:nodetypes="cccccc" /><path
        style="fill:#ffffff;stroke:#000000"