diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json
index 3d9593e1..9ffd96d9 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json	
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM02-NC SORTER/view.json	
@@ -23,31 +23,6 @@
     "children": [
       {
         "children": [
-          {
-            "meta": {
-              "name": "MCM2"
-            },
-            "position": {
-              "height": 1,
-              "width": 1
-            },
-            "propConfig": {
-              "props.source": {
-                "binding": {
-                  "config": {
-                    "expression": "\"http://127.0.0.1:5500/MCM02.svg?var\" + toMillis(now(1000))"
-                  },
-                  "type": "expr"
-                }
-              }
-            },
-            "props": {
-              "fit": {
-                "mode": "fill"
-              }
-            },
-            "type": "ia.display.image"
-          },
           {
             "meta": {
               "name": "NCS1_1_SOL1"
@@ -6581,7 +6556,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6610,36 +6585,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
-            },
-            "type": "ia.display.view"
-          },
-          {
-            "meta": {
-              "name": "Photoeye_1"
-            },
-            "position": {
-              "height": 0.037,
-              "width": 0.0573,
-              "x": 0.2781,
-              "y": 0.3435
-            },
-            "props": {
-              "params": {
-                "tagProps": [
-                  "/system/mcm01/test",
-                  "value",
-                  "value",
-                  "value",
-                  "value",
-                  "value",
-                  "value",
-                  "value",
-                  "value",
-                  "value"
-                ]
-              },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6668,7 +6614,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6697,7 +6643,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6726,7 +6672,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6755,7 +6701,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6784,7 +6730,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6813,7 +6759,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6842,7 +6788,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6871,7 +6817,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6900,7 +6846,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6929,7 +6875,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6958,7 +6904,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -6987,7 +6933,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7016,7 +6962,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7045,7 +6991,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7074,7 +7020,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7103,7 +7049,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7132,7 +7078,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7161,7 +7107,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7190,7 +7136,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7219,7 +7165,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7248,7 +7194,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7277,7 +7223,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7306,7 +7252,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7335,7 +7281,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -7364,7 +7310,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9252,7 +9198,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9281,7 +9227,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9310,7 +9256,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9339,7 +9285,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9368,7 +9314,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9397,7 +9343,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9426,7 +9372,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9455,7 +9401,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9484,7 +9430,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9513,7 +9459,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9542,7 +9488,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9571,7 +9517,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9600,7 +9546,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9629,7 +9575,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9658,7 +9604,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9687,7 +9633,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9716,7 +9662,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9745,7 +9691,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9774,7 +9720,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9803,7 +9749,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9832,7 +9778,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9861,7 +9807,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9890,7 +9836,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9919,7 +9865,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9948,7 +9894,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -9977,7 +9923,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           },
@@ -10006,7 +9952,7 @@
                   "value"
                 ]
               },
-              "path": "autStand/Equipment/Photoeye_Long (1)"
+              "path": "autStand/Equipment/Photoeye_Medium"
             },
             "type": "ia.display.view"
           }
diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json
index e5d9a63b..3c4e0383 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Overview/BNA8/view.json
@@ -9,180 +9,6 @@
   },
   "root": {
     "children": [
-      {
-        "events": {
-          "dom": {
-            "onClick": {
-              "config": {
-                "page": "/autStand/MCM01"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "Button"
-        },
-        "position": {
-          "height": 0.0333,
-          "width": 0.0646,
-          "x": 0.0616,
-          "y": 0.6633
-        },
-        "props": {
-          "primary": false,
-          "text": "MCM01 - FLUID INBOUND"
-        },
-        "type": "ia.input.button"
-      },
-      {
-        "events": {
-          "dom": {
-            "onClick": {
-              "config": {
-                "page": "/autStand/MCM02"
-              },
-              "scope": "C",
-              "type": "nav"
-            }
-          }
-        },
-        "meta": {
-          "name": "Button_0"
-        },
-        "position": {
-          "height": 0.0333,
-          "width": 0.0646,
-          "x": 0.5479,
-          "y": 0.6722
-        },
-        "props": {
-          "primary": false,
-          "text": "MCM02 - NC SORTER"
-        },
-        "type": "ia.input.button"
-      },
-      {
-        "meta": {
-          "name": "Camera"
-        },
-        "position": {
-          "height": 0.037,
-          "width": 0.0208,
-          "x": 0.0042,
-          "y": 0.3407
-        },
-        "props": {
-          "path": "autStand/Equipment/Camera",
-          "style": {
-            "overflow": "hidden"
-          }
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "Camera_0"
-        },
-        "position": {
-          "height": 0.037,
-          "width": 0.0208,
-          "x": 0.2531,
-          "y": 0.4
-        },
-        "props": {
-          "path": "autStand/Equipment/Camera",
-          "style": {
-            "overflow": "hidden"
-          }
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "Camera_1"
-        },
-        "position": {
-          "height": 0.037,
-          "width": 0.0208,
-          "x": 0.3953,
-          "y": 0.5676
-        },
-        "props": {
-          "path": "autStand/Equipment/Camera",
-          "style": {
-            "overflow": "hidden"
-          }
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "Camera_2"
-        },
-        "position": {
-          "height": 0.037,
-          "width": 0.0208,
-          "x": 0.4896,
-          "y": 0.3778
-        },
-        "props": {
-          "path": "autStand/Equipment/Camera",
-          "style": {
-            "overflow": "hidden"
-          }
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "Camera_3"
-        },
-        "position": {
-          "height": 0.037,
-          "width": 0.0208,
-          "x": 0.9755,
-          "y": 0.4848
-        },
-        "props": {
-          "path": "autStand/Equipment/Camera",
-          "style": {
-            "overflow": "hidden"
-          }
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "EmbeddedView"
-        },
-        "position": {
-          "height": 0.0516,
-          "width": 0.0935,
-          "x": 0.5943,
-          "y": 0.0972
-        },
-        "props": {
-          "path": "autStand/Custom_Views/Global-Start"
-        },
-        "type": "ia.display.view"
-      },
-      {
-        "meta": {
-          "name": "EmbeddedView_0"
-        },
-        "position": {
-          "height": 0.0516,
-          "width": 0.0935,
-          "x": 0.6901,
-          "y": 0.0972
-        },
-        "props": {
-          "path": "autStand/Custom_Views/Global-Stop"
-        },
-        "type": "ia.display.view"
-      },
       {
         "meta": {
           "name": "overview"
@@ -1095,6 +921,180 @@
           "viewBox": "0 0 507.99999 285.75"
         },
         "type": "ia.shapes.svg"
+      },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "page": "/autStand/MCM01"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "Button"
+        },
+        "position": {
+          "height": 0.0333,
+          "width": 0.0646,
+          "x": 0.0616,
+          "y": 0.6633
+        },
+        "props": {
+          "primary": false,
+          "text": "MCM01 - FLUID INBOUND"
+        },
+        "type": "ia.input.button"
+      },
+      {
+        "events": {
+          "dom": {
+            "onClick": {
+              "config": {
+                "page": "/autStand/MCM02"
+              },
+              "scope": "C",
+              "type": "nav"
+            }
+          }
+        },
+        "meta": {
+          "name": "Button_0"
+        },
+        "position": {
+          "height": 0.0333,
+          "width": 0.0646,
+          "x": 0.5479,
+          "y": 0.6722
+        },
+        "props": {
+          "primary": false,
+          "text": "MCM02 - NC SORTER"
+        },
+        "type": "ia.input.button"
+      },
+      {
+        "meta": {
+          "name": "Camera"
+        },
+        "position": {
+          "height": 0.037,
+          "width": 0.0208,
+          "x": 0.0042,
+          "y": 0.3407
+        },
+        "props": {
+          "path": "autStand/Equipment/Camera",
+          "style": {
+            "overflow": "hidden"
+          }
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "Camera_0"
+        },
+        "position": {
+          "height": 0.037,
+          "width": 0.0208,
+          "x": 0.2531,
+          "y": 0.4
+        },
+        "props": {
+          "path": "autStand/Equipment/Camera",
+          "style": {
+            "overflow": "hidden"
+          }
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "Camera_1"
+        },
+        "position": {
+          "height": 0.037,
+          "width": 0.0208,
+          "x": 0.3953,
+          "y": 0.5676
+        },
+        "props": {
+          "path": "autStand/Equipment/Camera",
+          "style": {
+            "overflow": "hidden"
+          }
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "Camera_2"
+        },
+        "position": {
+          "height": 0.037,
+          "width": 0.0208,
+          "x": 0.4896,
+          "y": 0.3778
+        },
+        "props": {
+          "path": "autStand/Equipment/Camera",
+          "style": {
+            "overflow": "hidden"
+          }
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "Camera_3"
+        },
+        "position": {
+          "height": 0.037,
+          "width": 0.0208,
+          "x": 0.9755,
+          "y": 0.4848
+        },
+        "props": {
+          "path": "autStand/Equipment/Camera",
+          "style": {
+            "overflow": "hidden"
+          }
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "EmbeddedView"
+        },
+        "position": {
+          "height": 0.0516,
+          "width": 0.0935,
+          "x": 0.5943,
+          "y": 0.0972
+        },
+        "props": {
+          "path": "autStand/Custom_Views/Global-Start"
+        },
+        "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "EmbeddedView_0"
+        },
+        "position": {
+          "height": 0.0516,
+          "width": 0.0935,
+          "x": 0.6901,
+          "y": 0.0972
+        },
+        "props": {
+          "path": "autStand/Custom_Views/Global-Stop"
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {