diff --git a/app/src/plugins/app/_components/a-bloker-modal.vue b/app/src/plugins/app/_components/a-bloker-modal.vue
index 20c8467..d93a14c 100644
--- a/app/src/plugins/app/_components/a-bloker-modal.vue
+++ b/app/src/plugins/app/_components/a-bloker-modal.vue
@@ -11,22 +11,13 @@
 					></v-icon>
 				</div>
 
-				<v-card-actions class="d-flex flex-column-reverse modal-content">
-					<Datepicker
+				<v-card-actions class="d-flex flex-column modal-content">
+					<v-text-field
+						@focus="onInputFocus"
 						class="modal-input"
-						v-model="date"
-						:format="dateFormat"
-						locale="sk"
-						select-text="Vybrať"
-						cancel-text="Zrušiť"
-						placeholder="02.12.2022,10:17  -  18.12.2022,10:17"
-						range
-					/>
-					<W-autocomplete
-						:options="employeesOptions"
-						class="modal-input"
-						@option-selected="employeeSelected"
-					/>
+						label="Názov blokeru"
+						variant="solo"
+					></v-text-field>
 					<div
 						class="employee-position w-100"
 						v-for="(employee, index) in selectedEmployees"
@@ -47,11 +38,22 @@
 							size="small"
 						></v-icon>
 					</div>
-					<v-text-field
+					<W-autocomplete
+						:options="employeesOptions"
 						class="modal-input"
-						label="Názov blokeru"
-						variant="outlined"
-					></v-text-field>
+						@option-selected="employeeSelected"
+					/>
+					<Datepicker
+						class="modal-input"
+						v-model="date"
+						:format="dateFormat"
+						locale="sk"
+						@focus="onDateFocus"
+						select-text="Vybrať"
+						cancel-text="Zrušiť"
+						placeholder="02.12.2022,10:17  -  18.12.2022,10:17"
+						range
+					/>
 				</v-card-actions>
 
 				<v-btn class="z-btn" @click="createBloker()">VYTVORIŤ</v-btn>
@@ -70,7 +72,12 @@ export default {
 		Datepicker,
 	},
 
-	props: ['visible'],
+	props: {
+		visible: {
+			type: Boolean,
+			required: true
+		}
+	},
 
 	data() {
 		return {
@@ -111,6 +118,20 @@ export default {
 				this.$toast.error(error.response.data.error)
 			}
 		},
+
+		// Vuetify input was automatically focus after date input was clicked. This will prevent this unwanted behavior
+		onDateFocus($event) {
+			if ($event == undefined) {
+				this.preventInputFocus = true
+			}
+		},
+
+		onInputFocus($event) {
+			if (this.preventInputFocus) {
+				$event.target.blur()
+				this.preventInputFocus = false
+			}
+		}
 	},
 
 	computed: {
@@ -166,7 +187,6 @@ export default {
 	flex: 1 1 100%
 	margin: 10px 0
 	overflow-y: scroll
-	justify-content: flex-end
 
 .z-btn
 	height: 50px
diff --git a/app/src/plugins/app/_components/a-files-upload.vue b/app/src/plugins/app/_components/a-files-upload.vue
new file mode 100644
index 0000000..96ec693
--- /dev/null
+++ b/app/src/plugins/app/_components/a-files-upload.vue
@@ -0,0 +1,66 @@
+<template>
+    <div>
+		<input
+			type="file"
+			multiple
+			name="file"
+			id="fileInput"
+			class="hidden-input"
+			@change="onChange"
+			ref="fileUpload"
+			accept="*"
+		/>
+
+		<v-btn class="upload-btn" @click="$refs.fileUpload.click()">
+			<v-icon class="mx-1" icon="mdi-cloud-upload-outline"></v-icon>NAHRAŤ
+		</v-btn>
+		<div v-if="files.length">
+			<div
+				v-for="file in files"
+				:key="file.name"
+			>
+				<v-chip> 	
+					{{ file.name }}
+					<v-icon class="mx-1" icon="mdi-paperclip"></v-icon>
+					<v-icon size="small" icon="mdi-close" @click.stop="remove(files.indexOf(file))"></v-icon>
+				</v-chip>
+			</div>
+		</div>
+    </div>
+</template>
+
+<script>
+export default {
+	emit: ['files-uploaded'],
+	
+    data() {
+        return {
+            files: [],
+        }
+    },
+
+    methods: {
+        onChange() {
+            this.files = [...this.files, ...this.$refs.fileUpload.files]
+			this.$emit('files-uploaded', this.files)
+        },
+
+		remove(index) {
+			this.files.splice(index, 1)
+		},
+    },
+}
+</script>
+
+<style lang="sass" scoped>
+.upload-btn
+	color: #6200EE
+	border-radius: 4px
+	border: 1px solid #E5E5E5
+.hidden-input
+	opacity: 0
+	overflow: hidden
+	position: absolute
+	width: 1px
+	height: 1px
+</style>
\ No newline at end of file
diff --git a/app/src/plugins/app/_components/a-master-task-modal.vue b/app/src/plugins/app/_components/a-master-task-modal.vue
index c7f0b0a..8dee4ae 100644
--- a/app/src/plugins/app/_components/a-master-task-modal.vue
+++ b/app/src/plugins/app/_components/a-master-task-modal.vue
@@ -10,20 +10,21 @@
 				></v-icon>
 			</div>
 
-			<v-card-actions class="d-flex flex-column-reverse modal-content">
-				<v-select
-					class="modal-input"
-					label="Tím"
-					variant="outlined"
-				></v-select>
+			<v-card-actions class="d-flex flex-column modal-content">
 				<v-text-field
-					class="modal-input mt-5"
-					label="Celkový odhad"
-					variant="outlined"
-					type="number"
-					placeholder="h"
+					@focus="onInputFocus"
+					class="modal-input"
+					label="Kód projektu"
+					variant="solo"
+				></v-text-field>
+				<v-text-field
+					@focus="onInputFocus"
+					class="modal-input"
+					label="Názov mastertasku"
+					variant="solo"
 				></v-text-field>
 				<Datepicker
+					@focus="onDateFocus"
 					class="modal-input"
 					v-model="date"
 					:format="dateFormat"
@@ -33,15 +34,25 @@
 					placeholder="Deadline"
 				/>
 				<v-text-field
-					class="modal-input"
-					label="Názov mastertasku"
-					variant="outlined"
-				></v-text-field>
-				<v-text-field
-					class="modal-input"
-					label="Kód projektu"
-					variant="outlined"
+					@focus="onInputFocus"
+					class="modal-input mt-5"
+					label="Celkový odhad"
+					variant="solo"
+					type="number"
+					placeholder="h"
 				></v-text-field>
+				<v-select
+					@focus="onInputFocus"
+					class="modal-input border-select"
+					label="Tím"
+					variant="solo"
+				></v-select>
+				<v-textarea 
+					label="Popis"
+					class="modal-input" 
+					variant="solo"
+				></v-textarea>
+				<A-files-upload @files-uploaded="filesUploaded"/>
 			</v-card-actions>
 
 			<v-btn class="z-btn" @click="createMasterTask()">VYTVORIŤ</v-btn>
@@ -50,19 +61,27 @@
 </template>
 
 <script>
-import Datepicker from '@vuepic/vue-datepicker'
+import Datepicker 	from '@vuepic/vue-datepicker'
+import AFilesUpload from '@/plugins/app/_components/a-files-upload.vue'
 
 export default {
-	props: ['visible'],
-
 	components: {
-		Datepicker
-	},	
+		Datepicker,
+		AFilesUpload
+	},
+
+	props: {
+		visible: {
+			type: Boolean,
+			required: true
+		}
+	},
 
 	data() {
 		return {
 			date: '',
-			dateFormat: 'dd.MM.yyyy, HH:mm'
+			dateFormat: 'dd.MM.yyyy, HH:mm',
+			preventInputFocus: false
 		}
 	},
 
@@ -76,6 +95,24 @@ export default {
 				this.$toast.error(error.response.data.error)
 			}
 		},
+
+		// Vuetify input was automatically focus after date input was clicked. This will prevent this unwanted behavior
+		onDateFocus($event) {
+			if ($event == undefined) {
+				this.preventInputFocus = true
+			}
+		},
+
+		onInputFocus($event) {
+			if (this.preventInputFocus) {
+				$event.target.blur()
+				this.preventInputFocus = false
+			}
+		},
+
+		filesUploaded(files) {
+			console.log(files.length)
+		}
 	},
 
 	computed: {
@@ -103,7 +140,6 @@ export default {
 	flex: 1 1 100%
 	margin: 10px 0
 	overflow-y: scroll
-	justify-content: flex-end
 
 .z-btn
 	height: 50px
diff --git a/app/src/plugins/app/_components/a-team-form-modal.vue b/app/src/plugins/app/_components/a-team-form-modal.vue
index 3869431..ec93593 100644
--- a/app/src/plugins/app/_components/a-team-form-modal.vue
+++ b/app/src/plugins/app/_components/a-team-form-modal.vue
@@ -34,7 +34,7 @@
 							class="modal-input"
 							disabled
 							label="Zamestanec"
-							variant="outlined"
+							variant="solo"
 							v-model="team.employees[index]._fullName"
 						>
 						</v-text-field>
diff --git a/app/src/plugins/app/_components/a-team-modal.vue b/app/src/plugins/app/_components/a-team-modal.vue
index b4312d3..2ee375b 100644
--- a/app/src/plugins/app/_components/a-team-modal.vue
+++ b/app/src/plugins/app/_components/a-team-modal.vue
@@ -1,7 +1,7 @@
 <template>
 	<v-dialog v-model="show" max-width="650" max-height="90%" height="700px">
-		<W-loadable :content="employees" class="h-100">
-			<v-card v-if="employees" height="100%" class="d-flex flex-column">
+		<W-loadable :content="allEmployees" class="h-100">
+			<v-card height="100%" class="d-flex flex-column">
 				<div class="d-flex justify-space-between align-center modal-header">
 					<h1>Vytvoriť tím</h1>
 					<v-icon
@@ -27,15 +27,15 @@
 
 					<div
 						class="employee-position w-100"
-						v-for="(employee, index) in selectedEmployees"
+						v-for="(employee, index) in team.employees"
 						:key="employee.id"
 					>
 						<v-text-field
 							class="modal-input"
 							disabled
 							label="Zamestanec"
-							variant="outlined"
-							v-model="selectedEmployees[index]._fullName"
+							variant="solo"
+							v-model="team.employees[index]._fullName"
 						>
 						</v-text-field>
 						<v-icon
@@ -48,6 +48,7 @@
 
 					<W-autocomplete
 						:options="employeesOptions"
+						:validations="v$.team.employees"
 						class="modal-input"
 						@option-selected="employeeSelected"
 					/>
@@ -62,24 +63,38 @@
 <script>
 import WAutocomplete 	from './w-autocomplete.vue'
 import useVuelidate		from '@vuelidate/core'
-import { required } 	from '@vuelidate/validators'
+import { required, minLength } 	from '@vuelidate/validators'
 import errorUtils 		from '@/plugins/lib@auth/_utils/error.utils'
 
+const atLeastOne = (value) => value.length
+
 export default {
 	components: {
 		WAutocomplete,
 	},
 
-	props: ['visible'],
+	props: {
+		visible: {
+			type: Boolean,
+			required: true
+		},
+
+		teamId: {
+			type: Number || null,
+			required: false,
+			default: null
+		}
+	},
 
 	data() {
 		return {
-			selectedEmployee: '',
-			selectedEmployees: [],
-			employees: null,
+			allEmployees: null,
 			v$: useVuelidate(),
 			errorUtils,
-			team: {},
+			team: {
+				name: '',
+				employees: []
+			},
 		}
 	},
 
@@ -87,31 +102,45 @@ export default {
 		return {
 			team: {
 				name: { required },
+				employees: { atLeastOne }
 			},
 		}
 	},
 
 	async created() {
 		try {
-			this.employees = await this.$axios.get_auth_data('v1/employees')
+			const allEmployees = await this.$axios.get_auth_data('v1/employees')
+			this.allEmployees = this._enrichEmployeesByFullName(allEmployees)
 		} catch (error) {
 			console.log(error)
 		}
+
+		if (this.teamId) {
+			try {
+				const team = await this.$axios.get_auth_data(`v1/teams/${this.teamId}`)
+				team.employees = this._enrichEmployeesByFullName(this.team.employees)
+
+				this.team = team
+
+			} catch (error) {
+				console.log(error)
+			}
+
+		}
 	},
 
 	methods: {
 		removeInput(index) {
-			this.selectedEmployees.splice(index, 1)
+			this.team.employees.splice(index, 1)
 		},
 
 		employeeSelected(selectedOption) {
-			const employee = this.employees.find((empl) => empl.id == selectedOption.key)
-			employee._fullName = `${employee.name} ${employee.surname}`
-
-			this.selectedEmployees.push(employee)
+			const employee = this.allEmployees.find((empl) => empl.id == selectedOption.key)
+			this.team.employees.push(employee)
 		},
 
 		async createTeam() {
+			console.log(this.team)
 			if (!(await this.v$.$validate())) return console.log(this.v$)
 
 			try {
@@ -122,14 +151,21 @@ export default {
 				this.$toast.error(error.response.data.error)
 			}
 		},
+
+		_enrichEmployeesByFullName(employees) {
+			return employees.map(employee => {
+				employee._fullName = `${employee.name} ${employee.surname}`
+				return employee
+			})
+		}
 	},
 
 	computed: {
 		employeesOptions() {
-			const selectedEmployeesIds = this.selectedEmployees.map(
+			const selectedEmployeesIds = this.team.employees.map(
 				(employee) => employee.id
 			)
-			const employees = this.employees.filter(
+			const employees = this.allEmployees.filter(
 				(employee) => !selectedEmployeesIds.includes(employee.id)
 			)
 
@@ -150,19 +186,7 @@ export default {
 				if (!value) this.$emit('close')
 			},
 		},
-	},
-
-	watch: {
-		selectedEmployee() {
-			const selectedEmployee = this.selectedEmployee.split(' ')
-
-			const employee = this.employees.find(
-				(e) => e.name == selectedEmployee[0] && e.surname == selectedEmployee[1]
-			)
-
-			this.selectedEmployees.push(JSON.parse(JSON.stringify(employee)))
-		},
-	},
+	}
 }
 </script>
 
diff --git a/app/src/plugins/app/_components/w-autocomplete.vue b/app/src/plugins/app/_components/w-autocomplete.vue
index e5f1c63..1e0c7a6 100644
--- a/app/src/plugins/app/_components/w-autocomplete.vue
+++ b/app/src/plugins/app/_components/w-autocomplete.vue
@@ -2,9 +2,15 @@
 	<div class="wrapper">
 		<v-text-field
 			label="Vyhľadať zamestnanca"
-			variant="outlined"
+			variant="solo"
 			v-model="search"
 			@keydown.enter="optionSelected()"
+			:class="{ error: validations?.$errors?.length }"
+			:hint="
+				validations?.$errors
+					? errorUtils.parseErrors(validations?.$errors)
+					: null
+			"
 		/>
 
 		<div class="suggestion" v-if="suggestion">
@@ -15,6 +21,8 @@
 </template>
 
 <script>
+import errorUtils 		from '@/plugins/lib@auth/_utils/error.utils'
+
 export default {
 	emits: ['option-selected'],
 
@@ -22,11 +30,17 @@ export default {
 		options: {
 			type: Array,
 			required: true
+		},
+
+		validations: {
+			type: Object || null,
+			required: false
 		}
 	},
 
 	data() {
 		return {
+			errorUtils,
 			search: ''
 		}
 	},
@@ -84,7 +98,7 @@ export default {
 
 	.suggestion
 		position: absolute
-		top: 15.5px
+		top: 27px
 		left: 15.5px
 		opacity: 0.5
 		letter-spacing: 0.009375em
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 8e28cac..fd949a2 100644
--- a/app/src/plugins/app/_layout/app/_components/a-header.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-header.vue
@@ -43,7 +43,7 @@
 					<v-list class="text-center">
 						<v-list-item class="cursor-pointer hover-background">Working hours </v-list-item>
 						<v-list-item>
-							<v-btn class="button">Odhlásiť sa</v-btn>
+							<v-btn class="button" @click="logOut()">Odhlásiť sa</v-btn>
 						</v-list-item>
 					</v-list>
 				</v-menu>
@@ -83,6 +83,18 @@ export default {
 		} catch (error) {
 			console.log(error)
 		}
+	},
+
+	methods: {
+		async logOut() {
+			try {
+				await this.$store.dispatch('wAuth/logout')
+				this.$router.push('/')
+				this.$toast.success('Boli ste odhlásený')
+			} catch (error) {
+				this.$toast.error(error.data.error)
+			}
+		}
 	}
 }
 </script>
diff --git a/app/src/plugins/app/_theme/date-picker.sass b/app/src/plugins/app/_theme/date-picker.sass
index 3a651b3..1abb3b5 100644
--- a/app/src/plugins/app/_theme/date-picker.sass
+++ b/app/src/plugins/app/_theme/date-picker.sass
@@ -1,6 +1,6 @@
 .dp__input
 	height: 56px
-	border: 1px solid #ABABAB !important
+	border: 1px solid #E5E5E5 !important
 
 .dp__range_end, .dp__range_start, .dp__active_date
 	background: #7F39FB !important
diff --git a/app/src/plugins/app/_theme/global.sass b/app/src/plugins/app/_theme/global.sass
index 735d982..2b1b72e 100644
--- a/app/src/plugins/app/_theme/global.sass
+++ b/app/src/plugins/app/_theme/global.sass
@@ -24,4 +24,12 @@ th
 	cursor: pointer
 
 .hover-background:hover
-	background-color: rgba(0, 0, 0, var(--v-hover-opacity))
\ No newline at end of file
+	background-color: rgba(0, 0, 0, var(--v-hover-opacity))
+
+.v-input__control
+	border-radius: 4px
+
+.border-select .v-input__control
+	border: 1px solid #E5E5E5 !important
+
+	
\ No newline at end of file
diff --git a/app/src/plugins/app/_theme/vuetify/v-dialog.sass b/app/src/plugins/app/_theme/vuetify/v-dialog.sass
index e727cf4..1314904 100644
--- a/app/src/plugins/app/_theme/vuetify/v-dialog.sass
+++ b/app/src/plugins/app/_theme/vuetify/v-dialog.sass
@@ -1,4 +1,4 @@
 .v-dialog
 	h1
-		font-size: 22px
-		font-weight: 300
\ No newline at end of file
+		font-size: 26px
+		font-weight: 500
\ No newline at end of file