diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index a83c723..b2edfe7 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -5,13 +5,13 @@
 		</v-main>
 	</v-app>
 
-	<Z-team-modal 				ref="z-team-modal"  @update="onTeamUpdate" />
-	<Z-delete-team-modal 		ref="z-delete-team-modal" @update="onTeamUpdate" />
+	<Z-team-modal 				ref="z-team-modal"  				@update="onTeamUpdate" />
+	<Z-delete-team-modal 		ref="z-delete-team-modal" 			@update="onTeamUpdate" />
 
-	<Z-task-modal 				ref="z-task-modal" @on-task-edited="onTaskEdited" />
-	<Z-delete-task-modal 		ref="z-delete-task-modal" @on-task-deleted="onTaskDeleted" />
-	<Z-delete-master-task-modal ref="z-delete-master-task-modal" @on-master-task-deleted="onMasterTaskDeleted" />
-	<Z-complete-task-modal 		ref="z-complete-task-modal" @task-completed="onTaskCompleted" />
+	<Z-task-modal 				ref="z-task-modal" 					@on-task-edited="onTaskEdited" />
+	<Z-delete-task-modal 		ref="z-delete-task-modal" 			@on-task-deleted="onTaskDeleted" />
+	<Z-delete-master-task-modal ref="z-delete-master-task-modal" 	@on-master-task-deleted="onMasterTaskDeleted" />
+	<Z-complete-task-modal 		ref="z-complete-task-modal" 		@task-completed="onTaskCompleted" />
 	<Z-task-add-time-modal 		ref="z-task-add-time-modal" />
 	<Z-blocker-modal 			ref="z-blocker-modal" />
 
@@ -42,18 +42,27 @@ export default {
 		ZDeleteMasterTaskModal
 	},
 
+	data() {
+		return {
+			loader: null
+		}
+	},
+
+
 	async created() {
-		const loader = await this.$loading.show()
 		await this.$store.dispatch('tm/initialize')
-		loader?.hide()
+		this.loader?.hide()
 	},
 
 	mounted() {
+		this.loader = this.$loading.show()
+
 		this.$events.on('show-delete-team-modal', ({team}) => {
 			this.$refs['z-delete-team-modal'].showModal(team)
 		})
 
 		this.$events.on('show-team-modal', ({team}) => {
+			console.log('show team modal')
 			this.$refs['z-team-modal'].showModal(team)
 		})
 
diff --git a/app/src/plugins/w/loadable/_components/w-loadable.vue b/app/src/plugins/w/loadable/_components/w-loadable.vue
index 3e2ce20..7e48953 100644
--- a/app/src/plugins/w/loadable/_components/w-loadable.vue
+++ b/app/src/plugins/w/loadable/_components/w-loadable.vue
@@ -33,22 +33,22 @@ export default {
 
 	methods: {
 		async _startLoading() {
-			this.loader = await this.$loading.show()
+			// this.loader = await this.$loading.show()
 		},
 
 		_stopLoading() {
-			this.loader?.hide()
+			// this.loader?.hide()
 		}
 	},
 
 	watch: {
-		content(value) {
-			if (value) {
-				this._stopLoading()
-			}
-			else
-				this._startLoading()
-		}
+		// content(value) {
+		// 	if (value) {
+		// 		this._stopLoading()
+		// 	}
+		// 	else
+		// 		this._startLoading()
+		// }
 	}
 }
 </script>