diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-MCM/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-MCM/view.json
index 47be597..c0ad220 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-MCM/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-MCM/view.json
@@ -1001,6 +1001,155 @@
                         },
                         "type": "ia.container.flex"
                       },
+                      {
+                        "children": [
+                          {
+                            "children": [
+                              {
+                                "meta": {
+                                  "name": "Name"
+                                },
+                                "position": {
+                                  "basis": "50%",
+                                  "grow": 1
+                                },
+                                "props": {
+                                  "style": {
+                                    "paddingLeft": 20
+                                  },
+                                  "text": "ESTOPPED LOCALLY"
+                                },
+                                "type": "ia.display.label"
+                              },
+                              {
+                                "meta": {
+                                  "name": "Estopped Locally"
+                                },
+                                "position": {
+                                  "basis": "50%",
+                                  "grow": 1
+                                },
+                                "propConfig": {
+                                  "props.style.backgroundColor": {
+                                    "binding": {
+                                      "config": {
+                                        "path": "this.props.text"
+                                      },
+                                      "transforms": [
+                                        {
+                                          "fallback": "#000000",
+                                          "inputType": "scalar",
+                                          "mappings": [
+                                            {
+                                              "input": "TRUE",
+                                              "output": "#FFFFFF"
+                                            },
+                                            {
+                                              "input": "FALSE",
+                                              "output": "#D5D5D5"
+                                            }
+                                          ],
+                                          "outputType": "color",
+                                          "type": "map"
+                                        }
+                                      ],
+                                      "type": "property"
+                                    }
+                                  },
+                                  "props.text": {
+                                    "binding": {
+                                      "config": {
+                                        "fallbackDelay": 2.5,
+                                        "mode": "indirect",
+                                        "references": {
+                                          "0": "{view.params.tagProps[0]}",
+                                          "fc": "{session.custom.fc}"
+                                        },
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Alarm/EStopped_Locally"
+                                      },
+                                      "transforms": [
+                                        {
+                                          "expression": "coalesce({value},{view.params.forceFaultStatus},0)",
+                                          "type": "expression"
+                                        },
+                                        {
+                                          "fallback": "FALSE",
+                                          "inputType": "scalar",
+                                          "mappings": [
+                                            {
+                                              "input": 1,
+                                              "output": "TRUE"
+                                            }
+                                          ],
+                                          "outputType": "scalar",
+                                          "type": "map"
+                                        }
+                                      ],
+                                      "type": "tag"
+                                    }
+                                  },
+                                  "props.textStyle.color": {
+                                    "binding": {
+                                      "config": {
+                                        "path": "this.props.text"
+                                      },
+                                      "transforms": [
+                                        {
+                                          "fallback": "#000000",
+                                          "inputType": "scalar",
+                                          "mappings": [
+                                            {
+                                              "input": "TRUE",
+                                              "output": "#FF0000"
+                                            },
+                                            {
+                                              "input": "FALSE",
+                                              "output": "#47FF47"
+                                            }
+                                          ],
+                                          "outputType": "color",
+                                          "type": "map"
+                                        }
+                                      ],
+                                      "type": "property"
+                                    }
+                                  }
+                                },
+                                "props": {
+                                  "style": {
+                                    "classes": "Text-Styles/Ariel-Bold-12pt",
+                                    "paddingLeft": 10
+                                  }
+                                },
+                                "type": "ia.display.label"
+                              }
+                            ],
+                            "meta": {
+                              "name": "Property"
+                            },
+                            "position": {
+                              "basis": "35px",
+                              "shrink": 2
+                            },
+                            "props": {
+                              "style": {
+                                "classes": "PopUp-Styles/InfoLabel"
+                              }
+                            },
+                            "type": "ia.container.flex"
+                          }
+                        ],
+                        "meta": {
+                          "name": "Estopped Locally"
+                        },
+                        "position": {
+                          "basis": "35px"
+                        },
+                        "props": {
+                          "direction": "column"
+                        },
+                        "type": "ia.container.flex"
+                      },
                       {
                         "children": [
                           {
@@ -2102,7 +2251,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Start_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Start_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2114,7 +2263,11 @@
                                           "inputType": "scalar",
                                           "mappings": [
                                             {
-                                              "input": 1,
+                                              "input": 2,
+                                              "output": "#009400"
+                                            },
+                                            {
+                                              "input": 4,
                                               "output": "#009400"
                                             }
                                           ],
@@ -2134,7 +2287,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Start_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Start_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2146,8 +2299,12 @@
                                           "inputType": "scalar",
                                           "mappings": [
                                             {
-                                              "input": 1,
-                                              "output": "START PRESSED"
+                                              "input": 2,
+                                              "output": "STARTED"
+                                            },
+                                            {
+                                              "input": 4,
+                                              "output": "STARTED"
                                             }
                                           ],
                                           "outputType": "scalar",
@@ -2346,7 +2503,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Motor_Fault_Reset_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Motor_Fault_Reset_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2358,8 +2515,12 @@
                                           "inputType": "scalar",
                                           "mappings": [
                                             {
-                                              "input": 1,
-                                              "output": "#FFFF86"
+                                              "input": 2,
+                                              "output": "#BCC002"
+                                            },
+                                            {
+                                              "input": 4,
+                                              "output": "#BCC002"
                                             }
                                           ],
                                           "outputType": "color",
@@ -2388,12 +2549,7 @@
                                         {
                                           "fallback": "MOTOR FAULT RESET",
                                           "inputType": "scalar",
-                                          "mappings": [
-                                            {
-                                              "input": 1,
-                                              "output": "MOTOR FAULT RESET PRESSED"
-                                            }
-                                          ],
+                                          "mappings": [],
                                           "outputType": "scalar",
                                           "type": "map"
                                         }
@@ -2472,7 +2628,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Power_Branch_Fault_Reset_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Power_Branch_Fault_Reset_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2484,8 +2640,12 @@
                                           "inputType": "scalar",
                                           "mappings": [
                                             {
-                                              "input": 1,
-                                              "output": "#FFFF86"
+                                              "input": 2,
+                                              "output": "#BCC002"
+                                            },
+                                            {
+                                              "input": 4,
+                                              "output": "#BCC002"
                                             }
                                           ],
                                           "outputType": "color",
@@ -2504,7 +2664,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Power_Branch_Fault_Reset_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Power_Branch_Fault_Reset_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2514,12 +2674,7 @@
                                         {
                                           "fallback": "POWER BRANCH FAULT RESET",
                                           "inputType": "scalar",
-                                          "mappings": [
-                                            {
-                                              "input": 1,
-                                              "output": "POWER BRANCH FAULT RESET PRESSED"
-                                            }
-                                          ],
+                                          "mappings": [],
                                           "outputType": "scalar",
                                           "type": "map"
                                         }
@@ -2598,7 +2753,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Low_Air_Pressure_Reset_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Low_Air_Pressure_Reset_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2610,8 +2765,12 @@
                                           "inputType": "scalar",
                                           "mappings": [
                                             {
-                                              "input": 1,
-                                              "output": "#7070FF"
+                                              "input": 2,
+                                              "output": "#0A0AA4"
+                                            },
+                                            {
+                                              "input": 4,
+                                              "output": "#0A0AA4"
                                             }
                                           ],
                                           "outputType": "color",
@@ -2720,7 +2879,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Jam_Restart_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Jam_Restart_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2732,7 +2891,11 @@
                                           "inputType": "scalar",
                                           "mappings": [
                                             {
-                                              "input": 1,
+                                              "input": 2,
+                                              "output": "#D0D0D0"
+                                            },
+                                            {
+                                              "input": 4,
                                               "output": "#D0D0D0"
                                             }
                                           ],
@@ -2752,7 +2915,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Jam_Restart_PB"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Jam_Restart_PB_STATE"
                                       },
                                       "transforms": [
                                         {
@@ -2762,12 +2925,7 @@
                                         {
                                           "fallback": "JAM RESTART",
                                           "inputType": "scalar",
-                                          "mappings": [
-                                            {
-                                              "input": 1,
-                                              "output": "JAM RESTART PRESSED"
-                                            }
-                                          ],
+                                          "mappings": [],
                                           "outputType": "scalar",
                                           "type": "map"
                                         }
@@ -2976,6 +3134,7 @@
                   "grow": 1
                 },
                 "props": {
+                  "currentTabIndex": 2,
                   "menuType": "modern",
                   "tabSize": {
                     "width": 1000