diff --git a/src/config.js b/src/config.js
index 80e01d8..d362db9 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,7 +1,7 @@
 // ==============================|| THEME CONFIG  ||============================== //
 
 const config = {
-  defaultPath: '/lionerDashboard',
+  defaultPath: '/client',
   fontFamily: `'Public Sans', sans-serif`,
   i18n: 'en',
   miniDrawer: false,
diff --git a/src/menu-items/client.js b/src/menu-items/client.js
index 24911ba..be3c2f1 100644
--- a/src/menu-items/client.js
+++ b/src/menu-items/client.js
@@ -20,7 +20,7 @@ const client = {
     id: 'client-management',
     title: 'Client Management',
     type: 'group',
-    //ability:['SUPPRESS','REMINDER'],
+    ability:['VIEW','CLIENT'],
     children: [
         {
             id: 'client',
@@ -29,7 +29,7 @@ const client = {
             url: '/client',
             icon: icons.ClientIcon,
             breadcrumbs: false,
-            ability:['VIEW','DASHBOARD']
+            ability:['VIEW','CLIENT']
         },
         {
             id: 'template',
@@ -38,7 +38,7 @@ const client = {
             url: '/template',
             icon: icons.AssignmentIcon,
             breadcrumbs: false,
-            ability:['VIEW','DASHBOARD']
+            ability:['VIEW','TEMPLATE']
         },
     ]
 };
diff --git a/src/menu-items/dashboard.js b/src/menu-items/dashboard.js
index 1a96811..c2c78dd 100644
--- a/src/menu-items/dashboard.js
+++ b/src/menu-items/dashboard.js
@@ -35,7 +35,7 @@ const dashboard = {
       url: '/lionerDashboard',
       icon: icons.SpeedIcon,
       breadcrumbs: false,
-      ability:['VIEW','DASHBOARD']
+      ability:['VIEW','CLIENT']
     },
     // {
     //   id: 'maintainPage',
diff --git a/src/menu-items/setting.js b/src/menu-items/setting.js
index e406c19..d751acf 100644
--- a/src/menu-items/setting.js
+++ b/src/menu-items/setting.js
@@ -40,6 +40,7 @@ const setting = {
     id: 'settingMenu',
     title: 'System Administration',
     type: 'group',
+    ability:['VIEW','SYSTEM_CONFIGURATION'],
     children: [
         // {
         //     id: 'category',
@@ -102,7 +103,7 @@ const setting = {
             url: '/userSearchview',
             icon: icons.UserOutlined,
             breadcrumbs: false,
-            ability:['MAINTAIN','USER']
+            ability:['VIEW','USER']
         },
         // {
         //     id: 'auditLog',
@@ -129,7 +130,7 @@ const setting = {
             url: '/passwordpolicy',
             icon: icons.SafetyCertificateOutlined,
             breadcrumbs: false,
-            ability:['MANAGE','PASSWORD_POLICY']
+            ability:['MANAGE','SYSTEM_CONFIGURATION']
         },
         {
             id: 'setting',
diff --git a/src/pages/client/ClientMaintainPage/index.js b/src/pages/client/ClientMaintainPage/index.js
index 86e480f..f4cf5c8 100644
--- a/src/pages/client/ClientMaintainPage/index.js
+++ b/src/pages/client/ClientMaintainPage/index.js
@@ -32,15 +32,7 @@ const ClientPanel = () => {
 
     const [onReady, setOnReady] = useState(false);
     const [isNewRecord, setIsNewRecord] = useState(false);
-    const [applicationDetail, setApplicationDetail] = useState({});
-    const [subDivisionCombo, setSubDivisionCombo] = useState([]);
-    const [refSubDivisionList, setRefSubDivisionList] = useState([]);
     const [clientDetail, setClientDetail] = useState({});
-    const [applicationList, setApplicationList] = useState([]);
-    const [reminderInterval, setReminderInterval] = useState(0);
-    const [reminderBefore, setReminderBefore] = useState(0);
-    const [reminderLimit, setReminderLimit] = useState(0);
-    const [reminderLimitMax, setReminderLimitMax] = useState(0);
 
     //const [tagCombo, setTagCombo] = useState({});
 
diff --git a/src/pages/lionerUserDetailPage/index.js b/src/pages/lionerUserDetailPage/index.js
index 93a7b53..19b88be 100644
--- a/src/pages/lionerUserDetailPage/index.js
+++ b/src/pages/lionerUserDetailPage/index.js
@@ -190,7 +190,7 @@ const UserMaintainPage = () => {
     }, [editedUserData]);
 
     return (
-        !onReady ?
+        !onReady || userData?.groupId==3 ?
             <LoadingComponent/>
             :
             <Grid container rowSpacing={3} columnSpacing={1.5}>
diff --git a/src/pages/pdf/PdfSearchPage/PdfSearchForm.js b/src/pages/pdf/PdfSearchPage/PdfSearchForm.js
index 4721abc..c39c8fc 100644
--- a/src/pages/pdf/PdfSearchPage/PdfSearchForm.js
+++ b/src/pages/pdf/PdfSearchPage/PdfSearchForm.js
@@ -300,7 +300,7 @@ const PdfSearchForm = ({applySearch, setExpanded,expanded, clientId}) => {
 
                     <Grid item>
                         <Grid container>
-                            {ability.can('EDIT','EVENT') ?
+                            {ability.can('MAINTAIN','CLIENT') ?
                                 <Grid item sx={{ml:3, mr:3, mb:0.5}}>
                                     <Button
                                         variant="contained"
diff --git a/src/routes/ClientRoutes.js b/src/routes/ClientRoutes.js
index 7682af8..393a3b1 100644
--- a/src/routes/ClientRoutes.js
+++ b/src/routes/ClientRoutes.js
@@ -30,9 +30,9 @@ const ClientRoutes =() => {
                 path: 'client',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <ClientSearchPage />,
-                        <Navigate to="/" />
+                        <Navigate to="/userSearchview" />
                     )
                 ),
             },
@@ -40,7 +40,7 @@ const ClientRoutes =() => {
                 path: 'client/maintain/:id',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <ClientMaintainPage />,
                         <Navigate to="/" />
                     )
@@ -50,7 +50,7 @@ const ClientRoutes =() => {
               path: '/pdf/:id',
               element:  (
                   handleRouteAbility(
-                      ability.can('VIEW', 'DASHBOARD'),
+                      ability.can('VIEW', 'CLIENT'),
                       <PdfSearchPage />,
                       <Navigate to="/" />
                   )
@@ -60,7 +60,7 @@ const ClientRoutes =() => {
                 path: '/pdf/maintain/:id',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <PdfMaintainPage />,
                         <Navigate to="/" />
                     )
@@ -70,7 +70,7 @@ const ClientRoutes =() => {
                 path: '/template/',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'TEMPLATE'),
                         <TemplateSearchPage />,
                         <Navigate to="/" />
                     )
@@ -80,7 +80,7 @@ const ClientRoutes =() => {
                 path: '/pdf/form-up-down/:id',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <PdfFormUpAndDown />,
                         <Navigate to="/" />
                     )
@@ -90,7 +90,7 @@ const ClientRoutes =() => {
                 path: '/pdf/newIDA/:id',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <PdfViewer pdfUrl={`${apiPath}/pdf2/get?id=1`} 
                             formCode='IDA'
                         />,
@@ -102,7 +102,7 @@ const ClientRoutes =() => {
                 path: '/pdf/newFNA/:id',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <PdfViewer pdfUrl={`${apiPath}/pdf2/get?id=2`} 
                             formCode='FNA'
                         />,
@@ -115,7 +115,7 @@ const ClientRoutes =() => {
                 path: '/pdf/newHSBCFIN/:id',
                 element:  (
                     handleRouteAbility(
-                        ability.can('VIEW', 'DASHBOARD'),
+                        ability.can('VIEW', 'CLIENT'),
                         <PdfViewer pdfUrl={`${apiPath}/pdf2/get?id=3`} 
                             formCode='HSBCFIN'
                         />,
diff --git a/src/routes/MainRoutes.js b/src/routes/MainRoutes.js
index 1cd5bda..8649041 100644
--- a/src/routes/MainRoutes.js
+++ b/src/routes/MainRoutes.js
@@ -37,9 +37,9 @@ const MainRoutes = () => {
         path: '/',
         element:  (
             handleRouteAbility(
-                ability.can('VIEW', 'DASHBOARD'),
-                <LIONERDashboard />,
-                <Navigate to="/appreciation" />
+                ability.can('VIEW', 'CLIENT'),
+                <ClientSearchPage />,
+                <Navigate to="/userSearchview" />
             )
         ),
       },
@@ -47,7 +47,7 @@ const MainRoutes = () => {
         path: '/lionerDashboard',
         element:  (
             handleRouteAbility(
-                ability.can('VIEW', 'DASHBOARD'),
+                ability.can('VIEW', 'CLIENT'),
                 <ClientSearchPage />,
                 // <LIONERDashboard />,
                 <Navigate to="/client" />
diff --git a/src/routes/SettingRoutes.js b/src/routes/SettingRoutes.js
index cefa052..b677467 100644
--- a/src/routes/SettingRoutes.js
+++ b/src/routes/SettingRoutes.js
@@ -118,7 +118,7 @@ const SettingRoutes = () => {
                 path: 'user/:id',
                 element: (
                     handleRouteAbility(
-                        ability.can('MAINTAIN', 'USER'),
+                        ability.can('VIEW', 'USER'),
                         <UserMaintainPage />,
                         <Navigate to="/" />
                     )
@@ -128,7 +128,7 @@ const SettingRoutes = () => {
                 path: 'userSearchview',
                 element:(
                     handleRouteAbility(
-                        ability.can('MAINTAIN', 'USER'),
+                        ability.can('VIEW', 'USER'),
                         <UserSearchPage />,
                         <Navigate to="/" />
                     )
@@ -168,7 +168,7 @@ const SettingRoutes = () => {
                 path: 'passwordpolicy',
                 element: (
                     handleRouteAbility(
-                        ability.can('MANAGE', 'PASSWORD_POLICY'),
+                        ability.can('MANAGE', 'SYSTEM_CONFIGURATION'),
                         <PasswordPolicyPage />,
                         <Navigate to="/" />
                     )
diff --git a/src/routes/index.js b/src/routes/index.js
index 5ef392d..5b6bb99 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -24,7 +24,7 @@ export default function ThemeRoutes() {
         }
 
         if(
-            !location.pathname.includes("/appreciation")
+            !location.pathname.includes("/client")
         ){
             setIsAdvanceDisplay(true);
         }
@@ -36,7 +36,7 @@ export default function ThemeRoutes() {
     return useRoutes([
         {
             path: '',
-            element: isUserLoggedIn() ? <Navigate to="/lionerDashboard" />
+            element: isUserLoggedIn() ? <Navigate to="/client" />
                 : <Navigate to="/login"/>
         },
         LoginRoutes,