diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json
index aa23a52..646ccd1 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/Symbol-Views/Equipment-Views/JR_Button/view.json
@@ -4,14 +4,15 @@
     "covert_mode": true,
     "disconnected": false,
     "display_icon": true,
-    "error": true,
+    "error": false,
     "isMatch": 0,
     "plc": "value",
-    "priority": 4,
-    "priority_string": "High",
+    "priority": 0,
+    "priority_string": "No active alarms",
     "searchId": "PLC01",
-    "state": 1,
-    "visible_status": true
+    "state": 5,
+    "status": 3,
+    "visible_status": false
   },
   "params": {
     "forceFaultStatus": null,
@@ -142,7 +143,7 @@
     "custom.priority_string": {
       "binding": {
         "config": {
-          "expression": "case({view.custom.state},\r\n1, \"High\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
+          "expression": "case({view.custom.state},\r\n4, \"Diagnostic\",\r\n5, \"No active alarms\",\r\n\"Unknown\")"
         },
         "type": "expr"
       },
@@ -178,8 +179,8 @@
             "inputType": "scalar",
             "mappings": [
               {
-                "input": 4,
-                "output": 1
+                "input": 1,
+                "output": 4
               },
               {
                 "input": 0,
@@ -194,6 +195,27 @@
       },
       "persistent": true
     },
+    "custom.status": {
+      "binding": {
+        "config": {
+          "fallbackDelay": 2.5,
+          "mode": "indirect",
+          "references": {
+            "0": "{view.params.tagProps[0]}",
+            "fc": "{session.custom.fc}"
+          },
+          "tagPath": "[{fc}_SCADA_TAG_PROVIDER]{0}/STATE"
+        },
+        "transforms": [
+          {
+            "expression": "coalesce({value},{view.params.forceFaultStatus},0)",
+            "type": "expression"
+          }
+        ],
+        "type": "tag"
+      },
+      "persistent": true
+    },
     "custom.visible_status": {
       "binding": {
         "config": {
@@ -246,7 +268,7 @@
           "props.elements[1].fill.paint": {
             "binding": {
               "config": {
-                "path": "view.custom.state"
+                "path": "view.custom.status"
               },
               "transforms": [
                 {
@@ -254,12 +276,20 @@
                   "inputType": "scalar",
                   "mappings": [
                     {
-                      "input": 5,
+                      "input": 0,
                       "output": "#D5D5D5"
                     },
                     {
                       "input": 1,
                       "output": "#FFFFFF"
+                    },
+                    {
+                      "input": 2,
+                      "output": "#47FF47"
+                    },
+                    {
+                      "input": 3,
+                      "output": "#FFFF47"
                     }
                   ],
                   "outputType": "color",