diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 56c1392fc..ff7b5464e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -564,23 +564,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: CSV download failed
-shelving:
-    list:
-        parking: Parking
-        priority: Priority
-        newShelving: New Shelving
-    summary:
-        recyclable: Recyclable
-parking:
-    pickingOrder: Picking order
-    sector: Sector
-    row: Row
-    column: Column
-    searchBar:
-        info: You can search by parking code
-        label: Search parking...
-    search: Search parking
-    searchInfo: You can search by parking code
 department:
     chat: Chat
     bossDepartment: Boss Department
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6fa2d16a0..679392fbd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -563,22 +563,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: Error al descargar CSV
-shelving:
-    list:
-        parking: Parking
-        priority: Prioridad
-        newShelving: Nuevo Carro
-    summary:
-        recyclable: Reciclable
-parking:
-    pickingOrder: Orden de recogida
-    row: Fila
-    column: Columna
-    searchBar:
-        info: Puedes buscar por código de parking
-        label: Buscar parking...
-    search: Buscar parking
-    searchInfo: Puedes buscar por código de parking
 department:
     chat: Chat
     bossDepartment: Jefe de departamento
diff --git a/src/pages/Parking/locale/en.yml b/src/pages/Parking/locale/en.yml
new file mode 100644
index 000000000..72caba408
--- /dev/null
+++ b/src/pages/Parking/locale/en.yml
@@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Picking order
+    sector: Sector
+    row: Row
+    column: Column
+    search: Search parking
+    searchInfo: You can search by parking code
\ No newline at end of file
diff --git a/src/pages/Parking/locale/es.yml b/src/pages/Parking/locale/es.yml
new file mode 100644
index 000000000..ab23182a1
--- /dev/null
+++ b/src/pages/Parking/locale/es.yml
@@ -0,0 +1,7 @@
+parking:
+    pickingOrder: Orden de recogida
+    row: Fila
+    sector: Sector
+    column: Columna
+    search: Buscar parking
+    searchInfo: Puedes buscar por código de parking
\ No newline at end of file
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index a501a7a99..41a0db33c 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,19 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-import ShelvingFilter from './ShelvingFilter.vue';
-import ShelvingSearchbar from './ShelvingSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Shelving"
         base-url="Shelvings"
         :descriptor="ShelvingDescriptor"
-        :filter-panel="ShelvingFilter"
-        search-data-key="ShelvingList"
-    >
-        <template #searchbar>
-            <ShelvingSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index cd7c4bcf9..053a7c463 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -6,13 +6,14 @@ import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
 import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
-import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ShelvingList';
+
 const filter = {
     include: [{ relation: 'parking' }],
 };
@@ -34,58 +35,64 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <ShelvingSearchbar />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        prefix="shelving"
+        :array-data-props="{
+            url: 'Shelvings',
+            order: ['code'],
+            userFilter: filter,
+            exprBuilder,
+        }"
+    >
+        <template #rightMenu>
             <ShelvingFilter data-key="ShelvingList" />
         </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ShelvingList"
-                url="Shelvings"
-                :filter="filter"
-                :expr-builder="exprBuilder"
-                :limit="20"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :id="row.id"
-                        :title="row.code"
-                        @click="navigate(row.id)"
+        <template #body>
+            <QPage class="column items-center q-pa-md">
+                <div class="vn-card-list">
+                    <VnPaginate
+                        :data-key="dataKey"
                     >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('shelving.list.parking')"
-                                :title-label="t('shelving.list.parking')"
-                                :value="row.parking?.code"
-                            />
-                            <VnLv
-                                :label="t('shelving.list.priority')"
-                                :value="row?.priority"
-                            />
+                        <template #body="{ rows }">
+                            <CardList
+                                v-for="row of rows"
+                                :key="row.id"
+                                :id="row.id"
+                                :title="row.code"
+                                @click="navigate(row.id)"
+                            >
+                                <template #list-items>
+                                    <VnLv
+                                        :label="t('shelving.list.parking')"
+                                        :title-label="t('shelving.list.parking')"
+                                        :value="row.parking?.code"
+                                    />
+                                    <VnLv
+                                        :label="t('shelving.list.priority')"
+                                        :value="row?.priority"
+                                    />
+                                </template>
+                                <template #actions>
+                                    <QBtn
+                                        :label="t('components.smartCard.openSummary')"
+                                        @click.stop="viewSummary(row.id, ShelvingSummary)"
+                                        color="primary"
+                                    />
+                                </template>
+                            </CardList>
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ShelvingSummary)"
-                                color="primary"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'ShelvingCreate' }">
-                <QBtn fab icon="add" color="primary" shortcut="+" />
-                <QTooltip>
-                    {{ t('shelving.list.newShelving') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
-</template>
+                    </VnPaginate>
+                </div>
+                <QPageSticky :offset="[20, 20]">
+                    <RouterLink :to="{ name: 'ShelvingCreate' }">
+                        <QBtn fab icon="add" color="primary" shortcut="+" />
+                        <QTooltip>
+                            {{ t('shelving.list.newShelving') }}
+                        </QTooltip>
+                    </RouterLink>
+                </QPageSticky>
+            </QPage>
+        </template>
+    </VnSection>
+</template>
\ No newline at end of file
diff --git a/src/pages/Shelving/locale/en.yml b/src/pages/Shelving/locale/en.yml
new file mode 100644
index 000000000..bd031f50c
--- /dev/null
+++ b/src/pages/Shelving/locale/en.yml
@@ -0,0 +1,9 @@
+shelving:
+    list:
+        parking: Parking
+        priority: Priority
+        newShelving: New Shelving
+    summary:
+        recyclable: Recyclable
+    search: Search shelving
+    searchInfo: You can search by shelving reference
\ No newline at end of file
diff --git a/src/pages/Shelving/locale/es.yml b/src/pages/Shelving/locale/es.yml
new file mode 100644
index 000000000..729485e70
--- /dev/null
+++ b/src/pages/Shelving/locale/es.yml
@@ -0,0 +1,9 @@
+shelving:
+    list:
+        parking: Parking
+        priority: Prioridad
+        newShelving: Nuevo Carro
+    summary:
+        recyclable: Reciclable
+    search: Buscar carro
+    searchInfo: Puedes buscar por referencia del carro
\ No newline at end of file