diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index d12fb8428a..f3f2315a33 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -21,7 +21,7 @@ const itemComputed = computed(() => {
 </script>
 <template>
     <QItem
-        active-class="bg-hover"
+        active-class="bg-vn-hover"
         class="min-height"
         :to="{ name: itemComputed.name }"
         clickable
diff --git a/src/css/app.scss b/src/css/app.scss
index f34b1358b2..27ed655349 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -5,6 +5,7 @@
 body.body--light {
     --font-color: black;
     --vn-section-color: #e0e0e0;
+    --vn-section-hover-color: #b9b9b9;
     --vn-page-color: #ffffff;
     --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
@@ -19,6 +20,7 @@ body.body--light {
 body.body--dark {
     --vn-page-color: #222;
     --vn-section-color: #3d3d3d;
+    --vn-section-hover-color: #747474;
     --vn-text-color: white;
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
@@ -71,8 +73,9 @@ select:-webkit-autofill {
 .bg-vn-section-color {
     background-color: var(--vn-section-color);
 }
-.bg-hover {
-    background-color: #666666;
+
+.bg-vn-hover {
+    background-color: var(--vn-section-hover-color);
 }
 
 .color-vn-label {
@@ -183,8 +186,6 @@ select:-webkit-autofill {
     justify-content: center;
 }
 
-/* q-notification row items-stretch q-notification--standard bg-negative text-white */
-
 .q-card,
 .q-table,
 .q-table__bottom,
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fbab069663..f1f18a89ce 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -990,6 +990,7 @@ roadmap:
         stops: Stops
 route:
     pageTitles:
+        agency: Agency List
         routes: Routes
         cmrsList: CMRs list
         RouteList: List
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
similarity index 98%
rename from src/pages/Agency/AgencyList.vue
rename to src/pages/Route/Agency/AgencyList.vue
index ec6506ba04..de335738de 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -33,6 +33,7 @@ function exprBuilder(param, value) {
                 url="Agencies"
                 order="name"
                 :expr-builder="exprBuilder"
+                auto-load
             >
                 <template #body="{ rows }">
                     <CardList
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Route/Agency/Card/AgencyBasicData.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyBasicData.vue
rename to src/pages/Route/Agency/Card/AgencyBasicData.vue
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
similarity index 82%
rename from src/pages/Agency/Card/AgencyCard.vue
rename to src/pages/Route/Agency/Card/AgencyCard.vue
index 6b2296df39..e1eebabf7b 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -1,5 +1,5 @@
 <script setup>
-import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
+import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
 </script>
 <template>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Route/Agency/Card/AgencyDescriptor.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyDescriptor.vue
rename to src/pages/Route/Agency/Card/AgencyDescriptor.vue
diff --git a/src/pages/Agency/Card/AgencyLog.vue b/src/pages/Route/Agency/Card/AgencyLog.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyLog.vue
rename to src/pages/Route/Agency/Card/AgencyLog.vue
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Route/Agency/Card/AgencyModes.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyModes.vue
rename to src/pages/Route/Agency/Card/AgencyModes.vue
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Route/Agency/Card/AgencySummary.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencySummary.vue
rename to src/pages/Route/Agency/Card/AgencySummary.vue
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
similarity index 100%
rename from src/pages/Agency/Card/AgencyWorkcenter.vue
rename to src/pages/Route/Agency/Card/AgencyWorkcenter.vue
diff --git a/src/pages/Agency/locale/en.yml b/src/pages/Route/Agency/locale/en.yml
similarity index 100%
rename from src/pages/Agency/locale/en.yml
rename to src/pages/Route/Agency/locale/en.yml
diff --git a/src/pages/Agency/locale/es.yml b/src/pages/Route/Agency/locale/es.yml
similarity index 100%
rename from src/pages/Agency/locale/es.yml
rename to src/pages/Route/Agency/locale/es.yml
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
index 6f281e21dc..46a73bfff0 100644
--- a/src/router/modules/agency.js
+++ b/src/router/modules/agency.js
@@ -1,88 +1,3 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/agency',
-    name: 'Agency',
-    meta: {
-        title: 'agency',
-        icon: 'garage_home',
-        moduleName: 'Agency',
-    },
-    component: RouterView,
-    redirect: { name: 'AgencyCard' },
-    menus: {
-        main: [],
-        card: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
-    },
-    children: [
-        {
-            path: '/agency/:id',
-            name: 'AgencyCard',
-            component: () => import('src/pages/Agency/Card/AgencyCard.vue'),
-            redirect: { name: 'AgencySummary' },
-            children: [
-                {
-                    name: 'AgencySummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Agency/Card/AgencySummary.vue'),
-                },
-                {
-                    name: 'AgencyBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
-                },
-                {
-                    path: 'workCenter',
-                    name: 'AgencyWorkCenterCard',
-                    redirect: { name: 'AgencyWorkCenters' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'AgencyWorkCenters',
-                            meta: {
-                                icon: 'apartment',
-                                title: 'workCenters',
-                            },
-                            component: () =>
-                                import('src/pages/Agency/Card/AgencyWorkcenter.vue'),
-                        },
-                    ],
-                },
-                {
-                    path: 'modes',
-                    name: 'AgencyModesCard',
-                    redirect: { name: 'AgencyModes' },
-                    children: [
-                        {
-                            path: '',
-                            name: 'AgencyModes',
-                            meta: {
-                                icon: 'format_list_bulleted',
-                                title: 'modes',
-                            },
-                            component: () =>
-                                import('src/pages/Agency/Card/AgencyModes.vue'),
-                        },
-                    ],
-                },
-                {
-                    name: 'AgencyLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Agency/Card/AgencyLog.vue'),
-                },
-            ],
-        },
-    ],
-};
+export default {};
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 8e08d7222b..54019f27b5 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
+        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'Agency'],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -76,17 +76,106 @@ export default {
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
                 {
-                    path: '/agency',
+                    path: 'agency',
+                    name: 'Agency',
+                    meta: {
+                        title: 'agency',
+                        icon: 'garage_home',
+                        moduleName: 'Agency',
+                    },
                     redirect: { name: 'AgencyList' },
+                    menus: {
+                        main: [],
+                        card: [
+                            'AgencyBasicData',
+                            'AgencyModes',
+                            'AgencyWorkCenters',
+                            'AgencyLog',
+                        ],
+                    },
                     children: [
                         {
-                            path: 'list',
-                            name: 'AgencyList',
-                            meta: {
-                                title: 'agencyList',
-                                icon: 'view_list',
-                            },
-                            component: () => import('src/pages/Agency/AgencyList.vue'),
+                            path: '/agency',
+                            name: 'AgencyCard',
+                            component: () =>
+                                import('src/pages/Route/Agency/Card/AgencyCard.vue'),
+                            redirect: { name: 'AgencySummary' },
+                            children: [
+                                {
+                                    name: 'AgencySummary',
+                                    path: 'summary',
+                                    meta: {
+                                        title: 'summary',
+                                        icon: 'view_list',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Route/Agency/Card/AgencySummary.vue'
+                                        ),
+                                },
+                                {
+                                    name: 'AgencyBasicData',
+                                    path: 'basic-data',
+                                    meta: {
+                                        title: 'basicData',
+                                        icon: 'vn:settings',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'pages/Route/Agency/Card/AgencyBasicData.vue'
+                                        ),
+                                },
+                                {
+                                    path: 'workCenter',
+                                    name: 'AgencyWorkCenterCard',
+                                    redirect: { name: 'AgencyWorkCenters' },
+                                    children: [
+                                        {
+                                            path: '',
+                                            name: 'AgencyWorkCenters',
+                                            meta: {
+                                                icon: 'apartment',
+                                                title: 'workCenters',
+                                            },
+                                            component: () =>
+                                                import(
+                                                    'src/pages/Route/Agency/Card/AgencyWorkcenter.vue'
+                                                ),
+                                        },
+                                    ],
+                                },
+                                {
+                                    path: 'modes',
+                                    name: 'AgencyModesCard',
+                                    redirect: { name: 'AgencyModes' },
+                                    children: [
+                                        {
+                                            path: '',
+                                            name: 'AgencyModes',
+                                            meta: {
+                                                icon: 'format_list_bulleted',
+                                                title: 'modes',
+                                            },
+                                            component: () =>
+                                                import(
+                                                    'src/pages/Route/Agency/Card/AgencyModes.vue'
+                                                ),
+                                        },
+                                    ],
+                                },
+                                {
+                                    name: 'AgencyLog',
+                                    path: 'log',
+                                    meta: {
+                                        title: 'log',
+                                        icon: 'history',
+                                    },
+                                    component: () =>
+                                        import(
+                                            'src/pages/Route/Agency/Card/AgencyLog.vue'
+                                        ),
+                                },
+                            ],
                         },
                     ],
                 },
diff --git a/src/router/routes.js b/src/router/routes.js
index 805eefb8cb..ca1296d36c 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -17,7 +17,6 @@ import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
-import agency from 'src/router/modules/agency';
 import zone from 'src/router/modules/zone';
 import account from './modules/account';
 import monitor from 'src/router/modules/monitor';
@@ -79,7 +78,6 @@ const routes = [
             roadmap,
             entry,
             parking,
-            agency,
             ItemType,
             zone,
             account,
diff --git a/test/cypress/integration/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
similarity index 97%
rename from test/cypress/integration/agency/agencyWorkCenter.spec.js
rename to test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 8349260ee1..a66476d47c 100644
--- a/test/cypress/integration/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -6,7 +6,6 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('assign workCenter', () => {
-        cy.visit(`/#/agency`);
         cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
         cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
@@ -27,7 +26,6 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('error on duplicate workCenter', () => {
-        cy.visit(`/#/agency`);
         cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
         cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();