diff --git a/src/app/master-data/area/detail/edit/page.tsx b/src/app/master-data/(suspense)/area/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/area/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/area/detail/edit/page.tsx
diff --git a/src/app/master-data/area/detail/page.tsx b/src/app/master-data/(suspense)/area/detail/page.tsx
similarity index 100%
rename from src/app/master-data/area/detail/page.tsx
rename to src/app/master-data/(suspense)/area/detail/page.tsx
diff --git a/src/app/master-data/kandang/detail/edit/page.tsx b/src/app/master-data/(suspense)/kandang/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/kandang/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/kandang/detail/edit/page.tsx
diff --git a/src/app/master-data/kandang/detail/page.tsx b/src/app/master-data/(suspense)/kandang/detail/page.tsx
similarity index 100%
rename from src/app/master-data/kandang/detail/page.tsx
rename to src/app/master-data/(suspense)/kandang/detail/page.tsx
diff --git a/src/app/master-data/area/detail/layout.tsx b/src/app/master-data/(suspense)/layout.tsx
similarity index 80%
rename from src/app/master-data/area/detail/layout.tsx
rename to src/app/master-data/(suspense)/layout.tsx
index 6a7b249d..a059dcf2 100644
--- a/src/app/master-data/area/detail/layout.tsx
+++ b/src/app/master-data/(suspense)/layout.tsx
@@ -1,8 +1,9 @@
+// src/app/master-data/(suspense)/layout.tsx
 'use client';
 
 import { Suspense } from 'react';
 
-export default function AreaLayout({
+export default function SuspenseLayout({
   children,
 }: {
   children: React.ReactNode;
diff --git a/src/app/master-data/location/detail/edit/page.tsx b/src/app/master-data/(suspense)/location/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/location/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/location/detail/edit/page.tsx
diff --git a/src/app/master-data/location/detail/page.tsx b/src/app/master-data/(suspense)/location/detail/page.tsx
similarity index 100%
rename from src/app/master-data/location/detail/page.tsx
rename to src/app/master-data/(suspense)/location/detail/page.tsx
diff --git a/src/app/master-data/nonstock/detail/edit/page.tsx b/src/app/master-data/(suspense)/nonstock/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/nonstock/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/nonstock/detail/edit/page.tsx
diff --git a/src/app/master-data/nonstock/detail/page.tsx b/src/app/master-data/(suspense)/nonstock/detail/page.tsx
similarity index 100%
rename from src/app/master-data/nonstock/detail/page.tsx
rename to src/app/master-data/(suspense)/nonstock/detail/page.tsx
diff --git a/src/app/master-data/product-category/detail/edit/page.tsx b/src/app/master-data/(suspense)/product-category/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/product-category/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/product-category/detail/edit/page.tsx
diff --git a/src/app/master-data/product-category/detail/page.tsx b/src/app/master-data/(suspense)/product-category/detail/page.tsx
similarity index 100%
rename from src/app/master-data/product-category/detail/page.tsx
rename to src/app/master-data/(suspense)/product-category/detail/page.tsx
diff --git a/src/app/master-data/product/detail/edit/page.tsx b/src/app/master-data/(suspense)/product/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/product/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/product/detail/edit/page.tsx
diff --git a/src/app/master-data/product/detail/page.tsx b/src/app/master-data/(suspense)/product/detail/page.tsx
similarity index 100%
rename from src/app/master-data/product/detail/page.tsx
rename to src/app/master-data/(suspense)/product/detail/page.tsx
diff --git a/src/app/master-data/uom/detail/edit/page.tsx b/src/app/master-data/(suspense)/uom/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/uom/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/uom/detail/edit/page.tsx
diff --git a/src/app/master-data/uom/detail/page.tsx b/src/app/master-data/(suspense)/uom/detail/page.tsx
similarity index 100%
rename from src/app/master-data/uom/detail/page.tsx
rename to src/app/master-data/(suspense)/uom/detail/page.tsx
diff --git a/src/app/master-data/warehouse/detail/edit/page.tsx b/src/app/master-data/(suspense)/warehouse/detail/edit/page.tsx
similarity index 100%
rename from src/app/master-data/warehouse/detail/edit/page.tsx
rename to src/app/master-data/(suspense)/warehouse/detail/edit/page.tsx
diff --git a/src/app/master-data/warehouse/detail/page.tsx b/src/app/master-data/(suspense)/warehouse/detail/page.tsx
similarity index 100%
rename from src/app/master-data/warehouse/detail/page.tsx
rename to src/app/master-data/(suspense)/warehouse/detail/page.tsx
diff --git a/src/app/master-data/kandang/detail/layout.tsx b/src/app/master-data/kandang/detail/layout.tsx
deleted file mode 100644
index f3c8c490..00000000
--- a/src/app/master-data/kandang/detail/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function KandangLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}
diff --git a/src/app/master-data/location/detail/layout.tsx b/src/app/master-data/location/detail/layout.tsx
deleted file mode 100644
index fbe0ff69..00000000
--- a/src/app/master-data/location/detail/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function LocationLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}
diff --git a/src/app/master-data/nonstock/detail/layout.tsx b/src/app/master-data/nonstock/detail/layout.tsx
deleted file mode 100644
index aa0d1116..00000000
--- a/src/app/master-data/nonstock/detail/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function NonstockLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}
diff --git a/src/app/master-data/product-category/detail/layout.tsx b/src/app/master-data/product-category/detail/layout.tsx
deleted file mode 100644
index 76235398..00000000
--- a/src/app/master-data/product-category/detail/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function ProductCategoryLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}
diff --git a/src/app/master-data/product/detail/layout.tsx b/src/app/master-data/product/detail/layout.tsx
deleted file mode 100644
index 5a91b249..00000000
--- a/src/app/master-data/product/detail/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function ProductLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}
diff --git a/src/app/master-data/uom/detail/layout.tsx b/src/app/master-data/uom/detail/layout.tsx
deleted file mode 100644
index 1938ec61..00000000
--- a/src/app/master-data/uom/detail/layout.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function UomLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}
diff --git a/src/app/master-data/warehouse/detail/layout.tsx b/src/app/master-data/warehouse/detail/layout.tsx
deleted file mode 100644
index 6b78cf39..00000000
--- a/src/app/master-data/warehouse/detail/layout.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-'use client';
-
-import { Suspense } from 'react';
-
-export default function WarehouseLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <Suspense
-      fallback={
-        <div className='w-full flex flex-row justify-center items-center p-4'>
-          <span className='loading loading-spinner loading-xl' />
-        </div>
-      }
-    >
-      {children}
-    </Suspense>
-  );
-}