diff --git a/package-lock.json b/package-lock.json
index 0f391e3..7bc5176 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5571,7 +5571,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5592,12 +5593,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5612,17 +5615,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5739,7 +5745,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5751,6 +5758,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5765,6 +5773,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5772,12 +5781,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5796,6 +5807,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5876,7 +5888,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5888,6 +5901,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5973,7 +5987,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6009,6 +6024,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6028,6 +6044,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6071,12 +6088,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/src/components/AppToolbar.vue b/src/components/AppToolbar.vue
index 75940c6..c51c6c9 100644
--- a/src/components/AppToolbar.vue
+++ b/src/components/AppToolbar.vue
@@ -90,7 +90,7 @@ export default {
       Util.toggleFullScreen();
     }
   }, 
-mounted(){
+  mounted(){
   this.userName = this.$store.state.name;
 }
 };
@@ -103,6 +103,9 @@ mounted(){
 .hide{
   display: none;
 }
+.v-input__slot{
+  width: 300px;
+}
 /* }
 @media screen and (max-width: 962px) {
 .imglogo{
diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 2fd1a96..9ea4be9 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -70,7 +70,6 @@
                         ></v-text-field>
                       </v-flex>
                     </v-layout>
-
                     <v-layout>
                       <v-flex xs4 class="pt-4 subheading">
                         <label>Email ID:</label>
@@ -90,23 +89,30 @@
                         <label>Date of Birth:</label>
                       </v-flex>
                       <v-flex xs8>
-                        <v-menu
-                        :close-on-content-click="false"
-                        v-model="modaledit"
-                        :nudge-right="20"
-                        lazy
-                        transition="scale-transition"
-                        persistent
-                        full-width
-                        max-width="290px"
-                      >
-                        <v-text-field
-                          slot="activator"
-                          v-model="editedItem.dob"
-                          name="dob"
-                        ></v-text-field>
-                        <v-date-picker v-model="editedItem.dob" @input="modaledit = false"></v-date-picker>
-                      </v-menu>
+                      <v-menu
+                         ref="menu1"
+                         :close-on-content-click="false"
+                         v-model="menu1"
+                         :nudge-right="40"
+                         lazy
+                         transition="scale-transition"
+                         offset-y
+                         full-width
+                         min-width="290px"
+                       >
+                       <v-text-field
+                        slot="activator"
+                        v-model="editedItem.dob"
+                        placeholder="Select date"
+                       ></v-text-field>
+                       <v-date-picker
+                        ref="picker"
+                        v-model="editedItem.dob"
+                        :max="new Date().toISOString().substr(0, 10)"
+                        min="1950-01-01"
+                        @input="menu1 = false"
+                        ></v-date-picker>
+                        </v-menu>
                       </v-flex>
                     </v-layout>
                     <v-card-actions>
@@ -121,7 +127,6 @@
           </v-card-text>
         </v-card>
       </v-dialog>
-
       <!-- PROFILE VIEW pateints Details-->
       <v-dialog v-model="dialog1" max-width="600px">
         <v-toolbar color="white">
@@ -334,7 +339,8 @@
                     </v-flex>
                     <v-flex xs6  class="ml-3">
                       <v-text-field
-                        placeholder="fill your country Name"               :rules="countryRules"
+                        placeholder="fill your country Name"   
+                        :rules="countryRules"
                         v-model="editedItem.country"
                         type="text"
                         name="country"
@@ -363,26 +369,33 @@
                       <label class="right">Date of Birth:</label>
                     </v-flex>
                     <v-flex xs6 class="ml-3">
-                      <v-menu
-                        :close-on-content-click="false"
-                        v-model="modal"
-                        :nudge-right="20"
-                        lazy
-                        transition="scale-transition"
+                       <v-menu
+                         ref="menu"
+                         :close-on-content-click="false"
+                         v-model="menu"
+                         :nudge-right="40"
+                         lazy
+                         transition="scale-transition"
                          offset-y
-                        persistent
-                        full-width
-                        max-width="290px"
-                      >
-                        <v-text-field
-                          slot="activator"
-                          v-model="editedItem.dob"
-                          name="dob"
-                        ></v-text-field>
-                        <v-date-picker v-model="editedItem.dob" @input="modal = false"></v-date-picker>
-                      </v-menu>
-                    </v-flex>
-                  </v-layout>
+                         full-width
+                         min-width="290px"
+
+                        >
+                       <v-text-field
+                        slot="activator"
+                        v-model="editedItem.date"
+                        placeholder="Select date"
+                       ></v-text-field>
+                       <v-date-picker
+                        ref="picker"
+                        v-model="editedItem.date"
+                        :max="new Date().toISOString().substr(0, 10)"
+                        min="1950-01-01"
+                        @input="menu = false"
+                        ></v-date-picker>
+                        </v-menu>
+                       </v-flex>
+                     </v-layout>
                   <v-layout>
                     <v-flex xs12 sm9 offset-sm2>
                   <v-card-actions>
@@ -429,9 +442,12 @@ export default {
     timeout: 3000,
     text: "",
     loading: false,
+    date:null,
     search: "",
     modal: false,
     modaledit:false,
+    menu: false,
+    menu1:false,
     dialog: false,
     dialog1: false,
     dialog2: false,
@@ -486,7 +502,7 @@ export default {
       name: "",
       lastName: "",
       email: "",
-      dob: new Date().toISOString().substr(0, 10),
+      date: null,
       country: ""
     },
     defaultItem: {
@@ -505,7 +521,18 @@ export default {
   //     return Math.ceil(this.pagination.totalItems / this.pagination.rowsPerPage);
   //   }
   // },
-  methods: {
+   watch: {
+    menu (val) {
+      val && this.$nextTick(() => (this.$refs.picker.activePicker = 'YEAR'))
+    },
+    menu1 (val) {
+      val && this.$nextTick(() => (this.$refs.picker.activePicker = 'YEAR'))
+    }
+   },
+   methods: {
+    save (date) {
+      this.$refs.menu.save(date)
+    },
     getPatientList() {
       var token = this.$store.state.token;
       http()
@@ -540,7 +567,7 @@ export default {
         userId: item.userId
       };
       http()
-        .post("/deletePatient", addUsers)
+        .post("/deletePatient", confirm('Are you sure you want to delete this?') && addUsers)
         .then(response => {
           if ((this.snackbar = true)) {
             this.text = "Successfully delete Existing User";
@@ -608,7 +635,7 @@ export default {
     submit() {
       if (this.$refs.form.validate()) {
         let addUsers = {
-          name: this.editedItem.name + this.editedItem.lastname,
+          name: this.editedItem.name + " " +this.editedItem.lastname,
           dob: this.editedItem.dob,
           email: this.editedItem.email,
           country: this.editedItem.country
@@ -643,7 +670,7 @@ export default {
     },
     save() {
       let editUsers = {
-        name: this.editedItem.name + this.editedItem.lastname,
+        name: this.editedItem.name + " " + this.editedItem.lastname,
         dob: this.editedItem.dob,
         email: this.editedItem.email,
         userId: this.editedItem.userId
@@ -677,7 +704,10 @@ export default {
   margin: 0 15px;
   min-width: 120px;
 }
-
+ .primary {
+    background-color: #aaa !important;
+    border-color: #aaa !important;
+}
 h4 {
   background-repeat: no-repeat;
   padding: 8px;
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index d78aa64..51a150a 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -50,7 +50,7 @@
                       <v-checkbox :label="`Remember me`" v-model="remember"></v-checkbox>
                     </v-flex>
                     <v-flex xs6>
-                     <h5  class="right mt-4"> <router-link class="link" to="/forgetpassword">Forget Password</router-link></h5>
+                     <h5  class="right mt-4"> <router-link class="link" to="/forgetpassword" style="border-bottom: 2px solid #aaa;">Forgot Password</router-link></h5>
                   </v-flex>
                    </v-layout>
                 </v-flex>
diff --git a/src/pages/Provider.vue b/src/pages/Provider.vue
index 877a3a0..2000bbb 100644
--- a/src/pages/Provider.vue
+++ b/src/pages/Provider.vue
@@ -12,7 +12,7 @@
           <v-text-field
             justify-right
             prepend-icon="search"
-            v-model="search"
+            v-model="terms"
             label="Find Yours Users"
             color="black"
           ></v-text-field>
@@ -139,7 +139,7 @@
       <v-data-table
         :headers="headers"
         :items="desserts"
-        :search="search"
+        :terms="terms"
         class="elevation-1"
         :pagination.sync="pagination"
       >
@@ -196,7 +196,7 @@
           :value="true"
           color="error"
           icon="warning"
-        >Your search for "{{ search }}" found no results.</v-alert>
+        >Your search for "{{ terms }}" found no results.</v-alert>
       </v-data-table>
     </v-card>
   </v-flex>
@@ -218,7 +218,7 @@ export default {
     dialog: false,
     dialog1: false,
     statusList: ["APPROVED", "DECLINED"],
-    search: "",
+    terms: [],
     e1: "",
     rules: {
       required: value => !!value || "This field is Required.",
@@ -288,6 +288,8 @@ export default {
         })
         .then(response => {
           this.desserts = response.data.data.providerList;
+          this.terms = response.data.data
+          console.log(terms)
         })
         .catch(err => {
           console.log("err====>", err);
@@ -329,7 +331,7 @@ export default {
         userId: item.userId
       };
       http()
-        .post("/deleteProvider", addUsers)
+        .post("/deleteProvider", confirm('Are you sure you want to delete this?') && addUsers)
         .then(response => {
           if ((this.snackbar = true)) {
             this.text = "Successfully delete Health Care Priovider";
@@ -354,7 +356,7 @@ export default {
 
     save() {
       let editUsers = {
-        name: this.editedItem.name + this.editedItem.lastname,
+        name: this.editedItem.name + " " + this.editedItem.lastname,
         dob: this.editedItem.dob,
         email: this.editedItem.email,
         userId: this.editedItem.userId