diff --git a/src/pages/01_branch-management/MainPage.vue b/src/pages/01_branch-management/MainPage.vue
index 2c9de9fb..30df4b8e 100644
--- a/src/pages/01_branch-management/MainPage.vue
+++ b/src/pages/01_branch-management/MainPage.vue
@@ -973,7 +973,10 @@ watch(currentHq, () => {
       />
     </transition>
 
-    <div class="col surface-2 rounded" :no-padding="!!branchData.total">
+    <div
+      class="col surface-2 rounded bordered overflow-hidden"
+      :no-padding="!!branchData.total"
+    >
       <template v-if="stats.length === 3 && !stats[0]?.count">
         <div class="full-width full-height column">
           <div class="self-end q-ma-md">
diff --git a/src/pages/02_personnel-management/MainPage.vue b/src/pages/02_personnel-management/MainPage.vue
index a4b26138..9e6205cb 100644
--- a/src/pages/02_personnel-management/MainPage.vue
+++ b/src/pages/02_personnel-management/MainPage.vue
@@ -827,8 +827,7 @@ watch(
 
     <!-- main -->
     <div
-      class="col surface-2 rounded justify-between column no-wrap bordered full-height"
-      style="overflow: hidden"
+      class="col surface-2 rounded justify-between column no-wrap bordered full-height overflow-hidden"
     >
       <div class="column">
         <div
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index f16dfdeb..b7c7d3c8 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -846,8 +846,7 @@ const emptyCreateDialog = ref(false);
 
       <!-- main -->
       <div
-        class="surface-2 bordered rounded col column full-width"
-        style="overflow: hidden"
+        class="surface-2 bordered rounded col column full-width overflow-hidden"
       >
         <!-- tabs -->
         <div class="column">
diff --git a/src/pages/04_flow-managment/MainPage.vue b/src/pages/04_flow-managment/MainPage.vue
index 5bb4711f..3a1caabc 100644
--- a/src/pages/04_flow-managment/MainPage.vue
+++ b/src/pages/04_flow-managment/MainPage.vue
@@ -344,7 +344,7 @@ watch([() => pageState.inputSearch, workflowPageSize], fetchWorkflowList);
     </transition>
 
     <!-- SEC: header content -->
-    <section class="col surface-1 rounded">
+    <section class="col surface-1 rounded bordered overflow-hidden">
       <div class="column full-height">
         <header
           class="row surface-3 justify-between full-width items-center bordered-b"
diff --git a/src/pages/04_product-service/MainPage.vue b/src/pages/04_product-service/MainPage.vue
index 65b70d9c..89231c23 100644
--- a/src/pages/04_product-service/MainPage.vue
+++ b/src/pages/04_product-service/MainPage.vue
@@ -1696,10 +1696,7 @@ watch(
       </div>
     </transition>
 
-    <div
-      class="column col rounded bordered"
-      style="flex-wrap: nowrap; overflow: hidden"
-    >
+    <div class="column col rounded bordered overflow-hidden no-wrap">
       <q-splitter
         v-model="splitterModel"
         :limits="[0, 100]"
diff --git a/src/pages/05_quotation/MainPage.vue b/src/pages/05_quotation/MainPage.vue
index 67c24027..9643b8aa 100644
--- a/src/pages/05_quotation/MainPage.vue
+++ b/src/pages/05_quotation/MainPage.vue
@@ -436,7 +436,7 @@ async function storeDataLocal(id: string) {
     </transition>
 
     <!-- SEC: header content -->
-    <header class="col surface-1 rounded">
+    <header class="col surface-1 rounded bordered overflow-hidden">
       <div class="column full-height">
         <section
           class="row surface-3 justify-between full-width items-center bordered-b"
diff --git a/src/pages/07_agencies-management/MainPage.vue b/src/pages/07_agencies-management/MainPage.vue
index f4ef8aa6..ef742cf8 100644
--- a/src/pages/07_agencies-management/MainPage.vue
+++ b/src/pages/07_agencies-management/MainPage.vue
@@ -314,7 +314,7 @@ watch(
     </transition>
 
     <!-- SEC: header content -->
-    <section class="col surface-1 rounded" style="overflow: hidden">
+    <section class="col surface-1 rounded bordered overflow-hidden">
       <div class="column full-height">
         <header
           class="row surface-3 justify-between full-width items-center bordered-b"