diff --git a/src/app/pages/auth/login/login.component.ts b/src/app/pages/auth/login/login.component.ts
index 0c79316..2a999da 100644
--- a/src/app/pages/auth/login/login.component.ts
+++ b/src/app/pages/auth/login/login.component.ts
@@ -69,9 +69,13 @@ export class LoginComponent implements OnInit {
           localStorage.setItem('email',JSON.stringify(auth))
           this.disable= true
             this.showToast('success', 'Login Successfully', 'Welcome..!');
-          setTimeout(() => {
-            this.router.navigate(['/home']) 
-          }, 500);
+
+            if(res.role == 'FRONT-OFFICE'){
+              this.router.navigate(['/home'])
+            }else{
+              this.router.navigate(['/pages/dashboard'])
+            }
+        
          
 
         }
diff --git a/src/app/pages/order/order.component.html b/src/app/pages/order/order.component.html
index 49f679a..af4287a 100644
--- a/src/app/pages/order/order.component.html
+++ b/src/app/pages/order/order.component.html
@@ -294,7 +294,7 @@
            <nb-option value="Out For Delivery"  >Out For Delivery</nb-option>
          
            <!-- <nb-option value="Delivered"  >Delivered</nb-option> -->
-           <nb-option value="Cancelled"  >Cancelled</nb-option>
+           <!-- <nb-option value="Cancelled"  >Cancelled</nb-option> -->
           
         </nb-select>
           <!-- <label for="subject">Drivers:</label> <br /> -->
diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts
index 7614b01..a1be8a7 100644
--- a/src/app/pages/pages.component.ts
+++ b/src/app/pages/pages.component.ts
@@ -19,22 +19,16 @@ export class PagesComponent {
 
   menu = MENU_ITEMS;
 
-  constructor(private router: Router){
-    let role = localStorage.getItem('user_role')
-    console.log(role)
+  constructor(private router: Router){}
+  
+  ngOnInit() {
+    const role = localStorage.getItem('user_role');
+    console.log(role);
 
-    if(role == "FRONT-OFFICE"){
-      this.menu = this.menu.filter(arr=>{return arr.title != 'Users'}) 
+    if (role === 'FRONT-OFFICE') {
+      this.menu = this.menu.filter((item) => item.title !== 'Users');
     }
 
-  
-    console.log(this.menu)
-   
-            this.router.navigate(['/pages/dashboard']);
-          
-
-     
-         
-            
+    console.log(this.menu);
   }
 }