diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 91ccc4f51..bce87126e 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -47,7 +47,7 @@ function exprBuilder(param, value) {
             exprBuilder,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ParkingFilter data-key="ParkingList" />
         </template>
         <template #body>
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 053a7c463..cf158e76b 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -45,15 +45,13 @@ function exprBuilder(param, value) {
             exprBuilder,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ShelvingFilter data-key="ShelvingList" />
         </template>
         <template #body>
             <QPage class="column items-center q-pa-md">
                 <div class="vn-card-list">
-                    <VnPaginate
-                        :data-key="dataKey"
-                    >
+                    <VnPaginate :data-key="dataKey">
                         <template #body="{ rows }">
                             <CardList
                                 v-for="row of rows"
@@ -95,4 +93,4 @@ function exprBuilder(param, value) {
             </QPage>
         </template>
     </VnSection>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index e52dfce4d..cd8a2bf15 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -39,6 +39,41 @@ const parkingCard = {
     ],
 };
 
+const shelvingCard = {
+    name: 'ShelvingLayout',
+    path: ':id',
+    component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
+    redirect: { name: 'ShelvingSummary' },
+    children: [
+        {
+            name: 'ShelvingSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+            },
+            component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
+        },
+        {
+            name: 'ShelvingBasicData',
+            path: 'basic-data',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
+        },
+        {
+            name: 'ShelvingLog',
+            path: 'log',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Shelving/Card/ShelvingLog.vue'),
+        },
+    ],
+};
+
 export default {
     path: '/shelving',
     name: 'Shelving',
@@ -58,16 +93,24 @@ export default {
             path: '',
             name: 'ShelvingMain',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ShelvingList' },
+            redirect: { name: 'ShelvingSection' },
             children: [
                 {
-                    path: 'list',
-                    name: 'ShelvingList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'ShelvingSection',
+                    redirect: { name: 'ShelvingList' },
                     component: () => import('src/pages/Shelving/ShelvingList.vue'),
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ShelvingList',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        shelvingCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -97,39 +140,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'ShelvingLayout',
-            path: ':id',
-            component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
-            redirect: { name: 'ShelvingSummary' },
-            children: [
-                {
-                    name: 'ShelvingSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                    },
-                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
-                },
-                {
-                    name: 'ShelvingBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
-                },
-                {
-                    name: 'ShelvingLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Shelving/Card/ShelvingLog.vue'),
-                },
-            ],
-        },
     ],
 };