diff --git a/src/app/(protected)/orders/page.tsx b/src/app/(protected)/orders/page.tsx
index af8e1ce..c70126a 100644
--- a/src/app/(protected)/orders/page.tsx
+++ b/src/app/(protected)/orders/page.tsx
@@ -905,7 +905,7 @@ export default function OrdersPage() {
     }, [visibleCols]);
 
     return (
-        <div className="space-y-6">
+        <div className="space-y-6 overflow-x-clip">
             {/* ส่วนหัว */}
             <div className="flex flex-col gap-3 sm:flex-row sm:items-end sm:justify-between">
                 <div>
@@ -998,7 +998,7 @@ export default function OrdersPage() {
 
             {/* ตาราง (2 ชั้น) — ไม่ fix size: ใช้ table-auto, ให้คอนเทนต์กำหนดความกว้าง, บรรทัดเดียวทุกเซลล์ */}
             <section className="rounded-3xl border border-neutral-200/70 bg-white/80 p-5 shadow-[0_10px_30px_-12px_rgba(0,0,0,0.08)]">
-                <div className="overflow-x-auto">
+                <div className="w-full max-w-full overflow-x-auto">
                     <table className="table-auto text-sm">
                         <thead>
                         {/* ชั้นบน: กลุ่มหัวข้อ (ไทย) */}
diff --git a/src/app/(public)/layout.tsx b/src/app/(public)/layout.tsx
index 49de0e0..4b7b94c 100644
--- a/src/app/(public)/layout.tsx
+++ b/src/app/(public)/layout.tsx
@@ -1,3 +1,3 @@
-export default function PublicLayout({ children }: { children: React.ReactNode }) {
+export default function PublicLayout({children}: { children: React.ReactNode }) {
     return <div id="main" className="min-h-screen">{children}</div>;
 }
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index f7fa87e..7f5dcb9 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -25,7 +25,7 @@ export default function RootLayout({
   return (
     <html lang="en">
       <body
-        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+        className={`${geistSans.variable} ${geistMono.variable} antialiased min-h-screen overflow-x-clip`}
       >
         {children}
       </body>
