diff --git a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/view.json b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/view.json
index 4a544590..b79dbba3 100644
--- a/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/view.json	
+++ b/BNA8/com.inductiveautomation.perspective/views/autStand/Detailed_Views/MCM01-FLUID INBOUND/view.json	
@@ -188,7 +188,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_SS2"
+          "name": "PS3_1_SS1"
         },
         "position": {
           "height": 20,
@@ -211,8 +211,8 @@
         "position": {
           "height": 20,
           "width": 35,
-          "x": 1865.99,
-          "y": 605
+          "x": 1880.99,
+          "y": 609
         },
         "props": {
           "path": "autStand/Equipment/SS_Button",
@@ -369,8 +369,8 @@
         "position": {
           "height": 20,
           "width": 20,
-          "x": 1839,
-          "y": 605.999
+          "x": 1859,
+          "y": 607.999
         },
         "props": {
           "path": "autStand/Equipment/EPC",
@@ -387,8 +387,8 @@
         "position": {
           "height": 20,
           "width": 20,
-          "x": 1840,
-          "y": 694
+          "x": 1854,
+          "y": 692
         },
         "props": {
           "path": "autStand/Equipment/EPC",
@@ -400,7 +400,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC3"
+          "name": "UL15_1_TPE1"
         },
         "position": {
           "height": 43,
@@ -418,7 +418,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC3"
+          "name": "UL15_2_TPE1"
         },
         "position": {
           "height": 40,
@@ -439,7 +439,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC4"
+          "name": "UL15_3_TPE1"
         },
         "position": {
           "height": 40,
@@ -460,7 +460,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC5"
+          "name": "UL15_4_TPE1"
         },
         "position": {
           "height": 40,
@@ -481,7 +481,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC6"
+          "name": "PS3_1_TPE1"
         },
         "position": {
           "height": 40,
@@ -520,7 +520,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC5"
+          "name": "UL14_2_TPE1"
         },
         "position": {
           "height": 43,
@@ -538,7 +538,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC6"
+          "name": "UL14_3_TPE1"
         },
         "position": {
           "height": 43,
@@ -556,7 +556,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC7"
+          "name": "UL14_4_TPE1"
         },
         "position": {
           "height": 40,
@@ -577,7 +577,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC8"
+          "name": "PS3_1_TPE2"
         },
         "position": {
           "height": 40,
@@ -598,7 +598,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC9"
+          "name": "PS3_1_TPE3"
         },
         "position": {
           "height": 40,
@@ -619,7 +619,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC10"
+          "name": "PS3_2_TPE1"
         },
         "position": {
           "height": 40,
@@ -640,7 +640,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC11"
+          "name": "PS3_3_TPE1"
         },
         "position": {
           "height": 40,
@@ -661,7 +661,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC7"
+          "name": "PS3_4_TPE1"
         },
         "position": {
           "height": 43,
@@ -679,7 +679,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC8"
+          "name": "PS3_5_TPE1"
         },
         "position": {
           "height": 43,
@@ -697,7 +697,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC9"
+          "name": "PS3_6_TPE1"
         },
         "position": {
           "height": 43,
@@ -715,7 +715,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC12"
+          "name": "PS3_7_TPE1"
         },
         "position": {
           "height": 40,
@@ -736,7 +736,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC13"
+          "name": "PS3_8_TPE1"
         },
         "position": {
           "height": 40,
@@ -757,7 +757,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC14"
+          "name": "PS3_9AL_TPE1"
         },
         "position": {
           "height": 40,
@@ -778,7 +778,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC15"
+          "name": "PS3_10_TPE1"
         },
         "position": {
           "height": 40,
@@ -799,7 +799,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC16"
+          "name": "PS3_11_TPE1"
         },
         "position": {
           "height": 40,
@@ -888,7 +888,7 @@
       },
       {
         "meta": {
-          "name": "Camera_5"
+          "name": "UL15_1_BCN1_R"
         },
         "position": {
           "height": 20,
@@ -922,7 +922,7 @@
       },
       {
         "meta": {
-          "name": "Camera_6"
+          "name": "UL15_1_BCN2_R"
         },
         "position": {
           "height": 20,
@@ -956,7 +956,7 @@
       },
       {
         "meta": {
-          "name": "Camera_7"
+          "name": "PS3_1_BCN1_A"
         },
         "position": {
           "height": 20,
@@ -1068,9 +1068,7 @@
         },
         "props": {
           "params": {
-            "forceFaultStatus": null,
-            "gamarjoba": "GAMARJOBA ",
-            "name": "blue",
+            "name": "Red",
             "tagProps": [
               "value",
               "value",
@@ -1093,7 +1091,7 @@
       },
       {
         "meta": {
-          "name": "Camera_10"
+          "name": "PS3_1_BCN2_A"
         },
         "position": {
           "height": 20,
@@ -1127,7 +1125,7 @@
       },
       {
         "meta": {
-          "name": "Camera_11"
+          "name": "PS3_1_BCN2_R"
         },
         "position": {
           "height": 20,
@@ -1161,7 +1159,7 @@
       },
       {
         "meta": {
-          "name": "Camera_12"
+          "name": "PS3_1_BCN4_A"
         },
         "position": {
           "height": 20,
@@ -1195,7 +1193,7 @@
       },
       {
         "meta": {
-          "name": "Camera_13"
+          "name": "PS3_1_BCN4_H"
         },
         "position": {
           "height": 20,
@@ -1229,7 +1227,7 @@
       },
       {
         "meta": {
-          "name": "Camera_14"
+          "name": "PS3_2_BCN1_A"
         },
         "position": {
           "height": 20,
@@ -1263,7 +1261,7 @@
       },
       {
         "meta": {
-          "name": "Camera_15"
+          "name": "PS3_4_BCN1_A"
         },
         "position": {
           "height": 20,
@@ -1337,7 +1335,7 @@
           "height": 20,
           "width": 20,
           "x": 1793,
-          "y": 577
+          "y": 580
         },
         "props": {
           "params": {
@@ -1433,7 +1431,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC17"
+          "name": "UL14_1_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1451,7 +1449,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC18"
+          "name": "UL14_2_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1469,7 +1467,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC19"
+          "name": "UL14_3_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1487,7 +1485,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC20"
+          "name": "UL14_4_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1505,7 +1503,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC21"
+          "name": "UL15_1_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1523,7 +1521,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC22"
+          "name": "UL15_2_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1541,7 +1539,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC23"
+          "name": "UL15_3_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1559,7 +1557,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC24"
+          "name": "UL15_4_ENSH1"
         },
         "position": {
           "height": 25,
@@ -1577,7 +1575,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC25"
+          "name": "PS3_10_ENW1"
         },
         "position": {
           "height": 25,
@@ -1595,7 +1593,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC26"
+          "name": "PS3_1_ENW1"
         },
         "position": {
           "height": 25,
@@ -1613,7 +1611,7 @@
       },
       {
         "meta": {
-          "name": "UL14_1_EPC27"
+          "name": "PS3_11_ENW1"
         },
         "position": {
           "height": 25,
@@ -1631,7 +1629,7 @@
       },
       {
         "meta": {
-          "name": "Camera_20"
+          "name": "UL15_1_VFD1"
         },
         "position": {
           "height": 20,
@@ -1665,7 +1663,7 @@
       },
       {
         "meta": {
-          "name": "Camera_21"
+          "name": "UL15_2_VFD1"
         },
         "position": {
           "height": 20,
@@ -1699,7 +1697,7 @@
       },
       {
         "meta": {
-          "name": "Camera_22"
+          "name": "UL15_3_VFD1"
         },
         "position": {
           "height": 20,
@@ -1733,7 +1731,7 @@
       },
       {
         "meta": {
-          "name": "Camera_23"
+          "name": "UL15_4_VFD1"
         },
         "position": {
           "height": 20,
@@ -1767,7 +1765,7 @@
       },
       {
         "meta": {
-          "name": "Camera_24"
+          "name": "UL15_5_VFD1"
         },
         "position": {
           "height": 20,
@@ -1835,7 +1833,7 @@
       },
       {
         "meta": {
-          "name": "Camera_26"
+          "name": "UL14_2_VFD1"
         },
         "position": {
           "height": 20,
@@ -1869,7 +1867,7 @@
       },
       {
         "meta": {
-          "name": "Camera_27"
+          "name": "UL14_3_VFD1"
         },
         "position": {
           "height": 20,
@@ -1903,7 +1901,7 @@
       },
       {
         "meta": {
-          "name": "Camera_28"
+          "name": "UL14_4_VFD1"
         },
         "position": {
           "height": 20,
@@ -1937,7 +1935,7 @@
       },
       {
         "meta": {
-          "name": "Camera_29"
+          "name": "UL14_5_VFD1"
         },
         "position": {
           "height": 20,
@@ -1971,7 +1969,7 @@
       },
       {
         "meta": {
-          "name": "Camera_30"
+          "name": "PS3_1_VFD1"
         },
         "position": {
           "height": 20,
@@ -2005,7 +2003,7 @@
       },
       {
         "meta": {
-          "name": "Camera_31"
+          "name": "PS3_2_VFD1"
         },
         "position": {
           "height": 20,
@@ -2039,7 +2037,7 @@
       },
       {
         "meta": {
-          "name": "Camera_32"
+          "name": "PS3_3_VFD1"
         },
         "position": {
           "height": 20,
@@ -2073,7 +2071,7 @@
       },
       {
         "meta": {
-          "name": "Camera_33"
+          "name": "PS3_4_VFD1"
         },
         "position": {
           "height": 20,
@@ -2180,7 +2178,7 @@
         "position": {
           "height": 20,
           "width": 20,
-          "x": 1614,
+          "x": 1606,
           "y": 605
         },
         "props": {
@@ -2249,7 +2247,7 @@
           "height": 20,
           "width": 20,
           "x": 1713,
-          "y": 620
+          "y": 627
         },
         "props": {
           "params": {
@@ -2282,8 +2280,8 @@
         "position": {
           "height": 20,
           "width": 20,
-          "x": 1788,
-          "y": 623
+          "x": 1787,
+          "y": 628
         },
         "props": {
           "params": {
@@ -2316,8 +2314,8 @@
         "position": {
           "height": 20,
           "width": 20,
-          "x": 1879,
-          "y": 636
+          "x": 1838,
+          "y": 627
         },
         "props": {
           "params": {
@@ -2351,7 +2349,7 @@
           "height": 20,
           "width": 20,
           "x": 1742,
-          "y": 625
+          "y": 627
         },
         "props": {
           "params": {
@@ -2379,7 +2377,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC10"
+          "name": "UL15_1_JR1"
         },
         "position": {
           "height": 20,
@@ -2415,7 +2413,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC12"
+          "name": "PS3_1_JR1"
         },
         "position": {
           "height": 20,
@@ -2433,13 +2431,13 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC13"
+          "name": "PS3_1_JR2"
         },
         "position": {
           "height": 20,
           "width": 20,
           "x": 421,
-          "y": 346
+          "y": 361
         },
         "props": {
           "path": "autStand/Equipment/JR_Button",
@@ -2451,7 +2449,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC14"
+          "name": "PS3_1_JR3"
         },
         "position": {
           "height": 20,
@@ -2469,7 +2467,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC15"
+          "name": "PS3_2_JR1"
         },
         "position": {
           "height": 20,
@@ -2487,7 +2485,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC16"
+          "name": "PS3_4_JR3"
         },
         "position": {
           "height": 20,
@@ -2505,13 +2503,13 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC17"
+          "name": "PS3_8_JR2"
         },
         "position": {
           "height": 20,
           "width": 20,
           "x": 1646,
-          "y": 692
+          "y": 684
         },
         "props": {
           "path": "autStand/Equipment/JR_Button",
@@ -2523,7 +2521,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC18"
+          "name": "PS3_8_JR1"
         },
         "position": {
           "height": 20,
@@ -2541,13 +2539,13 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC19"
+          "name": "PS3_10_JR2"
         },
         "position": {
           "height": 20,
           "width": 20,
           "x": 1787,
-          "y": 692
+          "y": 690
         },
         "props": {
           "path": "autStand/Equipment/JR_Button",
@@ -2559,7 +2557,7 @@
       },
       {
         "meta": {
-          "name": "UL15_1_EPC20"
+          "name": "PS3_10_JR1"
         },
         "position": {
           "height": 20,
@@ -2609,7 +2607,7 @@
       },
       {
         "meta": {
-          "name": "Camera_44"
+          "name": "UL14_2_SIO1"
         },
         "position": {
           "height": 22,
@@ -2641,7 +2639,7 @@
       },
       {
         "meta": {
-          "name": "Camera_45"
+          "name": "UL14_3_SIO1"
         },
         "position": {
           "height": 22,
@@ -2673,7 +2671,7 @@
       },
       {
         "meta": {
-          "name": "Camera_46"
+          "name": "UL14_4_SIO1"
         },
         "position": {
           "height": 22,
@@ -2705,7 +2703,7 @@
       },
       {
         "meta": {
-          "name": "Camera_47"
+          "name": "UL15_1_SIO1"
         },
         "position": {
           "height": 22,
@@ -2737,7 +2735,7 @@
       },
       {
         "meta": {
-          "name": "Camera_48"
+          "name": "UL15_2_SIO1"
         },
         "position": {
           "height": 22,
@@ -2769,7 +2767,7 @@
       },
       {
         "meta": {
-          "name": "Camera_49"
+          "name": "UL15_3_SIO1"
         },
         "position": {
           "height": 22,
@@ -2801,7 +2799,7 @@
       },
       {
         "meta": {
-          "name": "Camera_50"
+          "name": "UL15_4_SIO1"
         },
         "position": {
           "height": 22,
@@ -2833,7 +2831,7 @@
       },
       {
         "meta": {
-          "name": "Camera_51"
+          "name": "UL15_5_SIO1"
         },
         "position": {
           "height": 22,
@@ -2865,7 +2863,7 @@
       },
       {
         "meta": {
-          "name": "Camera_52"
+          "name": "UL14_5_SIO1"
         },
         "position": {
           "height": 22,
@@ -2897,7 +2895,7 @@
       },
       {
         "meta": {
-          "name": "Camera_53"
+          "name": "PS3_1_SIO1"
         },
         "position": {
           "height": 22,
@@ -2929,7 +2927,7 @@
       },
       {
         "meta": {
-          "name": "Camera_54"
+          "name": "PS3_3_SIO1"
         },
         "position": {
           "height": 22,
@@ -2961,7 +2959,7 @@
       },
       {
         "meta": {
-          "name": "Camera_55"
+          "name": "PS3_3_SIO1"
         },
         "position": {
           "height": 22,
@@ -2993,7 +2991,7 @@
       },
       {
         "meta": {
-          "name": "Camera_56"
+          "name": "PS3_4_SIO1"
         },
         "position": {
           "height": 22,
@@ -3025,7 +3023,7 @@
       },
       {
         "meta": {
-          "name": "Camera_57"
+          "name": "PS3_5_SIO1"
         },
         "position": {
           "height": 20,
@@ -3057,7 +3055,7 @@
       },
       {
         "meta": {
-          "name": "Camera_58"
+          "name": "PS3_6_SIO1"
         },
         "position": {
           "height": 22,
@@ -3089,7 +3087,7 @@
       },
       {
         "meta": {
-          "name": "Camera_59"
+          "name": "PS3_7_SIO1"
         },
         "position": {
           "height": 22,
@@ -3121,12 +3119,12 @@
       },
       {
         "meta": {
-          "name": "Camera_60"
+          "name": "PS3_8_SIO1"
         },
         "position": {
           "height": 22,
           "width": 40,
-          "x": 1692,
+          "x": 1668,
           "y": 599
         },
         "props": {
@@ -3153,12 +3151,12 @@
       },
       {
         "meta": {
-          "name": "Camera_61"
+          "name": "PS3_9AL_SIO1"
         },
         "position": {
           "height": 22,
           "width": 40,
-          "x": 1742,
+          "x": 1713,
           "y": 604
         },
         "props": {
@@ -3185,13 +3183,13 @@
       },
       {
         "meta": {
-          "name": "Camera_62"
+          "name": "PS3_9B_SIO1"
         },
         "position": {
           "height": 22,
           "width": 40,
-          "x": 1789,
-          "y": 601
+          "x": 1757,
+          "y": 605
         },
         "props": {
           "params": {
@@ -3217,7 +3215,7 @@
       },
       {
         "meta": {
-          "name": "Camera_63"
+          "name": "PS3_11_SIO1"
         },
         "position": {
           "height": 22,
@@ -3249,13 +3247,13 @@
       },
       {
         "meta": {
-          "name": "Camera_64"
+          "name": "PS3_10_SIO1"
         },
         "position": {
           "height": 22,
           "width": 40,
-          "x": 1823,
-          "y": 578
+          "x": 1808,
+          "y": 604
         },
         "props": {
           "params": {
@@ -3403,6 +3401,40 @@
           "path": "autStand/Equipment/Field_IO"
         },
         "type": "ia.display.view"
+      },
+      {
+        "meta": {
+          "name": "PS3_1_BCN3_A"
+        },
+        "position": {
+          "height": 20,
+          "width": 20,
+          "x": 421,
+          "y": 340
+        },
+        "props": {
+          "params": {
+            "forceFaultStatus": null,
+            "name": "amber",
+            "tagProps": [
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value",
+              "value"
+            ]
+          },
+          "path": "autStand/Equipment/Beacon",
+          "style": {
+            "overflow": "hidden"
+          }
+        },
+        "type": "ia.display.view"
       }
     ],
     "meta": {