diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 172acf9d..66904ac6 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -52,7 +52,8 @@ http://localhost:7575/login
 http://localhost:8080/login
 
 
-Lang error, WTF, it's def there, maybe the valert needs to be updated or something
+
+Grid not taking 25, 99 etc, stuck at 5 initial value for rows per page and that's what fetches off the server as well
 
 
 Vuetify dialog changes - https://github.com/yariksav/vuetify-dialog/issues/46
diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json
index ad2410ca..71d7c8c5 100644
--- a/ayanova/package-lock.json
+++ b/ayanova/package-lock.json
@@ -1068,9 +1068,9 @@
       }
     },
     "@babel/polyfill": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz",
-      "integrity": "sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==",
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.6.0.tgz",
+      "integrity": "sha512-q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw==",
       "requires": {
         "core-js": "^2.6.5",
         "regenerator-runtime": "^0.13.2"
@@ -6925,9 +6925,9 @@
       }
     },
     "core-js": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.3.6.tgz",
-      "integrity": "sha512-u4oM8SHwmDuh5mWZdDg9UwNVq5s1uqq6ZDLLIs07VY+VJU91i3h4f3K/pgFvtUQPGdeStrZ+odKyfyt4EnKHfA=="
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.3.3.tgz",
+      "integrity": "sha512-0xmD4vUJRY8nfLyV9zcpC17FtSie5STXzw+HyYw2t8IIvmDnbq7RJUULECCo+NstpJtwK9kx8S+898iyqgeUow=="
     },
     "core-js-compat": {
       "version": "3.3.3",
@@ -7535,9 +7535,9 @@
       "dev": true
     },
     "dayjs": {
-      "version": "1.8.17",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.17.tgz",
-      "integrity": "sha512-47VY/htqYqr9GHd7HW/h56PpQzRBSJcxIQFwqL3P20bMF/3az5c3PWdVY3LmPXFl6cQCYHL7c79b9ov+2bOBbw=="
+      "version": "1.8.16",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.16.tgz",
+      "integrity": "sha512-XPmqzWz/EJiaRHjBqSJ2s6hE/BUoCIHKgdS2QPtTQtKcS9E4/Qn0WomoH1lXanWCzri+g7zPcuNV4aTZ8PMORQ=="
     },
     "de-indent": {
       "version": "1.0.2",
@@ -16139,84 +16139,24 @@
       }
     },
     "sass-loader": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
-      "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
+      "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "neo-async": "^2.6.1",
-        "schema-utils": "^2.1.0",
+        "loader-utils": "^1.0.1",
+        "neo-async": "^2.5.0",
+        "pify": "^4.0.1",
         "semver": "^6.3.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
-          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
           "dev": true
         },
-        "big.js": {
-          "version": "5.2.2",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "neo-async": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-          "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
-          "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.10.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -16484,9 +16424,9 @@
       "dev": true
     },
     "shvl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shvl/-/shvl-2.0.0.tgz",
-      "integrity": "sha512-WbpzSvI5XgVGJ3A4ySGe8hBxj0JgJktfnoLhhJmvITDdK21WPVWwgG8GPlYEh4xqdti3Ff7PJ5G0QrRAjNS0Ig=="
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/shvl/-/shvl-1.3.1.tgz",
+      "integrity": "sha512-+rRPP46hloYUAEImJcqprUgXu+05Ikqr4h4V+w5i2zJy37nAqtkQKufs3+3S2fDq6JNRrHMIQhB/Vaex+jgAAw=="
     },
     "sigmund": {
       "version": "1.0.1",
@@ -18372,9 +18312,9 @@
       "integrity": "sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ=="
     },
     "vue-cli-plugin-vuetify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-1.1.2.tgz",
-      "integrity": "sha512-CcrZlAtsmGI6Uocq9e3rZjhxgfXRycE09yth1u+hKSPsAt0QQrX9JIGie4uJM5OLmq20TUaWQI/IosKHBp/fyQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-1.1.1.tgz",
+      "integrity": "sha512-Sd1bQhMPKjFUKtAqsbndxu+fOSmCrSXF7pa4bIToFszP6Otu3HcwICzdGfNOyXOCX4/qqvNfSOdYapbNEVG+Uw==",
       "dev": true,
       "requires": {
         "semver": "^6.0.0",
@@ -18458,9 +18398,9 @@
       "dev": true
     },
     "vuetify": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.9.tgz",
-      "integrity": "sha512-52CgEyPoGYHba5yocYKBB/LXcikoWzj9jCDTH8LlzH/hvjzkgsuEtFwUustGHyV9GstRaNZOrk4nuUWbPZc3kQ=="
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.6.tgz",
+      "integrity": "sha512-uK5jNTbRQtnPRMDsBeXOSVgo0nKDNq7XDi987XVhK6Vb5dl6Y5kSFBFDHPpdzSUraeUtyDHrJWxq29NTPIbdFw=="
     },
     "vuetify-dialog": {
       "version": "1.0.0-alpha.5",
@@ -18516,18 +18456,18 @@
       "integrity": "sha512-ER5moSbLZuNSMBFnEBVGhQ1uCBNJslH9W/Dw2W7GZN23UQA69uapP5GTT9Vm8Trc0PzBSVt6LzF3hGjmv41xcg=="
     },
     "vuex-persistedstate": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-2.7.0.tgz",
-      "integrity": "sha512-mpko65DUMBY4mF4sSGsgrqjE7fwO373LFZeuNrC55glRuBBAK4dkgzjr4j4Bij7WtMoKuo2t2w0NGenjauISaQ==",
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/vuex-persistedstate/-/vuex-persistedstate-2.5.4.tgz",
+      "integrity": "sha512-XYJhKIwO+ZVlTaXyxKxnplrJ88Fnvk5aDw753bxzRw5/yMKLQ6lq9CDCBex2fwZaQcLibhtgJOxGCHjy9GLSlQ==",
       "requires": {
-        "deepmerge": "^4.2.2",
-        "shvl": "^2.0.0"
+        "deepmerge": "^2.1.0",
+        "shvl": "^1.3.0"
       },
       "dependencies": {
         "deepmerge": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
+          "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
         }
       }
     },
diff --git a/ayanova/package.json b/ayanova/package.json
index 9f0489d8..ba66a8e3 100644
--- a/ayanova/package.json
+++ b/ayanova/package.json
@@ -11,19 +11,19 @@
     "myLint": "npm run lint"
   },
   "dependencies": {
-    "@babel/polyfill": "^7.7.0",
-    "core-js": "^3.3.6",
-    "dayjs": "^1.8.17",
+    "@babel/polyfill": "^7.6.0",
+    "core-js": "^3.3.2",
+    "dayjs": "^1.8.16",
     "jwt-decode": "^2.2.0",
     "nprogress": "^0.2.0",
     "register-service-worker": "^1.6.2",
     "typeface-roboto": "0.0.54",
     "vue": "^2.6.10",
     "vue-router": "^3.1.3",
-    "vuetify": "^2.1.9",
+    "vuetify": "^2.1.6",
     "vuetify-dialog": "^1.0.0-alpha.5",
     "vuex": "^3.0.1",
-    "vuex-persistedstate": "^2.7.0"
+    "vuex-persistedstate": "^2.5.4"
   },
   "devDependencies": {
     "@cypress/webpack-preprocessor": "^3.0.0",
@@ -44,8 +44,8 @@
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.2.3",
     "sass": "^1.23.1",
-    "sass-loader": "^8.0.0",
-    "vue-cli-plugin-vuetify": "^1.1.2",
+    "sass-loader": "^7.3.1",
+    "vue-cli-plugin-vuetify": "^1.1.1",
     "vue-template-compiler": "^2.6.10",
     "vuetify-loader": "^1.3.0"
   },
diff --git a/ayanova/public/index.html b/ayanova/public/index.html
index 2c4a2109..f0d1bba1 100644
--- a/ayanova/public/index.html
+++ b/ayanova/public/index.html
@@ -14,8 +14,6 @@
     <!--
       <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.2/css/all.css" integrity="sha384-/rXc/GQVaYpyDdyxK+ecHPVYJSN9bmVFBvjA/9eOB+pb3F2w2N6fc5qB9Ew5yIns" crossorigin="anonymous">
     -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
   </head>
   <body>
     <noscript>
diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 0399e287..cfc1490a 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -1,36 +1,180 @@
 <template>
   <v-app>
-    <v-app-bar app>
-      <v-toolbar-title class="headline text-uppercase">
-        <span>Vuetify</span>
-        <span class="font-weight-light">MATERIAL DESIGN</span>
+    <v-navigation-drawer v-if="isAuthenticated" v-model="drawer" app>
+      <v-list dense>
+        <v-list-item
+          v-for="item in navItems"
+          :key="item.route"
+          :to="item.route"
+        >
+          <v-list-item-action>
+            <v-icon>{{ "fa-" + item.icon }}</v-icon>
+          </v-list-item-action>
+          <v-list-item-content>
+            <v-list-item-title>{{ item.title }}</v-list-item-title>
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-navigation-drawer>
+    <v-app-bar
+      v-if="isAuthenticated"
+      :color="appBar.isMain ? 'primary' : 'secondary'"
+      dark
+      fixed
+      app
+    >
+      <v-app-bar-nav-icon @click.stop="drawer = !drawer"></v-app-bar-nav-icon>
+      <v-toolbar-title style="width: 300px" class="ml-0 pl-4">
+        <v-icon>{{ appBar.icon }}</v-icon
+        >&nbsp;
+        <span>{{ appBar.title }}</span>
       </v-toolbar-title>
       <v-spacer></v-spacer>
-      <v-btn
-        text
-        href="https://github.com/vuetifyjs/vuetify/releases/latest"
-        target="_blank"
-      >
-        <span class="mr-2">Latest Release</span>
-      </v-btn>
+      <v-toolbar-items>
+        <template v-for="item in appBar.menuItems">
+          <v-btn
+            class="hidden-xs-only"
+            icon
+            v-if="item.surface"
+            :key="item.key"
+            :disabled="item.disabled"
+            @click="clickMenuItem(item)"
+          >
+            <v-icon :color="item.color ? item.color : ''">
+              {{ "fa-" + item.icon }}
+            </v-icon>
+          </v-btn>
+        </template>
+        <v-spacer></v-spacer>
+        <v-menu bottom float-left>
+          <template v-slot:activator="{ on }">
+            <v-btn text icon v-on="on">
+              <v-icon>fa-ellipsis-v</v-icon>
+            </v-btn>
+          </template>
+          <v-list>
+            <template v-for="(item, index) in appBar.menuItems">
+              <v-subheader v-if="item.header" :key="index">
+                {{ item.header }}
+              </v-subheader>
+              <v-divider
+                v-else-if="item.divider"
+                :key="index"
+                :inset="item.inset"
+              ></v-divider>
+              <v-list-item
+                v-else
+                :key="item.key"
+                :disabled="item.disabled"
+                @click="clickMenuItem(item)"
+                v-bind:class="{ 'hidden-sm-and-up': item.surface }"
+              >
+                <v-list-item-action>
+                  <v-icon
+                    v-if="item.icon"
+                    :color="item.color ? item.color : ''"
+                    >{{ "fa-" + item.icon }}</v-icon
+                  >
+                </v-list-item-action>
+                <v-list-item-content>
+                  <v-list-item-title>
+                    <span>{{ item.title }}</span>
+                  </v-list-item-title>
+                </v-list-item-content>
+              </v-list-item>
+            </template>
+          </v-list>
+        </v-menu>
+      </v-toolbar-items>
     </v-app-bar>
-
     <v-content>
-      <HelloWorld />
+      <v-container fluid fill-height>
+        <v-row justify-center>
+          <transition name="fade" mode="out-in" @after-leave="afterLeave">
+            <router-view class="view"></router-view>
+          </transition>
+        </v-row>
+      </v-container>
     </v-content>
+    <v-footer color="primary" padless v-if="!isAuthenticated">
+      <div>
+        <a
+          href="https://ayanova.com"
+          target="_blank"
+          style="text-decoration:none"
+          class="white--text caption"
+        >
+          <span>AyaNova ({{ version }}) {{ copyright }}</span>
+        </a>
+      </div>
+    </v-footer>
   </v-app>
 </template>
 
 <script>
-import HelloWorld from "./components/HelloWorld";
+/*  xeslint-disable    */
+import aboutInfo from "./api/aboutinfo";
 
 export default {
-  name: "App",
-  components: {
-    HelloWorld
+  data() {
+    return {
+      drawer: null,
+      appBar: {
+        isMain: true,
+        icon: "",
+        title: "",
+        helpUrl: "index.html",
+        menuItems: []
+      }
+    };
   },
-  data: () => ({
+  created() {
+    //////////////////////////////////
+    // WIRE UP
+    // MENU and DIALOG EVENT HANDLERS
+    // ON GZEVENTBUS
     //
-  })
+    //
+    window.$gz.menu.wireUpEventHandlers(this);
+    window.$gz.dialog.wireUpEventHandlers(this);
+  },
+  beforeDestroy() {
+    //UNWIRE ALL EVENT HANDLERS FROM GZEVENTBUS
+    window.$gz.eventBus.$off();
+  },
+  mounted() {
+    //redirect to login if not authenticated
+    if (!this.$store.state.authenticated) {
+      this.$router.push({ name: "login" });
+    }
+  },
+  computed: {
+    isAuthenticated() {
+      return this.$store.state.authenticated === true;
+    },
+    navItems() {
+      return this.$store.state.navItems;
+    },
+    copyright() {
+      return aboutInfo.copyright;
+    },
+    version() {
+      return aboutInfo.version;
+    },
+    helpUrl() {
+      return this.$store.state.helpUrl;
+    }
+  },
+  props: {
+    source: String
+  },
+  methods: {
+    afterLeave() {
+      this.$root.$emit("triggerScroll");
+    },
+    clickMenuItem(item) {
+      window.$gz.eventBus.$emit("menu-click", item);
+    }
+  }
 };
 </script>
diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js
index 639873ac..7e2dbc29 100644
--- a/ayanova/src/api/initialize.js
+++ b/ayanova/src/api/initialize.js
@@ -144,7 +144,7 @@ export default function initialize() {
                 if (res.data.timeZoneOffset != localOffset) {
                   //TODO: localize message and also actually have a fix for it here
                   //so this should be a confirm prompt but for now will just show it
-
+                
                   //for now just show the message
                   window.$gz.eventBus.$emit(
                     "notify-info",
diff --git a/ayanova/src/assets/logo.svg b/ayanova/src/assets/logo.svg
index 145b6d13..3b7b89d7 100644
--- a/ayanova/src/assets/logo.svg
+++ b/ayanova/src/assets/logo.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 87.5 100"><defs><style>.cls-1{fill:#1697f6;}.cls-2{fill:#7bc6ff;}.cls-3{fill:#1867c0;}.cls-4{fill:#aeddff;}</style></defs><title>Artboard 46</title><polyline class="cls-1" points="43.75 0 23.31 0 43.75 48.32"/><polygon class="cls-2" points="43.75 62.5 43.75 100 0 14.58 22.92 14.58 43.75 62.5"/><polyline class="cls-3" points="43.75 0 64.19 0 43.75 48.32"/><polygon class="cls-4" points="64.58 14.58 87.5 14.58 43.75 100 43.75 62.5 64.58 14.58"/></svg>
+<svg version="1.1" viewBox="0 0 306.4 266.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="b" x1="96.55" x2="372.7" y1="285.5" y2="285.5" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".4271" offset="0"/><stop stop-opacity=".05208" offset="1"/><stop stop-color="#666" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="c" x1="67.56" x2="268" y1="242.9" y2="242.9" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop stop-color="#ff0" offset="0"/><stop stop-color="#ffbd00" offset="1"/><stop stop-color="#f6df00" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="a" x1="153.9" x2="193.8" y1="201.7" y2="201.7" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#d7d7d7" offset="1"/><stop stop-color="#fff" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="d" x1="66.38" x2="93" y1="201.6" y2="201.6" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop stop-color="#676767" offset="0"/><stop offset="1"/><stop stop-opacity="0" offset="1"/></linearGradient><linearGradient id="e" x1="216.4" x2="270.6" y1="259.1" y2="259.1" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop offset="0"/><stop stop-color="#858585" offset="1"/><stop stop-opacity="0" offset="1"/></linearGradient><linearGradient id="f" x1="162.8" x2="214.1" y1="293.5" y2="293.5" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop stop-color="#ffc707" offset="0"/><stop stop-color="#ff9507" offset="1"/><stop stop-color="#ec9b07" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="g" x1="89.94" x2="114.1" y1="266.3" y2="266.3" gradientTransform="translate(139.6 299.2)" gradientUnits="userSpaceOnUse"><stop stop-color="#ffa807" offset="0"/><stop stop-color="#ffbd07" stop-opacity=".498" offset="1"/><stop stop-color="#ec9b07" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="h" x1="149.7" x2="196.1" y1="168.1" y2="168.1" gradientTransform="translate(139.6 300.9)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".4479" offset="0"/><stop stop-opacity=".125" offset="1"/><stop stop-color="#ccc" stop-opacity="0" offset="1"/></linearGradient><linearGradient id="i" x1="102.1" x2="134.9" y1="158.7" y2="158.7" gradientTransform="translate(139.6 300.9)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".2188" offset="0"/><stop stop-opacity=".3542" offset="1"/><stop stop-opacity="0" offset="1"/></linearGradient></defs><g transform="translate(-206 -399.1)"><path d="m504 565.9c-17.79-25.55-44.68-44.04-74.35-53.08-18.41-5.706-37.67-8.396-56.9-8.984-45.52 37.58-91.04 75.17-136.6 112.8-0.4741 18.07 13.56 32.95 29.06 40.19 23.53 11.03 52.29 12.23 75.91 0.8933 29.55-17.71 58.6-36.29 87.95-54.34 7.776-4.829 15.55-9.659 23.33-14.49 3.729 7.438 7.458 14.88 11.19 22.31 12.63 4.732 28.08 6.169 39.88-1.438 3.721-2.884 7.562-6.828 8.725-11.34-2.742-10.82-5.484-21.65-8.225-32.47z" fill="url(#b)"/><path d="m381.4 480.5c-13.55-19.94-32.49-35.55-52.19-49.12-5.544-3.195-10.88-7.561-17.09-9.091-13.29-0.1002-26.67-1.049-39.9-0.6196-13.83 3.383-27.67 6.765-41.5 10.15-13.81 15.78-19.48 36.76-23.56 56.88-0.4744 9.291 9.174 15.46 17.36 16.74 2.449 1.343 8.398-1.749 8.026 1.964 0.166 35.22 0.0389 70.72 0.5392 106 0.6758 17.16 11.01 33.54 26.66 40.85 18.68 9.231 40.34 9.442 60.66 7.543 11.62-2.295 23.47-8.202 29.88-18.5 4.778-8.572 2.104-18.8 2.756-28.15-0.0645-20.87-0.129-41.74-0.1935-62.6 1.844 4.584 2.048 10.7 7.482 12.58 10.28 4.712 22.54 5.034 33.27 1.81 10.63-3.73 16.08-16.77 13.22-27.29-4.852-13.1-8.757-26.6-14.23-39.44-3.448-6.728-7.039-13.39-11.18-19.72zm-53 14.5c6.004 3.248 9.038 12.09 3.938 17.25-6.38 5.748-16.27 3.893-23.69 1.062-7.905-3.397-16.85-10.16-16.41-19.67 1.304-7.289 10.56-8.554 16.66-7.522 7.017 1.538 13.53 4.967 19.5 8.875z" fill="url(#c)"/><path d="m333.5 500.1c-5.392-7.184-14.35-10.66-22.56-13.56-6.278-1.57-15.46-1.095-18.36 5.708-1.927 9.031 6.51 16.23 13.73 19.96 7.782 3.596 18.08 6.038 25.51 0.5802 3.448-2.95 4.229-8.783 1.688-12.69zm-6.688-4.375c5.436 3.039 9.288 11.14 4 16.12-7.025 5.054-16.85 2.419-24.19-0.9375-6.37-3.402-14.06-9.488-12.81-17.56 2.628-6.985 12.12-7.143 18.2-5.171 5.275 1.739 10.26 4.367 14.8 7.546z" fill="#c10c0c"/><path d="m331.3 500.1c-5.11-6.245-13.03-9.719-20.53-12.26-6.101-1.708-15.95-0.8924-17.28 6.701 0.3044 9.073 9.16 15.05 16.88 18 6.64 2.193 15.5 3.933 21-1.375 2.767-3.352 2.37-7.669-0.0625-11.06zm-14.25-1.375c4.264-2.058 1.018 3.369-0.577 4.701-0.4077 3.391 2.754-2.073 4.264-1.014 1.211 1.857-0.7534 5.158 2.118 1.444 3.834-2.106-1.636 3.498 0.7568 2.368 1.581-3.598 2.718-0.8562 1.688 0.3125 0.8074-1.717 5.655-3.56 4.75-0.5625-1.896 2.284 0.8233 2.224 0.0887 3.039-3.409 2.185-0.3332-3.458-3.401-0.4138 3e-3 -4.143-3.418 0.9389-4.562-1.75-0.6432-0.251-4.369-0.7595-5.127-1.432-2.887 2.211-2.836-2.56-0.8734-3.693 3.699-3.792-1.558-0.7165-2.75 1.188-0.8989 0.4389-2.967 1.409-3.562 0.3125 1.04-1.472-2.362-0.4259-2.688-1.625-0.817 0.7992-3.523 4.164-3 1.312 2.69-3.914 0.6433-0.3018-0.4728-3.338-0.7414-2.209 4.176-4.235 2.122-1.157-3.202 2.832 1.782-0.6881 2.288-0.193-0.6596 2.203-3.074 4.54 0 1.688 1.555-1.775 4.797-1.17 3.75 0.9375-2.479 3.077 1.412 1.217 1.95-0.6842 2.788-2.802 0.6978-3.062-2.075-2.441-0.1842-2.102 2.803-2.24 2.625-1.875 4.154-0.6517 1.115 4.044-0.4162 5.463-0.3386-0.0947 2.329-2.062 3.104-2.588zm-11.81-5c-2.763 1.355 0.2374 3.723-2.437 3.828-2.065 1.327 1.612 2.25-2 2.172 0.4-1.79 0.6778-4.617-2.188-3-1.353 1.665-3.997 0.9406-1.25-0.625 2.588 0.7742-0.7308-3.433 2.75-1.938-1.143 1.444 5.137-3.583 5.312-1l-0.0625 0.25z" fill="url(#a)"/><path d="m318.3 498.1c-2.743 1.098-6.299 5.625-2.5 0.75 3.217-2.466-2.047-3.445-1.562-3.062-2.329-0.9051-3.8 3.8 0.1665 1.753 2.491-0.1841-1.461 3.517-1.979 4.497-2.44 1.942-0.4797-1.249-0.375-1.875-0.2901-3.011-4.039-0.2466-5.257 0.9628-1.635 1.69 3.56-4.666 0.2568-2.65-4.194 2.367-0.295 0.2033-0.9375-1.75-2.284-0.5031-3.56 5.377-0.625 4.062 1.706-1.923-3.377 4.156-0.5625 3.062 1.616-1.321 3.174-4.061 3.75-0.9375 2.863-2.937-0.0549 2.683 3.062 0.25 1.55 1.138 2.965-1.933 4.562-2.875 3.621-1.709-2.108 2.812-1.625 4.75 1.689 2.458 3.6-1.909 4.562 1.812 3.365-2.416 2.499 1.951 5.562 0.4375 1.242-0.2136 3.713 1.126 3.381 1.285-0.0331 2.776 4.836-1.258 1.057-0.4097 0.7528-1.161 2.186-3.942-0.4375-3.812-2.102-0.0462-4.755 4.44-2.812 0.375-0.4714-2.186-4.011 4.187-2.562 0.625 2.6-3.441-1.478-0.8137-2.5 0.375 1.958-2.654-1.536-4.876-3.062-1.75-3.253 2.046-0.1339-2.998 1.312-3.688 0.4142-0.6919 0.3972-2.759-0.875-2.188zm8.75 8.875c3.295-3.523 2.376 0.6757 0 0zm-7.062-3.062c1.69 0.2389-3.007 2.897 0 0zm-10.94-2.125c-0.7851-1.932 5.392-2.423 0 0z" fill="#c10c0c"/><path d="m327.1 506.5c-0.5529 2.707 2.558-1.023 0 0z" fill="#e2e2e2"/><path d="m327.1 507.4c-0.0208 0-0.0208 0 0 0z" fill="#e5e5e5"/><path d="m328.5 506.6c2.592-1.373-1.586-0.8154-0.2762-0.1487z" fill="#e2e2e2"/><path d="m320 503.9c-1.983 1.705 1.879-0.8668 0 0z" fill="#e5e5e5"/><path d="m319.2 504.3c-1.521 2.282 2.307 1.371 0 0z" fill="#fff"/><path d="m309 501.8c3.803-1.413-0.6724-2.158 0 0z" fill="#ededed"/><path d="m310.6 500.8c2.968-1.456-2.194-0.3268 0 0z" fill="#eaeaea"/><path d="m304.6 494.7c2.825-3.642-3.009-1.641-4.438-0.0625 0.3754-1.511-3.758-0.3361-1.188 1.062-1.843-0.229-4.314 3.303-1.25 1.625 0.8483-1.468 4.493-1.239 3.25 0.5-2.14 3.427 4.168 1.27 1 0.9375 1.051-1.32 2.814-1.566 1.935-3.169l0.3724-0.482zm-1.75-0.6875c4.1-1.078-4.735 3.178 0 0z" fill="#c10c0c"/><path d="m303.8 493.9c1.06-0.8607-0.8553-0.2525 0 0z" fill="#e4e4e4"/><path d="m303.5 493.7c-5.14 1.447 0.1753 2.946 0 0z" fill="#fff"/><path d="m213.3 509.5c5.803 3.379 12.74 3.38 19.25 3.25-0.1816-3.577 1.358-8.826-3.968-7.062-8.355 0.214-17.49-4.291-20.84-12.19-0.8983-5.537-0.6199-4.518-1.23 0.6356-1.246 4.735-0.4162 10.07 3.819 13.06 0.9293 0.8389 1.93 1.615 2.974 2.306z" fill="url(#d)"/><path d="m408.6 562.5c2.917-7.114 1.03-14.75-1.438-21.69 2.114 11.27-4.434 24.6-16.28 26.95-10.63 2.164-22.64 1.949-32.28-3.58-4.461-4.764-1.279 1.847-0.7313 4.792 2.99 4.917 9.947 5.427 15.2 6.235 11.01 1.349 23.29-0.052 32.1-7.277 1.446-1.598 2.694-3.404 3.438-5.438z" fill="url(#e)"/><path d="m336.4 524.1c-5.084 9.885-14.37 17.23-25.12 20.12-7.9 4.289-8.46 14.7-8.812 22.69-0.3883 23.84 5.7 47.25 12.41 69.95 1.597 6.747 4.794 14.16 2.211 20.99-0.8281 2.046-7.459 5.419-5.431 5.199 14.78-2.537 31.05-7.861 39.24-21.39 3.948-7.985 1.652-17.21 2.366-25.77 0.1488-20.33 0.2977-40.65 0.4465-60.98-5.417-10.94-10.83-21.88-16.25-32.81-0.3542 0.6667-0.7083 1.333-1.062 2z" fill="url(#f)"/><path d="m231.8 499.1c1.788 14.1 0.4803 28.41 0.8946 42.59 0.1508 24.46-0.2423 48.94 0.2484 73.39 1.28 12.8 6.982 25.42 17.55 33.16 4.625 4.376 2.083 0.5923 0.1846-2.789-9.777-17.61-13.37-39.79-4.63-58.54 5.552-16.17 5.069-33.7 5.312-50.62 0.5218-8.537-1.699-17.47-8.157-23.45-7.497-9.446-9.28-21.83-13.66-32.8 0.1864 6.405 1.143 12.76 2.25 19.06z" fill="url(#g)"/><path d="m338.2 419.5c-2.806-4.377-6.556-8.221-11.12-10.75 3.001 11.38 1.758 23.41 0.7075 34.99-0.9955 4.701-3.278 8.969-5.707 13.07 7.013 5.58 10.84 14.08 16.12 20.94 2.376-2.293 1.022-6.9 1.857-10.06 0.8095-12.11 2.558-24.2 2.768-36.32-0.5403-4.259-2.476-8.212-4.625-11.87z" fill="#272727"/><path d="m311.9 457.5c-7.507 3.669-14.25 8.66-21.37 13 4.847-3.583-2.345 4.954-0.6427 5.29 10.94-4.941 24.85-8.895 35.77-1.853 3.429 2.014 5.361 5.793 7.812 8.562 1.51-2.329 2.675-6.507 1.672-9.161-4.132-6.326-8.076-13.45-14.67-17.46-2.984-0.7694-5.875 0.4745-8.562 1.625z" fill="url(#h)"/><path d="m263.3 407.5c-4.528 2.67-5.69 7.748-7.187 12.37-2.102 5.278-6.916 8.798-10.19 13.06 2.099 5.237 10.28 6.644 13.81 2.125 3.363-0.5683 4.999-1.727 3-5.062-0.6331-4.82 2.499-8.723 6.573-10.89 8.215-6.584 19.28-5.374 28.8-2.981 10.96 2.69 23.46 6.397 29.44 16.81 1.233 5.963 0.9677 3.072 1.203-1.359 0.2386-7.619 0.5838-15.45-1.641-22.83-11.94-6.058-25.44-8.862-38.73-9.61-8.946 0.0614-18.06 2.685-25.08 8.36z"/><path d="m276 415.5c-4.5 2.14-9.75 4.623-12.35 8.959-1.083 2.744-2.172 8.512 2.288 8.354 10.13 2.722 15.47 12.87 19.19 21.83 1.587 4.662 1.139 9.697 1.37 14.55 14.17-11.92 28.06-24.56 38.56-39.94-9.424-9.984-23.68-12.74-36.67-14.85-4.185-0.493-8.383-0.3118-12.39 1.102z" fill="#444"/><path d="m328.4 436.2c-0.198-2.524-2.896-9.651-4.875-4.687-10.33 14.37-23.51 26.35-37 37.69-0.2078 4.718 0.3506 3.909 4 1.312 8.784-5.029 16.74-12.2 26.69-14.75 3.963 0.4394 6.093 1.369 7.405-3.353 2.68-4.944 4.129-10.58 3.783-16.21z" fill="#333"/><path d="m283.9 451.5c-4.087-8.371-9.9-17.95-20.12-19.06 0.087 2.572 5.109 3.309 5.505 6.99 4.783 12.26 3.827 25.73 4.87 38.63 0.2692 1.488-0.1301 10.32 0.9943 5.964 1.862-5.489 7.414-8.212 11.57-11.46-0.5852-6.984 0.5524-14.57-2.812-21.06z" fill="#666"/><path d="m271.4 446.4c-1.257-4.526-2.368-11.29-7.75-12.37-4.237-0.3286-6.386 4.766-10.73 3.668-3.57-1.407-5.097-1.442-5.872 2.71-1.015 2.554-4.703 3.736-5.211 6.247 3.158 2.504 7.989 3.802 12 3 3.728-2.511 9.999-5.385 13.31-0.625 6.146 9.187 5.2 20.85 6.871 31.36 0.5535 5.821 0.3374 4.058 0.1244-0.7447-0.64-11.08-0.6194-22.33-2.746-33.24z" fill="url(#i)"/><path d="m274.6 485.8c-0.8874 9.854-4.421 20.68 0.25 30.12 3.151 2.106 6.947 3.268 10.75 2.875-2.006-12.93-2.657-26.53 2.323-38.91 1.255-3.663 2.674-7.303 4.74-10.59-6.721 4.473-15.95 7.788-18.06 16.5z" fill="#c00b0b"/></g></svg>
diff --git a/ayanova/src/components/HelloWorld.vue b/ayanova/src/components/HelloWorld.vue
index 33c400bb..739c4be5 100644
--- a/ayanova/src/components/HelloWorld.vue
+++ b/ayanova/src/components/HelloWorld.vue
@@ -1,132 +1,43 @@
 <template>
   <v-container>
-    <v-layout text-center wrap>
-      <v-flex xs12>
+    <v-row>
+      <v-col cols="12">
         <v-img
           :src="require('../assets/logo.svg')"
-          class="my-3"
           contain
           height="200"
+          position="center top"
         ></v-img>
-      </v-flex>
-
-      <v-flex mb-4>
-        <h1 class="display-2 font-weight-bold mb-3">
-          Welcome to Vuetify
+      </v-col>
+      <v-col cols="12" v-if="this.formReady">
+        <h1 class="display-1 font-weight-bold text-center">
+          {{ lt("Welcome") }}
         </h1>
-        <p class="subheading font-weight-regular">
-          For help and collaboration with other Vuetify developers,
-          <br />please join our online
-          <a href="https://community.vuetifyjs.com" target="_blank"
-            >Discord Community</a
-          >
-        </p>
-      </v-flex>
-
-      <v-flex mb-5 xs12>
-        <h2 class="headline font-weight-bold mb-3">What's next?</h2>
-
-        <v-layout justify-center>
-          <a
-            v-for="(next, i) in whatsNext"
-            :key="i"
-            :href="next.href"
-            class="subheading mx-3"
-            target="_blank"
-          >
-            {{ next.text }}
-          </a>
-        </v-layout>
-      </v-flex>
-
-      <v-flex xs12 mb-5>
-        <h2 class="headline font-weight-bold mb-3">Important Links</h2>
-
-        <v-layout justify-center>
-          <a
-            v-for="(link, i) in importantLinks"
-            :key="i"
-            :href="link.href"
-            class="subheading mx-3"
-            target="_blank"
-          >
-            {{ link.text }}
-          </a>
-        </v-layout>
-      </v-flex>
-
-      <v-flex xs12 mb-5>
-        <h2 class="headline font-weight-bold mb-3">Ecosystem</h2>
-
-        <v-layout justify-center>
-          <a
-            v-for="(eco, i) in ecosystem"
-            :key="i"
-            :href="eco.href"
-            class="subheading mx-3"
-            target="_blank"
-          >
-            {{ eco.text }}
-          </a>
-        </v-layout>
-      </v-flex>
-    </v-layout>
+      </v-col>
+    </v-row>
   </v-container>
 </template>
 
 <script>
 export default {
-  data: () => ({
-    ecosystem: [
-      {
-        text: "vuetify-loader",
-        href: "https://github.com/vuetifyjs/vuetify-loader"
-      },
-      {
-        text: "github",
-        href: "https://github.com/vuetifyjs/vuetify"
-      },
-      {
-        text: "awesome-vuetify",
-        href: "https://github.com/vuetifyjs/awesome-vuetify"
-      }
-    ],
-    importantLinks: [
-      {
-        text: "Documentation",
-        href: "https://vuetifyjs.com"
-      },
-      {
-        text: "Chat",
-        href: "https://community.vuetifyjs.com"
-      },
-      {
-        text: "Made with Vuetify",
-        href: "https://madewithvuejs.com/vuetify"
-      },
-      {
-        text: "Twitter",
-        href: "https://twitter.com/vuetifyjs"
-      },
-      {
-        text: "Articles",
-        href: "https://medium.com/vuetify"
-      }
-    ],
-    whatsNext: [
-      {
-        text: "Explore components",
-        href: "https://vuetifyjs.com/components/api-explorer"
-      },
-      {
-        text: "Select a layout",
-        href: "https://vuetifyjs.com/layout/pre-defined"
-      },
-      {
-        text: "Frequently Asked Questions",
-        href: "https://vuetifyjs.com/getting-started/frequently-asked-questions"
-      }
-    ]
-  })
+  created() {
+    window.$gz.locale
+      .fetch(["Welcome"])
+      .then(() => (this.formReady = true))
+      .catch(err => {
+        this.formReady = true;
+        window.$gz.errorHandler.handleFormError(err);
+      });
+  },
+  data() {
+    return { formReady: false };
+  },
+  methods: {
+    lt(ltKey) {
+      return window.$gz.locale.get(ltKey);
+    }
+  }
 };
 </script>
+
+<style></style>
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 14dcf5e5..afdc0b88 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -1,206 +1,204 @@
-/* eslint-disable */
-import "@babel/polyfill";
-import "@fortawesome/fontawesome-free/css/all.css";
-import "typeface-roboto/index.css";
-import Vue from "vue";
-//import "./plugins/vuetify";
-import Vuetify from "./plugins/vuetify";
-import App from "./App.vue";
-import router from "./router";
-import store from "./store";
-import "./registerServiceWorker";
-import errorHandler from "./api/errorhandler";
-import NProgress from "nprogress";
-import "nprogress/nprogress.css";
-import dayjs from "dayjs";
-import UTC from "dayjs/plugin/utc"; // load on demand
-dayjs.extend(UTC); // use plugin
-import lodash from "./libs/lodash.min.js";
-import VuetifyDialog from "vuetify-dialog";
-
-//my libs
-import gzeventbus from "./api/eventbus";
-import gzmenu from "./api/gzmenu";
-import gzdialog from "./api/gzdialog";
-import gzutil from "./api/gzutil";
-import locale from "./api/locale";
-import gzapi from "./api/gzapi";
-import gzreport from "./api/gzreport";
-import gzform from "./api/gzform";
-import gzformcustomtemplate from "./api/form-custom-template";
-import authorizationroles from "./api/authorizationroles";
-import gztype from "./api/ayatype";
-import "@/assets/css/main.css";
-
-//controls
-import dateTimeControl from "./components/date-time-control.vue";
-import tagPicker from "./components/tag-picker.vue";
-import customFieldsControl from "./components/custom-fields-control.vue";
-import errorhandler from "./api/errorhandler";
-import vuetify from './plugins/vuetify';
-
-/////////////////////////////////////////////////////////////////
-// LIBS AND GLOBAL ITEMS
-// NOTE: I'm putting them on Window deliberately to be globally available
-// some say this is bad only due to if you want to server render the page
-// however when I researched that I found it's easily worked around
-// as all you need is a "window" global var defined and then it's all good in the hood
-// so for convenience and far less fuckery this is the way
-//
-
-window.$gz = {
-  locale: locale,
-  formCustomTemplate: gzformcustomtemplate,
-  type: gztype,
-  role: authorizationroles,
-  eventBus: gzeventbus,
-  menu: gzmenu,
-  dialog: gzdialog,
-  util: gzutil,
-  dayjs: dayjs,
-  _: lodash,
-  api: gzapi,
-  form: gzform,
-  report: gzreport,
-  errorHandler: errorhandler,
-  store: store
-};
-
-/////////////////////////////////////////////////////////////////
-// ERROR HANDLING
-//
-
-//**************************************************************
-//**************************************************************
-//**************************************************************
-//DEVELOPMENT MODE HANDLER
-//THIS SHOULD BE FALSE IN RELEASE
-errorHandler.developmentModeShowErrorsImmediately(true);
-//**************************************************************
-//**************************************************************
-//**************************************************************
-
-Vue.config.errorHandler = errorHandler.handleVueError;
-window.onerror = errorHandler.handleGeneralError;
-//warnings, only occur by default in debug mode not production
-Vue.config.warnHandler = errorHandler.handleVueWarning;
-
-//added for vuetify 2.x to disable annoying prodution mode tip warning
-//but commented out for now just to see what it looks like
-//Vue.config.productionTip = false;
-
-/////////////////////////////////////////////////////////////////
-// AJAX LOADER INDICATOR
-//
-// Store a copy of the fetch function
-var _oldFetch = fetch;
-
-// Create our new version of the fetch function
-window.fetch = function() {
-  // Create hooks
-  var fetchStart = new Event("fetchStart", {
-    view: document,
-    bubbles: true,
-    cancelable: false
-  });
-  var fetchEnd = new Event("fetchEnd", {
-    view: document,
-    bubbles: true,
-    cancelable: false
-  });
-
-  // Pass the supplied arguments to the real fetch function
-  var fetchCall = _oldFetch.apply(this, arguments);
-
-  // Trigger the fetchStart event
-  document.dispatchEvent(fetchStart);
-
-  fetchCall
-    .then(function() {
-      // Trigger the fetchEnd event
-      document.dispatchEvent(fetchEnd);
-    })
-    .catch(function() {
-      // Trigger the fetchEnd event
-      document.dispatchEvent(fetchEnd);
-    });
-
-  return fetchCall;
-};
-
-document.addEventListener("fetchStart", function() {
-  NProgress.start();
-});
-
-document.addEventListener("fetchEnd", function() {
-  NProgress.done();
-});
-
-/////////////////////////////////////////////////////////////////
-// FILTERS
-//
-Vue.filter("capitalize", function vueFilterCapitalize(value) {
-  if (!value) return "";
-  value = value.toString();
-  return value.charAt(0).toUpperCase() + value.slice(1);
-});
-
-Vue.filter("shortdate", function vueFilterShortDate(value) {
-  if (!value) return "";
-  var dj = dayjs(value);
-  return dj.format("YYYY-MM-DD hh:mm:ss A");
-});
-
-Vue.filter("currency", function vueFilterCurrency(value) {
-  if (!value) return "";
-  return "$" + value;
-});
-
-Vue.filter("boolastext", function vueFilterBoolAsText(value) {
-  if (!value) return "";
-  return value ? "Yes" : "Nope";
-});
-
-/////////////////////////////////////////////////////////////
-//GZ COMPONENTS
-//
-Vue.component("gz-date-time-picker", dateTimeControl);
-Vue.component("gz-tag-picker", tagPicker);
-Vue.component("gz-custom-fields", customFieldsControl);
-
-
-////////////////////////////////////////////////////////
-//3rd party ui components
-//
-Vue.use(VuetifyDialog, {
-  context: {
-    Vuetify
-  }
-});
-
-/////////////////////////////////////////////////////////////
-//DIRECTIVES
-//
-//Auto focus on forms
-Vue.directive("focus", {
-  // When the bound element is inserted into the DOM...
-  inserted: function(el) {
-    // Focus the element
-    el.focus();
-  }
-});
-
-// console.log(Vue);
-// console.log(Vuetify.lang);
-// debugger;
-
-/////////////////////////////////////////////////////////////////
-// INSTANTIATE
-//
-new Vue({
-  vuetify: Vuetify,
-  router,
-  store,
-  vuetify,
-  render: h => h(App)
-}).$mount("#app");
+/* eslint-disable */
+import "@babel/polyfill";
+import "@fortawesome/fontawesome-free/css/all.css";
+import "typeface-roboto/index.css";
+import Vue from "vue";
+//import "./plugins/vuetify";
+import Vuetify from "./plugins/vuetify";
+import App from "./App.vue";
+import router from "./router";
+import store from "./store";
+import "./registerServiceWorker";
+import errorHandler from "./api/errorhandler";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import dayjs from "dayjs";
+import UTC from "dayjs/plugin/utc"; // load on demand
+dayjs.extend(UTC); // use plugin
+import lodash from "./libs/lodash.min.js";
+import VuetifyDialog from "vuetify-dialog";
+
+//my libs
+import gzeventbus from "./api/eventbus";
+import gzmenu from "./api/gzmenu";
+import gzdialog from "./api/gzdialog";
+import gzutil from "./api/gzutil";
+import locale from "./api/locale";
+import gzapi from "./api/gzapi";
+import gzreport from "./api/gzreport";
+import gzform from "./api/gzform";
+import gzformcustomtemplate from "./api/form-custom-template";
+import authorizationroles from "./api/authorizationroles";
+import gztype from "./api/ayatype";
+import "@/assets/css/main.css";
+
+//controls
+import dateTimeControl from "./components/date-time-control.vue";
+import tagPicker from "./components/tag-picker.vue";
+import customFieldsControl from "./components/custom-fields-control.vue";
+import errorhandler from "./api/errorhandler";
+
+/////////////////////////////////////////////////////////////////
+// LIBS AND GLOBAL ITEMS
+// NOTE: I'm putting them on Window deliberately to be globally available
+// some say this is bad only due to if you want to server render the page
+// however when I researched that I found it's easily worked around
+// as all you need is a "window" global var defined and then it's all good in the hood
+// so for convenience and far less fuckery this is the way
+//
+
+window.$gz = {
+  locale: locale,
+  formCustomTemplate: gzformcustomtemplate,
+  type: gztype,
+  role: authorizationroles,
+  eventBus: gzeventbus,
+  menu: gzmenu,
+  dialog: gzdialog,
+  util: gzutil,
+  dayjs: dayjs,
+  _: lodash,
+  api: gzapi,
+  form: gzform,
+  report: gzreport,
+  errorHandler: errorhandler,
+  store: store
+};
+
+/////////////////////////////////////////////////////////////////
+// ERROR HANDLING
+//
+
+//**************************************************************
+//**************************************************************
+//**************************************************************
+//DEVELOPMENT MODE HANDLER
+//THIS SHOULD BE FALSE IN RELEASE
+errorHandler.developmentModeShowErrorsImmediately(true);
+//**************************************************************
+//**************************************************************
+//**************************************************************
+
+Vue.config.errorHandler = errorHandler.handleVueError;
+window.onerror = errorHandler.handleGeneralError;
+//warnings, only occur by default in debug mode not production
+Vue.config.warnHandler = errorHandler.handleVueWarning;
+
+//added for vuetify 2.x to disable annoying prodution mode tip warning
+//but commented out for now just to see what it looks like
+//Vue.config.productionTip = false;
+
+/////////////////////////////////////////////////////////////////
+// AJAX LOADER INDICATOR
+//
+// Store a copy of the fetch function
+var _oldFetch = fetch;
+
+// Create our new version of the fetch function
+window.fetch = function() {
+  // Create hooks
+  var fetchStart = new Event("fetchStart", {
+    view: document,
+    bubbles: true,
+    cancelable: false
+  });
+  var fetchEnd = new Event("fetchEnd", {
+    view: document,
+    bubbles: true,
+    cancelable: false
+  });
+
+  // Pass the supplied arguments to the real fetch function
+  var fetchCall = _oldFetch.apply(this, arguments);
+
+  // Trigger the fetchStart event
+  document.dispatchEvent(fetchStart);
+
+  fetchCall
+    .then(function() {
+      // Trigger the fetchEnd event
+      document.dispatchEvent(fetchEnd);
+    })
+    .catch(function() {
+      // Trigger the fetchEnd event
+      document.dispatchEvent(fetchEnd);
+    });
+
+  return fetchCall;
+};
+
+document.addEventListener("fetchStart", function() {
+  NProgress.start();
+});
+
+document.addEventListener("fetchEnd", function() {
+  NProgress.done();
+});
+
+/////////////////////////////////////////////////////////////////
+// FILTERS
+//
+Vue.filter("capitalize", function vueFilterCapitalize(value) {
+  if (!value) return "";
+  value = value.toString();
+  return value.charAt(0).toUpperCase() + value.slice(1);
+});
+
+Vue.filter("shortdate", function vueFilterShortDate(value) {
+  if (!value) return "";
+  var dj = dayjs(value);
+  return dj.format("YYYY-MM-DD hh:mm:ss A");
+});
+
+Vue.filter("currency", function vueFilterCurrency(value) {
+  if (!value) return "";
+  return "$" + value;
+});
+
+Vue.filter("boolastext", function vueFilterBoolAsText(value) {
+  if (!value) return "";
+  return value ? "Yes" : "Nope";
+});
+
+/////////////////////////////////////////////////////////////
+//GZ COMPONENTS
+//
+Vue.component("gz-date-time-picker", dateTimeControl);
+Vue.component("gz-tag-picker", tagPicker);
+Vue.component("gz-custom-fields", customFieldsControl);
+
+
+////////////////////////////////////////////////////////
+//3rd party ui components
+//
+Vue.use(VuetifyDialog, {
+  context: {
+    Vuetify
+  }
+});
+
+/////////////////////////////////////////////////////////////
+//DIRECTIVES
+//
+//Auto focus on forms
+Vue.directive("focus", {
+  // When the bound element is inserted into the DOM...
+  inserted: function(el) {
+    // Focus the element
+    el.focus();
+  }
+});
+
+// console.log(Vue);
+// console.log(Vuetify.lang);
+// debugger;
+
+/////////////////////////////////////////////////////////////////
+// INSTANTIATE
+//
+new Vue({
+  vuetify: Vuetify,
+  router,
+  store,
+  render: h => h(App)
+}).$mount("#app");
diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js
index f0648326..6a9e653a 100644
--- a/ayanova/src/plugins/vuetify.js
+++ b/ayanova/src/plugins/vuetify.js
@@ -1,10 +1,37 @@
+/* xeslint-disable */
+
 import Vue from "vue";
 import Vuetify from "vuetify/lib";
+//import myLang from "../api/en";
 
 Vue.use(Vuetify);
 
 export default new Vuetify({
+  // lang: { locales: { myLang }, current: "myLang" },
+  theme: {
+    themes: {
+      light: {
+        primary: "#00205B", //Canucks dark blue
+        secondary: "#00843D", //canucks green
+
+        accent: "#db7022", //lighter orangey red, more friendly looking though not as much clarity it seems
+        //error: "#b71c1c", //dark red, easy to read but not error-y enough possibly
+
+        //accent: "#BD491A", //dark orangey red, more clarity, less friendly looking
+        error: "#ff5252", //lighter red, have to see if it's good for all screens and sizes as it's a bit light but it stands out as an error condition better
+
+        disabled: "#e0e0e0"
+      }
+    }
+  },
   icons: {
-    iconfont: "mdi"
+    iconfont: "fa"
   }
 });
+
+// export default new Vuetify({
+//   lang: {
+//     locales: { zhHans, pl, sv },
+//     current: 'zhHans',
+//   },
+// })
diff --git a/ayanova/src/views/Home.vue b/ayanova/src/views/Home.vue
index 3101c267..f08413a8 100644
--- a/ayanova/src/views/Home.vue
+++ b/ayanova/src/views/Home.vue
@@ -8,6 +8,13 @@ import HelloWorld from "../components/HelloWorld";
 export default {
   components: {
     HelloWorld
+  },
+  beforeCreate() {
+    window.$gz.eventBus.$emit("menu-change", {
+      isMain: true,
+      icon: "fa-home",
+      title: window.$gz.locale.get("Home")
+    });
   }
 };
 </script>