diff --git a/src/App.vue b/src/App.vue
index 5af3df8..114eb8c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,8 +4,8 @@
     <template v-if="!$route.meta.public">
       <v-app id="inspire" class="app">
         <app-drawer class="app--drawer"></app-drawer>
-        <app-toolbar class="app--toolbar">
-      </app-toolbar>
+        <!-- <app-toolbar class="app--toolbar">
+      </app-toolbar> -->
         <v-content>
           <!-- Page Header -->
           <page-header v-if="$route.meta.breadcrumb"></page-header>
diff --git a/src/components/AppToolbar.vue b/src/components/AppToolbar.vue
index 0a31454..4a6038d 100644
--- a/src/components/AppToolbar.vue
+++ b/src/components/AppToolbar.vue
@@ -7,17 +7,6 @@
     <v-toolbar-title class="ml-0 pl-3">
     <v-toolbar-side-icon @click.stop="handleDrawerToggle" class="hide"></v-toolbar-side-icon>
     </v-toolbar-title>
-    <v-flex xs6 sm3>
-      <v-text-field
-        flat
-        prepend-icon="search"
-        label="Find your user"
-        v-model="search"
-        color="black"
-        :search="search"
-      >
-      </v-text-field>
-    </v-flex>
       <v-spacer></v-spacer>
       <h5 class="white--text name">{{userName}}</h5>
       <v-menu offset-y origin="center center" :nudge-bottom="10" transition="scale-transition">
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 9ea4be9..a595f1e 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -1,5 +1,46 @@
 <template>
 <v-app id="pages-dasboard">
+  <!-- <app-toolbar class="app--toolbar">
+      </app-toolbar> -->
+  <v-toolbar
+    color="grey"
+    fixed
+    app
+  >
+    <v-toolbar-title class="ml-0 pl-3">
+    <v-toolbar-side-icon @click.stop="handleDrawerToggle" class="hide"></v-toolbar-side-icon>
+    </v-toolbar-title>
+    <v-flex xs6 sm3>
+      <v-text-field
+        flat
+        prepend-icon="search"
+        label="Find your user"
+        v-model="term"
+        color="black"
+        @change="getPatientList"
+      >
+      </v-text-field>
+    </v-flex>
+      <v-spacer></v-spacer>
+      <h5 class="white--text name">{{userName}}</h5>
+      <v-menu offset-y origin="center center" :nudge-bottom="10" transition="scale-transition">
+     <v-btn icon large flat slot="activator">
+          <v-avatar size="40px">
+           <img src="/static/icon/user.png"/>
+          </v-avatar>
+      </v-btn>
+        <v-list class="pa-0">
+          <v-list-tile v-for="(item,index) in items" :to="!item.href ? { name: item.name } : null" :href="item.href" @click="item.click" ripple="ripple" :disabled="item.disabled" :target="item.target" rel="noopener" :key="index">
+             <v-list-tile-action v-if="item.icon">
+              <v-icon>{{ item.icon }}</v-icon>
+            </v-list-tile-action>
+            <v-list-tile-content>
+              <v-list-tile-title>{{ item.title }}</v-list-tile-title>
+            </v-list-tile-content>
+          </v-list-tile>
+        </v-list> 
+      </v-menu>
+  </v-toolbar>
   <v-tabs grow slider-color="black">
     <v-tab
       ripple
@@ -418,12 +459,15 @@
 </template>
 
 <script>
+// import AppToolbar from '@/components/AppToolbar';
 import onemonth from "@/components/report/onemonth.vue";
 import threemonth from "@/components/report/threemonth.vue";
 import sixmonth from "@/components/report/sixmonth.vue";
 import ninemonth from "@/components/report/ninemonth.vue";
 import generatereport from "@/components/report/generatereport.vue";
 import http from "@/Services/http.js";
+import NotificationList from "@/components/widgets/list/NotificationList";
+import Util from "@/util";
 
 export default {
   components: {
@@ -432,7 +476,7 @@ export default {
     "six-month": sixmonth,
     "nine-month": ninemonth,
     "report-generate": generatereport,
-  },
+ },
   data: () => ({
     component: "report-generate",
     snackbar: false,
@@ -443,7 +487,7 @@ export default {
     text: "",
     loading: false,
     date:null,
-    search: "",
+    term: "",
     modal: false,
     modaledit:false,
     menu: false,
@@ -511,7 +555,35 @@ export default {
       lastname: "",
       email: "",
       dob: ""
-    }
+    },
+    userName:'',
+    items: [
+      {
+        // icon: 'account_circle',
+        href: "/changepassword",
+        title: "Change Password",
+        click: e => {
+          console.log(e);
+        }
+      },
+      // {
+      //   icon: 'settings',
+      //   href: '#',
+      //   title: 'Settings',
+      //   click: (e) => {
+      //     console.log(e);
+      //   }
+      // },
+      {
+        // icon: 'fullscreen_exit',
+        href: "#",
+        title: "Logout",
+        click: e => {
+          window.getApp.$emit("APP_LOGOUT");
+       //   this.$store.dispatch("setToken", null);
+        }
+      }
+    ]
   }),
   // computed: {
   //   pages () {
@@ -536,7 +608,7 @@ export default {
     getPatientList() {
       var token = this.$store.state.token;
       http()
-        .get("/patientList", { 
+        .get("/patientList?term=" + this.term, { 
           headers: { Authorization: "Bearer " + token } 
          })
         .then(response => {
@@ -687,16 +759,23 @@ export default {
            console.log(error);
         });
       this.close();
+    },
+    handleDrawerToggle() {
+      window.getApp.$emit("APP_DRAWER_TOGGLED");
+    },
+    handleFullScreen() {
+      Util.toggleFullScreen();
     }
   },
   mounted() {
     this.getPatientList();
+    this.userName = this.$store.state.name;
+  },
+  computed:{
+    toolbarColor() {
+      return this.$vuetify.options.extra.mainNav;
+    }
   }
-  //computed:{
-  //   color(){
-  //     return this.loading ? 'success' : ''
-  // }
-  //}
 };
 </script>
 <style scoped>
@@ -803,4 +882,30 @@ h5 {
     font-size: 13px;
 }
 }
+.v-icon{
+  font-size:30px;
+}
+@media screen and (min-width: 1270px){
+.hide{
+  display: none;
+}
+/* }
+@media screen and (max-width: 962px) {
+.imglogo{
+    position: absolute;
+    top: 13px;
+    left: 13px !important;
+    width: 70px;
+    height: 24px;
+} */
+}
+@media screen and (max-width: 420px){
+.v-list__tile {
+  font-size:14px;
+  padding: 0 10px;
+}
+.name{
+  font-size:15px; 
+}
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/Provider.vue b/src/pages/Provider.vue
index b4ed4bb..be28195 100644
--- a/src/pages/Provider.vue
+++ b/src/pages/Provider.vue
@@ -1,6 +1,6 @@
 <template>
-  <!-- <v-container fluid> -->
   <v-flex xs12>
+    <app-toolbar class="app--toolbar"></app-toolbar> 
     <v-card>
       <v-card-title>
         <v-flex xs12 lg2 md3 sm4>
@@ -200,11 +200,16 @@
       </v-data-table>
     </v-card>
   </v-flex>
-  <!-- </v-container> -->
 </template>
 <script>
 import http from "@/Services/http.js";
+import AppToolbar from '@/components/AppToolbar';
+
+
 export default {
+  components: {
+    AppToolbar,
+  },
   data: () => ({
     snackbar: false,
     statussnackbar: false,
diff --git a/src/pages/notification.vue b/src/pages/notification.vue
index 82e2d19..5aad7c3 100644
--- a/src/pages/notification.vue
+++ b/src/pages/notification.vue
@@ -1,6 +1,7 @@
 <template>
  <v-app id="login">
-
+    <app-toolbar class="app--toolbar">
+      </app-toolbar>
     <v-toolbar color="white">
       <h4 class="text-lg-left"><b>Push Notification</b></h4>
       <v-spacer></v-spacer>
@@ -61,7 +62,13 @@
 </template>
 <script>
 import axios from 'axios';
+import AppToolbar from '@/components/AppToolbar';
+
+
 export default {
+  components: {
+    AppToolbar,
+  },
   data () {
     return {
       message: '',
diff --git a/src/pages/questions.vue b/src/pages/questions.vue
index 5bcb95f..8db4e7c 100644
--- a/src/pages/questions.vue
+++ b/src/pages/questions.vue
@@ -1,5 +1,6 @@
 <template>
  <v-flex>
+   <app-toolbar class="app--toolbar"></app-toolbar>
   <v-card>
     <v-toolbar flat color="white">
       <v-card-title>
@@ -32,6 +33,8 @@ import sex from '@/components/questions/sex.vue';
 import health from '@/components/questions/health.vue';
 import skin from '@/components/questions/skin.vue';
 import diet from '@/components/questions/diet.vue';
+import AppToolbar from '@/components/AppToolbar';
+
 export default {
   components: {
     'suggestion': suggestion,
@@ -39,6 +42,7 @@ export default {
     'health': health,
     'skin': skin,
     'diet': diet,
+     AppToolbar,
   },
   data: () => ({
     component: 'suggestion',
diff --git a/src/router/paths.js b/src/router/paths.js
index 046cd3b..6595c89 100644
--- a/src/router/paths.js
+++ b/src/router/paths.js
@@ -79,7 +79,7 @@ export default [
  
   {
     path: '/dashboard',
-    meta: { breadcrumb: true },
+    meta: { breadcrumb: false },
     name: 'Dashboard',
     component: () => import(
       /* webpackChunkName: "routes" */