diff --git a/frontend/components/TaskDialog.vue b/frontend/components/TaskDialog.vue
index 275cc38..97386d2 100644
--- a/frontend/components/TaskDialog.vue
+++ b/frontend/components/TaskDialog.vue
@@ -1,15 +1,87 @@
 <template>
-	<v-dialog v-model="showDialog" max-width="600px" persistent>
+	<v-dialog
+		v-model="showDialog"
+		max-width="600px"
+		persistent
+		@keydown.esc="closeDialog"
+	>
 		<v-card>
 			<v-card-title>
 				{{ task ? 'Edit Task' : 'New Task' }}
 			</v-card-title>
+			<v-card-text>
+				<v-form ref="formRef" lazy-validation>
+					<v-text-field
+						autofocus
+						v-model="formData.description"
+						label="Description*"
+						:rules="requiredRules"
+						required
+					/>
+					<v-combobox
+						v-model="formData.project"
+						:items="projects"
+						hide-selected
+						label="Project"
+					/>
+					<v-text-field
+						v-model="formData.due"
+						:label="recur ? 'Due*' : 'Due'"
+						:rules="recur ? requiredRules : []"
+						:required="recur"
+					/>
+					<v-text-field
+						v-model="formData.wait"
+						label="Wait"
+					/>
+					<v-text-field
+						v-model="formData.until"
+						label="Until"
+					/>
+					<v-combobox
+						v-model="formData.tags"
+						:items="tags"
+						hide-selected
+						small-chips
+						multiple
+						label="Tags"
+						hint="Press tab or enter to add new tags"
+					/>
+					<v-radio-group v-model="formData.priority" row hide-details class="align-center">
+						<template v-slot:prepend>
+							<span class="mr-3 subtitle-1">
+								Priority
+							</span>
+						</template>
+						<v-radio
+							v-for="p in priorities"
+							:key="p.text"
+							:label="p.text"
+							:value="p.value"
+						/>
+					</v-radio-group>
+					<v-row class="px-3">
+						<v-checkbox v-model="recur" class="mr-3" label="Recur" />
+						<v-text-field
+							label="period*"
+							v-model="formData.recur"
+							:rules="recur ? requiredRules : []"
+							:required="recur"
+							:disabled="!recur"
+						/>
+					</v-row>
+				</v-form>
+			</v-card-text>
+
 			<v-card-actions>
 				<v-spacer />
-				<v-btn text @click="cloesDialog">
+				<v-btn text @click="closeDialog" width="80px">
 					Cancel
 				</v-btn>
-				<v-btn color="primary" @click="submit">
+				<v-btn @click="reset" width="80px">
+					Reset
+				</v-btn>
+				<v-btn color="primary" @click="submit" width="80px">
 					Submit
 				</v-btn>
 			</v-card-actions>
@@ -18,7 +90,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, reactive, ref } from '@vue/composition-api';
+import { defineComponent, watch, computed, ref } from '@vue/composition-api';
 import { Task } from 'taskwarrior-lib';
 
 interface Props {
@@ -39,20 +111,94 @@ export default defineComponent({
 		}
 	},
 	setup(props: Props, context) {
+		const projects = computed(() => context.root.$store.getters.projects);
+		const tags = computed(() => context.root.$store.getters.tags);
+
 		const showDialog = computed({
 			get: () => props.value,
 			set: val => context.emit('input', val)
 		});
-		const cloesDialog = () => {
-			showDialog.value = false;
-		};
-		const submit = () => {
-			// TODO: submit
-			cloesDialog();
+
+		const requiredRules = [
+			(str: string) => Boolean(str) || 'Required'
+		];
+
+		const recur = ref(Boolean(props.task?.recur));
+		const formData = ref({
+			description: '',
+			project: '',
+			due: '',
+			until: '',
+			wait: '',
+			tags: [] as string[],
+			priority: 'N',
+			recur: '',
+			...props.task
+		});
+
+		const reset = () => {
+			formData.value = {
+				description: '',
+				project: '',
+				due: '',
+				until: '',
+				wait: '',
+				tags: [] as string[],
+				priority: 'N',
+				recur: '',
+				...props.task
+			};
+			recur.value = Boolean(props.task?.recur);
+			(formRef.value as any).resetValidation();
 		};
 
+		watch(() => props.task, () => {
+			reset();
+		});
+
+		const formRef = ref(null);
+
+		const closeDialog = () => {
+			showDialog.value = false;
+			reset();
+		};
+		const submit = async () => {
+			const valid = (formRef.value as any).validate();
+			if (valid) {
+				await context.root.$store.dispatch('updateTasks', [{
+					...formData.value,
+					project: formData.value.project || undefined,
+					due: formData.value.due || undefined,
+					until: formData.value.until || undefined,
+					wait: formData.value.wait || undefined,
+					priority: formData.value.priority === 'N' ? undefined : formData.value.priority,
+					recur: recur.value ? formData.value.recur : undefined
+				}]);
+				context.root.$store.commit('setNotification', {
+					color: 'success',
+					text: `Successfully ${props.task ? 'update' : 'create'} the task`
+				});
+				closeDialog();
+			}
+		};
+
+		const priorities = [
+			{ text: 'None', value: 'N' },
+			{ text: 'Low', value: 'L' },
+			{ text: 'Medium', value: 'M' },
+			{ text: 'High', value: 'H' }
+		];
+
 		return {
-			cloesDialog,
+			requiredRules,
+			formRef,
+			tags,
+			projects,
+			priorities,
+			recur,
+			formData,
+			closeDialog,
+			reset,
 			submit,
 			showDialog
 		};
diff --git a/frontend/components/TaskList.vue b/frontend/components/TaskList.vue
index 5bb39b2..16aaafb 100644
--- a/frontend/components/TaskList.vue
+++ b/frontend/components/TaskList.vue
@@ -2,7 +2,7 @@
 	<div>
 		<TaskDialog v-model="showTaskDialog" :task="currentTask" />
 
-		<v-btn-toggle v-model="status" mandatory>
+		<v-btn-toggle v-model="status" mandatory background-color="rgba(0, 0, 0, 0)">
 			<v-row class="pa-3">
 				<v-btn
 					v-for="st in allStatus"
@@ -20,9 +20,9 @@
 					</v-icon>
 					{{ st }}
 					<v-badge
-						v-if="st === 'pending'"
+						v-if="st === 'pending' && classifiedTasks[st].length"
 						:content="classifiedTasks[st].length"
-						:color="st === status ? 'primary' : 'grey darken-1'"
+						:color="st === status ? 'primary' : 'grey'"
 						inline
 					/>
 				</v-btn>
@@ -33,6 +33,7 @@
 			:items="classifiedTasks[status]"
 			:headers="headers"
 			show-select
+			item-key="uuid"
 			v-model="selected"
 			class="elevation-1"
 		>
@@ -47,9 +48,22 @@
 							small
 							dark
 							title="Done"
+							@click="completeTasks(selected)"
 						>
 							<v-icon>mdi-check</v-icon>
 						</v-btn>
+						<v-btn
+							v-show="status === 'completed' || status === 'deleted'"
+							class="ma-1"
+							color="primary"
+							fab
+							dark
+							small
+							title="Restore"
+							@click="restoreTasks(selected)"
+						>
+							<v-icon>mdi-restore</v-icon>
+						</v-btn>
 						<v-btn
 							v-show="status !== 'deleted'"
 							class="ma-1 red"
@@ -89,17 +103,59 @@
 				</v-row>
 			</template>
 
+			<template v-if="status === 'waiting'" v-slot:item.wait="{ item }">
+				{{ displayDate(item.wait) }}
+			</template>
+			<template v-slot:item.due="{ item }">
+				{{ displayDate(item.due) }}
+			</template>
+			<template v-slot:item.until="{ item }">
+				{{ displayDate(item.until) }}
+			</template>
+
+			<template v-slot:item.tags="{ item }">
+				<v-chip
+					v-for="tag in item.tags"
+					:key="tag"
+					small
+				>
+					{{ tag }}
+				</v-chip>
+			</template>
+
 			<template v-slot:item.actions="{ item }">
 				<v-icon
-					small
-					class="mr-2"
+					v-show="status === 'pending'"
+					size="20px"
+					class="ml-2"
+					@click="completeTasks([item])"
+					title="Done"
+				>
+					mdi-check
+				</v-icon>
+				<v-icon
+					v-show="status === 'completed' || status === 'deleted'"
+					size="20px"
+					class="ml-2"
+					@click="restoreTasks([item])"
+					title="Restore"
+				>
+					mdi-restore
+				</v-icon>
+				<v-icon
+					class="ml-2"
+					size="20px"
 					@click="editTask(item)"
+					title="Edit"
 				>
 					mdi-pencil
 				</v-icon>
 				<v-icon
-					small
+					v-show="status !== 'deleted'"
+					class="ml-2"
+					size="20px"
 					@click="deleteTasks([item])"
+					title="Delete"
 				>
 					mdi-delete
 				</v-icon>
@@ -113,6 +169,11 @@ import { defineComponent, computed, reactive, ref, ComputedRef, Ref } from '@vue
 import { Task } from 'taskwarrior-lib';
 import _ from 'lodash';
 import TaskDialog from '../components/TaskDialog.vue';
+import moment from 'moment';
+
+function displayDate(str?: string) {
+	return str && moment(str).format('YYYY-MM-DD');
+}
 
 interface Props {
 	[key: string]: unknown,
@@ -127,15 +188,6 @@ export default defineComponent({
 	},
 
 	setup(props: Props, context) {
-		const headers = [
-			{ text: 'Project', value: 'project' },
-			{ text: 'Description', value: 'description' },
-			{ text: 'Priority', value: 'priority' },
-			{ text: 'Due', value: 'due' },
-			{ text: 'Tags', value: 'tags' },
-			{ text: 'Actions', value: 'actions', sortable: false }
-		];
-
 		const selected = ref([] as Task[]);
 
 		const status = ref('pending');
@@ -147,31 +199,76 @@ export default defineComponent({
 			deleted: 'mdi-delete',
 			recurring: 'mdi-restart'
 		};
+		const headers = computed(() => [
+			{ text: 'Project', value: 'project' },
+			{ text: 'Description', value: 'description' },
+			{ text: 'Priority', value: 'priority' },
+			...(status.value !== 'waiting'
+				? [{ text: 'Due', value: 'due' }]
+				: [{ text: 'Wait', value: 'wait' }]),
+			{ text: 'Until', value: 'until' },
+			{ text: 'Tags', value: 'tags' },
+			{ text: 'Actions', value: 'actions', sortable: false }
+		]);
 
 		const tempTasks: { [key: string]: ComputedRef<Task[]> } = {};
 		for (const status of allStatus) {
 			tempTasks[status] = computed((): Task[] => props.tasks?.filter(task => task.status === status));
 		}
 		const classifiedTasks = reactive(tempTasks);
+		console.log(tempTasks);
 
 		const refresh = () => {
 			context.root.$store.dispatch('fetchTasks');
 		};
 
 		const showTaskDialog = ref(false);
-		const currentTask: Ref<Task> = ref(null);
+		const currentTask: Ref<Task | null> = ref(null);
 		const newTask = () => {
 			showTaskDialog.value = true;
 			currentTask.value = null;
 		};
 
-		const editTask = (_task: Task) => {
-			// TODO
+		const editTask = (task: Task) => {
+			showTaskDialog.value = true;
+			currentTask.value = _.cloneDeep(task);
 		};
 
 		const deleteTasks = async (tasks: Task[]) => {
 			await context.root.$store.dispatch('deleteTasks', tasks);
-			_.remove(selected.value, task => tasks.findIndex(t => t.uuid === task.uuid) !== -1);
+			selected.value = selected.value.filter(task => tasks.findIndex(t => t.uuid === task.uuid) === -1);
+			context.root.$store.commit('setNotification', {
+				color: 'success',
+				text: 'Successfully delete the task(s)'
+			});
+		};
+
+		const completeTasks = async (tasks: Task[]) => {
+			await context.root.$store.dispatch('updateTasks', tasks.map(task => {
+				return {
+					...task,
+					status: 'completed'
+				};
+			}));
+			selected.value = selected.value.filter(task => tasks.findIndex(t => t.uuid === task.uuid) === -1);
+			context.root.$store.commit('setNotification', {
+				color: 'success',
+				text: 'Successfully complete the task(s)'
+			});
+		};
+
+		const restoreTasks = async (tasks: Task[]) => {
+			await context.root.$store.dispatch('updateTasks', tasks.map(task => {
+				return {
+					...task,
+					status: 'pending'
+				};
+			}));
+			selected.value = selected.value.filter(task => tasks.findIndex(t => t.uuid === task.uuid) === -1);
+			context.root.$store.commit('setNotification', {
+				color: 'success',
+				text: 'Successfully restore the task(s)'
+			});
 		};
 
 		return {
@@ -186,8 +283,11 @@ export default defineComponent({
 			currentTask,
 			editTask,
 			deleteTasks,
+			completeTasks,
+			restoreTasks,
 			showTaskDialog,
-			TaskDialog
+			TaskDialog,
+			displayDate
 		};
 	}
 });
diff --git a/frontend/layouts/default.vue b/frontend/layouts/default.vue
index c279018..b35c981 100644
--- a/frontend/layouts/default.vue
+++ b/frontend/layouts/default.vue
@@ -1,5 +1,24 @@
 <template>
 	<v-app>
+		<v-snackbar
+			v-model="snackbar"
+			:color="notification.color"
+			:timeout="4000"
+		>
+			{{ notification.text }}
+
+			<template v-slot:action="{ attrs }">
+				<v-btn
+					dark
+					text
+					v-bind="attrs"
+					@click="snackbar = false"
+				>
+					Close
+				</v-btn>
+			</template>
+		</v-snackbar>
+
 		<v-app-bar height="54px" fixed app>
 			<v-toolbar-title>
 				Taskwarrior WebUI
@@ -19,7 +38,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed } from '@vue/composition-api';
+import { defineComponent, computed, onErrorCaptured } from '@vue/composition-api';
 
 export default defineComponent({
 	setup(_props, context) {
@@ -29,8 +48,38 @@ export default defineComponent({
 				context.root.$vuetify.theme.dark = val;
 			}
 		});
+
+		const notification = computed(() => context.root.$store.state.notification);
+		const snackbar = computed({
+			get: () => context.root.$store.state.snackbar,
+			set: val => context.root.$store.commit('setSnackbar', val)
+		});
+
+		onErrorCaptured((err: any) => {
+			// axios error
+			let notification: any;
+			if (err?.response) {
+				const { status, data } = err.response!;
+				notification = {
+					color: 'error',
+					text: `Error ${status}: ${data}`
+				};
+			}
+			else {
+				const { name, message } = err as Error;
+				notification = {
+					color: 'error',
+					text: `Error ${name}: ${message}`
+				};
+			}
+			context.root.$store.commit('setNotification', notification);
+			return false;
+		});
+
 		return {
-			dark
+			dark,
+			snackbar,
+			notification
 		};
 	}
 });
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 619d301..854239f 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -7788,6 +7788,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "moment": {
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 742036b..f3f96b9 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -17,6 +17,7 @@
     "@nuxtjs/pwa": "^3.0.0-beta.20",
     "@vue/composition-api": "^1.0.0-beta.1",
     "lodash": "^4.17.15",
+    "moment": "^2.27.0",
     "nuxt": "^2.13.0",
     "nuxt-typed-vuex": "^0.1.19"
   },