diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MTN6/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MTN6/view.json
index 9b7e06f..724e652 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MTN6/view.json
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Additional-Home-View/MTN6/view.json
@@ -6,9 +6,9 @@
         "$": [
           "ts",
           192,
-          1744960121476
+          1744962902950
         ],
-        "$ts": 1744960121472
+        "$ts": 1744962902950
       }
     }
   },
@@ -85,7 +85,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button"
+          "name": "MCM01_Button"
         },
         "position": {
           "height": 28.58,
@@ -105,7 +105,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_0"
+          "name": "MCM02_Button"
         },
         "position": {
           "height": 28.58,
@@ -125,7 +125,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_1"
+          "name": "MCM03_Button"
         },
         "position": {
           "height": 28.58,
@@ -145,7 +145,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_2"
+          "name": "MCM04_Button"
         },
         "position": {
           "height": 28.58,
@@ -168,7 +168,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_3"
+          "name": "MCM04_Chutes_Button"
         },
         "position": {
           "height": 28.58,
@@ -188,7 +188,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_4"
+          "name": "MCM05_Button"
         },
         "position": {
           "height": 28.58,
@@ -208,7 +208,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_5"
+          "name": "MCM05_Chutes_Button"
         },
         "position": {
           "height": 28.58,
@@ -228,7 +228,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_6"
+          "name": "MCM06_Button"
         },
         "position": {
           "height": 28.58,
@@ -248,7 +248,7 @@
       },
       {
         "meta": {
-          "name": "Area_Nav_Button_7"
+          "name": "MCM07_Button"
         },
         "position": {
           "height": 28.58,
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json
deleted file mode 100644
index 838d24a..0000000
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/resource.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "scope": "G",
-  "version": 1,
-  "restricted": false,
-  "overridable": true,
-  "files": [
-    "view.json",
-    "thumbnail.png"
-  ],
-  "attributes": {
-    "lastModification": {
-      "actor": "external",
-      "timestamp": "2025-04-08T09:28:16Z"
-    },
-    "lastModificationSignature": "536199704b8514a5b1f29cd3a6e8a76f38629b364d194b8e0717670a8aff6a51"
-  }
-}
\ No newline at end of file
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/thumbnail.png b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/thumbnail.png
deleted file mode 100644
index 8117355..0000000
Binary files a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/thumbnail.png and /dev/null differ
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/view.json
deleted file mode 100644
index 3a08477..0000000
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/Entry Point/view.json	
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-  "custom": {},
-  "params": {},
-  "props": {},
-  "root": {
-    "children": [
-      {
-        "meta": {
-          "name": "MCM07"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm07-bypass"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "MCM06"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm06-non-con"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "MCM05"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm05-bulk-inbound-problem-solve"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "MCM04"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm04-bulk-inbound-problem-solve"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "MCM03"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm03-non-con"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "MCM02"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm02-singulated-inbound"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "MCM01"
-        },
-        "position": {
-          "basis": "320px"
-        },
-        "props": {
-          "params": {
-            "url": "/mcm01-singulated-inbound"
-          },
-          "path": "Detailed-Views/MCM Button"
-        },
-        "type": "ia.display.view"
-      }
-    ],
-    "meta": {
-      "name": "root"
-    },
-    "props": {
-      "direction": "column-reverse",
-      "justify": "flex-end"
-    },
-    "type": "ia.container.flex"
-  }
-}
\ No newline at end of file
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json
deleted file mode 100644
index 7ad7479..0000000
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/resource.json	
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "scope": "G",
-  "version": 1,
-  "restricted": false,
-  "overridable": true,
-  "files": [
-    "view.json",
-    "thumbnail.png"
-  ],
-  "attributes": {
-    "lastModification": {
-      "actor": "admin",
-      "timestamp": "2025-04-08T09:30:51Z"
-    },
-    "lastModificationSignature": "1ab7d929c3b4e0a18eb53247051653ffdef711629e236bb833d955523b1690be"
-  }
-}
\ No newline at end of file
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png
deleted file mode 100644
index 97f7900..0000000
Binary files a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/thumbnail.png and /dev/null differ
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json
deleted file mode 100644
index 4ead1c9..0000000
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM Button/view.json	
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "custom": {},
-  "params": {
-    "url": "value"
-  },
-  "propConfig": {
-    "params.url": {
-      "paramDirection": "input",
-      "persistent": true
-    }
-  },
-  "props": {
-    "defaultSize": {
-      "height": 50,
-      "width": 446
-    }
-  },
-  "root": {
-    "children": [
-      {
-        "events": {
-          "component": {
-            "onActionPerformed": {
-              "config": {
-                "page": "{view.params.url}"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "MCM Button"
-        },
-        "position": {
-          "basis": "34px",
-          "grow": 1
-        },
-        "propConfig": {
-          "props.text": {
-            "binding": {
-              "config": {
-                "path": "view.params.url"
-              },
-              "transforms": [
-                {
-                  "expression": "upper(right(left({value},6),5))",
-                  "type": "expression"
-                }
-              ],
-              "type": "property"
-            }
-          }
-        },
-        "type": "ia.input.button"
-      }
-    ],
-    "meta": {
-      "name": "root"
-    },
-    "props": {
-      "direction": "column"
-    },
-    "type": "ia.container.flex"
-  }
-}
\ No newline at end of file
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json
index 6627042..f827c67 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM01 Fluid Inbound Merges 1-4/view.json	
@@ -17749,7 +17749,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-1",
+          "name": "PRS1-5_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
@@ -17772,7 +17772,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-2",
+          "name": "UL4-13_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
@@ -17781,7 +17781,7 @@
           "height": 35,
           "width": 260,
           "x": 1089.95,
-          "y": 601.65
+          "y": 611.15
         },
         "props": {
           "params": {
@@ -17795,7 +17795,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-3",
+          "name": "UL7-13_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
@@ -17818,7 +17818,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-4",
+          "name": "UL11-13_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json
index e3ffd3d..690af86 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Merges 5-7/view.json	
@@ -9881,7 +9881,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM02-UPPER",
+          "name": "MCM02-Upper_Buton",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Upper"
           }
@@ -9903,7 +9903,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-1",
+          "name": "UL21-17_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
@@ -9925,7 +9925,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-2",
+          "name": "UL18-16_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
@@ -9947,7 +9947,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM03-3",
+          "name": "UL13-12_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json
index 04cd0b6..3f88c2e 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM02 Fluid Inbound Upper/view.json	
@@ -2777,7 +2777,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM002-LOWER",
+          "name": "MCM02-Lower_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json
index 8948a9f..b8c402f 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM03 Non Con/view.json	
@@ -6296,7 +6296,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM06",
+          "name": "NCP1-8_MCM06_Button",
           "tooltip": {
             "text": "MCM06 Non Con"
           }
@@ -6328,7 +6328,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM02-1",
+          "name": "UL13-13_MCM02_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
@@ -6359,7 +6359,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM01-1",
+          "name": "UL1-14_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6390,7 +6390,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM01-2",
+          "name": "UL4-14_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6421,7 +6421,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM01-3",
+          "name": "UL7-14_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6452,7 +6452,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM01-4",
+          "name": "UL11-15_MCM01_Button",
           "tooltip": {
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
@@ -6483,7 +6483,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM02-2",
+          "name": "UL18-17_MCM02_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
@@ -6514,7 +6514,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM02-3",
+          "name": "UL21-18_MCM02_Button",
           "tooltip": {
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
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 d4cbfd4..67b745f 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	
@@ -15378,7 +15378,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM04",
+          "name": "MCM04_Button",
           "tooltip": {
             "text": "MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve"
           }
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 40479f2..ac605bd 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	
@@ -11569,7 +11569,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM04-CHUTES",
+          "name": "MCM04-Chutes_Button",
           "tooltip": {
             "text": "MCM04 Chutes"
           }
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Chutes/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Chutes/view.json
index 987c36a..1470d64 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Chutes/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 Chutes/view.json	
@@ -17301,7 +17301,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM05",
+          "name": "MCM05_Button",
           "tooltip": {
             "text": "MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve"
           }
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json
index a8e8cea..cb9db25 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve/view.json	
@@ -10353,7 +10353,7 @@
       },
       {
         "meta": {
-          "name": "TO-MCM05-CHUTES",
+          "name": "MCM05-Chutes_Button",
           "tooltip": {
             "text": "MCM05 Chutes"
           }
diff --git a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json
index 70981a5..6d67332 100644
--- a/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json	
+++ b/MTN6_SCADA/com.inductiveautomation.perspective/views/Detailed-Views/MCM06 Non Con/view.json	
@@ -6706,7 +6706,7 @@
       },
       {
         "meta": {
-          "name": "BACK-TO-MCM03",
+          "name": "NCP1-9_MCM03_Button",
           "tooltip": {
             "text": "MCM03 Non Con"
           }