diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Extendo/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Extendo/view.json
index 0c27445..fb4e880 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Extendo/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-Extendo/view.json
@@ -546,304 +546,6 @@
                         },
                         "type": "ia.container.flex"
                       },
-                      {
-                        "children": [
-                          {
-                            "children": [
-                              {
-                                "meta": {
-                                  "name": "Name"
-                                },
-                                "position": {
-                                  "basis": "50%",
-                                  "grow": 1
-                                },
-                                "props": {
-                                  "style": {
-                                    "paddingLeft": 20
-                                  },
-                                  "text": "ESTOPPED"
-                                },
-                                "type": "ia.display.label"
-                              },
-                              {
-                                "meta": {
-                                  "name": "Estopped"
-                                },
-                                "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"
-                                      },
-                                      "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"
-                        },
-                        "position": {
-                          "basis": "35px"
-                        },
-                        "props": {
-                          "direction": "column"
-                        },
-                        "type": "ia.container.flex"
-                      },
-                      {
-                        "children": [
-                          {
-                            "children": [
-                              {
-                                "meta": {
-                                  "name": "Name"
-                                },
-                                "position": {
-                                  "basis": "50%",
-                                  "grow": 1
-                                },
-                                "props": {
-                                  "style": {
-                                    "paddingLeft": 20
-                                  },
-                                  "text": "COMMUNICATION FAULTED"
-                                },
-                                "type": "ia.display.label"
-                              },
-                              {
-                                "meta": {
-                                  "name": "Communication Faulted"
-                                },
-                                "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/Communication_Faulted"
-                                      },
-                                      "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": "Communication Faulted"
-                        },
-                        "position": {
-                          "basis": "35px"
-                        },
-                        "props": {
-                          "direction": "column"
-                        },
-                        "type": "ia.container.flex"
-                      },
                       {
                         "children": [
                           {
@@ -1945,7 +1647,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Start_PB_STATE"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/PEC_Override_PB"
                                       },
                                       "transforms": [
                                         {
@@ -1967,14 +1669,45 @@
                                       ],
                                       "type": "tag"
                                     }
+                                  },
+                                  "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}/PEC_Override_PB"
+                                      },
+                                      "transforms": [
+                                        {
+                                          "expression": "coalesce({value},{view.params.forceFaultStatus},0)",
+                                          "type": "expression"
+                                        },
+                                        {
+                                          "fallback": "PEC OVERRIDE",
+                                          "inputType": "scalar",
+                                          "mappings": [
+                                            {
+                                              "input": 1,
+                                              "output": "PEC OVERRIDE PRESSED"
+                                            }
+                                          ],
+                                          "outputType": "scalar",
+                                          "type": "map"
+                                        }
+                                      ],
+                                      "type": "tag"
+                                    }
                                   }
                                 },
                                 "props": {
                                   "image": {},
                                   "style": {
                                     "classes": "Background-Styles/Controller"
-                                  },
-                                  "text": "PEC OVERRIDE"
+                                  }
                                 },
                                 "type": "ia.input.button"
                               }
@@ -2000,7 +1733,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+\"/PEC_Override_PB\"\n\tsystem.tag.writeBlocking([tag_path],[True])"
+                                        "script": "\ttag_name \u003d self.view.params.tagProps[0]\n\ttag_path \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/Extendo_Faults_Reset_PB\"\n\tsystem.tag.writeBlocking([tag_path],[True])"
                                       },
                                       "scope": "G",
                                       "type": "script"
@@ -2032,7 +1765,7 @@
                                           "0": "{view.params.tagProps[0]}",
                                           "fc": "{session.custom.fc}"
                                         },
-                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Start_PB_STATE"
+                                        "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/Extendo_Faults_Reset_PB"
                                       },
                                       "transforms": [
                                         {
@@ -2054,13 +1787,44 @@
                                       ],
                                       "type": "tag"
                                     }
+                                  },
+                                  "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}/Extendo_Faults_Reset_PB"
+                                      },
+                                      "transforms": [
+                                        {
+                                          "expression": "coalesce({value},{view.params.forceFaultStatus},0)",
+                                          "type": "expression"
+                                        },
+                                        {
+                                          "fallback": "EXTENDO FAULTS RESET",
+                                          "inputType": "scalar",
+                                          "mappings": [
+                                            {
+                                              "input": 1,
+                                              "output": "EXTENDO FAULTS RESET PRESSED"
+                                            }
+                                          ],
+                                          "outputType": "scalar",
+                                          "type": "map"
+                                        }
+                                      ],
+                                      "type": "tag"
+                                    }
                                   }
                                 },
                                 "props": {
                                   "style": {
                                     "classes": "Background-Styles/Controller"
-                                  },
-                                  "text": "RESET EXTENDO FAULT"
+                                  }
                                 },
                                 "type": "ia.input.button"
                               }