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 3a680fc..e23e850 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
@@ -3040,7 +3040,7 @@
                                   "meta.tooltip.text": {
                                     "binding": {
                                       "config": {
-                                        "expression": "if({this.props.enabled},{this.props.text} +\u0027 Button\u0027,\"You do not have Maintenance or Administrator role!\")"
+                                        "expression": "if({this.props.enabled},{this.props.text} +\u0027 Button\u0027,\"You do not have Administrator role!\")"
                                       },
                                       "type": "expr"
                                     }
@@ -3048,7 +3048,7 @@
                                   "props.enabled": {
                                     "binding": {
                                       "config": {
-                                        "expression": "indexOf({session.props.auth.user.roles}, \"Administrator\") \u003e\u003d 0 || indexOf({session.props.auth.user.roles}, \"Maintenance\") \u003e\u003d 0"
+                                        "expression": "indexOf({session.props.auth.user.roles}, \"Administrator\") \u003e\u003d 0"
                                       },
                                       "type": "expr"
                                     }
@@ -3070,7 +3070,7 @@
                                           "type": "expression"
                                         },
                                         {
-                                          "expression": "if(\r\n  {this.props.enabled} \u003d False,\r\n  \"#A1A1A1\",\r\n  if(\r\n    {value} \u003d 1,\r\n    \"#AAAAAA\",\r\n    \"#FFFFFF\"\r\n  )\r\n)\r\n",
+                                          "expression": "if(\r\n  {this.props.enabled} \u003d False,\r\n  \"#A1A1A1\",\r\n  if(\r\n    {value} \u003d True,\r\n    \"#AAAAAA\",\r\n    \"#FFFFFF\"\r\n  )\r\n)\r\n",
                                           "type": "expression"
                                         }
                                       ],
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD/view.json
index 458c406..167cdd7 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/Controller-Equipment/Information-Docked-East-VFD/view.json
@@ -1,7 +1,13 @@
 {
   "custom": {
     "MCM": "MCM01",
-    "PLC_list": null,
+    "PLC_list": [
+      "MCM01",
+      "MCM02",
+      "MCM03",
+      "MCM04",
+      "MCM05"
+    ],
     "color": "#C2C2C2",
     "state": "Closed",
     "type": false
@@ -24,11 +30,11 @@
     "custom.MCM": {
       "binding": {
         "config": {
-          "path": "view.custom.MCM"
+          "path": "view.params.tagProps[0]"
         },
         "transforms": [
           {
-            "code": "\tbaseTag \u003d self.view.params.tagProps[0]\n\tparts \u003d baseTag.split(\"/\")\n\tmcm \u003d parts[1] if len(parts) \u003e 1 else None\n\treturn mcm",
+            "code": "\tbaseTag \u003d value\n\tparts \u003d baseTag.split(\"/\")\n\tmcm \u003d parts[1] if len(parts) \u003e 1 else None\n\treturn mcm",
             "type": "script"
           }
         ],
@@ -2853,7 +2859,6 @@
                   "grow": 1
                 },
                 "props": {
-                  "currentTabIndex": 2,
                   "menuType": "modern",
                   "tabSize": {
                     "width": 1000
diff --git a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/SetupMotorSpeeds/view.json b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/SetupMotorSpeeds/view.json
index 80e18fd..06122a3 100644
--- a/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/SetupMotorSpeeds/view.json
+++ b/SCADA_PERSPECTIVE_PARENT_PROJECT/com.inductiveautomation.perspective/views/PopUp-Views/SetupMotorSpeeds/view.json
@@ -1,7 +1,7 @@
 {
   "custom": {},
   "params": {
-    "MCM": "value"
+    "MCM": "System/MCM01/MCM01"
   },
   "propConfig": {
     "params.MCM": {
@@ -11,37 +11,38 @@
   },
   "props": {
     "defaultSize": {
-      "height": 349,
-      "width": 600
+      "height": 311,
+      "width": 581
     }
   },
   "root": {
     "children": [
+      {
+        "meta": {
+          "name": "Icon"
+        },
+        "position": {
+          "basis": "30px"
+        },
+        "props": {
+          "path": "material/warning"
+        },
+        "type": "ia.display.icon"
+      },
       {
         "children": [
-          {
-            "meta": {
-              "name": "Icon"
-            },
-            "position": {
-              "basis": "30px"
-            },
-            "props": {
-              "path": "material/warning"
-            },
-            "type": "ia.display.icon"
-          },
           {
             "meta": {
               "name": "Label"
             },
             "position": {
-              "basis": "32px"
+              "basis": "153px"
             },
             "props": {
-              "text": "This button will set up the speed for all motors in the current system (MCM).\n  For Armour PowerFlex — conveyors will run at a motor speed of 30 rev/h.\n\n                      Are you sure you want to set motor speeds?",
+              "text": "           This button will set up the speed for all motors in the current system (MCM).    Armour PowerFlex — conveyors will run at a motor speed of 30 rev/h.                       Are you sure you want to set motor speeds? ",
               "textStyle": {
-                "whiteSpace": "pre-wrap"
+                "textAlign": "center",
+                "whiteSpace": "pre-line"
               }
             },
             "type": "ia.display.label"
@@ -54,6 +55,7 @@
           "grow": 1
         },
         "props": {
+          "alignItems": "flex-start",
           "direction": "column",
           "justify": "space-around",
           "style": {
@@ -66,11 +68,14 @@
       {
         "children": [
           {
+            "custom": {
+              "turn": false
+            },
             "events": {
               "component": {
                 "onActionPerformed": {
                   "config": {
-                    "script": "\ttag_name \u003d self.view.params.MCM\n\ttag_path \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/Setup_Motor_Speeds\"\n\tsystem.tag.writeBlocking([tag_path],[True])\n\tsystem.perspective.closePopup(\"\")"
+                    "script": "\ttag_name \u003d self.view.params.MCM \n\ttag_path \u003d \"[\" + self.session.custom.fc+ \"_SCADA_TAG_PROVIDER]\"+tag_name+\"/Setup_Motor_Speeds\" \n\tsystem.tag.writeBlocking([tag_path],[True]) \n\tsystem.perspective.closePopup(\"\")"
                   },
                   "scope": "G",
                   "type": "script"
@@ -120,6 +125,9 @@
             "type": "ia.input.button"
           }
         ],
+        "custom": {
+          "turn": "value"
+        },
         "meta": {
           "name": "FlexContainer_0"
         },
@@ -137,6 +145,9 @@
         "type": "ia.container.flex"
       }
     ],
+    "custom": {
+      "turn": false
+    },
     "meta": {
       "name": "root"
     },