diff --git a/app/src/plugins/app/_config/App.vue b/app/src/plugins/app/_config/App.vue
index d8eb8ba..d2f4d98 100644
--- a/app/src/plugins/app/_config/App.vue
+++ b/app/src/plugins/app/_config/App.vue
@@ -55,24 +55,24 @@ export default {
 			this.$refs['z-delete-task-modal'].showModal(task)
 		})
 
-		this.$events.on('show-delete-master-task-modal', ({masterTask}) => {
-			this.$refs['z-delete-master-task-modal'].showModal(masterTask)
+		this.$events.on('show-delete-master-task-modal', ({mastertask}) => {
+			this.$refs['z-delete-master-task-modal'].showModal(mastertask)
 		})
 
-		this.$events.on('show-task-modal', ({task, editMode, masterTask}) => {
+		this.$events.on('show-task-modal', ({task, editMode, mastertask}) => {
 			if(task && task.id) {
 				const id = task.id
 				this.$router.push({ query: { 'task': id }})
 			}
-			this.$refs['z-task-modal'].showModal(task, editMode, masterTask)
+			this.$refs['z-task-modal'].showModal(task, editMode, mastertask)
 		})
 
-		this.$events.on('show-master-task-modal', ({ masterTask, editMode }) => {
-			if (masterTask && masterTask.id) {
-				const id = masterTask.id
+		this.$events.on('show-master-task-modal', ({ mastertask, editMode }) => {
+			if (mastertask && mastertask.id) {
+				const id = mastertask.id
 				this.$router.push({ query: { 'master-task': id } })
 			}
-			this.$refs['z-master-task-modal'].showModal(masterTask, editMode)
+			this.$refs['z-master-task-modal'].showModal(mastertask, editMode)
 		})
 
 		this.$events.on('show-complete-task-modal', ({ subtask }) => {
@@ -90,6 +90,14 @@ export default {
 		this.$events.on('on-subtask-edited', () => {
 			this.$store.dispatch('tm/reloadSubtasks')
 		})
+
+		this.$events.on('on-mastertask-edited', () => {
+			this.$store.dispatch('tm/reloadMastertasks')
+		})
+
+		this.$events.on('on-mastertask-deleted', () => {
+			this.$store.dispatch('tm/reloadMastertasks')
+		})
 	},
 
 	methods: {
@@ -105,19 +113,19 @@ export default {
 			this.$events.emit('on-subtask-edited', task)
 		},
 
-		onMasterTaskDeleted(masterTask){
-			this.$events.emit('on-master-task-deleted', masterTask)
+		onMasterTaskDeleted(mastertask){
+			this.$events.emit('on-master-task-deleted', mastertask)
 		},
 
-		onMasterTaskEdited(masterTask){
-			this.$events.emit('on-master-task-edited', masterTask)
+		onMasterTaskEdited(mastertask){
+			this.$events.emit('on-mastertask-edited', mastertask)
 		}
 	},
 
 	watch: {
 		'$route'() {
 			if (this.$route.query['master-task']) {
-				this.$events.emit('show-master-task-modal', { masterTask: { id: this.$route.query['master-task'] }, editMode: false })
+				this.$events.emit('show-master-task-modal', { mastertask: { id: this.$route.query['master-task'] }, editMode: false })
 			}
 		}
 	}
diff --git a/app/src/plugins/app@vendor/vue-cal/utils/date.js b/app/src/plugins/app@vendor/vue-cal/utils/date.js
index e6d7a89..eec9b14 100644
--- a/app/src/plugins/app@vendor/vue-cal/utils/date.js
+++ b/app/src/plugins/app@vendor/vue-cal/utils/date.js
@@ -110,6 +110,8 @@ export default class DateUtils {
   }
 
   getWeek (date) {
+	console.log(date)
+	console.log('kokot')
     const d = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()))
     const dayNum = d.getUTCDay() || 7
     d.setUTCDate(d.getUTCDate() + 4 - dayNum)
diff --git a/app/src/plugins/tm@_store/store/index.ts b/app/src/plugins/tm@_store/store/index.ts
index b4bbfe3..919f8e1 100644
--- a/app/src/plugins/tm@_store/store/index.ts
+++ b/app/src/plugins/tm@_store/store/index.ts
@@ -108,10 +108,16 @@ export default {
 			])
 		},
 
+		reloadMastertasks({dispatch}: {dispatch: any}) {
+			return Promise.all([
+				dispatch('loadMastertasks')
+			])
+		},
+
 		loadMastertasks({commit}: {commit: any}) {
 			return new Promise((resolve, reject) => {
-				axios.get_auth_data('v1/mastertasks')
-					.then(mastertasks => {
+				axios.get_auth('v1/mastertasks')
+					.then(({ mastertasks }) => {
 						commit('set_mastertasks', mastertasks)
 						resolve(mastertasks)
 					})
@@ -208,7 +214,11 @@ export default {
 		enrichedEmployees: (state: any) => {
 			if (!state.employees) return []
 			
-			return state.employees.map(employee => ({...employee, _fullName: `${ employee.name } ${ employee.surname }`}))
+			return state.employees.map(employee => ({
+				...employee, 
+				_fullName: `${ employee.name } ${ employee.surname }`,
+				_initials: employee.name.charAt(0) + employee.surname.charAt(0)
+			})).sort((a, b) => a.name < b.name ? -1 : 1)
 		},
 
 		teams: (state: any) => {
diff --git a/app/src/plugins/tm@_utils/tm.utils.ts b/app/src/plugins/tm@_utils/tm.utils.ts
index 3cfc31c..bc09bc1 100644
--- a/app/src/plugins/tm@_utils/tm.utils.ts
+++ b/app/src/plugins/tm@_utils/tm.utils.ts
@@ -1,8 +1,12 @@
 import moment from 'moment'
 
 export default {
-	enrichEmployeesByFullName(employees) {
-		return employees.map(employee => ({...employee, _fullName: `${ employee.name } ${ employee.surname }`}))
+	enrichEmployees(employees) {
+		return employees.map(employee => ({
+			...employee, 
+			_fullName: `${ employee.name } ${ employee.surname }`,
+			_initials: employee.name.charAt(0) + employee.surname.charAt(0)
+		}))
 	},
 
 	formatDateTime(date) {
diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue
index 004e244..cfea543 100644
--- a/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue
+++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-calendar.vue
@@ -44,9 +44,10 @@ export default {
 	},
 
 	mounted() {
-		const currentYear = new Date().getFullYear()
+		const currentYear 	= new Date().getFullYear()
+		const monthIndex 	= typeof this.month == 'string' ? parseInt(this.month) - 1 : this.month - 1
 		this.calendarOptions.events = this.events
-		this.$refs.fullCalendar?.getApi().gotoDate(new Date(currentYear, this.month, 1))
+		this.$refs.fullCalendar?.getApi().gotoDate(new Date(currentYear, monthIndex, 1))
 	},
 
 	watch: {
diff --git a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
index f0d6b79..a14823e 100644
--- a/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
+++ b/app/src/plugins/tm@dashboard/projects/_components/a-project-filter.vue
@@ -1,18 +1,18 @@
 <template>
 	<v-row class="px-10 py-8 subheader">
-		<v-select v-model="filter.selectedProject" class="subheader-input" :items="[null, ...projects]" item-title="name" item-value="id" label="Projekt" variant="outlined" />
+		<v-select v-model="filter.projectId" class="subheader-input" :items="[null, ...projects]" item-title="name" item-value="id" label="Projekt" variant="outlined" />
 
-		<v-select v-model="filter.selectedTeam" class="subheader-input" :items="[null, ...teams]" label="Tím" variant="outlined" item-title="name" item-value="id" />
+		<v-select v-model="filter.teamId" class="subheader-input" :items="[null, ...teams]" label="Tím" variant="outlined" item-title="name" item-value="id" />
 
-		<v-select v-model="filter.selectedEmployee" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" />
+		<v-select v-model="filter.employeeId" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Zamestnanec" variant="outlined" item-title="_fullName" item-value="id" />
 		
-		<v-select v-model="filter.selectedAssignedBy" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
+		<v-select v-model="filter.createdById" class="subheader-input" :items="[null, ...enrichedEmployees]" label="Vytvoril" variant="outlined" item-title="_fullName" item-value="id" />
 
-		<v-select v-model="filter.selectedMonth" class="subheader-input" :items="months" label="Mesiac" variant="outlined" />
+		<v-select v-model="filter.month" class="subheader-input" :items="months" label="Mesiac" variant="outlined" />
 
 		<div class="subheader-input switch">
 			<p class="switch-label">Zobraziť ukončené</p>
-			<v-switch v-model="filter.showFinishedTasks" color="#6200EE" hide-details></v-switch>
+			<v-switch v-model="filter.isFinished" color="#6200EE" hide-details></v-switch>
 		</div>
 	</v-row>
 </template>
@@ -26,31 +26,36 @@ export default {
 	data() {
 		return {
 			months: [
-				{ title: 'Január', value: 0 },
-				{ title: 'Február', value: 1 },
-				{ title: 'Marec', value: 2 },
-				{ title: 'Apríl', value: 3 },
-				{ title: 'Máj', value: 4 },
-				{ title: 'Jún', value: 5 },
-				{ title: 'Júl', value: 6 },
-				{ title: 'August', value: 7 },
-				{ title: 'September', value: 8 },
-				{ title: 'Október', value: 9 },
-				{ title: 'November', value: 10 },
-				{ title: 'December', value: 11 }
+				{ title: 'Január', value: '01' },
+				{ title: 'Február', value: '02' },
+				{ title: 'Marec', value: '03' },
+				{ title: 'Apríl', value: '04' },
+				{ title: 'Máj', value: '05' },
+				{ title: 'Jún', value: '06' },
+				{ title: 'Júl', value: '07' },
+				{ title: 'August', value: '08' },
+				{ title: 'September', value: '09' },
+				{ title: 'Október', value: '10' },
+				{ title: 'November', value: '11' },
+				{ title: 'December', value: '12' }
 			],
 
 			filter: {
-				selectedProject: null,
-				selectedTeam: null,
-				selectedEmployee: null,
-				selectedAssignedBy: null,
-				selectedMonth: new Date().getMonth(),
-				showFinishedTasks: false
+				projectId: null,
+				teamId: null,
+				employeeId: null,
+				createdById: null,
+				month: null,
+				isFinished: false
 			}
 		}
 	},
 
+	mounted() {
+		const monthIndex = new Date().getMonth()
+		this.filter.month = monthIndex < 9 ? `0${monthIndex + 1}` : `${monthIndex + 1}`
+	},
+
 	computed: {
 		...mapGetters('tm', [
 			'teams',
diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue
index 072c384..c762b58 100644
--- a/app/src/plugins/tm@dashboard/projects/projects.vue
+++ b/app/src/plugins/tm@dashboard/projects/projects.vue
@@ -1,12 +1,14 @@
 <template>
-	<W-loadable :content="filteredEvents" empty-message="Nepodarilo sa nacitat data!">
-		<A-project-filter @filterChanged="onFilterChanged" />
-		<A-project-calendar :events="filteredEvents" :month="filter.selectedMonth" @open-detail="openMasterTaskModal" />
-	</W-loadable>
+	<div>
+		<A-project-filter v-if="$store.getters['tm/isInitialized']" @filterChanged="onFilterChanged" />
+		
+		<W-loadable :content="filteredProjects" emptyMessage="Nenašli sa žiadne vyhovujúce projekty">
+			<A-project-calendar :events="filteredProjects" :month="filter.month" @open-detail="openMasterTaskModal" />
+		</W-loadable>
+	</div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import AProjectCalendar from './_components/a-project-calendar.vue'
 import AProjectFilter 	from './_components/a-project-filter.vue'
 
@@ -15,51 +17,20 @@ export default {
 		AProjectCalendar,
 		AProjectFilter
 	},
+	
 	data() {
 		return {
-			selectedProject: null,
-			filter: {
-				selectedMonth: new Date().getMonth()
-			}
+			mastertasks: null,
+			filter: null
 		}
 	},
 
 	computed: {
-		...mapGetters('tm', [
-			'mastertasks'
-		]),
-
-		filteredEvents() {
+		filteredProjects() {
 			if (!this.mastertasks)
 				return null
-
-			if (this.mastertasks.error)
-				return this.mastertasks
-
-			if (!this.mastertasks.length)
-				return []
-
-			// duplicate all tasks
-			let events = this.mastertasks
-
-			// show/hide finished tasks
-			if (!this.filter.showFinishedTasks)
-				events = events.filter(event => !event.is_finished)
-
-			// filter by project_id
-			if(this.filter.selectedProject)
-				events = events.filter(event => event.project_id == this.filter.selectedProject)
-
-			// filter by team_id
-			if (this.filter.selectedTeam)
-				events = events.filter(event => event.team_id == this.filter.selectedTeam)
-
-			// filter by employee_id
-			if (this.filter.selectedEmployee)
-				events = events.filter(event => event.employees.find(employee => employee.id == this.filter.selectedEmployee))
-
-			// format masterTasks to event format for calendar
-			events = events.map(event => {
+			
+			return this.mastertasks.map(event => {
 				return {
 					id: event.id,
 					title: `${event.project_code} - ${event.name}`,
@@ -72,30 +43,35 @@ export default {
 					borderColor: event.color
 				}
 			})
-
-			return events
 		}
 	},
 
-	mounted() {
-		// this.$events.on('on-master-task-deleted', (masterTask) => {
-		// 	this.mastertasks = this.mastertasks.filter(mt => mt.id != masterTask.id)
-		// })
-
-		// this.$events.on('on-master-task-edited', (masterTask) => {
-		// 	this.mastertasks = this.mastertasks.map(mTask => mTask.id == masterTask.id ? masterTask : mTask)
-		// 	this._getData()
-		// })
-	},
-
 	methods: {
-		onFilterChanged(filterValues) {
-			this.filter = filterValues
+		async onFilterChanged(filter) {
+			this.mastertasks = null
+			this.filter = filter
+			const urlQueryObject = {}
+
+			if (filter.employeeId) 	urlQueryObject.employee_id 	= filter.employeeId
+			if (filter.projectId) 	urlQueryObject.project_id 	= filter.projectId
+			if (filter.teamId) 		urlQueryObject.team_id 		= filter.teamId
+			if (filter.createdById) urlQueryObject.created_by 	= filter.createdById
+			if (filter.isFinished)  urlQueryObject.is_finished 	= filter.isFinished ? 1 : 0
+			if (filter.month)  		urlQueryObject.created_at 	= filter.month
+
+			const queryParameters = new URLSearchParams(urlQueryObject).toString()
+
+			try {
+				const { mastertasks } = await this.$axios.get_auth(`v1/mastertasks?${queryParameters}`)
+				this.mastertasks = mastertasks
+			} catch (error) {
+				this.$toast.error('Nepodarilo sa nacitat data!')
+			}
 		},
 
-		openMasterTaskModal(masterTaskId) {
-			const masterTask = this.mastertasks.find(masterTask => masterTask.id == masterTaskId)
-			this.$events.emit('show-master-task-modal', {masterTask, editMode: false})
+		openMasterTaskModal(mastertaskId) {
+			const mastertask = this.mastertasks.find(mastertask => mastertask.id == mastertaskId)
+			this.$events.emit('show-master-task-modal', {mastertask, editMode: false})
 		}
 	}
 }
diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue
index b61ca64..cfe4bf0 100644
--- a/app/src/plugins/tm@dashboard/tasks/tasks.vue
+++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue
@@ -9,10 +9,8 @@
 import ATaskFilter 								from './_components/a-tasks-filter.vue'
 import ZTimeline 								from '@/plugins/tm@dashboard/_components/z-timeline.vue'
 import { addDays, subDays } 					from 'date-fns'
-import { mapGetters } 							from 'vuex'
 import moment 									from 'moment'
 import timelineUtils 							from './_utils/timeline.utils'
-import tmUtils from '@/plugins/tm@_utils/tm.utils'
 
 export default {
 	components: {
@@ -81,21 +79,18 @@ export default {
 	},
 
 	mounted() {
-
-		this.$events.on('on-subtask-edited', (subtask) => {
-			this.subtasks = this.subtasks.map(st => {
-				if (st.id == subtask.id)
-					return subtask
-				
-				return st
-			})
+		this.$events.on('on-subtask-edited', () => {
+			this.onFilterChanged(this.filter)
 		})
 	},
 
+	unmounted() {
+		this.$events.off('on-subtask-edited')
+	},
+
 	methods: {
 		async onFilterChanged(filter) {
 			this.filter = filter
-
 			const urlQueryObject = {}
 
 			if (filter.start) 		urlQueryObject.start 		= moment(filter.start).format('YYYY-MM-DD')
@@ -106,10 +101,11 @@ export default {
 
 			try {
 				const { subtasks } 		= await this.$axios.get_auth(`v1/subtasks?${queryParameters}`)
-				this.config.scrollHour 	= this.filter.employee.work_start - 1
+				this.config.scrollHour 	= this.filter?.employee.work_start - 1
 				this.config.date 		= this.filter.start
 				this.subtasks			= subtasks
 			} catch (error) {
+				console.log(error)
 				this.$toast.error('Nepodarilo sa nacitat data!')
 			}
 		}
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue b/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
new file mode 100644
index 0000000..dbf4411
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-created-by.vue
@@ -0,0 +1,32 @@
+<template>
+    <v-row no-gutters class="align-center" v-if="employee">
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-account-star-outline" size="large"></v-icon>
+					<p class="mx-3">Vytvoril</p>
+				</div>
+			</v-sheet>
+		</v-col>
+        
+		<v-col cols="7">
+			<v-sheet class="py-3 d-flex align-center">
+				<p class="employee-selected-avatar d-flex justify-center align-center">
+					{{ employee._initials }}
+				</p>
+				<p class="ml-2">{{  employee._fullName }}</p>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+<script>
+export default {
+	props: {
+		employee: {
+			type: [Object, Number],
+			required: false
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-deadline.vue b/app/src/plugins/tm@modal/_components/read-only/z-deadline.vue
new file mode 100644
index 0000000..16461e9
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-deadline.vue
@@ -0,0 +1,36 @@
+<template>
+	<v-row no-gutters class="align-center">
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-calendar-week" size="large"></v-icon>
+					<p class="mx-3">Deadline</p>
+				</div>
+			</v-sheet>
+		</v-col>
+		<v-col cols="7">
+			<v-sheet class="py-3">
+				<p :class="`${tmUtils.isAfter(deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDateTime(deadline) }}</p>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+<script>
+import tmUtils from '@/plugins/tm@_utils/tm.utils'
+
+export default {
+	props: {
+		deadline: {
+			type: String,
+			required: true
+		}
+	},
+
+	data() {
+		return {
+			tmUtils
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-description.vue b/app/src/plugins/tm@modal/_components/read-only/z-description.vue
new file mode 100644
index 0000000..9fafaa3
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-description.vue
@@ -0,0 +1,27 @@
+<template>
+	<div class="px-5 py-5 border-bottom" v-if="description" >
+		<p>Popis zadania</p>
+		<section v-html="description" class="description-detail px-2 py-2 w-100 rounded mt-2" />
+	</div>
+
+	<div class="px-5 py-5 border-bottom" v-if="inheritedDescription">
+		<p>Popis mastertasku</p>
+		<section v-html="inheritedDescription" class="description-detail px-2 py-2 w-100 rounded mt-2" />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		description: {
+			type: String || null,
+			default: () => null
+		},
+
+		inheritedDescription: {
+			type: String || null,
+			default: () => null
+		}
+	}
+}
+</script>
diff --git a/app/src/plugins/tm@modal/_components/z-files.vue b/app/src/plugins/tm@modal/_components/read-only/z-files.vue
similarity index 100%
rename from app/src/plugins/tm@modal/_components/z-files.vue
rename to app/src/plugins/tm@modal/_components/read-only/z-files.vue
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-planned-time.vue b/app/src/plugins/tm@modal/_components/read-only/z-planned-time.vue
new file mode 100644
index 0000000..431ca24
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-planned-time.vue
@@ -0,0 +1,28 @@
+<template>
+	<v-row no-gutters class="align-center">
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-clock-time-three-outline" size="large"></v-icon>
+					<p class="mx-3">Naplánovaný čas</p>
+				</div>
+			</v-sheet>
+		</v-col>
+		<v-col cols="7">
+			<v-sheet class="py-3">
+				<p>{{ hours }} h</p>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+<script>
+export default {
+	props: {
+		hours: {
+			type: Number,
+			required: true
+		}
+	}
+}
+</script>
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-remaining-time.vue b/app/src/plugins/tm@modal/_components/read-only/z-remaining-time.vue
new file mode 100644
index 0000000..2cf3b51
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-remaining-time.vue
@@ -0,0 +1,29 @@
+<template>
+	<v-row no-gutters class="align-center border-bottom">
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-clock-time-three-outline" size="large"></v-icon>
+					<p class="mx-3">Zostávajúci čas</p>
+				</div>
+			</v-sheet>
+		</v-col>
+
+		<v-col cols="7">
+			<v-sheet class="py-3">
+				<p>{{ hours }} h</p>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+<script>
+export default {
+	props: {
+		hours: {
+			type: Number,
+			required: true
+		}
+	}
+}
+</script>
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-spent-time.vue b/app/src/plugins/tm@modal/_components/read-only/z-spent-time.vue
new file mode 100644
index 0000000..b61b02e
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-spent-time.vue
@@ -0,0 +1,34 @@
+<template>
+	<v-row no-gutters>
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-clock-time-three-outline" size="large"></v-icon>
+					<p class="mx-3">Odpracovaný čas</p>
+				</div>
+			</v-sheet>
+		</v-col>
+
+		<v-col cols="7">
+			<v-sheet class="py-3">
+				<p :class="isExceeded ? 'text-red-darken-4' : 'text-black'">{{ hours }} h</p>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+<script>
+export default {
+	props: {
+		hours: {
+			type: Number,
+			required: true
+		},
+
+		isExceeded: {
+			type: Boolean,
+			required: true
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-status.vue b/app/src/plugins/tm@modal/_components/read-only/z-status.vue
new file mode 100644
index 0000000..f0acf77
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-status.vue
@@ -0,0 +1,29 @@
+<template>
+	<v-row no-gutters class="align-center">
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-drag-vertical" size="large"></v-icon>
+					<p class="mx-3">Status</p>
+				</div>
+			</v-sheet>
+		</v-col>
+		<v-col cols="7">
+			<v-sheet class="py-3">
+				<p v-if="status == 1" class="status-badge px-4 py-2 rounded-pill">Ukončený</p>
+				<p v-else-if="status == 0" class="status-badge px-4 py-2 rounded-pill">Neukončený</p>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+<script>
+export default {
+	props: {
+		status: {
+			type: Number,
+			required: true
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/_components/read-only/z-team.vue b/app/src/plugins/tm@modal/_components/read-only/z-team.vue
new file mode 100644
index 0000000..6642a23
--- /dev/null
+++ b/app/src/plugins/tm@modal/_components/read-only/z-team.vue
@@ -0,0 +1,48 @@
+<template>
+	<v-row no-gutters>
+		<v-col cols="5">
+			<v-sheet class="py-3">
+				<div class="d-flex align-center">
+					<v-icon icon="mdi-account-multiple-outline" size="large"></v-icon>
+					<p class="mx-3">Tím</p>
+				</div>
+			</v-sheet>
+		</v-col>
+		<v-col cols="7">
+			<v-sheet class="py-3 d-flex flex-wrap flex-column">
+				<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">{{ team?.name || 'Nepriradený' }}</p>
+				<div class="d-flex align-center flex-shrink-0 mt-2 task-badge px-4 py-2 rounded-pill" v-for="employee in enrichedEmployees" :key="employee.id">
+					<p class="employee-selected-avatar d-flex justify-center align-center">
+						{{ employee._initials }}
+					</p>
+					<p class="ml-2">{{ employee._fullName }}</p>
+				</div>
+			</v-sheet>
+		</v-col>
+	</v-row>
+</template>
+
+
+<script>
+import tmUtils from '@/plugins/tm@_utils/tm.utils'
+
+export default {
+	props: {
+		team: {
+			type: Object,
+			required: false
+		},
+		
+		employees: {
+			type: Array,
+			required: true
+		}
+	},
+
+	computed: {
+		enrichedEmployees() {
+			return tmUtils.enrichEmployees(this.employees)
+		}
+	}
+}
+</script>
\ No newline at end of file
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 c74c0b9..d5d7139 100644
--- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
+++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
@@ -139,11 +139,11 @@ export default {
 
 			try {
 				const employees = await this.$axios.get_auth_data('v1/employees')
-				this.employees 	= tmUtils.enrichEmployeesByFullName(employees)
+				this.employees 	= tmUtils.enrichEmployees(employees)
 
 				if (blocker?.id) {
 					const b 	  = await this.$axios.get_auth_data(`v1/blockers/${blocker.id}`)
-					this.blocker  = {...b, employees: tmUtils.enrichEmployeesByFullName(b.employees)}
+					this.blocker  = {...b, employees: tmUtils.enrichEmployees(b.employees)}
 				} else {
 					this.blocker  = {employees: []}
 				}
diff --git a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
index a096c4e..43f3bb8 100644
--- a/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
+++ b/app/src/plugins/tm@modal/master-task/_components/a-mastertask-description.vue
@@ -1,153 +1,44 @@
 <template>
-	<v-row no-gutters class="align-center">
-		<v-col cols="5">
-			<v-sheet class="py-3">
-				<div class="d-flex align-center">
-					<v-icon icon="mdi-drag-vertical" size="large"></v-icon>
-					<p class="mx-3">Status</p>
-				</div>
-			</v-sheet>
-		</v-col>
-		<v-col cols="7">
-			<v-sheet class="py-3">
-				<p v-if="masterTask.is_finished" class="status-badge px-4 py-2 rounded-pill">Ukončený</p>
-				<p v-if="!masterTask.is_finished" class="status-badge px-4 py-2 rounded-pill">Neukončený</p>
-			</v-sheet>
-		</v-col>
-	</v-row>
-	<v-row no-gutters class="align-center">
-		<v-col cols="5">
-			<v-sheet class="py-3">
-				<div class="d-flex align-center">
-					<v-icon icon="mdi-calendar-week" size="large"></v-icon>
-					<p class="mx-3">Deadline</p>
-				</div>
-			</v-sheet>
-		</v-col>
-		<v-col cols="7">
-			<v-sheet class="py-3">
-				<p :class="`${tmUtils.isAfter(masterTask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDateTime(masterTask.deadline) }}</p>
-			</v-sheet>
-		</v-col>
-	</v-row>
-	<v-row no-gutters>
-		<v-col cols="5">
-			<v-sheet class="pa-2 pt-0">
-				<div class="d-flex align-center">
-					<v-icon icon="mdi-account-multiple-outline" size="large"></v-icon>
-					<p class="mx-3">Tím</p>
-				</div>
-			</v-sheet>
-		</v-col>
-		<v-col cols="7">
-			<v-sheet class="d-flex flex-wrap flex-column">
-				<p class="task-badge px-4 py-2 rounded-pill flex-shrink-0">{{ masterTask.team?.name }}</p>
-				<div class="d-flex align-center flex-shrink-0 mt-2 task-badge px-4 py-2 rounded-pill" v-for="(employee, index) in masterTask.employees" :key="employee.id">
-					<p class="employee-selected-avatar d-flex justify-center align-center">
-						{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
-					</p>
-					<p class="ml-2" v-html="`${masterTask.employees[index].name} ${masterTask.employees[index].surname}`" />
-				</div>
-			</v-sheet>
-		</v-col>
-	</v-row>
-	<v-row no-gutters class="align-center">
-		<v-col cols="5">
-			<v-sheet class="py-3">
-				<div class="d-flex align-center">
-					<v-icon icon="mdi-clock-time-three-outline" size="large"></v-icon>
-					<p class="mx-3">Naplánovaný čas</p>
-				</div>
-			</v-sheet>
-		</v-col>
-		<v-col cols="7">
-			<v-sheet class="py-3">
-				<p>{{ masterTask?.duration?.toFixed(2) }} h</p>
-			</v-sheet>
-		</v-col>
-	</v-row>
-	<v-row no-gutters class="align-center">
-		<v-col cols="5">
-			<v-sheet class="py-3">
-				<div class="d-flex align-center">
-					<v-icon icon="mdi-timer-outline" size="large"></v-icon>
-					<p class="mx-3">Odpracovaný čas</p>
-				</div>
-			</v-sheet>
-		</v-col>
-		<v-col cols="7">
-			<v-sheet class="py-3">
-				<p :class="masterTask.time_worked > masterTask.duration ? 'text-red-darken-4' : 'text-black'">{{ masterTask.time_worked?.toFixed(2) }} h</p>
-			</v-sheet>
-		</v-col>
-	</v-row>
-	<v-row no-gutters class="align-center border-bottom">
-		<v-col cols="5">
-			<v-sheet class="py-3">
-				<div class="d-flex align-center">
-					<v-icon icon="mdi-clock-time-three-outline" size="large"></v-icon>
-					<p class="mx-3">Zostávajúci čas</p>
-				</div>
-			</v-sheet>
-		</v-col>
-		
-		<v-col cols="7">
-			<v-sheet class="py-3">
-				<p :class="masterTask.time_worked > masterTask.duration ? 'text-red-darken-4' : 'text-black'">{{ (masterTask.duration - masterTask.time_worked)?.toFixed(2) }} h</p>
-			</v-sheet>
-		</v-col>
-	</v-row>
-
-	<div class="px-5 py-5 border-bottom">
-		<p>Popis zadania</p>
-		<section v-html="masterTask.description" class="description-detail px-2 py-2 w-100 rounded mt-2" />
-		
-		<template v-if="masterTask.files?.length">
-			<p class="mt-5">Prílohy</p>
-			<div class="w-100 d-flex align-center">
-				<div v-for="(file, index) in masterTask.files" :key="file.id" class="d-flex align-center flex-wrap" :class="[index === 0 ? 'ml-0' : 'ml-2']">
-					<v-chip class="mt-2">
-						<p @click="downloadFile(index)" class="cursor-pointer">{{ file.name }}</p>
-						<v-icon class="mx-1" icon="mdi-paperclip"></v-icon>
-					</v-chip>
-				</div>
-			</div>
-		</template>
-	</div>
+	<Z-status 				:status="mastertask.is_finished" />
+	<Z-deadline 			:deadline="mastertask.deadline" />
+	<Z-created-by 			:employee="mastertask.created_by" />
+	<Z-team 				:team="mastertask.team" :employees="mastertask.employees" />
+	<Z-planned-time        	:hours="mastertask.duration" />
+    <Z-remaining-time      	:hours="mastertask.duration - mastertask.time_worked" />
+	<Z-spent-time     		:hours="mastertask.time_worked"  :is-exceeded="mastertask.time_worked > mastertask.duration" />
+	<Z-description			:description="mastertask.description" />
+	<Z-files				:files="mastertask.files" />
 </template>
 
 <script>
-import tmUtils from '@/plugins/tm@_utils/tm.utils'
-import * as FileSaver	from 'file-saver'
+import ZCreatedBy 		from '../../_components/read-only/z-created-by.vue'
+import ZDeadline 		from '../../_components/read-only/z-deadline.vue'
+import ZDescription 	from '../../_components/read-only/z-description.vue'
+import ZFiles 			from '../../_components/read-only/z-files.vue'
+import ZPlannedTime 	from '../../_components/read-only/z-planned-time.vue'
+import ZRemainingTime 	from '../../_components/read-only/z-remaining-time.vue'
+import ZSpentTime 		from '../../_components/read-only/z-spent-time.vue'
+import ZStatus 			from '../../_components/read-only/z-status.vue'
+import ZTeam 			from '../../_components/read-only/z-team.vue'
 
 export default {
+	components: {
+		ZCreatedBy,
+		ZDeadline,
+		ZDescription,
+		ZFiles,
+		ZPlannedTime,
+		ZRemainingTime,
+		ZSpentTime,
+		ZStatus,
+		ZTeam
+	},
+
 	props: {
-		masterTask: {
+		mastertask: {
 			type: Object,
 			required: true
 		}
-	},
-
-	data() {
-		return {
-			tmUtils
-		}
-	},
-
-	methods: {
-		async downloadFile(id) {
-			try {
-				const file = await this.$axios.get_auth_data(`v1/mastertasks/${this.masterTask.id}`, { responseType: 'arraybuffer' })
-				FileSaver.saveAs(file.files[id].path, file.files[id].name)
-			} catch(error) {
-				this.$toast.error(error)
-			}
-		}
 	}
 }
-</script>
-<style lang="sass" scoped>
-@media screen and (max-width: 522px)
-	.files
-		margin-top: 104px !important
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
index 78697b4..31170b2 100644
--- a/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
+++ b/app/src/plugins/tm@modal/master-task/_mixins/selects.mixin.ts
@@ -1,7 +1,7 @@
 export default {
 	computed: {
 		employeesOptions() {
-			const selectedEmployees = [...this.masterTask.employees].map(employee => employee.id)
+			const selectedEmployees = [...this.mastertask.employees].map(employee => employee.id)
 
 			const employees = this.employees.filter(
 				(employee) => !selectedEmployees.includes(employee.id)
@@ -19,26 +19,26 @@ export default {
 	methods: {
 		onProjectSelected({ key }) {
 			const project = this.projects.find(project => project.id == key)
-			this.masterTask.project_code = project.code
-			this.masterTask.project_id 	 = project.id
+			this.mastertask.project_code = project.code
+			this.mastertask.project_id 	 = project.id
 		},
 
 		onMasterTaskSelected({ key }) {
-			const mastertask = this.mastertasks.find(masterTask => masterTask.id == key)
+			const mastertask = this.mastertasks.find(mastertask => mastertask.id == key)
 			this.task.master_task	= mastertask
 			this.task.project_code 	= mastertask.project_code
 		},
 
 		onEmployeeSelected({ key }) {
 			const employee = this.employees.find(employee => employee.id == key)
-			this.masterTask.employees.push(employee)
+			this.mastertask.employees.push(employee)
 			this.showAddEmployeeInput = false
 		},
 
 		onEmployeeDurationChanged() {
 			let totalDuration = 0
 
-			this.masterTask.employees = this.masterTask.employees.map(employee => {
+			this.mastertask.employees = this.mastertask.employees.map(employee => {
 				if (typeof employee.duration == 'string') {
 					totalDuration += parseInt(employee.duration)
 					employee.duration = parseInt(employee.duration)
@@ -50,16 +50,16 @@ export default {
 				return employee
 			})
 
-			this.masterTask.duration = totalDuration
+			this.mastertask.duration = totalDuration
 		}
 	},
 
 	watch: {
-		'masterTask.team_id'(value, oldValue) {
+		'mastertask.team_id'(value, oldValue) {
 			if (!value || !oldValue) return
 			
-			this.masterTask.team 		= this.teams.find(team => team.id == value)
-			this.masterTask.employees   = this.masterTask.team.employees
+			this.mastertask.team 		= this.teams.find(team => team.id == value)
+			this.mastertask.employees   = this.mastertask.team.employees
 		}
 	}
 }
\ No newline at end of file
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 a32a696..c85f3d8 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
@@ -2,7 +2,7 @@
 	<v-dialog v-model="visible" max-width="750">
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
-				<h1>Ste si istý, že chcete zmazať <b>{{ masterTask.name }}</b>?</h1>
+				<h1>Ste si istý, že chcete zmazať <b>{{ mastertask.name }}</b>?</h1>
 
 				<v-icon
 					@click.stop="closeModal()"
@@ -26,13 +26,13 @@ export default {
 	data() {
 		return {
 			visible: false,
-			masterTask: null
+			mastertask: null
 		}
 	},
 
 	methods: {
-		async showModal(masterTask) {
-			this.masterTask = masterTask
+		async showModal(mastertask) {
+			this.mastertask = mastertask
 			this.visible = true
 		},
 
@@ -42,8 +42,8 @@ export default {
 
 		async deleteMasterTask() {
 			try {
-				await this.$axios.delete_auth(`v1/mastertasks/${this.masterTask.id}`)
-				this.$emit('on-master-task-deleted', this.masterTask)
+				await this.$axios.delete_auth(`v1/mastertasks/${this.mastertask.id}`)
+				this.$emit('on-master-task-deleted', this.mastertask)
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
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 13fa0fe..6fc4965 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,25 +1,25 @@
 <template>
 	<v-dialog v-model="visible" max-width="750" max-height="90%" height="700px">
-		<W-loadable :content="masterTask" class="h-100">
+		<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">
-					<h1>{{ masterTask?.id ? 'Upraviť master task' : 'Vytvoriť master task' }}</h1>
+					<h1>{{ mastertask?.id ? 'Upraviť master task' : 'Vytvoriť master task' }}</h1>
 					<v-icon @click.stop="closeModal()" icon="mdi-close" size="large"></v-icon>
 				</div>
 
 				<v-card-actions class="d-flex flex-column modal-content">
-					<Z-autocomplete label="Kód projektu" :options="projects.map((project) => ({ key: project.id, value: project.code }))" :validations="v$.masterTask.project_code" :clear-on-submit="false" :value="masterTask.project_code" :class="{ error: v$.masterTask.project_code.$errors.length }" class="modal-input" @option-selected="onProjectSelected" />
+					<Z-autocomplete label="Kód projektu" :options="projects.map((project) => ({ key: project.id, value: project.code }))" :validations="v$.mastertask.project_code" :clear-on-submit="false" :value="mastertask.project_code" :class="{ error: v$.mastertask.project_code.$errors.length }" class="modal-input" @option-selected="onProjectSelected" />
 
-					<v-text-field v-model="masterTask.name" @focus="onInputFocus" class="modal-input" label="Názov mastertasku" variant="solo" :class="{ error: v$.masterTask.name.$errors.length }" :hint="v$.masterTask.name.$errors ? errorUtils.parseErrors(v$.masterTask.name.$errors) : null"></v-text-field>
+					<v-text-field v-model="mastertask.name" @focus="onInputFocus" class="modal-input" label="Názov mastertasku" variant="solo" :class="{ error: v$.mastertask.name.$errors.length }" :hint="v$.mastertask.name.$errors ? errorUtils.parseErrors(v$.mastertask.name.$errors) : null"></v-text-field>
 
-					<Datepicker v-model="masterTask.deadline" @focus="onDateFocus" class="modal-input" format="dd.MM.yyyy, HH:mm" locale="sk" :class="{ error: v$.masterTask.deadline.$errors.length }" select-text="Vybrať" cancel-text="Zrušiť" placeholder="Deadline" />
+					<Datepicker v-model="mastertask.deadline" @focus="onDateFocus" class="modal-input" format="dd.MM.yyyy, HH:mm" locale="sk" :class="{ error: v$.mastertask.deadline.$errors.length }" select-text="Vybrať" cancel-text="Zrušiť" placeholder="Deadline" />
 
-					<v-text-field v-model="masterTask.duration" @focus="onInputFocus" class="modal-input mt-5" variant="solo" type="number" disabled :label="`${masterTask.duration} h`"></v-text-field>
+					<v-text-field v-model="mastertask.duration" @focus="onInputFocus" class="modal-input mt-5" variant="solo" type="number" disabled :label="`${mastertask.duration} h`"></v-text-field>
 
-					<v-select v-model="this.masterTask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{ error: v$.masterTask.team_id.$errors.length }" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name"></v-select>
+					<v-select v-model="this.mastertask.team_id" @focus="onInputFocus" class="modal-input border-select" :class="{ error: v$.mastertask.team_id.$errors.length }" label="Tím" variant="solo" :items="teams" item-value="id" item-title="name"></v-select>
 
-					<template v-if="!masterTask.id">
-						<v-text-field v-for="(employee, index) in masterTask.employees" :key="employee.id" @focus="onInputFocus" :class="{ error: !masterTask.employees[index].duration }" class="modal-input" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="masterTask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
+					<template v-if="!mastertask.id">
+						<v-text-field v-for="(employee, index) in mastertask.employees" :key="employee.id" @focus="onInputFocus" :class="{ error: !mastertask.employees[index].duration }" class="modal-input" :label="`${employee.name} ${employee.surname}`" variant="solo" placeholder="h" v-model="mastertask.employees[index].duration" type="number" min="1" @input="onEmployeeDurationChanged">
 							<p class="employee-select-avatar d-flex justify-center align-center">
 								{{ employee.name.charAt(0) + employee.surname.charAt(0) }}
 							</p>
@@ -28,40 +28,40 @@
 
 					<Z-autocomplete label="Vyhľadať zamestnanca" v-if="showAddEmployeeInput" :options="employeesOptions" class="modal-input" @option-selected="onEmployeeSelected" />
 
-					<v-btn class="w-100 mb-5 button secondary" :disabled="!masterTask.team?.id" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn>
+					<v-btn class="w-100 mb-5 button secondary" :disabled="!mastertask.team?.id" @click="showAddEmployeeInput = true"> <v-icon class="mx-1" icon="mdi-plus" />Pridať zamestnanca </v-btn>
 
-					<div class="w-100 modal-input" :class="{ error: v$.masterTask.description.$errors.length }">
-						<QuillEditor ref="description" v-model="masterTask.description" placeholder="Popis" theme="snow" class="rich-text-editor" @input="masterTask.description = $event.srcElement.innerHTML" />
+					<div class="w-100 modal-input" :class="{ error: v$.mastertask.description.$errors.length }">
+						<QuillEditor ref="description" v-model="mastertask.description" placeholder="Popis" theme="snow" class="rich-text-editor" @input="mastertask.description = $event.srcElement.innerHTML" />
 					</div>
 
-					<Z-files-upload class="mt-15 files" :files="masterTask.files" @files-uploaded="filesUploaded" />
+					<Z-files-upload class="mt-15 files" :files="mastertask.files" @files-uploaded="filesUploaded" />
 				</v-card-actions>
 
-				<v-btn class="button primary" @click="save()">{{ masterTask.id ? 'ULOŽIŤ' : 'VYTVORIŤ' }}</v-btn>
+				<v-btn class="button primary" @click="save()">{{ mastertask.id ? 'ULOŽIŤ' : 'VYTVORIŤ' }}</v-btn>
 			</v-card>
 
 			<v-card v-else height="100%" class="d-flex flex-column scrolling">
 				<div class="d-flex justify-space-between align-center">
-					<p>{{ masterTask.project_code }}</p>
+					<p>{{ mastertask.project_code }}</p>
 					<v-icon @click.stop="closeModal()" icon="mdi-close" size="large" class="pb-5"></v-icon>
 				</div>
 				<div class="d-flex justify-space-between align-center modal-header border-bottom pb-4">
-					<h1>{{ masterTask.name }}</h1>
+					<h1>{{ mastertask.name }}</h1>
 					<div class="d-flex justify-start">
 						<img class="icon" :src="require('@/plugins/app/_img/icons/pencil.svg')" alt="pencil-icon" @click.stop="editMode = !editMode" />
-						<img class="icon trash" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(masterTask)" />
+						<img class="icon trash" :src="require('@/plugins/app/_img/icons/bin.svg')" alt="trash-icon" @click.stop="openDeleteMasterTaskModal(mastertask)" />
 					</div>
 				</div>
 
 				<v-card-actions class="d-flex flex-column modal-content">
 					<div class="w-100">
-						<A-mastertask-description :master-task="masterTask" />
+						<A-mastertask-description :mastertask="mastertask" />
 
 						<div class="d-flex justify-start align-center mt-8">
 							<v-btn class="button primary" @click="save()">Ukončiť mastertask</v-btn>
 						</div>
 
-						<A-tasks-table :tasks="masterTask.subtasks" :employees="enrichedEmployees" />
+						<A-tasks-table :tasks="mastertask.subtasks" :employees="enrichedEmployees" />
 
 						<div class="d-flex align-center ">
 							<v-btn class="subtask-btn w-100" @click="addTask()" ><v-icon class="mx-1" icon="mdi-plus" />Pridať task</v-btn>
@@ -96,7 +96,7 @@ export default {
 	// MIXINS
 	// computed: employeesOptions
 	// methods: onProjectSelected, onEmployeeSelected, onEmployeeDurationChanged
-	// watch: masterTask.team_id
+	// watch: mastertask.team_id
 
 	emits: ['master-task-edited', 'close'],
 	mixins: [VuetifyFixFocusMixin, SelectsMixin],
@@ -116,7 +116,7 @@ export default {
 			visible: false,
 			errorUtils,
 			v$: useVuelidate(),
-			masterTask: null,
+			mastertask: null,
 			showAddEmployeeInput: false,
 			date: null,
 		}
@@ -132,7 +132,7 @@ export default {
 
 	validations() {
 		return {
-			masterTask: {
+			mastertask: {
 				project_code: { required },
 				team_id: { required },
 				name: { required },
@@ -143,22 +143,22 @@ export default {
 	},
 
 	mounted() {
-		this.$events.on('on-master-task-deleted', (masterTask) => {
-			if (masterTask?.id == this.masterTask?.id) this.closeModal()
+		this.$events.on('on-master-task-deleted', (mastertask) => {
+			if (mastertask?.id == this.mastertask?.id) this.closeModal()
 		})
 
 		this.$events.on('on-task-deleted', (task) => {
-			if (!this.masterTask) return
-			this.masterTask.subtasks = this.masterTask.subtasks.filter((subtask) => subtask.id != task.id)
+			if (!this.mastertask) return
+			this.mastertask.subtasks = this.mastertask.subtasks.filter((subtask) => subtask.id != task.id)
 		})
 
 		this.$events.on('on-subtask-edited', (task) => {
-			if (!this.masterTask?.subtasks) return
+			if (!this.mastertask?.subtasks) return
 
-			if (this.masterTask.subtasks.find(subtask => subtask.id == task.id)) {
-				this.masterTask.subtasks = this.masterTask.subtasks.map(t => t.id == task.id ? task : t)
+			if (this.mastertask.subtasks.find(subtask => subtask.id == task.id)) {
+				this.mastertask.subtasks = this.mastertask.subtasks.map(t => t.id == task.id ? task : t)
 			} else {
-				this.masterTask.subtasks.push(task)
+				this.mastertask.subtasks.push(task)
 			}
 		})
 	},
@@ -170,25 +170,25 @@ export default {
 	},
 
 	methods: {
-		async showModal(masterTask, editMode = false) {
+		async showModal(mastertask, editMode = false) {
 			this.v$.$reset()
 			this.visible = true
-			this.masterTask = null
+			this.mastertask = null
 
 			try {
-				if (masterTask?.id) {
-					this.masterTask = await this.$axios.get_auth_data(`v1/mastertasks/${masterTask.id}`)
+				if (mastertask?.id) {
+					this.mastertask = await this.$axios.get_auth_data(`v1/mastertasks/${mastertask.id}`)
 
-					const project = this.projects.find((project) => project.code == this.masterTask?.project_code)
+					const project = this.projects.find((project) => project.code == this.mastertask?.project_code)
 
-					this.masterTask.team_id 		= this.masterTask.team.id
-					this.masterTask.project_id 		= project.id
-					this.masterTask.project_code 	= project.code
+					this.mastertask.team_id 		= this.mastertask.team?.id || null
+					this.mastertask.project_id 		= project.id
+					this.mastertask.project_code 	= project.code
 				} else {
-					this.masterTask = { employees: [], duration: 0 }
+					this.mastertask = { employees: [], duration: 0 }
 				}
 
-				this.editMode = editMode || !this.masterTask.id
+				this.editMode = editMode || !this.mastertask.id
 			} catch (error) {
 				this.$toast.error(error)
 			}
@@ -197,24 +197,24 @@ export default {
 		async save() {
 			if (!(await this.v$.$validate())) return
 
-			this.masterTask.description = this.$refs['description'].getHTML()
+			this.mastertask.description = this.$refs['description'].getHTML()
 
-			// this.masterTask.subtasks = this.masterTask.subtasks.map(subtask => {
-			// 	const employee = this.masterTask.employees.find(employee => employee.id == subtask.employee_id)
+			// this.mastertask.subtasks = this.mastertask.subtasks.map(subtask => {
+			// 	const employee = this.mastertask.employees.find(employee => employee.id == subtask.employee_id)
 			// 	subtask.duration = employee.duration
 
 			// 	return subtask
 			// })
 
-			// this.masterTask.project_code = null
+			// this.mastertask.project_code = null
 
 			try {
-				this.masterTask.deadline = moment(this.masterTask.deadline).format('YYYY-MM-DD HH:MM:SS')
+				this.mastertask.deadline = moment(this.mastertask.deadline).format('YYYY-MM-DD HH:MM:SS')
 
-				if (this.masterTask.id) await this.$axios.put_auth_data(`v1/mastertasks/${this.masterTask.id}`, this.masterTask)
-				else await this.$axios.post_auth_data('v1/mastertasks', this.masterTask)
+				if (this.mastertask.id) await this.$axios.put_auth_data(`v1/mastertasks/${this.mastertask.id}`, this.mastertask)
+				else await this.$axios.post_auth_data('v1/mastertasks', this.mastertask)
 
-				this.$emit('master-task-edited', this.masterTask)
+				this.$emit('master-task-edited', this.mastertask)
 				this.closeModal()
 			} catch (error) {
 				this.$toast.error(error)
@@ -222,26 +222,26 @@ export default {
 		},
 
 		filesUploaded(files) {
-			this.masterTask.files = files
+			this.mastertask.files = files
 		},
 
 		closeModal() {
 			this.visible = false
 		},
 
-		openDeleteMasterTaskModal(masterTask) {
-			this.$events.emit('show-delete-master-task-modal', { masterTask })
+		openDeleteMasterTaskModal(mastertask) {
+			this.$events.emit('show-delete-master-task-modal', { mastertask })
 		},
 
 		addTask() {
-			this.$events.emit('show-task-modal', { task: null, editMode: false, masterTask: this.masterTask })
+			this.$events.emit('show-task-modal', { task: null, editMode: false, mastertask: this.mastertask })
 		}
 	},
 
 	watch: {
 		editMode() {
 			this.$nextTick(() => {
-				this.$refs['description']?.setHTML(this.masterTask.description || '')
+				this.$refs['description']?.setHTML(this.mastertask.description || '')
 			})
 		}
 	}
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-mastertask-name.vue b/app/src/plugins/tm@modal/task/_components/_components/a-mastertask-name.vue
index ea2642c..4b6a553 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-mastertask-name.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-mastertask-name.vue
@@ -42,7 +42,7 @@ export default {
 	methods: {
 		openMastertask() {
 			this.$emit('close-modal')
-			this.$events.emit('show-master-task-modal', {masterTask: {id: this.id}, editMode: false})
+			this.$events.emit('show-master-task-modal', {mastertask: {id: this.id}, editMode: false})
 		}
 	}
 }
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue
index f5f181f..af4bb55 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-description.vue
@@ -4,9 +4,9 @@
 		<section v-html="description" class="description-detail px-2 py-2 w-100 rounded mt-2" />
 	</div>
 
-	<div class="px-5 py-5 border-bottom" v-if="masterTaskDescription">
+	<div class="px-5 py-5 border-bottom" v-if="mastertaskDescription">
 		<p>Popis mastertasku</p>
-		<section v-html="masterTaskDescription" class="description-detail px-2 py-2 w-100 rounded mt-2" />
+		<section v-html="mastertaskDescription" class="description-detail px-2 py-2 w-100 rounded mt-2" />
 	</div>
 </template>
 
@@ -18,7 +18,7 @@ export default {
 			default: () => null
 		},
 
-		masterTaskDescription: {
+		mastertaskDescription: {
 			type: String || null,
 			default: () => null
 		}
diff --git a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
index 930afe0..c0d531f 100644
--- a/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
+++ b/app/src/plugins/tm@modal/task/_components/z-task-readonly-info.vue
@@ -7,7 +7,7 @@
     <A-task-planned-time        :hours="task.duration" />
     <A-task-remaining-time      :hours="task.duration - task.spent_time" />
     <A-task-spent-time          :hours="task.spent_time" :task="task" />
-    <A-task-description         :description="task.description" :master-task-description="task.master_task_description" />
+    <A-task-description         :description="task.description" :mastertask-description="task.master_task_description" />
     <Z-files                    :files="task.files" />
 </template>
 
@@ -21,7 +21,7 @@ import ATaskPlannedTime         from './_components/a-task-planned-time.vue'
 import ATaskSpentTime           from './_components/a-task-spent-time.vue'
 import ATaskRemainingTime       from './_components/a-task-remaining-time.vue'
 import ATaskDescription         from './_components/a-task-description.vue'
-import ZFiles 					from '@/plugins/tm@modal/_components/z-files.vue'
+import ZFiles 					from '@/plugins/tm@modal/_components/read-only/z-files.vue'
 
 export default {
 	emits: ['close-modal'],
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 f967872..b920349 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
@@ -2,7 +2,7 @@
 	<v-dialog v-model="visible" max-width="750">
 		<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>
+				<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>
 				<v-icon
 					@click.stop="visible = false"
 					icon="mdi-close"
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 6bf3f37..cb212ab 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
@@ -2,7 +2,7 @@
 	<v-dialog v-model="visible" max-width="750">
 		<v-card>
 			<div class="d-flex justify-space-between align-center">
-				<h1>Ste si istý, že chcete zmazať task z masterTasku <b>{{ task.project_code }}</b>?</h1>
+				<h1>Ste si istý, že chcete zmazať task z mastertasku <b>{{ task.project_code }}</b>?</h1>
 
 				<v-icon
 					@click.stop="closeModal()"
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 e23cac8..18b77a8 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -10,13 +10,13 @@
 				<v-card-actions class="d-flex flex-column modal-content">
 					<v-text-field v-model="task.project_code" label="Kód projektu" :value="task.project_code" @focus="onInputFocus" class="modal-input" variant="solo" disabled></v-text-field>
 
-					<Z-autocomplete label="Master task" :options="mastertasks.map((masterTask) => ({ key: masterTask.id, value: masterTask.name }))" :validations="v$.task.master_task.id" :clear-on-submit="false" :value="task?.master_task?.name" :class="{ error: v$.task.master_task.id.$errors.length }" class="modal-input" @option-selected="onMasterTaskSelected" />
+					<Z-autocomplete label="Master task" :options="mastertasks.map((mastertask) => ({ key: mastertask.id, value: mastertask.name }))" :validations="v$.task.master_task.id" :clear-on-submit="false" :value="task?.master_task?.name" :class="{ error: v$.task.master_task.id.$errors.length }" class="modal-input" @option-selected="onMasterTaskSelected" />
 
 					<v-select v-model="task.employee_id" ref="employee-select" @focus="onInputFocus" class="modal-input border-select" label="Priradený" :class="{ error: v$.task.employee_id.$errors.length }" variant="solo" :items="filteredEmployees" item-value="id" item-title="_fullName"></v-select>
 
 					<v-text-field v-model="task.duration" @focus="onInputFocus" class="modal-input" variant="solo" type="number" label="Časový odhad" :class="{ error: v$.task.duration.$errors.length }" :hint="v$.task.duration.$errors ? errorUtils.parseErrors(v$.task.duration.$errors) : null" append-inner-icon="mdi-clock-outline"></v-text-field>
 
-					<div class="w-100 modal-input" :class="{ error: v$.task.description.$errors.length }">
+					<div class="w-100 modal-input">
 						<QuillEditor ref="description" v-model="task.description" placeholder="Popis" theme="snow" class="rich-text-editor" @input="task.description = $event.srcElement.innerHTML" />
 					</div>
 
@@ -92,7 +92,7 @@ export default {
 			errorUtils,
 			v$: useVuelidate(),
 			preventInputFocus: false,
-			masterTaskIdSelect: null,
+			mastertaskIdSelect: null,
 			showDatePicker: false,
 			selectedNewDate: []
 		}
@@ -115,7 +115,6 @@ export default {
 	validations() {
 		return {
 			task: {
-				description: { required },
 				master_task: {
 					id: { required }
 				},
@@ -140,7 +139,7 @@ export default {
 	},
 
 	methods: {
-		async showModal(task, editMode = false, masterTask = {}) {
+		async showModal(task, editMode = false, mastertask = {}) {
 			this.task = null
 			this.visible = true
 			this.$nextTick(() => this.v$.$reset())
@@ -150,8 +149,8 @@ export default {
 					const subtask = await this.$axios.get_auth_data(`v1/subtasks/${task.id}`)
 					this.task = this._enrichTask(subtask)
 				} else {
-					this.task = { master_task: masterTask, timeblocks: [{start: tmUtils.formatDateTimeForBackend(moment()), end: tmUtils.formatDateTimeForBackend(moment())}] }
-					this.masterTaskIdSelect = masterTask.id
+					this.task = { master_task: mastertask, timeblocks: [{start: tmUtils.formatDateTimeForBackend(moment()), end: tmUtils.formatDateTimeForBackend(moment())}] }
+					this.mastertaskIdSelect = mastertask.id
 				}
 
 				this.editMode = editMode || !this.task.id
@@ -224,26 +223,29 @@ export default {
 		},
 
 		_enrichTask(task) {
-			task.master_task 		= this.mastertasks.find((masterTask) => masterTask.id == task.master_task_id)
+			task.master_task 		= this.mastertasks.find((mastertask) => mastertask.id == task.master_task_id)
 			task.employee 			= this.enrichedEmployees.find((employee) => employee.id == task.employee_id)
 			task._created_by 		= this.enrichedEmployees.find((employee) => employee.id == task.created_by)
-			this.masterTaskIdSelect = task.master_task?.id
+			this.mastertaskIdSelect = task.master_task?.id
 
 			return task
 		}
 	},
 
 	watch: {
-		masterTaskIdSelect(value) {
+		mastertaskIdSelect(value) {
 			if (!value || !this.task) return
 
-			this.task.master_task = this.mastertasks.find((masterTask) => masterTask.id == value)
+			this.task.master_task = this.mastertasks.find((mastertask) => mastertask.id == value)
 			this.task.project_code = this.task.master_task.project_code
 		},
 
-		"task.employee_id"(value) {
+		"task.employee_id"(value, oldValue) {
 			if (!value) return
 
+			if (value && oldValue) 
+				this.task.timeblocks = []
+
 			this.task.employee = this.enrichedEmployees.find((employee) => employee.id == value)
 		},
 
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 e91cb8f..218e425 100644
--- a/app/src/plugins/tm@modal/team/z-team-modal.vue
+++ b/app/src/plugins/tm@modal/team/z-team-modal.vue
@@ -104,7 +104,7 @@ export default {
 
 			try {
 				const allEmployees = await this.$axios.get_auth_data('v1/employees')
-				this.allEmployees = tmUtils.enrichEmployeesByFullName(allEmployees)
+				this.allEmployees = tmUtils.enrichEmployees(allEmployees)
 
 				if (team?.id) {
 					const t = await this.$axios.get_auth_data(`v1/teams/${team.id}`)
@@ -146,7 +146,7 @@ export default {
 		},
 
 		_enrichTeam(team) {
-			team.employees = tmUtils.enrichEmployeesByFullName(team.employees)
+			team.employees = tmUtils.enrichEmployees(team.employees)
 			return team
 		}
 	},