diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index 5c391a2d..862c4b5f 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -194,146 +194,135 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
-    getBackupStatus() {
+    async getBackupStatus() {
       let vm = this;
       //  vm.formState.loading = true;
       let url = "backup/status";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .get(url)
-        .then(res => {
-          if (res.error) {
-            if (res.error.code == "2010") {
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
-              window.$gz._.delay(function() {
-                vm.$router.go(-1);
-              }, 2000);
-            }
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          } else {
-            //process add url dl token and id
-            if (res.data) {
-              vm.backupAvailableSpace = res.data.availableFreeSpace;
-              let ret = [];
-              for (let i = 0; i < res.data.backupFiles.length; i++) {
-                let o = res.data.backupFiles[i];
-                ret.push({
-                  id: i,
-                  created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-                    o.created,
-                    this.timeZoneName,
-                    this.languageName,
-                    this.hour12
-                  ),
-                  url: vm.formState.readOnly
-                    ? null
-                    : window.$gz.api.backupDownloadUrl(o.name),
-                  name: o.name,
-                  length: o.length
-                });
-              }
-              vm.backupFileList = ret;
-            } else {
-              vm.backupFileList = [];
-            }
+      try {
+        let res = await window.$gz.api.get(url);
+
+        if (res.error) {
+          if (res.error.code == "2010") {
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
+            window.$gz._.delay(function() {
+              vm.$router.go(-1);
+            }, 2000);
           }
-        })
-        .catch(function handleGetBackupFileListError(error) {
-          window.$gz.form.setFormState({
-            vm: vm,
-            loading: false
-          });
-          window.$gz.errorHandler.handleFormError(error, vm);
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //process add url dl token and id
+          if (res.data) {
+            vm.backupAvailableSpace = res.data.availableFreeSpace;
+            let ret = [];
+            for (let i = 0; i < res.data.backupFiles.length; i++) {
+              let o = res.data.backupFiles[i];
+              ret.push({
+                id: i,
+                created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+                  o.created,
+                  this.timeZoneName,
+                  this.languageName,
+                  this.hour12
+                ),
+                url: vm.formState.readOnly
+                  ? null
+                  : window.$gz.api.backupDownloadUrl(o.name),
+                name: o.name,
+                length: o.length
+              });
+            }
+            vm.backupFileList = ret;
+          } else {
+            vm.backupFileList = [];
+          }
+        }
+      } catch (error) {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
         });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       vm.formState.loading = true;
       let url = "global-ops-backup-setting";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .get(url)
-        .then(res => {
+      try {
+        let res = await window.$gz.api.get(url);
+
+        if (res.error) {
+          if (res.error.code == "2010") {
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
+            window.$gz._.delay(function() {
+              vm.$router.go(-1);
+            }, 2000);
+          }
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          vm.obj = res.data;
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true,
+            loading: false
+          });
+          generateMenu(vm);
+        }
+      } catch (error) {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
+    },
+    async submit() {
+      let vm = this;
+      try {
+        if (vm.canSave) {
+          vm.formState.loading = true;
+          let url = "global-ops-backup-setting";
+          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          let res = await window.$gz.api.upsert(url, vm.obj);
+
+          vm.formState.loading = false;
           if (res.error) {
-            if (res.error.code == "2010") {
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
-              window.$gz._.delay(function() {
-                vm.$router.go(-1);
-              }, 2000);
-            }
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            vm.obj = res.data;
+            vm.obj.concurrency = res.data.concurrency;
             window.$gz.form.setFormState({
               vm: vm,
-              dirty: false,
-              valid: true,
-              loading: false
+              dirty: false
             });
-            generateMenu(vm);
           }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
-          window.$gz.form.setFormState({
-            vm: vm,
-            loading: false
-          });
-          window.$gz.errorHandler.handleFormError(error, vm);
-        });
-    },
-    submit() {
-      let vm = this;
-      if (vm.canSave) {
-        vm.formState.loading = true;
-        let url = "global-ops-backup-setting";
-        window.$gz.form.deleteAllErrorBoxErrors(vm);
-        window.$gz.api
-          .upsert(url, vm.obj)
-          .then(res => {
-            vm.formState.loading = false;
-            if (res.error) {
-              vm.formState.serverError = res.error;
-              window.$gz.form.setErrorBoxErrors(vm);
-            } else {
-              vm.obj.concurrency = res.data.concurrency;
-              window.$gz.form.setFormState({
-                vm: vm,
-                dirty: false
-              });
-            }
-          })
-          .catch(function handleSubmitError(error) {
-            vm.formState.loading = false;
-            window.$gz.errorHandler.handleFormError(error, vm);
-          });
+        }
+      } catch (error) {
+        vm.formState.loading = false;
+        window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
-    backupNow() {
+    async backupNow() {
       let vm = this;
       vm.formState.loading = true;
       let url = "backup/backup-now";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .upsert(url, {})
-        .then(res => {
-          vm.formState.loading = false;
-          if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          }
-        })
-        .catch(function handleSubmitError(error) {
-          vm.formState.loading = false;
-          window.$gz.errorHandler.handleFormError(error, vm);
-        });
+      try {
+        let res = await window.$gz.api.upsert(url, {});
+        vm.formState.loading = false;
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        }
+      } catch (error) {
+        vm.formState.loading = false;
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     }
   }
 };
@@ -341,7 +330,7 @@ export default {
 /////////////////////////////
 //
 //
-function clickHandler(menuItem) {
+async function clickHandler(menuItem) {
   if (!menuItem) {
     return;
   }
@@ -352,13 +341,14 @@ function clickHandler(menuItem) {
         m.vm.submit();
         break;
       case "backupnow":
-        window.$gz.dialog
-          .confirmGeneric("AreYouSureBackupNow", "warning")
-          .then(dialogResult => {
-            if (dialogResult == true) {
-              m.vm.backupNow();
-            }
-          });
+        if (
+          (await window.$gz.dialog.confirmGeneric(
+            "AreYouSureBackupNow",
+            "warning"
+          )) === true
+        ) {
+          m.vm.backupNow();
+        }
         break;
       default:
         window.$gz.eventBus.$emit(
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index dca8be61..5d0e48ff 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -36,21 +36,21 @@
 const FORM_KEY = "ops-jobs";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
-        vm.rights = window.$gz.role.getRights(window.$gz.type.ServerJob);
-        vm.formState.readOnly = !vm.rights.change;
-        vm.formState.ready = true;
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        vm.getDataFromApi();
-        vm.formState.loading = false;
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    try {
+      await initForm(vm);
+
+      vm.rights = window.$gz.role.getRights(window.$gz.type.ServerJob);
+      vm.formState.readOnly = !vm.rights.change;
+      vm.formState.ready = true;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      vm.getDataFromApi();
+      vm.formState.loading = false;
+    } catch (err) {
+      vm.formState.ready = true;
+      window.$gz.errorHandler.handleFormError(err, vm);
+    }
   },
   data() {
     return {
@@ -87,88 +87,82 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       vm.formState.loading = true;
       let url = "job-operations/logs/all-jobs";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .get(url)
-        .then(res => {
-          if (res.error) {
-            if (res.error.code == "2010") {
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
-              window.$gz._.delay(function() {
-                vm.$router.go(-1);
-              }, 2000);
-            }
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          } else {
-            if (res.data) {
-              vm.rawObj = res.data;
-              let ret = [];
-              for (let i = 0; i < res.data.length; i++) {
-                let o = res.data[i];
-                ret.push({
-                  id: i,
-                  created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
-                    o.created,
-                    this.timeZoneName,
-                    this.languageName,
-                    this.hour12
-                  ),
-                  status: o.statusText,
-                  jobId:
-                    o.jobId == "00000000-0000-0000-0000-000000000000"
-                      ? ""
-                      : o.jobId
-                });
-              }
-              vm.obj = ret;
-            } else {
-              vm.rawObj = [];
-              vm.obj = [];
-            }
+      try {
+        let res = await window.$gz.api.get(url);
 
-            window.$gz.form.setFormState({
-              vm: vm,
-              dirty: false,
-              valid: true,
-              loading: false
-            });
-            generateMenu(vm);
+        if (res.error) {
+          if (res.error.code == "2010") {
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
+            window.$gz._.delay(function() {
+              vm.$router.go(-1);
+            }, 2000);
           }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          if (res.data) {
+            vm.rawObj = res.data;
+            let ret = [];
+            for (let i = 0; i < res.data.length; i++) {
+              let o = res.data[i];
+              ret.push({
+                id: i,
+                created: window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+                  o.created,
+                  this.timeZoneName,
+                  this.languageName,
+                  this.hour12
+                ),
+                status: o.statusText,
+                jobId:
+                  o.jobId == "00000000-0000-0000-0000-000000000000"
+                    ? ""
+                    : o.jobId
+              });
+            }
+            vm.obj = ret;
+          } else {
+            vm.rawObj = [];
+            vm.obj = [];
+          }
+
           window.$gz.form.setFormState({
             vm: vm,
+            dirty: false,
+            valid: true,
             loading: false
           });
-          window.$gz.errorHandler.handleFormError(error, vm);
+          generateMenu(vm);
+        }
+      } catch (error) {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
         });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     },
-    testJob() {
+    async testJob() {
       let vm = this;
       vm.formState.loading = true;
       let url = "job-operations/test-job";
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .upsert(url, {})
-        .then(res => {
-          vm.formState.loading = false;
-          if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          }
-        })
-        .catch(function handleSubmitError(error) {
-          vm.formState.loading = false;
-          window.$gz.errorHandler.handleFormError(error, vm);
-        });
+      try {
+        let res = await window.$gz.api.upsert(url, {});
+        vm.formState.loading = false;
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        }
+      } catch (error) {
+        vm.formState.loading = false;
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     }
   }
 };
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index f6bb89c5..efeb8892 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -37,20 +37,20 @@
 const FORM_KEY = "ops-logs";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
-        vm.formState.ready = true;
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        generateMenu(vm);
-        vm.getDataFromApi();
-        vm.formState.loading = false;
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    try {
+      await initForm(vm);
+
+      vm.formState.ready = true;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      generateMenu(vm);
+      vm.getDataFromApi();
+      vm.formState.loading = false;
+    } catch (err) {
+      vm.formState.ready = true;
+      window.$gz.errorHandler.handleFormError(err, vm);
+    }
   },
   data() {
     return {
@@ -93,7 +93,7 @@ export default {
     logSelected: function() {
       this.getDataFromApi();
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       if (!vm.selectedLog) {
         return;
@@ -101,44 +101,40 @@ export default {
       vm.formState.loading = true;
       let url = "log-file/" + vm.selectedLog;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .get(url)
-        .then(res => {
-          if (res.error) {
-            if (res.error.code == "2010") {
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
-              window.$gz._.delay(function() {
-                vm.$router.go(-1);
-              }, 2000);
-            }
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          } else {
-            if (res) {
-              vm.log = res;
-            } else {
-              vm.log = vm.$ay.t("NoData");
-            }
+      try {
+        let res = await window.$gz.api.get(url);
 
-            window.$gz.form.setFormState({
-              vm: vm,
-              dirty: false,
-              valid: true,
-              loading: false
-            });
-            // generateMenu(vm);
+        if (res.error) {
+          if (res.error.code == "2010") {
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
+            window.$gz._.delay(function() {
+              vm.$router.go(-1);
+            }, 2000);
           }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          if (res) {
+            vm.log = res;
+          } else {
+            vm.log = vm.$ay.t("NoData");
+          }
+
           window.$gz.form.setFormState({
             vm: vm,
+            dirty: false,
+            valid: true,
             loading: false
           });
-          window.$gz.errorHandler.handleFormError(error, vm);
+          // generateMenu(vm);
+        }
+      } catch (error) {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
         });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     }
   }
 };
@@ -220,13 +216,12 @@ async function fetchTranslatedText(vm) {
 //////////////////////
 //
 //
-function populateSelectionLists(vm) {
-  return window.$gz.api.get("log-file").then(res => {
-    if (res.error) {
-      window.$gz.errorHandler.handleFormError(res.error, vm);
-    } else {
-      vm.selectLists.serverLogs = res.data;
-    }
-  });
+async function populateSelectionLists(vm) {
+  let res = await window.$gz.api.get("log-file");
+  if (res.error) {
+    window.$gz.errorHandler.handleFormError(res.error, vm);
+  } else {
+    vm.selectLists.serverLogs = res.data;
+  }
 }
 </script>