diff --git a/src/components/pageHeader/AppToolbar.vue b/src/components/pageHeader/AppToolbar.vue
index 4c830ed..9af83bf 100644
--- a/src/components/pageHeader/AppToolbar.vue
+++ b/src/components/pageHeader/AppToolbar.vue
@@ -5,7 +5,7 @@
     </v-toolbar-title>
 
     <!-- ****** SEARCH ALL EXISTING STUDENTS ****** -->
-    <v-flex xs7 sm3 class="userSearch" v-if="$route.name != 'Dashboard'">
+    <v-flex xs7 sm3 class="userSearch" v-if="$route.name != 'Dashboard' && $route.name != 'changepassword'">
       <v-text-field
         flat
         append-icon="search"
diff --git a/src/pages/Authentication/changepassword.vue b/src/pages/Authentication/changepassword.vue
index 407afc4..b316998 100644
--- a/src/pages/Authentication/changepassword.vue
+++ b/src/pages/Authentication/changepassword.vue
@@ -1,6 +1,5 @@
 <template>
   <v-app id="login">
-    <app-toolbar class="app--toolbar"></app-toolbar>
     <v-container fluid fill-height>
       <v-layout>
         <v-flex xs12 sm8 md8 lg5 offset-sm2 offset-lg3 class="mt-5">
@@ -55,12 +54,8 @@
 </template>
 <script>
 import http from "@/Services/http.js";
-import AppToolbar from "@/components/pageHeader/AppToolbar";
 
 export default {
-  components: {
-    AppToolbar
-  },
   data() {
     return {
       snackbar: false,
diff --git a/src/pages/Event/event.vue b/src/pages/Event/event.vue
index 0de5aae..9d8bd90 100644
--- a/src/pages/Event/event.vue
+++ b/src/pages/Event/event.vue
@@ -47,8 +47,8 @@
                     >
                       <v-avatar size="100px">
                         <img src="/static/icon/user.png" />
-                      </v-avatar> -->
-                      <!-- <input
+                    </v-avatar>-->
+                    <!-- <input
                         type="file"
                         style="display: none"
                         ref="image"
@@ -60,7 +60,7 @@
                         height="150"
                         v-if="imageUrl"
                         style="border-radius:50%; width:200px"
-                      />-->
+                    />-->
                     <!-- </v-flex> -->
                   </v-layout>
                   <v-flex xs12 sm12>
@@ -83,30 +83,30 @@
                       <v-flex xs4 class="pt-4 subheading">
                         <label class="right">Date:</label>
                       </v-flex>
-                        <v-flex xs5 class="ml-3">
-                         <v-menu
-                            ref="menu"
-                            :close-on-content-click="false"
-                            v-model="menu"
-                            :nudge-right="40"
-                            lazy
-                            transition="scale-transition"
-                            offset-y
-                            full-width
-                            min-width="290px"
-                          >
-                            <v-text-field
-                              slot="activator"
-                              :rules="dateRules"
-                              v-model="editedItem.joinDate"
-                              placeholder="Select date"
-                            ></v-text-field>
-                            <v-date-picker
-                              ref="picker"
-                              v-model="editedItem.joinDate"
-                              @input="menu = false"
-                            ></v-date-picker>
-                          </v-menu>
+                      <v-flex xs5 class="ml-3">
+                        <v-menu
+                          ref="menu"
+                          :close-on-content-click="false"
+                          v-model="menu"
+                          :nudge-right="40"
+                          lazy
+                          transition="scale-transition"
+                          offset-y
+                          full-width
+                          min-width="290px"
+                        >
+                          <v-text-field
+                            slot="activator"
+                            :rules="dateRules"
+                            v-model="editedItem.dateOfEvent"
+                            placeholder="Select date"
+                          ></v-text-field>
+                          <v-date-picker
+                            ref="picker"
+                            v-model="editedItem.dateOfEvent"
+                            @input="menu = false"
+                          ></v-date-picker>
+                        </v-menu>
                       </v-flex>
                     </v-layout>
                   </v-flex>
@@ -155,7 +155,7 @@
               <v-avatar size="50px" style="position:absolute; top:20px;">
                 <img src="/static/icon/user.png" />
               </v-avatar>
-            </v-flex> -->
+            </v-flex>-->
             <v-card-text>
               <v-container grid-list-md>
                 <v-layout wrap>
@@ -173,7 +173,7 @@
                         <h5 class="right my-1">Date:</h5>
                       </v-flex>
                       <v-flex sm6 xs8>
-                        <h5 class="my-1">{{ editedItem.title }}</h5>
+                        <h5 class="my-1">{{ dates(editedItem.dateOfEvent) }}</h5>
                       </v-flex>
                     </v-layout>
                     <v-layout>
@@ -210,6 +210,7 @@
           <template slot="items" slot-scope="props">
             <td id="td" class="text-xs-center">{{ props.index}}</td>
             <td id="td" class="text-xs-center">{{ props.item.title}}</td>
+            <td id="td" class="text-xs-center">{{ dates(props.item.dateOfEvent)}}</td>
             <td id="td" class="text-xs-center">{{ props.item.description}}</td>
 
             <td id="td" class="text-xs-center">
@@ -267,8 +268,8 @@
                     >
                       <v-avatar size="100px">
                         <img src="/static/icon/user.png" />
-                      </v-avatar> -->
-                      <!-- <input
+                    </v-avatar>-->
+                    <!-- <input
                         type="file"
                         style="display: none"
                         ref="image"
@@ -280,7 +281,7 @@
                         height="150"
                         v-if="imageUrl"
                         style="border-radius:50%; width:200px"
-                      />-->
+                    />-->
                     <!-- </v-flex> -->
                   </v-layout>
                   <v-flex xs12>
@@ -299,35 +300,35 @@
                       </v-flex>
                     </v-layout>
                   </v-flex>
-                   <v-flex xs12>
+                  <v-flex xs12>
                     <v-layout>
                       <v-flex xs4 class="pt-4 subheading">
                         <label class="right">date:</label>
                       </v-flex>
                       <v-flex xs4 class="ml-3">
-                         <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"
-                              :rules="dateRules"
-                              v-model="addEvent.joinDate"
-                              placeholder="Select date"
-                            ></v-text-field>
-                            <v-date-picker
-                              ref="picker"
-                              v-model="addEvent.joinDate"
-                              @input="menu1 = 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"
+                            :rules="dateRules"
+                            v-model="addEvent.dateOfEvent"
+                            placeholder="Select date"
+                          ></v-text-field>
+                          <v-date-picker
+                            ref="picker"
+                            v-model="addEvent.dateOfEvent"
+                            @input="menu1 = false"
+                          ></v-date-picker>
+                        </v-menu>
                       </v-flex>
                     </v-layout>
                   </v-flex>
@@ -372,6 +373,7 @@
 <script>
 import http from "@/Services/http.js";
 import Util from "@/util";
+import moment from "moment";
 
 export default {
   data: () => ({
@@ -453,11 +455,14 @@ export default {
     //     this.imageUrl = "";
     //   }
     // },
+    dates: function(date) {
+      return moment(date).format("MMMM DD, YYYY");
+    },
     getEvents() {
       //   this.showLoader = true;
       var token = this.$store.state.token;
       http()
-        .get("/getNotificationsList", {
+        .get("/getSchoolEventsList", {
           headers: { Authorization: "Bearer " + token }
         })
         .then(response => {
@@ -477,6 +482,7 @@ export default {
     editItem(item) {
       this.editedIndex = this.desserts.indexOf(item);
       this.editedItem = Object.assign({}, item);
+      this.editedItem.schoolEventId = item._id
       this.dialog = true;
     },
     profile(item) {
@@ -487,17 +493,16 @@ export default {
 
     deleteItem(item) {
       let deleteEvent = {
-        notificationId: item._id
+        schoolEventId: item._id
       };
       http()
         .delete(
-          "/deleteNotification",
+          "/deleteSchoolEvent",
           confirm("Are you sure you want to delete this?") && {
-            params: deleteNotification
+            params: deleteEvent
           }
         )
         .then(response => {
-          // console.log("deleteNotification",deleteNotification)
           if ((this.snackbar = true)) {
             this.text = response.data.message;
           }
@@ -532,29 +537,18 @@ export default {
     },
     submit() {
       if (this.$refs.form.validate()) {
-        // let imageData = new FormData();
-        // imageData.append("upload", this.imageFile);
-        // console.log(imageData);
-        // let create = {
-        //   title: this.addNotification.title,
-        //   description: this.addNotification.description
-        //   // imageData
-        // };
-        // console.log(create);
         this.loading = true;
         http()
-          .post("/createNotification", this.addEvent)
+          .post("/createSchoolEvent", this.addEvent)
           .then(response => {
-            console.log(create);
             if ((this.snackbar = true)) {
-              this.text = "New Notification added successfully";
+              this.text = response.data.message;
             }
             this.getEvents();
             this.clear();
             this.loading = false;
           })
           .catch(error => {
-            // console.log(error);
             if ((this.snackbar = true)) {
               this.text = error.response.data.message;
             }
@@ -566,28 +560,17 @@ export default {
       this.$refs.form.reset();
     },
     save() {
-      //   let imageData = new FormData();
-      //   imageData.append("upload", this.imageFile);
-      //   console.log(imageData);
-      //   let editNotification = {
-      //     notificationId: this.editedItem._id,
-      //     title: this.editedItem.title,
-      //     description: this.editedItem.description
-      //     // imageData
-      //   };
       http()
-        .put("/updateNotification", this.editedItem)
+        .put("/updateSchoolEvent", this.editedItem)
         .then(response => {
-          // console.log("editNotification",editNotification);
-          if ((this.snackbar = true)) {
-            this.text = "Successfully Edit Notification";
-          }
+          this.snackbar = true;
+          this.text = response.data.message;
           this.getEvents();
+          this.close();
         })
         .catch(error => {
           // console.log(error);
         });
-      this.close();
     }
   },
   mounted() {