diff --git a/app/public/mock/v1/auth/info.GET.json b/app/public/mock/v1/auth/info.GET.json
index 0334130..cfbcd2d 100644
--- a/app/public/mock/v1/auth/info.GET.json
+++ b/app/public/mock/v1/auth/info.GET.json
@@ -2,9 +2,9 @@
 	"data": {
 		"user": {
 			"id": 1,
-			"name": "Matej",
-			"surname": "Glasnak",
-			"email": "glasnak@wezeo.com",
+			"name": "Rastislav",
+			"surname": "Kuttner",
+			"email": "rastislav.kuttner@jandl.com",
 			"work_hours_from": "08:00",
 			"work_hours_to": "16:00"
 		}
diff --git a/app/public/mock/v1/auth/info.POST.json b/app/public/mock/v1/auth/info.POST.json
index 0334130..cfbcd2d 100644
--- a/app/public/mock/v1/auth/info.POST.json
+++ b/app/public/mock/v1/auth/info.POST.json
@@ -2,9 +2,9 @@
 	"data": {
 		"user": {
 			"id": 1,
-			"name": "Matej",
-			"surname": "Glasnak",
-			"email": "glasnak@wezeo.com",
+			"name": "Rastislav",
+			"surname": "Kuttner",
+			"email": "rastislav.kuttner@jandl.com",
 			"work_hours_from": "08:00",
 			"work_hours_to": "16:00"
 		}
diff --git a/app/public/mock/v1/auth/login.POST.json b/app/public/mock/v1/auth/login.POST.json
index 7baeba9..b056ef9 100644
--- a/app/public/mock/v1/auth/login.POST.json
+++ b/app/public/mock/v1/auth/login.POST.json
@@ -3,9 +3,9 @@
 		"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwczpcL1wvZ2FtaXNmZXJhLndlemVvLmRldlwvY21zXC9hcGlcL3YxXC9hdXRoXC9sb2dpbiIsImlhdCI6MTYxNjQzNTEzMCwiZXhwIjoxNjE2NTIxNTMwLCJuYmYiOjE2MTY0MzUxMzAsImp0aSI6IlJtQmRQNnpDWXJsYWM5d3kiLCJzdWIiOjIsInBydiI6IjFkMDE2ZjgxZmMwNzljMzJkMzY2MDZkYThjOGY4Njk1NzQwYjg0OWQifQ.-a7YeLzozzliAP3UMvqgQEkuHDYG4L04Zdo_sezU9L4",
 		"user": {
 			"id": 1,
-			"name": "Matej",
-			"surname": "Glasnak",
-			"email": "glasnak@wezeo.com",
+			"name": "Rastislav",
+			"surname": "Kuttner",
+			"email": "rastislav.kuttner@jandl.com",
 			"work_hours_from": "08:00",
 			"work_hours_to": "16:00"
 		}
diff --git a/app/public/mock/v1/employees.GET.json b/app/public/mock/v1/employees.GET.json
index 14cd56e..0ddf3de 100644
--- a/app/public/mock/v1/employees.GET.json
+++ b/app/public/mock/v1/employees.GET.json
@@ -2,20 +2,50 @@
 	"data": [
 		{
 			"id": 1,
-			"name": "Matej",
-			"surname": "Glasnak"
+			"name": "Rastislav",
+			"surname": "Kuttner"
 		},
 
 		{
 			"id": 2,
-			"name": "Mate",
-			"surname": "Klempa"
+			"name": "Lenka",
+			"surname": "Nemeckova"
 		},
 
 		{
 			"id": 3,
-			"name": "Marek",
-			"surname": "Guspan"
+			"name": "Peter",
+			"surname": "Bucan"
+		},
+
+		{
+			"id": 4,
+			"name": "Viliam",
+			"surname": "Sedivy"
+		},
+
+		{
+			"id": 5,
+			"name": "Pavel",
+			"surname": "Gajdos"
+		},
+
+		{
+			"id": 6,
+			"name": "Francesca",
+			"surname": "Spinelli"
+		},
+
+		{
+			"id": 7,
+			"name": "Simona",
+			"surname": "Tremkova"
+		},
+
+		{
+			"id": 8,
+			"name": "Matej",
+			"surname": "Macho"
 		}
 	],
 	"status": 200
diff --git a/app/public/mock/v1/overview/tasks.GET.json b/app/public/mock/v1/overview/tasks.GET.json
index 3bd143d..01bab0b 100644
--- a/app/public/mock/v1/overview/tasks.GET.json
+++ b/app/public/mock/v1/overview/tasks.GET.json
@@ -1,8 +1,8 @@
 {
 	"data": {
 		"id": 1,
-		"name": "Matej",
-		"surname": "Glasnak",
+		"name": "Rastislav",
+		"surname": "Kuttner",
 		"work_hours_from": "08:00",
 		"work_hours_to": "19:00",
 		"unscheduled_times": [
diff --git a/app/public/mock/v1/overview/teams.GET.json b/app/public/mock/v1/overview/teams.GET.json
index debdf1e..22eb775 100644
--- a/app/public/mock/v1/overview/teams.GET.json
+++ b/app/public/mock/v1/overview/teams.GET.json
@@ -6,8 +6,8 @@
 			{
 				"user": {
 					"id": 1,
-					"name": "Matej",
-					"surname": "Glasnak",
+					"name": "Rastislav",
+					"surname": "Kuttner",
 					"work_hours_from": "08:00",
 					"work_hours_to": "16:00"
 				},
@@ -42,8 +42,8 @@
 			{
 				"user": {
 					"id": 2,
-					"name": "Mate",
-					"surname": "Klempa",
+					"name": "Lenka",
+					"surname": "Nemeckova",
 					"work_hours_from": "09:00",
 					"work_hours_to": "17:00"
 				},
diff --git a/app/public/mock/v1/search.GET.json b/app/public/mock/v1/search.GET.json
index 6a3d459..1e21b75 100644
--- a/app/public/mock/v1/search.GET.json
+++ b/app/public/mock/v1/search.GET.json
@@ -7,8 +7,8 @@
 				"title": "Nazov tasku 1",
 				"user": {
 					"id": 1,
-					"name": "Matej",
-					"surname": "Glasnak"
+					"name": "Rastislav",
+					"surname": "Kuttner"
 				}
 			},
 
@@ -18,8 +18,8 @@
 				"title": "Nazov tasku 2",
 				"user": {
 					"id": 1,
-					"name": "Matej",
-					"surname": "Glasnak"
+					"name": "Lenka",
+					"surname": "Nemeckova"
 				}
 			}
 		],
diff --git a/app/public/mock/v1/teams.GET.json b/app/public/mock/v1/teams.GET.json
index 6611c00..bfb4efe 100644
--- a/app/public/mock/v1/teams.GET.json
+++ b/app/public/mock/v1/teams.GET.json
@@ -6,16 +6,20 @@
 			"employees": [
 				{
 					"id": 1,
-					"name": "Matej",
-					"surname": "Glasnak",
-					"hours": 34
+					"name": "Rastislav",
+					"surname": "Kuttner"
 				},
-		
+
 				{
 					"id": 2,
-					"name": "Mate",
-					"surname": "Klempa",
-					"hours": 123
+					"name": "Lenka",
+					"surname": "Nemeckova"
+				},
+
+				{
+					"id": 3,
+					"name": "Peter",
+					"surname": "Bucan"
 				}
 			]
 		},
@@ -25,22 +29,15 @@
 			"name": "Team 2",
 			"employees": [
 				{
-					"id": 1,
-					"name": "Lukas",
-					"surname": "Koza",
-					"hours": 45
+					"id": 4,
+					"name": "Peter",
+					"surname": "Bucan"
 				},
+
 				{
-					"id": 2,
-					"name": "Mate",
-					"surname": "Klempa",
-					"hours": 39
-				},
-				{
-					"id": 3,
-					"name": "Marek",
-					"surname": "Guspan",
-					"hours": 14
+					"id": 5,
+					"name": "Pavel",
+					"surname": "Gajdos"
 				}
 			]
 		},
@@ -51,21 +48,20 @@
 			"employees": [
 				{
 					"id": 1,
-					"name": "Roman",
-					"surname": "Glasnak",
-					"hours": 90
+					"name": "Rastislav",
+					"surname": "Kuttner"
 				},
+
 				{
 					"id": 2,
-					"name": "Sebastian",
-					"surname": "Klempa",
-					"hours": 423
+					"name": "Lenka",
+					"surname": "Nemeckova"
 				},
+
 				{
 					"id": 3,
-					"name": "Jarko",
-					"surname": "Guspan",
-					"hours": 44
+					"name": "Peter",
+					"surname": "Bucan"
 				}
 			]
 		}
diff --git a/app/public/mock/v1/teams/(id).GET.json b/app/public/mock/v1/teams/(id).GET.json
index 60c07f7..0567138 100644
--- a/app/public/mock/v1/teams/(id).GET.json
+++ b/app/public/mock/v1/teams/(id).GET.json
@@ -5,15 +5,20 @@
 		"employees": [
 			{
 				"id": 1,
-				"name": "Matej",
-				"surname": "Glasnak",
-				"hours": 45
+				"name": "Rastislav",
+				"surname": "Kuttner"
 			},
+
 			{
 				"id": 2,
-				"name": "Mate",
-				"surname": "Klempa",
-				"hours": 105
+				"name": "Lenka",
+				"surname": "Nemeckova"
+			},
+
+			{
+				"id": 3,
+				"name": "Peter",
+				"surname": "Bucan"
 			}
 		]
 	},
diff --git a/app/public/mock/v1/teams/(id).POST.json b/app/public/mock/v1/teams/(id).POST.json
index 2db7b58..0567138 100644
--- a/app/public/mock/v1/teams/(id).POST.json
+++ b/app/public/mock/v1/teams/(id).POST.json
@@ -5,13 +5,20 @@
 		"employees": [
 			{
 				"id": 1,
-				"name": "Matej",
-				"surname": "Glasnak"
+				"name": "Rastislav",
+				"surname": "Kuttner"
 			},
+
 			{
 				"id": 2,
-				"name": "Mate",
-				"surname": "Klempa"
+				"name": "Lenka",
+				"surname": "Nemeckova"
+			},
+
+			{
+				"id": 3,
+				"name": "Peter",
+				"surname": "Bucan"
 			}
 		]
 	},
diff --git a/app/src/plugins/app/_layout/app/_components/a-header.vue b/app/src/plugins/app/_layout/app/_components/a-header.vue
index 7d2a865..8165394 100644
--- a/app/src/plugins/app/_layout/app/_components/a-header.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-header.vue
@@ -18,7 +18,7 @@
 
 					<v-list>
 						<v-list-item class="cursor-pointer hover-background" @click="createMasterTaskDialog = true">MASTER TASK</v-list-item>
-						<v-list-item class="cursor-pointer hover-background">SUB TASK</v-list-item>
+						<v-list-item class="cursor-pointer hover-background" :disabled="true">SUB TASK</v-list-item>
 						<v-list-item class="cursor-pointer hover-background" @click="createTeamDialog = true">TÍM</v-list-item>
 						<v-list-item class="cursor-pointer hover-background" @click="createBlockerDialog = true">BLOCKER</v-list-item>
 					</v-list>
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 a29442b..3e711a2 100644
--- a/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
+++ b/app/src/plugins/tm@modal/blocker/z-blocker-modal.vue
@@ -62,6 +62,7 @@
 						select-text="Vybrať"
 						cancel-text="Zrušiť"
 						placeholder="Trvanie od - do"
+						:start-time="startTime"
 						range
 					/>
 				</v-card-actions>
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 1ba13f2..2ec68aa 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
@@ -90,7 +90,7 @@
 					</p>
 				</v-text-field>
 
-				<Z-autocomplete 
+				<Z-autocomplete
 					v-if="showAddEmployeeInput"
 					:options="employeesOptions"
 					:validations="v$.masterTask.employees"
@@ -165,6 +165,7 @@ export default {
 			v$: useVuelidate(),
 			preventInputFocus: false,
 			teams: null,
+			employees: null,
 			selectedTeam: '',
 			showAddEmployeeInput: false,
 			mrenka: null
@@ -186,7 +187,8 @@ export default {
 
 	async created() {
 		try {
-			this.teams = await this.$axios.get_auth_data('v1/teams')
+			this.teams 		= await this.$axios.get_auth_data('v1/teams')
+			this.employees 	= await this.$axios.get_auth_data('v1/employees')
 
 			// this.masterTask = await this.$axios.get_auth_data(`v1/master-task/${this.masterTaksId}`)
 			// this.selectedTeam = `${this.masterTask.team.name} - ${this.masterTask.team.id}`)
@@ -198,7 +200,7 @@ export default {
 	methods: {
 		async save() {
 			if (!(await this.v$.$validate())) return console.log(this.v$)
-			
+
 			try {
 				if (this.masterTask.id)
 					await this._update()
@@ -229,7 +231,7 @@ export default {
 		},
 
 		employeeSelected(selectedOption) {
-			const employee = this.masterTask.team.employees.find((empl) => empl.id == selectedOption.key)
+			const employee = this.employees.find((empl) => empl.id == selectedOption.key)
 			this.masterTask.employees.push(employee)
 			this.showAddEmployeeInput = false
 		},
@@ -273,7 +275,7 @@ export default {
 			const selectedEmployeesIds = this.masterTask.employees.map(
 				(employee) => employee.id
 			)
-			const employees = this.masterTask.team.employees?.filter(
+			const employees = this.employees.filter(
 				(employee) => !selectedEmployeesIds.includes(employee.id)
 			) || []
 
@@ -298,8 +300,8 @@ export default {
 
 	watch: {
 		selectedTeam() {
-			this.masterTask.team = this.teams.find(team => `${team.name} - ${team.id}` == this.selectedTeam)
-			console.log(this.masterTask)
+			this.masterTask.team 		= this.teams.find(team => `${team.name} - ${team.id}` == this.selectedTeam)
+			this.masterTask.employees 	= this.masterTask.team.employees
 		}
 	}
 }
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index 334fec9..f87fe21 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -18,7 +18,7 @@
 				<td>{{ (task.remaining_time / 1000 / 60 / 60).toFixed(2) }} h</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">
-						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" />
+						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" :style="{opacity: 0.3}" />
 						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = { task }" />
 
 						<Z-delete-task-modal v-if="showDeleteModal" :visible="showDeleteModal ? true : false" :task="showDeleteModal.task" @close="showDeleteModal = null" />
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
index 5a9fd19..3ef6a87 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
@@ -16,7 +16,7 @@
 				<td>{{ task.duration / 1000 / 60 / 60 }} h</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">
-						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon">
+						<img class="pencil-icon" :src="require('@/plugins/tm@overview/_img/pencil-icon.svg')" alt="pencil-icon" :style="{opacity: 0.3}">
 						<img class="trash-icon" :src="require('@/plugins/tm@overview/_img/trash-icon.svg')" alt="trash-icon" @click.stop="showDeleteModal = { task }">
 
 						<Z-delete-task-modal v-if="showDeleteModal" :visible="showDeleteModal ? true : false" :task="showDeleteModal.task" @close="showDeleteModal = null" />