diff --git a/resources/assets/js/components/NotificationPlugin/Notification.vue b/resources/assets/js/components/NotificationPlugin/Notification.vue
index 348634063..8a2186e77 100644
--- a/resources/assets/js/components/NotificationPlugin/Notification.vue
+++ b/resources/assets/js/components/NotificationPlugin/Notification.vue
@@ -25,6 +25,7 @@
         ]"
         role="alert"
         :style="customPosition"
+        style="z-index: 100;"
         data-notify-position="top-center"
     >
         <div class="flex items-center ltr:pr-3 rtl:pl-3">
diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue
index e3de3cd7f..9ad05f09b 100644
--- a/resources/assets/js/views/wizard/Finish.vue
+++ b/resources/assets/js/views/wizard/Finish.vue
@@ -2,20 +2,20 @@
     <div class="relative bg-body z-10 rounded-lg shadow-2xl p-5 sm:p-10 full-height-mobile overflow-hidden">
         <WizardSteps :active_state="active"></WizardSteps>
 
-        <div class="flex flex-col justify-between -mt-5 sm:mt-0" style="height:565px;">
+        <div class="flex flex-col justify-between -mt-5 sm:mt-0" style="height:523px;">
             <div v-if="pageLoad" class="absolute left-0 right-0 top-0 bottom-0 w-full h-full bg-white rounded-lg flex items-center justify-center z-50">
-                <span class="material-icons form-spin text-lg animate-spin text-9xl">data_usage</span>
+                <span class="material-icons form-spin animate-spin text-9xl">data_usage</span>
             </div>
 
-            <div class="flex flex-col lg:flex-row mt-6">
+            <div class="flex flex-col lg:flex-row mt-4">
                 <div class="w-full lg:w-1/2 ltr:pr-10 rtl:pl-10 mt-3">
-                    <div class="grid sm:grid-cols-6">
-                        <h1 class="sm:col-span-6 text-black-300 mb-2">
+                    <div class="grid sm:grid-cols-6 overflow-y-scroll lg:overflow-hidden scroll">
+                        <h1 class="sm:col-span-6 text-black-300 mb-2 text-lg font-light">
                             {{ translations.finish.recommended_apps }}
                         </h1>
 
-                        <div v-for="(item, index) in modules" :key="index" class="sm:col-span-6 mb-6">
-                            <a :href="route_url + '/apps/' + item.slug" class="flex items-center">
+                        <div v-for="(item, index) in modules" :key="index" class="sm:col-span-6 mb-3">
+                            <a :href="route_url + '/apps/' + item.slug" class="flex items-center space-x-4 bg-purple-50 rounded-md p-2">
                                 <div class="w-1/4">
                                     <img v-for="(file, indis) in item.files" :key="indis" v-if="file.media_type == 'image' && file.pivot.zone == 'thumbnail'"
                                         :src="file.path_string"
@@ -24,46 +24,56 @@
                                     />
                                 </div>
 
-                                <div class="w-3/4 ltr:pl-8 rtl:pr-8">
-                                    <span class="font-medium">
+                                <div class="w-3/4 ltr:pl-2 rtl:pr-2">
+                                    <span class="font-medium text-sm">
                                         {{ item.name }}
                                     </span>
 
-                                    <div class="text-black-300 text-sm my-2 line-clamp-2 h-10" v-html="item.description"></div>
+                                    <div class="text-black-300 text-sm mt-1 line-clamp-2 h-10" v-html="item.description"></div>
                                 </div>
                             </a>
                         </div>
                     </div>
 
                     <div class="lg:hidden">
-                        <base-button class="btn flex items-center justify-center text-base disabled:opacity-50 relative mt-5 mx-auto bg-green hover:bg-gray-100 text-white rounded-md py-3 px-5 font-semibold" @click="finish()">
+                        <base-button class="btn flex items-center justify-center text-base disabled:opacity-50 relative mt-5 mx-auto bg-green hover:bg-gray-100 text-white rounded-md py-3 px-5 font-medium" @click="finish()">
                             {{ translations.finish.create_first_invoice }}
                         </base-button>
                     </div>
                 </div>
 
                 <div class="absolute w-1/2 right-0 ltr:pl-10 rtl:pr-10 mt-3 hidden lg:flex lg:flex-col">
-                    <div class="flex flex-col ltr:items-start rtl:items-end bg-purple ltr:rounded-tl-lg ltr:rounded-bl-lg rtl:rounded-tr-lg rtl:rounded-br-lg p-6">
-                        <div class="w-48 text-white text-left text-2xl font-semibold leading-9">
-                            {{ translations.finish.apps_managing }}
-                        </div>
-
-                        <div style="width:372px; height:372px;"></div>
-
-                        <img :src="image_src" class="absolute top-3 right-2" alt="Akaunting" />
+                    <div class="flex">
+                        <img :src="image_src" class="absolute top-12 right-2 w-10/12 p-3 -mt-12" alt="Akaunting" />
                     </div>
 
-                    <base-button
-                        class="relative flex items-center justify-center text-base rounded-lg m-auto bottom-48 bg-white hover:bg-gray-100 text-purple py-3 px-5 font-semibold disabled:bg-gray-100 "
-                        :disabled="anchor_loading"
-                        @click="finish()"
-                    >
-                        <i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i> 
+                    <div class="flex">
+                        <base-button
+                            class="relative flex items-center justify-center text-base rounded-lg m-auto mt-96 hover:underline py-1.5 -right-20 font-semibold disabled:bg-gray-100 "
+                            :disabled="anchor_loading"
+                            @click="finish()"
+                            style="top: 5.9rem"
+                        >
+                            <i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i> 
 
-                        <span :class="[{'opacity-0': anchor_loading}]">
-                            {{ translations.finish.create_first_invoice }}
-                        </span>
-                    </base-button>
+                            <span :class="[{'opacity-0': anchor_loading}]">
+                                {{ translations.company.skip }}
+                            </span>
+                        </base-button>
+
+                        <base-button
+                            class="relative flex items-center justify-center text-base rounded-lg m-auto mt-96 bg-default hover:bg-default-hover text-white py-1.5 px-7 font-medium"
+                            :disabled="anchor_loading"
+                            @click="finish()"
+                            style="top: 5.9rem; right: -0.6rem;"
+                        >
+                            <i v-if="anchor_loading" class="animate-submit_second delay-[0.28s] absolute w-2 h-2 rounded-full left-0 right-0 -top-2.5 m-auto before:absolute before:w-2 before:h-2 before:rounded-full before:animate-submit_second before:delay-[0.14s] after:absolute after:w-2 after:h-2 after:rounded-full after:animate-submit_second before:-left-3.5 after:-right-3.5 after:delay-[0.42s]"></i> 
+
+                            <span :class="[{'opacity-0': anchor_loading}]">
+                                {{ translations.finish.create_first_invoice }}
+                            </span>
+                        </base-button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -98,7 +108,7 @@ export default {
         return {
             active: 3,
             route_url: url,
-            image_src: app_url + "/public/img/wizard-modules.png",
+            image_src: app_url + "/public/img/wizard-rocket.gif",
             anchor_loading: false
         };
     },
@@ -144,5 +154,9 @@ export default {
         [modal-container] {
             height: 100% !important;
         }
+
+        .scroll{
+            height:450px;
+        }
     }
 </style>
diff --git a/resources/assets/js/views/wizard/Steps.vue b/resources/assets/js/views/wizard/Steps.vue
index eac4351b1..90bd0730b 100644
--- a/resources/assets/js/views/wizard/Steps.vue
+++ b/resources/assets/js/views/wizard/Steps.vue
@@ -39,7 +39,7 @@
                 </li>
 
                 <li class="w-1/3">
-                    <span class="pl-6 flex flex-col">
+                    <span class="ltr:pl-6 ltr:pr-9 rtl:pl-3 flex flex-col">
                         <span
                             :class="[{'bg-purple': active_state == 2}]"
                             class="w-full h-1 bg-gray-300 rounded-xl text-transparent"