diff --git a/src/components/core/Drawer.vue b/src/components/core/Drawer.vue
index 2b10d81..756a7dc 100644
--- a/src/components/core/Drawer.vue
+++ b/src/components/core/Drawer.vue
@@ -96,19 +96,13 @@ export default {
         to: { name: 'AllItem' },
         icon: 'far fa-clone',
         text: 'Items',
-        role: 'Admin|Supervisor'
-      },
-      {
-        to: { name: 'MyItem' },
-        icon: 'far fa-clone',
-        text: 'My Items',
-        role: 'User|Admin|Supervisor'
+        role: 'Admin|Supervisor|User'
       },
       {
         to: { name: 'AllPackage' },
         icon: 'fas fa-archive',
         text: 'Packages',
-        role: 'Admin|Supervisor'
+        role: 'Admin|Supervisor|User'
       },
       {
         to: { name: 'AllLabels' },
diff --git a/src/components/material/Cards.vue b/src/components/material/Cards.vue
index 0737dbc..2d451e5 100644
--- a/src/components/material/Cards.vue
+++ b/src/components/material/Cards.vue
@@ -2,7 +2,7 @@
    <v-card :class="color">
      <v-container>
        <v-layout row wrap>
-         <v-flex xs7>
+         <v-flex xs12>
            <v-card-text primary-text :class="aligntext">
              <div>
                <div class="headline WM-NoLetterSpacing-7">{{title}}</div>
@@ -11,8 +11,8 @@
              </div>
            </v-card-text>
          </v-flex>
-         <v-flex xs5 :class="alignimg" :style="{'background':'url('+ icon +') no-repeat center center', 'background-size':'contain','height':'100px'}">
-         </v-flex>
+         <!-- <v-flex xs5 :class="alignimg" :style="{'background':'url('+ icon +') no-repeat center center', 'background-size':'contain','height':'100px'}">
+         </v-flex> -->
        </v-layout>
      </v-container>
    </v-card>
diff --git a/src/components/modal/user/List.vue b/src/components/modal/user/List.vue
index bd86c27..648d49c 100644
--- a/src/components/modal/user/List.vue
+++ b/src/components/modal/user/List.vue
@@ -90,7 +90,7 @@ export default {
         async load(page = 1) {
             let filter = "?";
 
-            this.filter.medical_center_id = this.getModalProperties.data.user?.medical_center_id;
+            this.filter.medical_center_id = this.getModalProperties.data.user?.medical_center?.id;
             for (const key in this.filter) {
                 if (this.filter.hasOwnProperty(key)) {
                     filter += `${key}=${this.filter[key]}&`;
diff --git a/src/views/Auth/Login.vue b/src/views/Auth/Login.vue
index fab6384..6a951db 100644
--- a/src/views/Auth/Login.vue
+++ b/src/views/Auth/Login.vue
@@ -42,7 +42,7 @@
               </v-flex>
             </v-layout>
             <v-layout row wrap class="text-md-left text-sm-center text-xs-center">
-              <v-flex xs12 md6 sm6 class="px-4 py-3">
+              <v-flex xs12 md12 sm12 class="px-4 py-3">
                 <router-link :to="{name: 'ForgotPassword'}">
                   <span class="black--text" style="border-bottom:1px solid #000;">Forgot Password ?</span>
                 </router-link>
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index d1c7b7b..7f17596 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -54,18 +54,18 @@ export default {
   data() {
     return {
       AdminCards: [
-        { title: 'Manage Users', text: 'You can Manage the users information', icon: '/img/Static/Dashboard/manageusers.png', color: 'WM-LightGreenGradient-BG', route: { name: 'ManageUsers' }, aligntext: 'text-md-center', alignimg: 'text-md-left', column: 'xs12 md12 sm12', role: 'Admin|Supervisor' },
+        { title: 'Manage Users', text: 'You can Manage the users information', icon: '/img/Static/Dashboard/manageusers.png', color: 'WM-LightGreenGradient-BG', route: { name: 'ManageUsers' }, aligntext: 'text-md-left', alignimg: 'text-md-left', column: 'xs12 md12 sm12', role: 'Admin|Supervisor' },
         { title: 'Manage Medical Center', text: 'You can edit the medical center information', icon: '/img/Static/Dashboard/settings.png', color: 'WM-MuskGradient-BG', route: { name: 'ManageMedicalCenter' }, aligntext: 'text-md-left', alignimg: 'text-md-right', column: 'xs12 md7 sm7', role: 'Admin' },
-        { title: 'List Test Type', text: 'You can simply add your test type', icon: '/img/Static/Dashboard/result.png', color: 'WM-GreyGradient-BG', route: { name: 'ListTestType' }, aligntext: 'text-md-left', alignimg: 'text-md-right', column: 'xs12 md5 sm5', role: 'Admin' }
+        { title: 'List Test Type', text: 'You can simply add your test type', icon: '/img/Static/Dashboard/result.png', color: 'WM-GreyGradient-BG', route: { name: 'ListTestType' }, aligntext: 'text-md-left', alignimg: 'text-md-ce', column: 'xs12 md5 sm5', role: 'Admin' }
       ],
       SupervisorCards: [
-        { title: 'Manage Users', text: 'You can Manage the users information', icon: '/img/Static/Dashboard/manageusers.png', color: 'WM-LightGreenGradient-BG', route: { name: 'ManageUsers' }, aligntext: 'text-md-center', alignimg: 'text-md-left', column: 'xs12 md12 sm12', role: 'Admin|Supervisor' },
-        { title: 'Test to Verify', text: 'You can simply verify your own medical center test result in this section of website', icon: '/img/Static/Dashboard/verify.png', color: 'WM-PinkGradient-BG', route: { name: 'NotVerifyTestResult' }, aligntext: 'text-md-center', alignimg: 'text-md-left', column: 'xs12 md12 sm12', role: 'Admin|Supervisor' },
+        { title: 'Manage Users', text: 'You can Manage the users information', icon: '/img/Static/Dashboard/manageusers.png', color: 'WM-LightGreenGradient-BG', route: { name: 'ManageUsers' }, aligntext: 'text-md-left', alignimg: 'text-md-left', column: 'xs12 md12 sm12', role: 'Admin|Supervisor' },
+        { title: 'Test to Verify', text: 'You can simply verify your own medical center test result in this section of website', icon: '/img/Static/Dashboard/verify.png', color: 'WM-PinkGradient-BG', route: { name: 'NotVerifyTestResult' }, aligntext: 'text-md-left', alignimg: 'text-md-left', column: 'xs12 md12 sm12', role: 'Admin|Supervisor' },
       ],
       UsersCards: [
         { title: 'My Info', text: 'You can easily edit your registration information', icon: '/img/Static/Dashboard/info.png', color: 'WM-OrangeGradient-BG', route: { name: 'MyInfo' }, aligntext: 'text-md-left', alignimg: 'text-md-right', column: 'xs12 md6 sm6' },
         { title: 'All Test Result', text: 'You can see all user tests and own tests', icon: '/img/Static/Dashboard/alltest.png', color: 'WM-GreenGradient-BG', route: { name: 'AllResultTest' }, aligntext: 'text-md-left', alignimg: 'text-md-right', column: 'xs12 md6 sm6' },
-        { title: 'Add a Test Result', text: 'You can add the test result', icon: '/img/Static/Dashboard/addtest.png', color: 'WM-YellowGradient-BG', route: { name: 'SubmitTestResult' }, aligntext: 'text-md-center', alignimg: 'text-md-left', column: 'xs12 md12 sm12' },
+        { title: 'Add a Test Result', text: 'You can add the test result', icon: '/img/Static/Dashboard/addtest.png', color: 'WM-YellowGradient-BG', route: { name: 'SubmitTestResult' }, aligntext: 'text-md-left', alignimg: 'text-md-left', column: 'xs12 md12 sm12' },
       ],
     }
   },
diff --git a/src/views/Label/AddEdit.vue b/src/views/Label/AddEdit.vue
index 6df4729..438238f 100644
--- a/src/views/Label/AddEdit.vue
+++ b/src/views/Label/AddEdit.vue
@@ -158,7 +158,7 @@ export default {
 			}
 
 			if (result && result.status == 200) {
-				window.location.href = "/Show/Label/" + result.data.data.id;
+				this.$router.push({ name: 'AllLabels' });
 			}
 		}
 	}
diff --git a/src/views/MedicalCenter/OperatorList.vue b/src/views/MedicalCenter/OperatorList.vue
index 9d9dfe0..374c442 100644
--- a/src/views/MedicalCenter/OperatorList.vue
+++ b/src/views/MedicalCenter/OperatorList.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container grid-list-xs>
-    <material-card class color="black" :title="`Operator List ${name}`" text>
+    <material-card class color="black" :title="`Operator List`" text>
       <v-layout row wrap class="px-5 mb-3">
         <v-flex xs12 md3 xs3>
           <v-text-field name="Name" v-model="filter.name" label="Name" class="pa-2" color="black"></v-text-field>
@@ -149,8 +149,7 @@ export default {
         urls.listOpertorMedicalCenter(medicalCenterId, filter)
       );
       if (result && result.status == 200) {
-        this.items = result.data.data.users;
-        this.name = result.data.data.name;
+        this.items = result.data.data;
       } else {
         this.$router.push({name:`Dashboard`});
       }