diff --git a/README.md b/README.md
index 30034bd..7d1bf16 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,25 @@
 # QUIZ APP
+https://squiz-app.netlify.app/
+
+Tested with:
+
+Node v12.13.1
+
+Npm 6.12.1
 
 ## Project setup
 ```
-yarn install
+npm install
 ```
 
 ### Compiles and hot-reloads for development
 ```
-yarn serve
+npm run serve
 ```
 
 ### Compiles and minifies for production
 ```
-yarn build
-```
-
-### Lints and fixes files
-```
-yarn lint
+npm run build
 ```
 
 ### Customize configuration
diff --git a/src/views/auth/user/Form.vue b/src/views/auth/user/Form.vue
deleted file mode 100644
index 0254a1a..0000000
--- a/src/views/auth/user/Form.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <div>
-    <h1>User Form</h1>
-
-    <form class="login-form" @submit.prevent="registerUser">
-        <div class="mb-2">
-            <form-input
-                label="Full Name"
-                v-model:value="form.name"
-                type="text"
-                @validate="validate('name')"
-                name="name"
-                :error="errors.name"
-            ></form-input>
-        </div>
-        <div class="mb-2">
-            <form-input
-                label="Email Address"
-                v-model:value="form.email"
-                type="email"
-                @validate="validate('email')"
-                name="email"
-                :error="errors.email"
-            ></form-input>
-        </div>
-        <div class="mb-2">
-            <form-input
-                label="Password"
-                v-model:value="form.password"
-                type="password"
-                @validate="validate('password')"
-                name="password"
-                :error="errors.password"
-            ></form-input>
-        </div>
-
-        <div class="mb-2">
-            <form-select
-                :options="['go', 'python', 'rust', 'javascript']"
-                :default="'go'"
-                class="select"
-                @input="alert(displayToKey($event))"
-            >
-            </form-select>
-        </div>
-
-        <button class="btn btn-primary btn-block btn-sm">Submit</button>
-    </form>
-  </div>
-</template>
-
-<script>
-import { REGISTER } from "@/store/actions/type";
-import FormInput from "@/components/inputs/FormInput";
-import FormSelect from "@/components/inputs/FormSelect";
-import * as Yup from 'yup';
-
-const signUpFormSchema = Yup.object({
-    name: Yup.string().required(),
-    email: Yup.string().email().required(),
-    password: Yup.string().min(8).required(),
-})
-
-export default {
-    name: 'user-form',
-    components: {
-        "form-input": FormInput,
-        "form-select": FormSelect
-    },
-    data: () => ({
-        form: {
-            name: "",
-            email: "",
-            password: "",
-        },
-        errors: {
-            name: "",
-            email: "",
-            password: "",
-        }
-    }),
-    watch: {
-        "formErrors.errors": function(newQuestion) {
-            if (newQuestion.message) {
-                this.errors.name = newQuestion.name ? newQuestion.name[0] : "";
-                this.errors.email = newQuestion.email
-                    ? newQuestion.email[0]
-                    : "";
-                this.errors.password = newQuestion.password
-                    ? newQuestion.password[0]
-                    : "";
-                this.$toast.error(newQuestion.message[0]);
-                this.loading = false;
-            }
-        }
-    },
-    computed: {
-        formErrors() {
-            return this.$store.getters.formErrors;
-        }
-    },
-    methods: {
-        registerUser() {
-            this.loading = true
-
-            signUpFormSchema
-                .validate(this.form, { abortEarly: false })
-                .then(() => {
-                    this.loading = true
-
-                    this.$store
-                        .dispatch(REGISTER, this.form)
-                        .then((resp) => {
-                            this.$toast.success(resp)
-                            this.$router.push(`/`)
-                        })
-                        .catch(err => this.$toast.error(err))
-                })
-                .catch(err => {
-                    err.inner.forEach(error => {
-                        this.errors = { ...this.errors, [error.path]: error.message };
-                    });
-                });
-        },
-        validate(field) {
-            signUpFormSchema
-                .validateAt(field, this.form)
-                .then(() => {
-                    this.errors[field] = "";
-                })
-                .catch(err => {
-                    this.errors[err.path] = err.message;
-                });
-        }
-    },
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index 55d9e4a..3361da7 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -80,6 +80,7 @@
     methods: {
       getSummary() {
         this.loader = true
+        ApiService.setHeader()
         ApiService.get(`/dashboard-summary`)
             .then((resp) => {
               this.loading = false;
diff --git a/src/views/dashboard/pages/MCQ/MCQs.vue b/src/views/dashboard/pages/MCQ/MCQs.vue
index 31c3e49..c3fb379 100644
--- a/src/views/dashboard/pages/MCQ/MCQs.vue
+++ b/src/views/dashboard/pages/MCQ/MCQs.vue
@@ -32,19 +32,20 @@
         </thead>
 
         <tbody>
-          <tr v-for="mcq in list.data" :key="mcq.id">
-            <td>#{{ mcq.id }}</td>
-            <td>{{ mcq.question }}</td>
-            <td>{{ mcq.correct_answer }}</td>
-            <td>
-              {{moment(mcq.created_at).format('YYYY-MM-DD')}}
-            </td>
-            <td class="text-right">
-
-            </td>
-          </tr>
-
-
+          <template v-if="list.data && list.data.length > 0">
+            <tr v-for="mcq in list.data" :key="mcq.id">
+              <td>#{{ mcq.id }}</td>
+              <td>{{ mcq.question }}</td>
+              <td>{{ mcq.correct_answer }}</td>
+              <td>
+                {{moment(mcq.created_at).format('YYYY-MM-DD')}}
+              </td>
+              <td class="text-right"></td>
+            </tr>
+          </template>
+          <template v-else>
+            <tr><td colspan="5" class="text-center">No data found</td></tr>
+          </template>
         </tbody>
       </v-simple-table>
       <v-row justify="center">
@@ -89,6 +90,7 @@ export default {
       if(searchQuery) {
         searchQuery = `&${searchQuery}`;
       }
+      ApiService.setHeader()
       ApiService.get(`/mcq?page=${page}${searchQuery}&limit=${this.pagination.per_page}`).then(res => {
         this.list = res.data;
         this.pagination.current = res.data.meta.current_page;
diff --git a/src/views/dashboard/pages/Quiz/Attempts.vue b/src/views/dashboard/pages/Quiz/Attempts.vue
index 57f2473..5150bf2 100644
--- a/src/views/dashboard/pages/Quiz/Attempts.vue
+++ b/src/views/dashboard/pages/Quiz/Attempts.vue
@@ -27,22 +27,27 @@
         </thead>
 
         <tbody>
-          <tr v-for="attempt in list.data" :key="attempt.id">
-            <td>
-              <router-link :to="{name: 'TestResult', params: { id: attempt.id }}">#{{ attempt.id }}</router-link>
-            </td>
-            <td>{{ attempt.quiz.title }}</td>
-            <td>
-              {{ moment.utc(moment.duration(attempt.quiz.time_limit,'seconds').as('milliseconds')).format('HH:mm:ss') }}
-            </td>
-            <td>
-              {{ attempt.score + '%' }}
-            </td>
-            <td>{{moment(attempt.created_at).format('YYYY-MM-DD')}}</td>
-            <td class="text-right">
+          <template v-if="list.data && list.data.length > 0">
+            <tr v-for="attempt in list.data" :key="attempt.id">
+              <td>
+                <router-link :to="{name: 'TestResult', params: { id: attempt.id }}">#{{ attempt.id }}</router-link>
+              </td>
+              <td>{{ attempt.quiz.title }}</td>
+              <td>
+                {{ moment.utc(moment.duration(attempt.quiz.time_limit,'seconds').as('milliseconds')).format('HH:mm:ss') }}
+              </td>
+              <td>
+                {{ attempt.score + '%' }}
+              </td>
+              <td>{{moment(attempt.created_at).format('YYYY-MM-DD')}}</td>
+              <td class="text-right">
 
-            </td>
-          </tr>
+              </td>
+            </tr>
+          </template>
+          <template v-else>
+            <tr><td colspan="6" class="text-center">No data found</td></tr>
+          </template>
         </tbody>
       </v-simple-table>
 
diff --git a/src/views/dashboard/pages/Quiz/Quizzes.vue b/src/views/dashboard/pages/Quiz/Quizzes.vue
index a279dfd..aa4ce79 100644
--- a/src/views/dashboard/pages/Quiz/Quizzes.vue
+++ b/src/views/dashboard/pages/Quiz/Quizzes.vue
@@ -35,6 +35,7 @@
         </thead>
 
         <tbody>
+        <template v-if="list.data && list.data.length > 0">
           <tr v-for="quiz in list.data" :key="quiz.id">
             <td>{{ quiz.id }}</td>
             <td>
@@ -54,6 +55,10 @@
             </td>
             <td></td>
           </tr>
+        </template>
+        <template v-else>
+          <tr><td colspan="6" class="text-center">No data found</td></tr>
+        </template>
         </tbody>
       </v-simple-table>
 
diff --git a/src/views/guest/Login.vue b/src/views/guest/Login.vue
index 98f109d..d4a30a2 100644
--- a/src/views/guest/Login.vue
+++ b/src/views/guest/Login.vue
@@ -133,11 +133,11 @@ export default {
         this.$store.dispatch(LOGIN, {
           email: this.loginEmail, password: this.loginPassword
         }).then((resp) => {
-              // if (this.$route.query['redirect']) {
-              //   this.$router.push({ path: '/' + this.$route.query['redirect'] })
-              // } else {
+              if (this.$route.query['redirect']) {
+                window.location.href = window.location.origin + this.$route.query['redirect'];
+              } else {
                 this.$router.push({ name: 'Dashboard' })
-              // }
+              }
 
         }).catch((err) =>{
           this.$toastr.e('Wrong email or password!');