diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index 6c40234b..74ae7fbb 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-row row wrap v-if="!readonly">
+    <v-row v-if="!readonly">
       <v-col cols="12">
         <v-dialog v-model="dlgdate" persistent width="290px">
           <template v-slot:activator="{ on }">
diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index 461eb696..bd1771e3 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-row row wrap v-if="!readonly">
+    <v-row v-if="!readonly">
       <v-col xs6>
         <v-dialog
           ref="theDateDialog"
diff --git a/ayanova/src/components/tag-picker.vue b/ayanova/src/components/tag-picker.vue
index 2ab3702e..fb78ab13 100644
--- a/ayanova/src/components/tag-picker.vue
+++ b/ayanova/src/components/tag-picker.vue
@@ -27,7 +27,7 @@
       </template> -->
       <template slot="no-data" v-if="tagSearchEntry">
         <v-container fluid>
-          <v-row row>
+          <v-row>
             <v-row justify-center>
               <v-chip color="primary" text-color="white" class="display-1">
                 {{ this.normalizeTag(tagSearchEntry) }}</v-chip
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index 122d99b4..30cfac1b 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-row row wrap v-if="!readonly">
+    <v-row v-if="!readonly">
       <v-col cols="12">
         <v-dialog v-model="dlgtime" persistent width="290px">
           <template v-slot:activator="{ on }">
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index 4622448f..94e10756 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-row row v-if="this.formState.ready">
+  <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col>
       <v-card id="ayaNovaVersioncard">
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index 677022a3..9b6b225d 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -1,10 +1,10 @@
 <template>
-  <v-card>
+  <v-card v-if="this.formState.ready">
     <v-card-title
       ><v-icon class="mr-3">{{ getIconForPage() }}</v-icon
       >{{ name }}</v-card-title
     >
-    <v-row row v-if="this.formState.ready">
+    <v-row>
       <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
 
       <v-col rows="12">
@@ -112,16 +112,16 @@ export default {
     let vm = this;
     initForm(vm)
       .then(() => {
-        vm.formState.ready = true;
         vm.readOnly = true;
         window.$gz.eventBus.$on("menu-click", clickHandler);
         generateMenu(vm, false);
-
         vm.getDataFromApi();
       })
       .catch(err => {
-        vm.formState.ready = true;
         window.$gz.errorHandler.handleFormError(err, vm);
+      })
+      .finally(function() {
+        vm.formState.ready = true;
       });
   },
   data() {
diff --git a/ayanova/src/views/ay-log.vue b/ayanova/src/views/ay-log.vue
index a78b676b..0475d291 100644
--- a/ayanova/src/views/ay-log.vue
+++ b/ayanova/src/views/ay-log.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-row row v-if="this.formState.ready">
+  <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col>
       <v-textarea v-model="logText" full-width readonly auto-grow></v-textarea>