diff --git a/public/0.js b/public/0.js
index 39c516a5..d903661c 100644
--- a/public/0.js
+++ b/public/0.js
@@ -210,7 +210,7 @@ __webpack_require__.r(__webpack_exports__);
 
 exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.WM-Border[data-v-308d838e] {\n    border: 1px solid;\n}\n.WM-Border-Black[data-v-308d838e] {\n  border-color: #2f353b !important;\n}\n.WM-Border-Gray[data-v-308d838e] {\n  border-color: #aaa !important;\n}\n.WM-Color-LightGrey[data-v-308d838e] {\n  background-color : #F5F5F5;\n}\n.WM-Relative[data-v-308d838e] {\n    position: relative;\n}\n.v-btn--top.v-btn--absolute.v-btn--small[data-v-308d838e] {\n    top: -25px !important;\n}\n", ""]);
+exports.push([module.i, "\n.WM-Border[data-v-308d838e] {\r\n    border: 1px solid;\n}\n.WM-Border-Black[data-v-308d838e] {\r\n  border-color: #2f353b !important;\n}\n.WM-Border-Gray[data-v-308d838e] {\r\n  border-color: #aaa !important;\n}\n.WM-Color-LightGrey[data-v-308d838e] {\r\n  background-color : #F5F5F5;\n}\n.WM-Relative[data-v-308d838e] {\r\n    position: relative;\n}\n.v-btn--top.v-btn--absolute.v-btn--small[data-v-308d838e] {\r\n    top: -25px !important;\n}\r\n", ""]);
 
 
 
diff --git a/public/1.js b/public/1.js
index f9429ac3..ce9ff146 100644
--- a/public/1.js
+++ b/public/1.js
@@ -137,7 +137,7 @@ __webpack_require__.r(__webpack_exports__);
 
 exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.WM-ActionButton[data-v-1305c16e] {\n  padding : 8px 22px;\n}\n\n", ""]);
+exports.push([module.i, "\n.WM-ActionButton[data-v-1305c16e] {\r\n  padding : 8px 22px;\n}\r\n\r\n", ""]);
 
 
 
diff --git a/public/2.js b/public/2.js
index 632dcde4..6accb5ec 100644
--- a/public/2.js
+++ b/public/2.js
@@ -423,7 +423,7 @@ __webpack_require__.r(__webpack_exports__);
 
 exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n.WM-Border-Gray[data-v-d05735bc] {\n  border-color: #aaa !important;\n}\n.WM-Color-LightGrey[data-v-d05735bc] {\n  background-color : #F5F5F5;\n}\n.v-btn--top.v-btn--absolute.v-btn--small[data-v-d05735bc] {\n    top: -25px !important;\n}\n.v-btn--bottom.v-btn--absolute.v-btn--small[data-v-d05735bc] {\n    bottom: -24px !important;\n}\n", ""]);
+exports.push([module.i, "\n.WM-Border-Gray[data-v-d05735bc] {\r\n  border-color: #aaa !important;\n}\n.WM-Color-LightGrey[data-v-d05735bc] {\r\n  background-color : #F5F5F5;\n}\n.v-btn--top.v-btn--absolute.v-btn--small[data-v-d05735bc] {\r\n    top: -25px !important;\n}\n.v-btn--bottom.v-btn--absolute.v-btn--small[data-v-d05735bc] {\r\n    bottom: -24px !important;\n}\r\n", ""]);
 
 
 
diff --git a/public/vue/js/app.js b/public/vue/js/app.js
index 1ca704ce..79cfd046 100644
--- a/public/vue/js/app.js
+++ b/public/vue/js/app.js
@@ -2179,6 +2179,7 @@ module.exports = {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _services__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @/services */ "./resources/js/vue/services/index.js");
+/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! vuex */ "./node_modules/vuex/dist/vuex.esm.js");
 //
 //
 //
@@ -2194,12 +2195,12 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 
+
 /* harmony default export */ __webpack_exports__["default"] = ({
   data: function data() {
-    return {
-      loggedIn: !!_services__WEBPACK_IMPORTED_MODULE_0__["TokenService"].getToken()
-    };
-  }
+    return {};
+  },
+  computed: Object(vuex__WEBPACK_IMPORTED_MODULE_1__["mapState"])('auth', ['accessToken'])
 });
 
 /***/ }),
@@ -2325,14 +2326,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         to: '/submit-test-result',
         icon: 'done',
         text: 'Submit Test Result'
-      }, {
-        to: '/login',
-        icon: 'input',
-        text: 'Login'
-      }, {
-        to: '/register',
-        icon: 'fas fa-plus',
-        text: 'Register'
       }],
       responsive: false
     };
@@ -2719,9 +2712,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 //
 //
 //
-//
-//
-//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   data: function data() {
@@ -2744,10 +2734,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
   beforeDestroy: function beforeDestroy() {
     window.removeEventListener('resize', this.onResponsiveInverted);
   },
-  methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapMutations"])('app', ['setDrawer', 'toggleDrawer']), {
+  methods: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapMutations"])('app', ['setDrawer', 'toggleDrawer']), Object(vuex__WEBPACK_IMPORTED_MODULE_0__["mapActions"])('auth', ['logout']), {
     onClickBtn: function onClickBtn() {
       this.setDrawer(!this.$store.state.app.drawer);
     },
+    submitLogout: function submitLogout() {
+      this.logout();
+    },
     onClick: function onClick() {//
     },
     onResponsiveInverted: function onResponsiveInverted() {
@@ -8136,7 +8129,7 @@ exports.push([module.i, "/*!\n* Vuetify v1.5.11\n* Forged by John Leider\n* Rele
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n#core-footer {\n  z-index: 0;\n}\n", ""]);
+exports.push([module.i, "\n#core-footer {\r\n  z-index: 0;\n}\r\n", ""]);
 
 
 
@@ -8151,7 +8144,7 @@ exports.push([module.i, "\n#core-footer {\n  z-index: 0;\n}\n", ""]);
 
 exports = module.exports = __webpack_require__(/*! ../../../../../node_modules/css-loader/dist/runtime/api.js */ "./node_modules/css-loader/dist/runtime/api.js")(false);
 // Module
-exports.push([module.i, "\n#core-toolbar a {\n  text-decoration: none;\n}\n", ""]);
+exports.push([module.i, "\n#core-toolbar a {\n  text-decoration: none;\n}\n.Pointer {\n    cursor: pointer;\n}\n", ""]);
 
 
 
@@ -14351,9 +14344,9 @@ var render = function() {
     [
       _c("core-modal"),
       _vm._v(" "),
-      _vm.loggedIn ? _c("core-toolbar") : _vm._e(),
+      _vm.accessToken ? _c("core-toolbar") : _vm._e(),
       _vm._v(" "),
-      _vm.loggedIn ? _c("core-drawer") : _vm._e(),
+      _vm.accessToken ? _c("core-drawer") : _vm._e(),
       _vm._v(" "),
       _c("core-view")
     ],
@@ -14901,21 +14894,6 @@ var render = function() {
                   })
                 : _vm._e(),
               _vm._v(" "),
-              _c(
-                "router-link",
-                {
-                  directives: [{ name: "ripple", rawName: "v-ripple" }],
-                  staticClass: "toolbar-items",
-                  attrs: { to: "/" }
-                },
-                [
-                  _c("v-icon", { attrs: { color: "tertiary" } }, [
-                    _vm._v("mdi-view-dashboard")
-                  ])
-                ],
-                1
-              ),
-              _vm._v(" "),
               _c(
                 "v-menu",
                 {
@@ -14999,6 +14977,25 @@ var render = function() {
                   ])
                 ],
                 1
+              ),
+              _vm._v(" "),
+              _c(
+                "v-badge",
+                {
+                  directives: [{ name: "ripple", rawName: "v-ripple" }],
+                  staticClass: "toolbar-items Pointer",
+                  nativeOn: {
+                    click: function($event) {
+                      return _vm.submitLogout($event)
+                    }
+                  }
+                },
+                [
+                  _c("v-icon", { attrs: { color: "tertiary" } }, [
+                    _vm._v("input")
+                  ])
+                ],
+                1
               )
             ],
             1
@@ -60989,8 +60986,8 @@ var UserService = {
                   grant_type: 'password'
                 },
                 auth: {
-                  username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
-                  password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
+                  username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
+                  password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
                 }
               };
               _context.prev = 1;
@@ -61005,7 +61002,7 @@ var UserService = {
               //       but don't worry about this just yet - I'll come back to it later
 
               _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].mount401Interceptor();
-              return _context.abrupt("return", response.data.access_token);
+              return _context.abrupt("return", response.data.token);
 
             case 12:
               _context.prev = 12;
@@ -61049,8 +61046,8 @@ var UserService = {
                   cell_number: cell_number
                 },
                 auth: {
-                  username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
-                  password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
+                  username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
+                  password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
                 }
               };
               _context2.prev = 1;
@@ -61104,8 +61101,8 @@ var UserService = {
                   verifyCode: _verifyCode
                 },
                 auth: {
-                  username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
-                  password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
+                  username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
+                  password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
                 }
               };
               _context3.prev = 1;
@@ -61158,8 +61155,8 @@ var UserService = {
                   refresh_token: refreshToken
                 },
                 auth: {
-                  username: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
-                  password: Object({"MIX_PUSHER_APP_KEY":"","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
+                  username: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_ID,
+                  password: Object({"MIX_APP_ROOT_API":"https://www.cssd-doc.com/api/","MIX_PUSHER_APP_CLUSTER":"mt1","MIX_PUSHER_APP_KEY":"","NODE_ENV":"development"}).VUE_APP_CLIENT_SECRET
                 }
               };
               _context4.prev = 2;
@@ -61172,7 +61169,7 @@ var UserService = {
               _storage_service__WEBPACK_IMPORTED_MODULE_2__["TokenService"].saveRefreshToken(response.data.token); // Update the header in ApiService
 
               _api_service__WEBPACK_IMPORTED_MODULE_1__["default"].setHeader();
-              return _context4.abrupt("return", response.data.access_token);
+              return _context4.abrupt("return", response.data.token);
 
             case 12:
               _context4.prev = 12;
@@ -61922,7 +61919,7 @@ module.exports = webpackAsyncContext;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-module.exports = __webpack_require__(/*! /home/saeid/Projects/Git/CSSD/resources/js/vue/main.js */"./resources/js/vue/main.js");
+module.exports = __webpack_require__(/*! D:\Atom\Git\Laravel_CSSD\resources\js\vue\main.js */"./resources/js/vue/main.js");
 
 
 /***/ })
diff --git a/resources/js/vue/App.vue b/resources/js/vue/App.vue
index a72017f6..0193e59f 100644
--- a/resources/js/vue/App.vue
+++ b/resources/js/vue/App.vue
@@ -4,9 +4,9 @@
 
     <core-modal />
 
-    <core-toolbar v-if="loggedIn" />
+    <core-toolbar v-if="accessToken" />
 
-    <core-drawer v-if="loggedIn" />
+    <core-drawer v-if="accessToken" />
 
     <core-view />
   </v-app>
@@ -14,13 +14,14 @@
 
 <script>
     import { TokenService } from '@/services';
+    import { mapState } from 'vuex';
 
     export default {
         data() {
           return {
-            loggedIn : !!TokenService.getToken(),
           };
         },
+        computed: mapState('auth', ['accessToken']),
 
     }
 </script>
@@ -29,7 +30,6 @@
 @import '@/styles/index.scss';
 @import '@/styles/css/Assets/Main.scss';
 @import '@/styles/css/Assets/WM-ModernTheme.scss';
-// @import '@/fontello/fontello-embedded.scss';
 
 /* Remove in 1.2 */
 .v-datatable thead th.column.sortable i {
diff --git a/resources/js/vue/components/core/Drawer.vue b/resources/js/vue/components/core/Drawer.vue
index a3470d77..76473a9b 100644
--- a/resources/js/vue/components/core/Drawer.vue
+++ b/resources/js/vue/components/core/Drawer.vue
@@ -116,16 +116,6 @@ export default {
         icon: 'done',
         text: 'Submit Test Result'
       },
-      {
-        to: '/login',
-        icon: 'input',
-        text: 'Login'
-      },
-      {
-        to: '/register',
-        icon: 'fas fa-plus',
-        text: 'Register'
-      },
     ],
     responsive: false
   }),
diff --git a/resources/js/vue/components/core/Toolbar.vue b/resources/js/vue/components/core/Toolbar.vue
index 86bc08f1..452dab75 100644
--- a/resources/js/vue/components/core/Toolbar.vue
+++ b/resources/js/vue/components/core/Toolbar.vue
@@ -37,13 +37,7 @@
           hide-details
           color="purple"
         />
-        <router-link
-          v-ripple
-          class="toolbar-items"
-          to="/"
-        >
-          <v-icon color="tertiary">mdi-view-dashboard</v-icon>
-        </router-link>
+
         <v-menu
           bottom
           left
@@ -87,6 +81,9 @@
         >
           <v-icon color="tertiary">mdi-account</v-icon>
         </router-link>
+        <v-badge v-ripple class="toolbar-items Pointer" @click.native="submitLogout" >
+          <v-icon color="tertiary">input</v-icon>
+        </v-badge>
       </v-flex>
     </v-toolbar-items>
   </v-toolbar>
@@ -95,7 +92,7 @@
 <script>
 
 import {
-  mapMutations
+  mapMutations, mapActions
 } from 'vuex'
 
 export default {
@@ -128,9 +125,13 @@ export default {
 
   methods: {
     ...mapMutations('app', ['setDrawer', 'toggleDrawer']),
+    ...mapActions('auth', ['logout']),
     onClickBtn () {
       this.setDrawer(!this.$store.state.app.drawer)
     },
+    submitLogout () {
+      this.logout();
+    },
     onClick () {
       //
     },
@@ -151,4 +152,7 @@ export default {
   #core-toolbar a {
     text-decoration: none;
   }
+  .Pointer {
+      cursor: pointer;
+  }
 </style>
diff --git a/resources/js/vue/services/auth/user.service.js b/resources/js/vue/services/auth/user.service.js
index fad1ee95..0c0ff24c 100644
--- a/resources/js/vue/services/auth/user.service.js
+++ b/resources/js/vue/services/auth/user.service.js
@@ -42,8 +42,7 @@ const UserService = {
             // NOTE: We haven't covered this yet in our ApiService
             //       but don't worry about this just yet - I'll come back to it later
             ApiService.mount401Interceptor();
-
-            return response.data.access_token;
+            return response.data.token;
         } catch (error) {
             throw new AuthenticationError(error.response.status, error.response.data.detail);
         }
@@ -132,7 +131,7 @@ const UserService = {
             // Update the header in ApiService
             ApiService.setHeader()
 
-            return response.data.access_token
+            return response.data.token
         } catch (error) {
             throw new AuthenticationError(error.response.status, error.response.data.detail)
         }
diff --git a/resources/js/vue/store/modules/auth/mutations.js b/resources/js/vue/store/modules/auth/mutations.js
index 2e4828cf..3708c22f 100644
--- a/resources/js/vue/store/modules/auth/mutations.js
+++ b/resources/js/vue/store/modules/auth/mutations.js
@@ -6,7 +6,7 @@ export default {
     },
 
     loginSuccess(state, accessToken) {
-        state.accessToken = accessToken
+        state.accessToken = accessToken;
         state.authenticating = false;
     },