diff --git a/app/src/plugins/tm@_components/z-files-upload.vue b/app/src/plugins/tm@_components/z-files-upload.vue
index 9d003b9..8555385 100644
--- a/app/src/plugins/tm@_components/z-files-upload.vue
+++ b/app/src/plugins/tm@_components/z-files-upload.vue
@@ -66,6 +66,8 @@ export default {
 
 			this.uploadedFiles = [...this.uploadedFiles, ...files]
 			this.$emit('files-uploaded', this.uploadedFiles)
+
+			this.$refs.fileUpload.value = ''
         },
 
 		remove(index) {
diff --git a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
index 03b1325..a5cb5e5 100644
--- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
+++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
+	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
 		<W-loadable :content="blocker" class="h-100">
 			<v-card height="100%" class="d-flex flex-column">
 				<div class="d-flex justify-space-between align-center modal-header">
diff --git a/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue b/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
index 132520f..c5e042c 100644
--- a/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
+++ b/app/src/plugins/tm@modal/blocker/z-delete-blocker-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750">
+	<v-dialog v-model="visible" max-width="750" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Ste si istý, že chcete zmazať <b>{{ blocker.name }}</b>?</h1>
@@ -12,7 +12,7 @@
 				></v-icon>
 			</div>
 			<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
-				<v-btn class="button primary half" variant="flat" @click="deleteBlocker()">ÁNO</v-btn>
+				<v-btn class="button primary half" variant="flat" @click="deleteBlocker()" :disabled="isDeleting">ÁNO</v-btn>
 				<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
 			</v-card-actions>
 		</v-card>
@@ -26,7 +26,8 @@ export default {
 	data() {
 		return {
 			visible: false,
-			blocker: null
+			blocker: null,
+			isDeleting: false
 		}
 	},
 
@@ -41,6 +42,10 @@ export default {
 		},
 
 		async deleteBlocker() {
+			if (this.isDeleting) return 
+
+			this.isDeleting = true
+
 			try {
 				await this.$axios.delete_auth(`v1/blockers/${this.blocker.id}`)
 				
@@ -48,6 +53,8 @@ export default {
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
+			} finally {
+				this.isDeleting = false
 			}
 		}
 	}
diff --git a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
index 083555c..404f4c9 100644
--- a/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-delete-master-task-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750">
+	<v-dialog v-model="visible" max-width="750" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Ste si istý, že chcete zmazať <b>{{ mastertask.name }}</b>?</h1>
@@ -12,7 +12,7 @@
 				></v-icon>
 			</div>
 			<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
-				<v-btn class="button primary half" variant="flat" @click="deleteMasterTask()">ÁNO</v-btn>
+				<v-btn class="button primary half" variant="flat" @click="deleteMasterTask()" :disabled="isDeleting">ÁNO</v-btn>
 				<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
 			</v-card-actions>
 		</v-card>
@@ -26,7 +26,8 @@ export default {
 	data() {
 		return {
 			visible: false,
-			mastertask: null
+			mastertask: null,
+			isDeleting: false
 		}
 	},
 
@@ -41,12 +42,18 @@ export default {
 		},
 
 		async deleteMasterTask() {
+			if (this.isDeleting) return 
+
+			this.isDeleting = true
+
 			try {
 				await this.$axios.delete_auth(`v1/mastertasks/${this.mastertask.id}`)
 				this.$emit('on-mastertask-deleted', this.mastertask)
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
+			} finally {
+				this.isDeleting = false
 			}
 		}
 	}
diff --git a/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue b/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
index 85a1b85..cf643bf 100644
--- a/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-delete-team-member-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="500" >
+	<v-dialog v-model="visible" max-width="500" persistent>
 		<v-card>
         <h1 class="text-h5">
           Chcete túto osobu odstrániť z tímu?
diff --git a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
index 5f8c090..0e23fd6 100644
--- a/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
+++ b/app/src/plugins/tm@modal/master-task/z-master-task-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
+	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
 		<W-loadable :content="mastertask" class="h-100">
 			<v-card v-if="editMode" height="100%" class="d-flex flex-column scrolling">
 				<div class="d-flex justify-space-between align-center modal-header">
@@ -304,10 +304,10 @@ export default {
 		},
 
 		_mergeDeadlineTimeDate() {
-			const date = new Date(this.mastertask.deadline);
-			const timeParts = this.mastertask._deadline_time.split(':');
-			date.setHours(parseInt(timeParts[0]));
-			date.setMinutes(parseInt(timeParts[1]));
+			const date = new Date(this.mastertask.deadline)
+			const timeParts = this.mastertask._deadline_time.split(':')
+			date.setHours(parseInt(timeParts[0]))
+			date.setMinutes(parseInt(timeParts[1]))
 
 			this.mastertask.deadline = date
 		},
@@ -339,7 +339,7 @@ export default {
 				const hours = date.getHours()
 				const minutes = date.getMinutes()
 
-				this.mastertask._deadline_time = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`;
+				this.mastertask._deadline_time = `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}`
 			})
 		}
 	}
diff --git a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
index 148cb7d..ba801d3 100644
--- a/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
+++ b/app/src/plugins/tm@modal/task-cell/z-show-menu-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750">
+	<v-dialog v-model="visible" max-width="750" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Vytvoriť</h1>
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
index a743312..867eefe 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-spent-time.vue
@@ -35,7 +35,7 @@
 		</v-col>
 	</v-row>
 
-	<v-dialog max-width="750" v-model="showModal">
+	<v-dialog max-width="750" v-model="showModal" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Pridať odpracovaný čas</h1>
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
index b30b96d..7f666d8 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
@@ -25,7 +25,7 @@
 		</v-col>
 	</v-row>
 
-	<v-dialog max-width="750" v-model="showModal">
+	<v-dialog max-width="750" v-model="showModal" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Pridať dátum</h1>
diff --git a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
index 968bd03..c11c7af 100644
--- a/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-complete-task-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750">
+	<v-dialog v-model="visible" max-width="750" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Ste si istý, že chcete {{ subtask.is_finished ? 'znovu otvoriť' : 'dokončiť' }} task, z mastertasku <b>{{ subtask?.master_task?.name || subtask.master_task }}</b>?</h1>
diff --git a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
index 6fa04d9..4751947 100644
--- a/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-delete-task-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750">
+	<v-dialog v-model="visible" max-width="750" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Ste si istý, že chcete zmazať task z mastertasku <b>{{ subtask.project_code }}</b>?</h1>
@@ -12,7 +12,7 @@
 				></v-icon>
 			</div>
 			<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
-				<v-btn class="button primary half" variant="flat" @click="deleteTask()">ÁNO</v-btn>
+				<v-btn class="button primary half" variant="flat" @click="deleteTask()" :disabled="isDeleting">ÁNO</v-btn>
 				<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
 			</v-card-actions>
 		</v-card>
@@ -26,7 +26,8 @@ export default {
 	data() {
 		return {
 			visible: false,
-			subtask: null
+			subtask: null,
+			isDeleting: false
 		}
 	},
 
@@ -41,6 +42,10 @@ export default {
 		},
 
 		async deleteTask() {
+			if (this.isDeleting) return 
+
+			this.isDeleting = true
+
 			try {
 				await this.$axios.delete_auth(`v1/subtasks/${this.subtask.id}`)
 				
@@ -49,6 +54,8 @@ export default {
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
+			} finally {
+				this.isDeleting = false
 			}
 		}
 	}
diff --git a/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue b/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
index 4fe7c95..0c45aa5 100644
--- a/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-add-time-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog max-width="750" v-model="visible">
+	<v-dialog max-width="750" v-model="visible" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>Pridať odpracovaný čas</h1>
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index 3000f0a..6a5bd83 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
+	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
 		<W-loadable :content="subtask" class="h-100">
 			<v-card v-if="editMode" height="100%" class="d-flex flex-column scrolling">
 				<div class="d-flex justify-space-between align-center modal-header">
diff --git a/app/src/plugins/tm@modal/team/z-delete-team-modal.vue b/app/src/plugins/tm@modal/team/z-delete-team-modal.vue
index f53cb90..5d57453 100644
--- a/app/src/plugins/tm@modal/team/z-delete-team-modal.vue
+++ b/app/src/plugins/tm@modal/team/z-delete-team-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750">
+	<v-dialog v-model="visible" max-width="750" persistent>
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
 				<h1>
@@ -9,7 +9,7 @@
 			</div>
 
 			<v-card-actions class="mt-10 d-flex justify-start align-center mobile-view">
-				<v-btn class="button primary half" variant="flat" @click="deleteTeam()">ÁNO</v-btn>
+				<v-btn class="button primary half" variant="flat" @click="deleteTeam()" :disabled="isDeleting">ÁNO</v-btn>
 				<v-btn class="button primary half outline" @click.stop="closeModal()">ZRUŠIŤ</v-btn>
 			</v-card-actions>
 		</v-card>
@@ -23,7 +23,8 @@ export default {
 	data() {
 		return {
 			visible: false,
-			team: null
+			team: null,
+			isDeleting: false
 		}
 	},
 
@@ -38,6 +39,9 @@ export default {
 		},
 
 		async deleteTeam() {
+			if (this.isDeleting) return 
+
+			this.isDeleting = true
 			try {
 				await this.$axios.delete_auth(`v1/teams/${this.team.id}`)
 				this.visible = false
@@ -45,6 +49,8 @@ export default {
 				this.$store.commit('tm/delete_team', this.team)
 			} catch (error) {
 				this.$toast.error(error)
+			} finally {
+				this.isDeleting = false
 			}
 		}
 	}
diff --git a/app/src/plugins/tm@modal/team/z-team-modal.vue b/app/src/plugins/tm@modal/team/z-team-modal.vue
index 204dcad..c6a7d52 100644
--- a/app/src/plugins/tm@modal/team/z-team-modal.vue
+++ b/app/src/plugins/tm@modal/team/z-team-modal.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
+	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px" persistent>
 		<W-loadable :content="team" class="h-100">
 			<v-card height="100%" class="d-flex flex-column">
 				<div class="d-flex justify-space-between align-center modal-header">