diff --git a/src/pages/Payroll/manageSalary.vue b/src/pages/Payroll/manageSalary.vue
index f3755df..4e6788d 100644
--- a/src/pages/Payroll/manageSalary.vue
+++ b/src/pages/Payroll/manageSalary.vue
@@ -211,7 +211,10 @@
                         <v-toolbar>
                           <h3>Allowances</h3>
                         </v-toolbar>
-                        <v-layout v-for="(editedItem,salaryTemplate,index) in editedItem.salaryTemplate.allowances" :key="index">
+                        <v-layout
+                          v-for="(editedItem,salaryTemplate,index) in editedItem.salaryTemplate.allowances"
+                          :key="index"
+                        >
                           <v-flex xs4 class="mt-4 hidden-xs-only hidden-sm-only">
                             <v-text-field
                               readonly
@@ -236,7 +239,10 @@
                         <v-toolbar>
                           <h3>Deduction</h3>
                         </v-toolbar>
-                        <v-layout v-for="(editedItem,salaryTemplate,index) in editedItem.salaryTemplate.deduction" :key="index">
+                        <v-layout
+                          v-for="(editedItem,salaryTemplate,index) in editedItem.salaryTemplate.deduction"
+                          :key="index"
+                        >
                           <v-flex xs4 class="mt-4 hidden-xs-only hidden-sm-only">
                             <v-text-field
                               readonly
@@ -269,7 +275,7 @@
                               ></v-text-field>
                             </v-flex>
                           </v-flex>
-                        </v-layout> -->
+                        </v-layout>-->
                       </v-card>
                     </v-flex>
                     <v-flex xs12 sm12 md12 style="padding-top: 1%;">
@@ -529,12 +535,8 @@ export default {
 
     editedItem: {
       salaryTemplate: {
-        allowances: {
-
-        },
-        deduction: {
-
-        }
+        allowances: {},
+        deduction: {}
       },
       hourlyTemplate: {}
     },
@@ -576,7 +578,7 @@ export default {
       },
       { text: "Action", value: "", sortable: false, align: "center" }
     ],
-    desserts: [],
+    desserts: []
   }),
 
   methods: {
@@ -596,12 +598,12 @@ export default {
       this.editedItem = Object.assign({}, item);
       this.profileSalaryDialog = true;
       // console.log("item", item);
-      if(item.salaryTemplate) {
+      if (item.salaryTemplate) {
         this.viewSalary = true;
-        this.viewHourly = false
+        this.viewHourly = false;
       } else {
         this.viewHourly = true;
-        this.viewSalary = false
+        this.viewSalary = false;
       }
     },
     getRole() {
@@ -613,10 +615,16 @@ export default {
         })
         .then(response => {
           this.getRoles = response.data.data;
-          if (this.getRoles[2].role !== 3) {
-            this.getRoles = response.data.data;
-            console.log("roles", this.getRoles[2].role);
-          }
+          // if (this.getRoles[2].role !== 3) {
+          //   this.getRoles = response.data.data;
+          //   console.log("roles", this.getRoles[2].role);
+          // }
+          this.getRoles = response.data.data;
+          var removedRoles = _.remove(this.getRoles, function(c) {
+            //remove if color is green or yellow
+            return c.role === 1 ||  c.role === 4 || c.role === 5;
+            // console.log(c);
+          });
           this.showLoader = false;
         })
         .catch(error => {
diff --git a/src/pages/User/user.vue b/src/pages/User/user.vue
index cffa715..51cd303 100644
--- a/src/pages/User/user.vue
+++ b/src/pages/User/user.vue
@@ -1092,6 +1092,12 @@ export default {
         .then(response => {
           this.userRole = response.data.data;
           this.showLoader = false;
+          this.userRole = response.data.data;
+          var removedRoles = _.remove(this.userRole, function(c) {
+            //remove if color is green or yellow
+            return c.role === 1 || c.role === 3 || c.role === 4 || c.role === 5;
+            // console.log(c);
+          });
         })
         .catch(error => {
           this.showLoader = false;