diff --git a/src/pages/Class/addclass.vue b/src/pages/Class/addclass.vue
index 5e5e6ba..fc9d514 100644
--- a/src/pages/Class/addclass.vue
+++ b/src/pages/Class/addclass.vue
@@ -91,7 +91,7 @@
                     <br />
                     <v-layout>
                       <v-flex xs6 sm6>
-                        <h5 class="right my-1">Class Name:</h5>
+                        <h5 class="right my-1"><b>Class Name:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs6>
                         <h5 class="my-1">{{ editedItem.classNum }}</h5>
diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue
index 2856e89..982c7ac 100644
--- a/src/pages/Dashboard/dashboard.vue
+++ b/src/pages/Dashboard/dashboard.vue
@@ -68,12 +68,7 @@ export default {
     return {
       showLoader: false,
       dialog: false,
-      events: [
-        {
-          title: "",
-          start: ""
-        }
-      ],
+      events: [],
       eventHoliday: [],
       config: {
         eventClick: event => {
@@ -139,44 +134,7 @@ export default {
           headers: { Authorization: "Bearer " + token }
         })
         .then(response => {
-          for (var i = 0; i < response.data.data.length; i++) {
-            this.eventHoliday = [
-              {
-                title: response.data.data[i].occasion,
-                date: response.data.data[i].dateOfHoliday
-              }
-            ];
-          }
-          this.showLoader = false;
-        })
-        .catch(err => {
-          // console.log("err====>", err);
-          this.showLoader = false;
-          if (error.response.status === 401) {
-            this.$router.replace({ path: "/" });
-            this.$store.dispatch("setToken", null);
-            this.$store.dispatch("Id", null);
-          }
-        });
-    }
-  },
-  computed: {
-    getEvents() {
-      this.showLoader = true;
-      var token = this.$store.state.token;
-      http()
-        .get("/getSchoolEventsList", {
-          headers: { Authorization: "Bearer " + token }
-        })
-        .then(response => {
-          for (var i = 0; i < response.data.data.length; i++) {
-            this.events = [
-              {
-                title: response.data.data[i].title,
-                start: response.data.data[i].dateOfEvent
-              }
-            ];
-          }
+          this.eventHoliday = response.data.data;
           this.showLoader = false;
         })
         .catch(err => {
@@ -210,23 +168,10 @@ export default {
         headers: { Authorization: "Bearer " + token }
       })
       .then(response => {
-        // this.events = response.data.data;
-        //  console.log(this.events)
-        for (var i = 0; i < response.data.data.length; i++) {
-          this.events = [
-            {
-              title: response.data.data[i].title,
-              date: response.data.data[i].dateOfEvent
-            }
-          ];
-        }
-        // this.events = [
-        //   { title: "event 1", date: "2019-09-30",desciptiom:"dataA" },
-        //   { title: "event 2", date: "2019-09-29",desciptiom:"dataB" }
-        // ];
+        this.events = response.data.data;
         this.showLoader = false;
       })
-      .catch(err => {
+      .catch(error => {
         // console.log("err====>", err);
         this.showLoader = false;
         if (error.response.status === 401) {
diff --git a/src/pages/Event/event.vue b/src/pages/Event/event.vue
index 407bb5e..ea70624 100644
--- a/src/pages/Event/event.vue
+++ b/src/pages/Event/event.vue
@@ -104,7 +104,7 @@
                           <v-date-picker
                             ref="picker"
                             v-model="editedItem.dateOfEvent"
-                            @input="menu = false"
+                            @input="$refs.menu.save(editedItem.dateOfEvent)"
                           ></v-date-picker>
                         </v-menu>
                       </v-flex>
@@ -151,18 +151,13 @@
             <v-icon @click="close1">close</v-icon>
           </v-toolbar>
           <v-card>
-            <!-- <v-flex align-center justify-center layout text-xs-center>
-              <v-avatar size="50px" style="position:absolute; top:20px;">
-                <img src="/static/icon/user.png" />
-              </v-avatar>
-            </v-flex>-->
             <v-card-text>
               <v-container grid-list-md>
                 <v-layout wrap>
                   <v-flex>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Title:</h5>
+                        <h5 class="right my-1"><b>Title:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.title }}</h5>
@@ -170,7 +165,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Date:</h5>
+                        <h5 class="right my-1"><b>Date:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ dates(editedItem.dateOfEvent) }}</h5>
@@ -178,7 +173,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Description:</h5>
+                        <h5 class="right my-1"><b>Description:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.description }}</h5>
@@ -311,6 +306,7 @@
                           :close-on-content-click="false"
                           v-model="menu1"
                           :nudge-right="40"
+                          :return-value.sync="addEvent.dateOfEvent"
                           lazy
                           transition="scale-transition"
                           offset-y
@@ -324,10 +320,9 @@
                             placeholder="Select date"
                           ></v-text-field>
                           <v-date-picker
-                            ref="picker"
                             v-model="addEvent.dateOfEvent"
-                            @input="menu1 = false"
-                          ></v-date-picker>
+                            @input="$refs.menu1.save(addEvent.dateOfEvent)">
+                          </v-date-picker>
                         </v-menu>
                       </v-flex>
                     </v-layout>
diff --git a/src/pages/Holiday/holiday.vue b/src/pages/Holiday/holiday.vue
index dc1827e..7c96a68 100644
--- a/src/pages/Holiday/holiday.vue
+++ b/src/pages/Holiday/holiday.vue
@@ -105,7 +105,7 @@
         <!-- ****** PROFILE VIEW Holiday DEATILS ******  -->
 
         <v-dialog v-model="dialog1" max-width="700px">
-          <v-toolbar color="white">
+          <v-toolbar class="v-toolbar">
             <v-spacer></v-spacer>
             <v-toolbar-title>
               <h3>Holiday</h3>
@@ -120,7 +120,7 @@
                   <v-flex>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Occasion:</h5>
+                        <h5 class="right my-1"><b>Occasion:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.occasion }}</h5>
@@ -128,7 +128,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Date:</h5>
+                        <h5 class="right my-1"><b>Date:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.dateOfHoliday }}</h5>
@@ -252,7 +252,7 @@
                           <v-date-picker
                             ref="picker"
                             v-model="addHoliday.dateOfHoliday"
-                            @input="menu1 = false"
+                            @input="$refs.menu1.save(addHoliday.dateOfHoliday)"
                           ></v-date-picker>
                         </v-menu>
                       </v-flex>
diff --git a/src/pages/NoticeBoard/noticeBoard.vue b/src/pages/NoticeBoard/noticeBoard.vue
index 5118bf0..8b7adad 100644
--- a/src/pages/NoticeBoard/noticeBoard.vue
+++ b/src/pages/NoticeBoard/noticeBoard.vue
@@ -136,7 +136,7 @@
         <!-- ****** VIEW PROFIL NOTICE BOARD ******  -->
 
         <v-dialog v-model="dialog1" max-width="640px" scrollable>
-          <v-card style="height: 480px;">
+          <v-card style="height: 380px;">
             <v-toolbar color="grey lighten-2" flat>
               <v-spacer></v-spacer>
               <v-toolbar-title>
@@ -159,7 +159,7 @@
                   <v-flex>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Title:</h5>
+                        <h5 class="right my-1"><b>Title:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.title }}</h5>
@@ -167,7 +167,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Description:</h5>
+                        <h5 class="right my-1"><b>Description:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.description }}</h5>
diff --git a/src/pages/Notification/notification.vue b/src/pages/Notification/notification.vue
index 4894fc4..e516518 100644
--- a/src/pages/Notification/notification.vue
+++ b/src/pages/Notification/notification.vue
@@ -132,7 +132,7 @@
                     <br />
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Title:</h5>
+                        <h5 class="right my-1"><b>Title:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.title }}</h5>
@@ -140,7 +140,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Description:</h5>
+                        <h5 class="right my-1"><b>Description:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.description }}</h5>
diff --git a/src/pages/Teachers/teachers.vue b/src/pages/Teachers/teachers.vue
index af036a9..708f8f5 100644
--- a/src/pages/Teachers/teachers.vue
+++ b/src/pages/Teachers/teachers.vue
@@ -339,7 +339,7 @@
                     </v-flex>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Full Name:</h5>
+                        <h5 class="right my-1"><b>Full Name:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.name }}</h5>
@@ -347,7 +347,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Email:</h5>
+                        <h5 class="right my-1"><b>Email:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.email }}</h5>
@@ -355,7 +355,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">City:</h5>
+                        <h5 class="right my-1"><b>City:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.city }}</h5>
@@ -363,7 +363,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">State:</h5>
+                        <h5 class="right my-1"><b>State:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.state }}</h5>
@@ -371,7 +371,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Country:</h5>
+                        <h5 class="right my-1"><b>Country:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.country }}</h5>
@@ -379,7 +379,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Pincode:</h5>
+                        <h5 class="right my-1"><b>Pincode:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.pincode }}</h5>
@@ -387,7 +387,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Mobile No:</h5>
+                        <h5 class="right my-1"><b>Mobile No:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.mobileNo }}</h5>
@@ -395,7 +395,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Join Date:</h5>
+                        <h5 class="right my-1"><b>Join Date:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ dates(editedItem.joinDate) }}</h5>
@@ -403,7 +403,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Date Of Birth:</h5>
+                        <h5 class="right my-1"><b>Date Of Birth:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ dates(editedItem.dob) }}</h5>
@@ -411,7 +411,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs6 sm6>
-                        <h5 class="right my-1">Permanent Address:</h5>
+                        <h5 class="right my-1"><b>Permanent Address:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.permanentAddress }}</h5>
@@ -419,7 +419,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs6 sm6>
-                        <h5 class="right my-1">present Address:</h5>
+                        <h5 class="right my-1"><b>present Address:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.presentAddress }}</h5>
diff --git a/src/pages/socialMedia/socialMedia.vue b/src/pages/socialMedia/socialMedia.vue
index 41d3c39..c7e9aab 100644
--- a/src/pages/socialMedia/socialMedia.vue
+++ b/src/pages/socialMedia/socialMedia.vue
@@ -135,7 +135,7 @@
                     <br />
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Title:</h5>
+                        <h5 class="right my-1"><b>Title:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.type }}</h5>
@@ -143,7 +143,7 @@
                     </v-layout>
                     <v-layout>
                       <v-flex xs5 sm6>
-                        <h5 class="right my-1">Description:</h5>
+                        <h5 class="right my-1"><b>Description:</b></h5>
                       </v-flex>
                       <v-flex sm6 xs8>
                         <h5 class="my-1">{{ editedItem.linkUrl }}</h5>