diff --git a/app/Http/Controllers/Wizard/Data.php b/app/Http/Controllers/Wizard/Data.php
index f496f36ab..fa3a43b9f 100644
--- a/app/Http/Controllers/Wizard/Data.php
+++ b/app/Http/Controllers/Wizard/Data.php
@@ -125,8 +125,8 @@ class Data extends Controller
         $company->api_key = setting('apps.api_key');
         $company->financial_start = setting('localisation.financial_start');
 
-        if ($company->company_logo) {
-            $logo = $company->company_logo;
+        if ($company->logo) {
+            $logo = \Plank\Mediable\Media::find($company->logo);
 
             $logo->path = route('uploads.get', $logo->id);
 
diff --git a/resources/assets/js/Wizard.vue b/resources/assets/js/Wizard.vue
index 609523d1c..6131491eb 100644
--- a/resources/assets/js/Wizard.vue
+++ b/resources/assets/js/Wizard.vue
@@ -6,17 +6,13 @@
     :modules="modules.data"
     :currency_codes="currency_codes"
     :company="company"
+    :pageLoad="page_loaded"
   ></router-view>
 </template>
 
 <script>
 export default {
   name: "Wizard",
-  data: function () {
-    return {
-      page_loaded: true,
-    };
-  },
   created() {
     let self = this;
 
@@ -36,12 +32,7 @@ export default {
           return data.currency_codes[key];
         });
 
-        setTimeout(
-          function () {
-            self.page_loaded = false;
-          }.bind(self),
-          800
-        );
+        self.page_loaded = false;
       });
   },
 
@@ -58,6 +49,7 @@ export default {
         taxes: {},
         finish: {},
       },
+      page_loaded: true
     };
   },
 };
@@ -69,6 +61,11 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 9999;
 }
 
 .document-loading div {
diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue
index c57573992..98b72ee1c 100644
--- a/resources/assets/js/views/wizard/Company.vue
+++ b/resources/assets/js/views/wizard/Company.vue
@@ -14,6 +14,11 @@
       </div>
       <form ref="form" class="w-100">
         <div class="card-body">
+          <div class="document-loading" v-if="pageLoad">
+            <div>
+              <i class="fas fa-spinner fa-pulse fa-7x"></i>
+            </div>
+          </div>
           <div class="row mb-4">
             <div class="col-12 mb-4">
               <base-input
@@ -139,6 +144,10 @@ export default {
             type: String,
             default: "text",
         },
+
+        pageLoad: {
+          type: [Boolean, String]
+        }
     },
 
     data() {
diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue
index c0d6b98d5..98b7b64c2 100644
--- a/resources/assets/js/views/wizard/Currencies.vue
+++ b/resources/assets/js/views/wizard/Currencies.vue
@@ -15,6 +15,11 @@
       </div>
 
       <div class="card-body">
+        <div class="document-loading" v-if="pageLoad">
+          <div>
+            <i class="fas fa-spinner fa-pulse fa-7x"></i>
+          </div>
+        </div>
         <div class="d-flex justify-content-end mb-3">
           <base-button
             type="success"
@@ -323,6 +328,10 @@ export default {
         translations: {
             type: [Object, Array],
         },
+
+        pageLoad: {
+          type: [Boolean, String]
+        }
     },
 
     data() {
diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue
index 714f47184..6f465c687 100644
--- a/resources/assets/js/views/wizard/Finish.vue
+++ b/resources/assets/js/views/wizard/Finish.vue
@@ -11,6 +11,11 @@
         </el-steps>
       </div>
       <div class="card-body bg-default">
+        <div class="document-loading" v-if="pageLoad">
+          <div>
+            <i class="fas fa-spinner fa-pulse fa-7x"></i>
+          </div>
+        </div>
         <div class="row">
           <div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
             <div class="content-header">
@@ -27,10 +32,10 @@
                 <div class="card">
                   <div class="card-header py-2">
                     <h4 class="ml--3 mb-0 float-left">
-                      <a :href="item.slug">{{ item.name }}</a>
+                      <a :href="route_url + '/apps/' + item.slug">{{ item.name }}</a>
                     </h4>
                   </div>
-                  <a :href="route_url + '/' + item.slug"
+                  <a :href="route_url + '/apps/' + item.slug"
                     ><img
                       v-for="(file, indis) in item.files"
                       :key="indis"
@@ -101,6 +106,10 @@ export default {
 
         translations: {
             type: [Object, Array],
+        },
+
+        pageLoad: {
+          type: [Boolean, String]
         }
     },
 
diff --git a/resources/assets/js/views/wizard/Taxes.vue b/resources/assets/js/views/wizard/Taxes.vue
index 2a4ef5198..5db47879e 100644
--- a/resources/assets/js/views/wizard/Taxes.vue
+++ b/resources/assets/js/views/wizard/Taxes.vue
@@ -11,6 +11,11 @@
         </el-steps>
       </div>
       <div class="card-body">
+        <div class="document-loading" v-if="pageLoad">
+          <div>
+            <i class="fas fa-spinner fa-pulse fa-7x"></i>
+          </div>
+        </div>
         <div class="d-flex justify-content-end mb-3">
           <base-button
             type="success"
@@ -247,6 +252,10 @@ export default {
         translations: {
             type: [Object, Array],
         },
+
+        pageLoad: {
+          type: [Boolean, String]
+        }
     },
 
     data() {
diff --git a/resources/views/layouts/wizard.blade.php b/resources/views/layouts/wizard.blade.php
index cce3d002b..e5839b61d 100644
--- a/resources/views/layouts/wizard.blade.php
+++ b/resources/views/layouts/wizard.blade.php
@@ -8,11 +8,6 @@
 
             <div id="app">
                 <div class="card-body">
-                    <div class="document-loading" v-if="!page_loaded">
-                        <div>
-                            <i class="fas fa-spinner fa-pulse fa-7x"></i>
-                        </div>
-                    </div>
 
                     @include('flash::message')