diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 264c68ee..c224ba18 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -137,7 +137,7 @@ export default {
     //
     //
     window.$gz.menu.wireUpEventHandlers(this);
-    this.$gzdialog.wireUpEventHandlers(this);
+    window.$gz.dialog.wireUpEventHandlers(this);
   },
   beforeDestroy() {
     //UNWIRE ALL EVENT HANDLERS FROM GZEVENTBUS
@@ -173,8 +173,8 @@ export default {
     afterLeave() {
       this.$root.$emit("triggerScroll");
     },
-    clickMenuItem(item){
-      window.$gz.eventbus.$emit('menu-click', item)
+    clickMenuItem(item) {
+      window.$gz.eventbus.$emit("menu-click", item);
     }
   }
 };
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index a5d8b280..e6776baf 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -59,13 +59,12 @@ window.$gz = {
   report: gzreport,
   errorHandler: errorhandler
 };
-window.$gzlocale = locale;
-window.$gzformcustomtemplate = gzformcustomtemplate;
+
 //Object.defineProperty(Vue.prototype, "$gztype", { value: gztype });
 //Object.defineProperty(Vue.prototype, "$gzrole", { value: roles });
 //Object.defineProperty(Vue.prototype, "$gzevent", { value: gzeventbus });
-Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu });
-Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog });
+//Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu });
+//Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog });
 Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil });
 Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs });
 Object.defineProperty(Vue.prototype, "$_", { value: lodash });
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index c52304a2..074fedeb 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -297,7 +297,7 @@ export default {
   beforeRouteLeave(to, from, next) {
     var vm = this;
     if (this.formState.dirty && !JUST_DELETED) {
-      vm.$gzdialog.confirmLeaveUnsaved(vm).then(dialogResult => {
+      window.$gz.dialog.confirmLeaveUnsaved(vm).then(dialogResult => {
         if (dialogResult == true) {
           next();
         } else {
@@ -410,7 +410,7 @@ export default {
             //Not found?
             if (res.error.code == "2010") {
               //notify not found error then navigate backwards
-              vm.$gzdialog
+              window.$gz.dialog
                 .displayLTErrorMessage(vm, "ErrorAPI2010")
                 .then(() => {
                   // navigate backwards
@@ -490,7 +490,7 @@ export default {
     },
     remove() {
       var vm = this;
-      vm.$gzdialog.confirmDelete(vm).then(dialogResult => {
+      window.$gz.dialog.confirmDelete(vm).then(dialogResult => {
         if (dialogResult == true) {
           //do the delete
           vm.formState.loading = true;
@@ -584,7 +584,7 @@ function clickHandler(menuItem) {
       case "report":
         var reportList = m.vm.$gzreport.availableReports("WIDGET");
         var selectedItem = reportList[0].value;
-        m.vm.$gzdialog
+        window.$gz.dialog
           .getReportChoice(m.vm, reportList, selectedItem)
           .then(res => {
             if (res) {