diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 069c04da..29b15035 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -85,7 +85,7 @@ export default function initialize() {
           subSub.push({
             title: window.$gz.locale.get("NotifySubscriptionList"),
             icon: "bullhorn",
-            route: "/form-home-notify-subscriptions",
+            route: "/home-notify-subscriptions",
             key: key++
           });
 
diff --git a/ayanova/src/router.js b/ayanova/src/router.js
index d38840ff..7f515c0d 100644
--- a/ayanova/src/router.js
+++ b/ayanova/src/router.js
@@ -68,174 +68,164 @@ export default new Router({
       name: "login",
       meta: { scrollToTop: true }, //KEEP THIS AS AN EXAMPLE OF HOW TO USE WITH CODE ABOVE
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/login.vue")
+        import(/* webpackChunkName: "home" */ "./views/login.vue")
     },
     {
       path: "/home-dashboard",
       name: "home-dashboard",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/home-dashboard.vue")
+        import(/* webpackChunkName: "home" */ "./views/home-dashboard.vue")
     },
     {
       path: "/home-schedule",
       name: "home-schedule",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/home-schedule.vue")
+        import(/* webpackChunkName: "home" */ "./views/home-schedule.vue")
     },
     {
       path: "/home-memos",
       name: "home-memos",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/home-memos.vue")
+        import(/* webpackChunkName: "home" */ "./views/home-memos.vue")
     },
     {
       path: "/home-reminders",
       name: "home-reminders",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/home-reminders.vue")
+        import(/* webpackChunkName: "home" */ "./views/home-reminders.vue")
     },
     {
       path: "/home-locale",
       name: "home-locale",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/home-locale.vue")
+        import(/* webpackChunkName: "home" */ "./views/home-locale.vue")
     },
     {
       path: "/home-password",
       name: "home-password",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/home-password.vue")
+        import(/* webpackChunkName: "home" */ "./views/home-password.vue")
     },
     {
-      path: "/form-home-notify-subscriptions",
-      name: "form-home-notify-subscriptions",
+      path: "/home-notify-subscriptions",
+      name: "home-notify-subscriptions",
       component: () =>
         import(
-          /* webpackChunkName: "aybase" */ "./views/form-home-notify-subscriptions.vue"
+          /* webpackChunkName: "home" */ "./views/home-notify-subscriptions.vue"
         )
     },
     {
       path: "/cust-customers",
       name: "cust-customers",
       component: () =>
-        import(/* webpackChunkName: "customer" */ "./views/cust-customers.vue")
+        import(/* webpackChunkName: "cust" */ "./views/cust-customers.vue")
     },
     {
       path: "/cust-headoffices",
       name: "cust-headoffices",
       component: () =>
-        import(
-          /* webpackChunkName: "customer" */ "./views/cust-headoffices.vue"
-        )
+        import(/* webpackChunkName: "cust" */ "./views/cust-headoffices.vue")
     },
     {
       path: "/svc-schedule",
       name: "svc-schedule",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/svc-schedule.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-schedule.vue")
     },
     {
       path: "/svc-workorders",
       name: "svc-workorders",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-workorders.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-workorders.vue")
     },
     {
       path: "/svc-workorder-templates",
       name: "svc-workorder-templates",
       component: () =>
         import(
-          /* webpackChunkName: "service" */ "./views/svc-workorder-templates.vue"
+          /* webpackChunkName: "svc" */ "./views/svc-workorder-templates.vue"
         )
     },
     {
       path: "/svc-quotes",
       name: "svc-quotes",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-quotes.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-quotes.vue")
     },
     {
       path: "/svc-quote-templates",
       name: "svc-quote-templates",
       component: () =>
-        import(
-          /* webpackChunkName: "service" */ "./views/svc-quote-templates.vue"
-        )
+        import(/* webpackChunkName: "svc" */ "./views/svc-quote-templates.vue")
     },
     {
       path: "/svc-pm-list",
       name: "svc-pm-list",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-pm-list.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-list.vue")
     },
     {
       path: "/svc-pm-templates",
       name: "svc-pm-templates",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-pm-templates.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-pm-templates.vue")
     },
     {
       path: "/svc-units",
       name: "svc-units",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-units.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-units.vue")
     },
     {
       path: "/svc-unit-models",
       name: "svc-unit-models",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-unit-models.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-unit-models.vue")
     },
     {
       path: "/svc-loaners",
       name: "svc-loaners",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-loaners.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-loaners.vue")
     },
     {
       path: "/svc-contracts",
       name: "svc-contracts",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-contracts.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-contracts.vue")
     },
     {
       path: "/svc-csr-list",
       name: "svc-csr-list",
       component: () =>
-        import(/* webpackChunkName: "service" */ "./views/svc-csr-list.vue")
+        import(/* webpackChunkName: "svc" */ "./views/svc-csr-list.vue")
     },
     {
       path: "/inv-parts",
       name: "inv-parts",
       component: () =>
-        import(/* webpackChunkName: "inventory" */ "./views/inv-parts.vue")
+        import(/* webpackChunkName: "inv" */ "./views/inv-parts.vue")
     },
 
     {
       path: "/inv-part-inventory",
       name: "inv-part-inventory",
       component: () =>
-        import(
-          /* webpackChunkName: "inventory" */ "./views/inv-part-inventory.vue"
-        )
+        import(/* webpackChunkName: "inv" */ "./views/inv-part-inventory.vue")
     },
 
     {
       path: "/inv-part-requests",
       name: "inv-part-requests",
       component: () =>
-        import(
-          /* webpackChunkName: "inventory" */ "./views/inv-part-requests.vue"
-        )
+        import(/* webpackChunkName: "inv" */ "./views/inv-part-requests.vue")
     },
 
     {
       path: "/inv-purchase-orders",
       name: "inv-purchase-orders",
       component: () =>
-        import(
-          /* webpackChunkName: "inventory" */ "./views/inv-purchase-orders.vue"
-        )
+        import(/* webpackChunkName: "inv" */ "./views/inv-purchase-orders.vue")
     },
 
     {
@@ -243,7 +233,7 @@ export default new Router({
       name: "inv-purchase-order-receipts",
       component: () =>
         import(
-          /* webpackChunkName: "inventory" */ "./views/inv-purchase-order-receipts.vue"
+          /* webpackChunkName: "inv" */ "./views/inv-purchase-order-receipts.vue"
         )
     },
 
@@ -251,9 +241,7 @@ export default new Router({
       path: "/inv-adjustments",
       name: "inv-adjustments",
       component: () =>
-        import(
-          /* webpackChunkName: "inventory" */ "./views/inv-adjustments.vue"
-        )
+        import(/* webpackChunkName: "inv" */ "./views/inv-adjustments.vue")
     },
     {
       path: "/vendors",
@@ -266,104 +254,90 @@ export default new Router({
       path: "/acc-accounting",
       name: "acc-accounting",
       component: () =>
-        import(/* webpackChunkName: "vendors" */ "./views/acc-accounting.vue")
+        import(/* webpackChunkName: "acc" */ "./views/acc-accounting.vue")
     },
 
     {
       path: "/adm-global-settings",
       name: "adm-global-settings",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-global-settings.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-global-settings.vue")
     },
     {
       path: "/adm-license",
       name: "adm-license",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-license.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-license.vue")
     },
 
     {
       path: "/adm-users",
       name: "adm-users",
       component: () =>
-        import(/* webpackChunkName: "administration" */ "./views/adm-users.vue")
+        import(/* webpackChunkName: "adm" */ "./views/adm-users.vue")
     },
 
     {
       path: "/adm-localized-text",
       name: "adm-localized-text",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-localized-text.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-localized-text.vue")
     },
 
     {
       path: "/adm-report-templates",
       name: "adm-report-templates",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-report-templates.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-report-templates.vue")
     },
 
     {
       path: "/adm-attachments",
       name: "adm-attachments",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-attachments.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-attachments.vue")
     },
 
     {
       path: "/adm-history",
       name: "adm-history",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-history.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-history.vue")
     },
 
     {
       path: "/adm-statistics",
       name: "adm-statistics",
       component: () =>
-        import(
-          /* webpackChunkName: "administration" */ "./views/adm-statistics.vue"
-        )
+        import(/* webpackChunkName: "adm" */ "./views/adm-statistics.vue")
     },
 
     {
       path: "/ops-backup",
       name: "ops-backup",
       component: () =>
-        import(/* webpackChunkName: "operations" */ "./views/ops-backup.vue")
+        import(/* webpackChunkName: "ops" */ "./views/ops-backup.vue")
     },
 
     {
       path: "/ops-jobs",
       name: "ops-jobs",
       component: () =>
-        import(/* webpackChunkName: "operations" */ "./views/ops-jobs.vue")
+        import(/* webpackChunkName: "ops" */ "./views/ops-jobs.vue")
     },
 
     {
       path: "/ops-log",
       name: "ops-log",
       component: () =>
-        import(/* webpackChunkName: "operations" */ "./views/ops-log.vue")
+        import(/* webpackChunkName: "ops" */ "./views/ops-log.vue")
     },
 
     {
       path: "/ops-metrics",
       name: "ops-metrics",
       component: () =>
-        import(/* webpackChunkName: "operations" */ "./views/ops-metrics.vue")
+        import(/* webpackChunkName: "ops" */ "./views/ops-metrics.vue")
     },
 
     {
@@ -371,7 +345,7 @@ export default new Router({
       name: "ops-notification-settings",
       component: () =>
         import(
-          /* webpackChunkName: "operations" */ "./views/ops-notification-settings.vue"
+          /* webpackChunkName: "ops" */ "./views/ops-notification-settings.vue"
         )
     },
     //**********************************GENERAL   */
@@ -382,13 +356,12 @@ export default new Router({
       // this generates a separate chunk (about.[hash].js) for this route
       // which is lazy-loaded when the route is visited.
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/about.vue")
+        import(/* webpackChunkName: "home" */ "./views/about.vue")
     },
     {
       path: "/log",
       name: "log",
-      component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/log.vue")
+      component: () => import(/* webpackChunkName: "home" */ "./views/log.vue")
     },
     {
       path: "/customize/:formCustomTemplateKey",
@@ -406,18 +379,20 @@ export default new Router({
     },
 
     {
+      //TEST WIDGET EDIT FORM
       path: "/inventory/widget/edit/:id",
       name: "inventory-widget-edit",
       component: () =>
         import(
-          /* webpackChunkName: "inventory" */ "./views/test-inventory-widget-edit.vue"
+          /* webpackChunkName: "test" */ "./views/test-inventory-widget-edit.vue"
         )
     },
     {
+      //404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404 404
       path: "*",
       name: "notfound",
       component: () =>
-        import(/* webpackChunkName: "aybase" */ "./views/notfound.vue")
+        import(/* webpackChunkName: "home" */ "./views/notfound.vue")
     }
   ]
 });
diff --git a/ayanova/src/views/form-home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
similarity index 100%
rename from ayanova/src/views/form-home-notify-subscriptions.vue
rename to ayanova/src/views/home-notify-subscriptions.vue