diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index bfc6b7de..bb4b889d 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -127,14 +127,14 @@ export default new Router({
           /* webpackChunkName: "ay-common" */ "./views/home-user-settings.vue"
         )
     },
-    {
-      path: "/home-translation",
-      name: "home-translation",
-      component: () =>
-        import(
-          /* webpackChunkName: "ay-common" */ "./views/home-translation.vue"
-        )
-    },
+    // {
+    //   path: "/home-translation",
+    //   name: "home-translation",
+    //   component: () =>
+    //     import(
+    //       /* webpackChunkName: "ay-common" */ "./views/home-translation.vue"
+    //     )
+    // },
     {
       path: "/home-password",
       name: "home-password",
diff --git a/ayanova/src/views/acc-accounting.vue b/ayanova/src/views/acc-accounting.vue
index 6afeaf5a..8f6bb891 100644
--- a/ayanova/src/views/acc-accounting.vue
+++ b/ayanova/src/views/acc-accounting.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/ay-review.vue b/ayanova/src/views/ay-review.vue
index 195c90c5..24892386 100644
--- a/ayanova/src/views/ay-review.vue
+++ b/ayanova/src/views/ay-review.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/cust-customers.vue b/ayanova/src/views/cust-customers.vue
index 9f3f2353..268077f1 100644
--- a/ayanova/src/views/cust-customers.vue
+++ b/ayanova/src/views/cust-customers.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/cust-headoffices.vue b/ayanova/src/views/cust-headoffices.vue
index 8828332d..c1b73a9c 100644
--- a/ayanova/src/views/cust-headoffices.vue
+++ b/ayanova/src/views/cust-headoffices.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/customer-csr-list.vue b/ayanova/src/views/customer-csr-list.vue
index f3f7231f..a260be4c 100644
--- a/ayanova/src/views/customer-csr-list.vue
+++ b/ayanova/src/views/customer-csr-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/customer-workorders.vue b/ayanova/src/views/customer-workorders.vue
index 673e132c..6154babd 100644
--- a/ayanova/src/views/customer-workorders.vue
+++ b/ayanova/src/views/customer-workorders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-dashboard.vue b/ayanova/src/views/home-dashboard.vue
index ed13a402..6c1c4d82 100644
--- a/ayanova/src/views/home-dashboard.vue
+++ b/ayanova/src/views/home-dashboard.vue
@@ -3,7 +3,7 @@
     <h1>
       //DASHBOARD - KPI / METRICS / CHARTS AND STUFF APPROPRIATE TO ROLE
     </h1>
-    <UnderConstruction />
+    <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
   </div>
 </template>
 
diff --git a/ayanova/src/views/home-memos.vue b/ayanova/src/views/home-memos.vue
index 11863949..4f20a287 100644
--- a/ayanova/src/views/home-memos.vue
+++ b/ayanova/src/views/home-memos.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-reminders.vue b/ayanova/src/views/home-reminders.vue
index c635cc33..ddf7725c 100644
--- a/ayanova/src/views/home-reminders.vue
+++ b/ayanova/src/views/home-reminders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index f16b7943..a09aed63 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-translation.vue b/ayanova/src/views/home-translation.vue
deleted file mode 100644
index 4e0fd1c9..00000000
--- a/ayanova/src/views/home-translation.vue
+++ /dev/null
@@ -1,21 +0,0 @@
-<template>
-  <UnderConstruction />
-</template>
-
-<script>
-import UnderConstruction from "../components/underconstruction.vue";
-
-export default {
-  components: {
-    UnderConstruction
-  },
-  beforeCreate() {
-    window.$gz.eventBus.$emit("menu-change", {
-      isMain: true,
-      icon: "$ayiLanguage",
-      title: "Translation",
-      helpUrl: "form-home-translation"
-    });
-  }
-};
-</script>
diff --git a/ayanova/src/views/inv-adjustments.vue b/ayanova/src/views/inv-adjustments.vue
index df30bd75..bb25bc18 100644
--- a/ayanova/src/views/inv-adjustments.vue
+++ b/ayanova/src/views/inv-adjustments.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-part-inventory.vue b/ayanova/src/views/inv-part-inventory.vue
index 08aa99e8..a726570b 100644
--- a/ayanova/src/views/inv-part-inventory.vue
+++ b/ayanova/src/views/inv-part-inventory.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue
index f9d382a0..34a72f72 100644
--- a/ayanova/src/views/inv-part-requests.vue
+++ b/ayanova/src/views/inv-part-requests.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-parts.vue b/ayanova/src/views/inv-parts.vue
index b3ccb887..08d44bd9 100644
--- a/ayanova/src/views/inv-parts.vue
+++ b/ayanova/src/views/inv-parts.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-purchase-order-receipts.vue b/ayanova/src/views/inv-purchase-order-receipts.vue
index 1918624c..69653d73 100644
--- a/ayanova/src/views/inv-purchase-order-receipts.vue
+++ b/ayanova/src/views/inv-purchase-order-receipts.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-purchase-orders.vue b/ayanova/src/views/inv-purchase-orders.vue
index de1892f5..f78d8a1f 100644
--- a/ayanova/src/views/inv-purchase-orders.vue
+++ b/ayanova/src/views/inv-purchase-orders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index 71c2972f..c996867f 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-csr-list.vue b/ayanova/src/views/svc-csr-list.vue
index b8e8341c..0e623187 100644
--- a/ayanova/src/views/svc-csr-list.vue
+++ b/ayanova/src/views/svc-csr-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-loaners.vue b/ayanova/src/views/svc-loaners.vue
index 0112df2f..9ea9e352 100644
--- a/ayanova/src/views/svc-loaners.vue
+++ b/ayanova/src/views/svc-loaners.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-pm-list.vue b/ayanova/src/views/svc-pm-list.vue
index 47e986e8..ad470292 100644
--- a/ayanova/src/views/svc-pm-list.vue
+++ b/ayanova/src/views/svc-pm-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-pm-templates.vue b/ayanova/src/views/svc-pm-templates.vue
index 216fd2fb..8aba63c8 100644
--- a/ayanova/src/views/svc-pm-templates.vue
+++ b/ayanova/src/views/svc-pm-templates.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-quote-templates.vue b/ayanova/src/views/svc-quote-templates.vue
index 91ad46d3..3b1d659d 100644
--- a/ayanova/src/views/svc-quote-templates.vue
+++ b/ayanova/src/views/svc-quote-templates.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index 1d96db9d..a96ce202 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-schedule.vue b/ayanova/src/views/svc-schedule.vue
index cf4c59a9..a40c75bd 100644
--- a/ayanova/src/views/svc-schedule.vue
+++ b/ayanova/src/views/svc-schedule.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-unit-models.vue b/ayanova/src/views/svc-unit-models.vue
index 6a4bccd6..d922a273 100644
--- a/ayanova/src/views/svc-unit-models.vue
+++ b/ayanova/src/views/svc-unit-models.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index 1fa3cdd6..aa865b73 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-workorder-templates.vue b/ayanova/src/views/svc-workorder-templates.vue
index d1a81d11..64d71567 100644
--- a/ayanova/src/views/svc-workorder-templates.vue
+++ b/ayanova/src/views/svc-workorder-templates.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue
index 70dc0d5c..245e029b 100644
--- a/ayanova/src/views/svc-workorders.vue
+++ b/ayanova/src/views/svc-workorders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/vendors.vue b/ayanova/src/views/vendors.vue
index 9c36a65f..0866ec17 100644
--- a/ayanova/src/views/vendors.vue
+++ b/ayanova/src/views/vendors.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction />
+  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
 </template>
 
 <script>
diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js
index c6dbf8fb..10f4eaba 100644
--- a/ayanova/tests/e2e/specs/smoke.js
+++ b/ayanova/tests/e2e/specs/smoke.js
@@ -15,70 +15,126 @@ describe("SMOKE", () => {
 
     cy.visit("/home-dashboard");
     cy.url().should("include", "/home-dashboard");
+    cy.get("[data-cy=underconstruction]");
 
     //go to every form and ensure it loads
 
     cy.visit("/home-search");
     cy.url().should("include", "/home-search");
+    cy.get("[data-cy=phrase]");
+
     cy.visit("/home-schedule");
     cy.url().should("include", "/home-schedule");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/home-memos");
     cy.url().should("include", "/home-memos");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/home-reminders");
     cy.url().should("include", "/home-reminders");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/home-user-settings");
     cy.url().should("include", "/home-user-settings");
-    cy.visit("/home-translation");
-    cy.url().should("include", "/home-translation");
+
+    // cy.visit("/home-translation");
+    // cy.url().should("include", "/home-translation");
+    // cy.get("[data-cy=underconstruction]");
+
     cy.visit("/home-password");
     cy.url().should("include", "/home-password");
     cy.visit("/home-notify-subscriptions");
     cy.url().should("include", "/home-notify-subscriptions");
+
     cy.visit("/cust-customers");
     cy.url().should("include", "/cust-customers");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/cust-headoffices");
     cy.url().should("include", "/cust-headoffices");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-schedule");
     cy.url().should("include", "/svc-schedule");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-workorders");
     cy.url().should("include", "/svc-workorders");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-workorder-templates");
     cy.url().should("include", "/svc-workorder-templates");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-quotes");
     cy.url().should("include", "/svc-quotes");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-quote-templates");
     cy.url().should("include", "/svc-quote-templates");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-pm-list");
     cy.url().should("include", "/svc-pm-list");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-pm-templates");
     cy.url().should("include", "/svc-pm-templates");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-units");
     cy.url().should("include", "/svc-units");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-unit-models");
     cy.url().should("include", "/svc-unit-models");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-loaners");
     cy.url().should("include", "/svc-loaners");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-contracts");
     cy.url().should("include", "/svc-contracts");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/svc-csr-list");
     cy.url().should("include", "/svc-csr-list");
+    cy.get("[data-cy=underconstruction]");
 
     cy.visit("/inv-parts");
     cy.url().should("include", "/inv-parts");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/inv-part-inventory");
     cy.url().should("include", "/inv-part-inventory");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/inv-part-requests");
     cy.url().should("include", "/inv-part-requests");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/inv-purchase-orders");
     cy.url().should("include", "/inv-purchase-orders");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/inv-purchase-order-receipts");
     cy.url().should("include", "/inv-purchase-order-receipts");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/inv-adjustments");
     cy.url().should("include", "/inv-adjustments");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/vendors");
     cy.url().should("include", "/vendors");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/acc-accounting");
     cy.url().should("include", "/acc-accounting");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/adm-global-settings");
     cy.url().should("include", "/adm-global-settings");
 
@@ -125,6 +181,8 @@ describe("SMOKE", () => {
     );
     cy.visit("/review/2/1");
     cy.url().should("include", "/review/2/1");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/history/3/1");
     cy.url().should("include", "/history/3/1");
 
@@ -150,8 +208,11 @@ describe("SMOKE", () => {
       .clear()
       .type("CustomerFull{enter}");
     cy.url().should("include", "/customer-csr-list");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/customer-workorders");
     cy.url().should("include", "/customer-workorders");
+    cy.get("[data-cy=underconstruction]");
 
     //LOGOUT
     cy.get("[data-cy=navicon]").click();