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 1546697..8f8ce1c 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	
@@ -17817,30 +17817,20 @@
         "meta": {
           "name": "TO-MCM03-1",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "rotate": {
-            "anchor": "0% 50%",
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1043.99,
-          "y": 748.849
+          "height": 35,
+          "width": 260,
+          "x": 1278.73,
+          "y": 833.768
         },
         "props": {
           "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -17860,30 +17850,20 @@
         "meta": {
           "name": "TO-MCM03-2",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "rotate": {
-            "anchor": "0% 50%",
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1066.99,
-          "y": 589.64
+          "height": 35,
+          "width": 260,
+          "x": 1089.95,
+          "y": 601.65
         },
         "props": {
           "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -17903,30 +17883,20 @@
         "meta": {
           "name": "TO-MCM03-3",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "rotate": {
-            "anchor": "0% 50%",
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1066.99,
-          "y": 387.64
+          "height": 35,
+          "width": 260,
+          "x": 1089.95,
+          "y": 403.65
         },
         "props": {
           "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -17946,30 +17916,20 @@
         "meta": {
           "name": "TO-MCM03-4",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "rotate": {
-            "anchor": "0% 50%",
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1066.99,
-          "y": 144.64
+          "height": 35,
+          "width": 260,
+          "x": 1089.95,
+          "y": 153.65
         },
         "props": {
           "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       }
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 2909a62..ae583f7 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	
@@ -49,48 +49,6 @@
         },
         "type": "ia.display.image"
       },
-      {
-        "events": {
-          "dom": {
-            "onClick": {
-              "config": {
-                "params": {},
-                "view": "Detailed-Views/MCM03 Non Con"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "TO-MCM03-1",
-          "tooltip": {
-            "enabled": true,
-            "text": "MCM03 Non Con"
-          }
-        },
-        "position": {
-          "height": 55,
-          "rotate": {
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1394.11,
-          "y": 754.604
-        },
-        "props": {
-          "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
-          },
-          "path": "Custom-Views/Nav_Button"
-        },
-        "type": "ia.display.view"
-      },
       {
         "meta": {
           "name": "Label"
@@ -11304,37 +11262,6 @@
         },
         "type": "ia.display.view"
       },
-      {
-        "events": {
-          "dom": {
-            "onClick": {
-              "config": {
-                "params": {},
-                "view": "Detailed-Views/MCM02 Fluid Inbound Upper"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "Upper Level Button"
-        },
-        "position": {
-          "height": 46,
-          "width": 204,
-          "x": 1137,
-          "y": 258.5
-        },
-        "props": {
-          "primary": false,
-          "style": {
-            "fontSize": 18
-          },
-          "text": "Upper Level"
-        },
-        "type": "ia.input.button"
-      },
       {
         "meta": {
           "name": "Camera_14"
@@ -11370,6 +11297,72 @@
         },
         "type": "ia.display.view"
       },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "params": {},
+                "view": "Detailed-Views/MCM02 Fluid Inbound Upper"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "TO-MCM02-UPPER",
+          "tooltip": {
+            "text": "MCM02 Fluid Inbound Upper"
+          }
+        },
+        "position": {
+          "height": 35,
+          "width": 260,
+          "x": 1134.004248046875,
+          "y": 236.20999999999998
+        },
+        "props": {
+          "params": {
+            "text": "MCM02 Fluid Inbound Upper"
+          },
+          "path": "Custom-Views/Area_Nav_Button"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "params": {},
+                "view": "Detailed-Views/MCM03 Non Con"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "TO-MCM03-1",
+          "tooltip": {
+            "text": "MCM03 Non Con"
+          }
+        },
+        "position": {
+          "height": 35,
+          "width": 260,
+          "x": 1409.1,
+          "y": 417.533
+        },
+        "props": {
+          "params": {
+            "text": "MCM03 Non Con"
+          },
+          "path": "Custom-Views/Area_Nav_Button"
+        },
+        "type": "ia.display.view"
+      },
       {
         "events": {
           "dom": {
@@ -11386,29 +11379,20 @@
         "meta": {
           "name": "TO-MCM03-2",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "rotate": {
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1394.11,
-          "y": 608.6
+          "height": 35,
+          "width": 260,
+          "x": 1409.1,
+          "y": 613.53
         },
         "props": {
           "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -11428,29 +11412,20 @@
         "meta": {
           "name": "TO-MCM03-3",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "rotate": {
-            "angle": 0
-          },
-          "width": 40,
-          "x": 1394.11,
-          "y": 414.6
+          "height": 35,
+          "width": 260,
+          "x": 1409.1,
+          "y": 752.53
         },
         "props": {
           "params": {
-            "direction": {
-              "downward": false,
-              "left": false,
-              "right": true,
-              "upward": false
-            }
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       }
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 92728ed..90c452b 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	
@@ -2814,22 +2814,24 @@
           }
         },
         "meta": {
-          "name": "Lower Level Button"
+          "name": "TO-MCM002-LOWER",
+          "tooltip": {
+            "text": "MCM02 Fluid Inbound Merges 5-7"
+          }
         },
         "position": {
-          "height": 46,
-          "width": 204,
-          "x": 628.1354370117188,
-          "y": 296.359375
+          "height": 35,
+          "width": 364,
+          "x": 709.89825,
+          "y": 297.207375
         },
         "props": {
-          "primary": false,
-          "style": {
-            "fontSize": 18
+          "params": {
+            "text": "MCM02 Fluid Inbound Merges 5-7"
           },
-          "text": "Lower Level"
+          "path": "Custom-Views/Area_Nav_Button"
         },
-        "type": "ia.input.button"
+        "type": "ia.display.view"
       }
     ],
     "meta": {
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 9265f00..d5c4ba4 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	
@@ -6310,19 +6310,18 @@
         "meta": {
           "name": "TO-MCM06",
           "tooltip": {
-            "enabled": true,
             "text": "MCM06 Non Con"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 0%",
             "angle": 0
           },
-          "width": 40,
+          "width": 260,
           "x": 1398,
-          "y": 60.1455
+          "y": 69.1455
         },
         "props": {
           "params": {
@@ -6331,9 +6330,10 @@
               "left": false,
               "right": true,
               "upward": false
-            }
+            },
+            "text": "MCM06 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6378,17 +6378,16 @@
         "meta": {
           "name": "BACK-TO-MCM02-1",
           "tooltip": {
-            "enabled": true,
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 100%"
           },
-          "width": 40,
-          "x": 435.656,
+          "width": 260,
+          "x": 232.656,
           "y": 364.275
         },
         "props": {
@@ -6398,9 +6397,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM02 Fluid Inbound Merges 5-7"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6420,17 +6420,16 @@
         "meta": {
           "name": "BACK-TO-MCM01-1",
           "tooltip": {
-            "enabled": true,
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% -81%"
           },
-          "width": 40,
-          "x": 434.263,
+          "width": 260,
+          "x": 232.656,
           "y": 843.427
         },
         "props": {
@@ -6440,9 +6439,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM01 Fluid Inbound Merges 1-4"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6462,17 +6462,16 @@
         "meta": {
           "name": "BACK-TO-MCM01-2",
           "tooltip": {
-            "enabled": true,
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 39%"
           },
-          "width": 40,
-          "x": 434.26,
+          "width": 260,
+          "x": 232.656,
           "y": 726.431
         },
         "props": {
@@ -6482,9 +6481,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM01 Fluid Inbound Merges 1-4"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6504,17 +6504,16 @@
         "meta": {
           "name": "BACK-TO-MCM01-3",
           "tooltip": {
-            "enabled": true,
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 39%"
           },
-          "width": 40,
-          "x": 434.26,
+          "width": 260,
+          "x": 232.656,
           "y": 604.431
         },
         "props": {
@@ -6524,9 +6523,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM01 Fluid Inbound Merges 1-4"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6546,17 +6546,16 @@
         "meta": {
           "name": "BACK-TO-MCM01-4",
           "tooltip": {
-            "enabled": true,
             "text": "MCM01 Fluid Inbound Merges 1-4"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 39%"
           },
-          "width": 40,
-          "x": 434.26,
+          "width": 260,
+          "x": 232.656,
           "y": 487.431
         },
         "props": {
@@ -6566,9 +6565,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM01 Fluid Inbound Merges 1-4"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6588,17 +6588,16 @@
         "meta": {
           "name": "BACK-TO-MCM02-2",
           "tooltip": {
-            "enabled": true,
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 100%"
           },
-          "width": 40,
-          "x": 435.66,
+          "width": 260,
+          "x": 232.656,
           "y": 257.271
         },
         "props": {
@@ -6608,9 +6607,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM02 Fluid Inbound Merges 5-7"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },
@@ -6630,17 +6630,16 @@
         "meta": {
           "name": "BACK-TO-MCM02-3",
           "tooltip": {
-            "enabled": true,
             "text": "MCM02 Fluid Inbound Merges 5-7"
           }
         },
         "position": {
-          "height": 55,
+          "height": 35,
           "rotate": {
             "anchor": "50% 100%"
           },
-          "width": 40,
-          "x": 435.66,
+          "width": 260,
+          "x": 232.656,
           "y": 157.271
         },
         "props": {
@@ -6650,9 +6649,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM02 Fluid Inbound Merges 5-7"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       }
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 82bae7d..400d0cf 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	
@@ -37,34 +37,6 @@
         },
         "type": "ia.display.image"
       },
-      {
-        "events": {
-          "component": {
-            "onActionPerformed": {
-              "config": {
-                "params": {},
-                "view": "Detailed-Views/MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "Button"
-        },
-        "position": {
-          "height": 56,
-          "width": 147,
-          "x": 1535,
-          "y": 764.998
-        },
-        "props": {
-          "primary": false,
-          "text": "Go Back"
-        },
-        "type": "ia.input.button"
-      },
       {
         "meta": {
           "name": "DTC_NCH1"
@@ -15414,8 +15386,8 @@
             "anchor": "25% 25%"
           },
           "width": 182,
-          "x": 928,
-          "y": 20.03
+          "x": 834.021,
+          "y": 17.03
         },
         "props": {
           "style": {
@@ -15428,6 +15400,39 @@
           }
         },
         "type": "ia.display.label"
+      },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "params": {},
+                "view": "Detailed-Views/MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "TO-MCM04",
+          "tooltip": {
+            "text": "MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve"
+          }
+        },
+        "position": {
+          "height": 35,
+          "width": 487,
+          "x": 1230.5,
+          "y": 833.58
+        },
+        "props": {
+          "params": {
+            "text": "MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve"
+          },
+          "path": "Custom-Views/Area_Nav_Button"
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {
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 242c1f7..5f75127 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	
@@ -4087,34 +4087,6 @@
         },
         "type": "ia.display.view"
       },
-      {
-        "events": {
-          "component": {
-            "onActionPerformed": {
-              "config": {
-                "params": {},
-                "view": "Detailed-Views/MCM04_Chutes"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "Button"
-        },
-        "position": {
-          "height": 58,
-          "width": 145,
-          "x": 1333,
-          "y": 691
-        },
-        "props": {
-          "primary": false,
-          "text": "Chutes"
-        },
-        "type": "ia.input.button"
-      },
       {
         "meta": {
           "elementPrefix": null,
@@ -11140,27 +11112,6 @@
         },
         "type": "ia.display.view"
       },
-      {
-        "meta": {
-          "name": "Label"
-        },
-        "position": {
-          "height": 40,
-          "width": 740,
-          "x": 640,
-          "y": 13
-        },
-        "props": {
-          "style": {
-            "borderStyle": "groove"
-          },
-          "text": "MCM04_South_Bulk_Inbound, Fluid Outbound and Problem Solve",
-          "textStyle": {
-            "fontSize": 24
-          }
-        },
-        "type": "ia.display.label"
-      },
       {
         "meta": {
           "elementPrefix": "CON",
@@ -11615,6 +11566,60 @@
           "path": "Detailed-Views/Divert Arm"
         },
         "type": "ia.display.view"
+      },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "params": {},
+                "view": "Detailed-Views/MCM04 Chutes"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "TO-MCM04-CHUTES",
+          "tooltip": {
+            "text": "MCM04 Chutes"
+          }
+        },
+        "position": {
+          "height": 35,
+          "width": 260,
+          "x": 827.52254196167,
+          "y": 156.63242175292964
+        },
+        "props": {
+          "params": {
+            "text": "MCM04 Chutes"
+          },
+          "path": "Custom-Views/Area_Nav_Button"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "Label_0"
+        },
+        "position": {
+          "height": 39,
+          "width": 736,
+          "x": 568,
+          "y": 24
+        },
+        "props": {
+          "style": {
+            "borderStyle": "groove"
+          },
+          "text": "MCM04 North Bulk Inbound, Fluid Outbound and Problem Solve",
+          "textStyle": {
+            "fontSize": 24
+          }
+        },
+        "type": "ia.display.label"
       }
     ],
     "meta": {
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 62b92c2..c23cf5f 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	
@@ -3699,34 +3699,6 @@
         },
         "type": "ia.display.view"
       },
-      {
-        "events": {
-          "component": {
-            "onActionPerformed": {
-              "config": {
-                "params": {},
-                "view": "Detailed-Views/MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "mcm05_back"
-        },
-        "position": {
-          "height": 80,
-          "width": 160,
-          "x": 916.731,
-          "y": 868
-        },
-        "props": {
-          "primary": false,
-          "text": "Go Back"
-        },
-        "type": "ia.input.button"
-      },
       {
         "meta": {
           "elementPrefix": "CON",
@@ -17328,23 +17300,56 @@
         "type": "ia.display.view"
       },
       {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "params": {},
+                "view": "Detailed-Views/MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
         "meta": {
-          "name": "Label_0"
+          "name": "TO-MCM05",
+          "tooltip": {
+            "text": "MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve"
+          }
         },
         "position": {
-          "height": 42,
+          "height": 35,
+          "width": 487,
+          "x": 454.9,
+          "y": 869.7029370117187
+        },
+        "props": {
+          "params": {
+            "text": "MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve"
+          },
+          "path": "Custom-Views/Area_Nav_Button"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "Label"
+        },
+        "position": {
+          "height": 44,
           "rotate": {
             "anchor": "25% 25%"
           },
-          "width": 871,
-          "x": 559,
-          "y": 18.03
+          "width": 182,
+          "x": 834.02,
+          "y": 17.03
         },
         "props": {
           "style": {
             "borderStyle": "groove"
           },
-          "text": "MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve chutes",
+          "text": "MCM05 Chutes",
           "textStyle": {
             "fontSize": 24,
             "textAlign": "center"
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 069ee33..29ce224 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	
@@ -2756,34 +2756,6 @@
         },
         "type": "ia.display.view"
       },
-      {
-        "events": {
-          "component": {
-            "onActionPerformed": {
-              "config": {
-                "params": {},
-                "view": "Detailed-Views/MCM05_Chutes"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "mcm05_chutes"
-        },
-        "position": {
-          "height": 80,
-          "width": 160,
-          "x": 244.96,
-          "y": 832
-        },
-        "props": {
-          "primary": false,
-          "text": "Chutes"
-        },
-        "type": "ia.input.button"
-      },
       {
         "meta": {
           "name": "MCM05"
@@ -9750,14 +9722,14 @@
         "position": {
           "height": 39,
           "width": 736,
-          "x": 568,
+          "x": 557,
           "y": 24
         },
         "props": {
           "style": {
             "borderStyle": "groove"
           },
-          "text": "MCM05 North Bulk Inbound, Fluid Outbound and Problem Solve",
+          "text": "MCM05 South Bulk Inbound, Fluid Outbound and Problem Solve",
           "textStyle": {
             "fontSize": 24
           }
@@ -10399,6 +10371,39 @@
           "path": "Symbol-Views/Equipment-Views/PullChord_End"
         },
         "type": "ia.display.view"
+      },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "params": {},
+                "view": "Detailed-Views/MCM05 Chutes"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "TO-MCM05-CHUTES",
+          "tooltip": {
+            "text": "MCM05 Chutes"
+          }
+        },
+        "position": {
+          "height": 35,
+          "width": 260,
+          "x": 205.15,
+          "y": 776.7
+        },
+        "props": {
+          "params": {
+            "text": "MCM05 Chutes"
+          },
+          "path": "Custom-Views/Area_Nav_Button"
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {
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 a9d3c6a..402f6a9 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	
@@ -10286,15 +10286,14 @@
         "meta": {
           "name": "BACK-TO-MCM03",
           "tooltip": {
-            "enabled": true,
             "text": "MCM03 Non Con"
           }
         },
         "position": {
-          "height": 55,
-          "width": 40,
-          "x": 615.606,
-          "y": 200.073
+          "height": 35,
+          "width": 260,
+          "x": 389.356,
+          "y": 213.396
         },
         "props": {
           "params": {
@@ -10303,9 +10302,10 @@
               "left": true,
               "right": false,
               "upward": false
-            }
+            },
+            "text": "MCM03 Non Con"
           },
-          "path": "Custom-Views/Nav_Button"
+          "path": "Custom-Views/Area_Nav_Button"
         },
         "type": "ia.display.view"
       },