diff --git a/src/components/pages/closing/ClosingKandangList.tsx b/src/components/pages/closing/ClosingKandangList.tsx
index dd3083a7..b324c512 100644
--- a/src/components/pages/closing/ClosingKandangList.tsx
+++ b/src/components/pages/closing/ClosingKandangList.tsx
@@ -10,18 +10,17 @@ const ClosingKandangList = ({
   projectData?: ProjectFlock;
 }) => {
   return (
-    <div className='w-full my-4 @container'>
+    <div className='w-full py-3 @container relative before:absolute before:top-0 before:left-0 before:right-0 before:-mx-4 before:border-t before:border-base-content/10 after:absolute after:bottom-0 after:left-0 after:right-0 after:-mx-4 after:border-b after:border-base-content/10'>
       <div className='flex flex-col @sm:flex-row gap-4'>
         <div className='w-full'>
           <div className='overflow-x-auto'>
-            <h1 className='font-bold my-4'>Kandang</h1>
-            <div className='flex flex-wrap gap-2 mb-4'>
+            <div className='flex flex-wrap gap-2'>
               {projectData?.kandangs?.map((kandang) => (
                 <Button
                   key={kandang.id}
                   variant='outline'
+                  className='px-3 py-2.5 w-fit text-sm rounded-lg shadow-sm'
                   href={`/closing/detail/?closingId=${initialValue?.flock_id}&kandangId=${kandang.project_flock_kandang_id}`}
-                  className='min-w-32'
                 >
                   {kandang.name}
                 </Button>
diff --git a/src/components/pages/closing/table/OverheadClosingTable.tsx b/src/components/pages/closing/table/OverheadClosingTable.tsx
index 2d3faaec..a6c31e6c 100644
--- a/src/components/pages/closing/table/OverheadClosingTable.tsx
+++ b/src/components/pages/closing/table/OverheadClosingTable.tsx
@@ -224,15 +224,28 @@ const OverheadClosingTable = ({
       >
         {isLoadingOverhead ? (
           <OverheadClosingSkeleton columns={columns} />
-        ) : !isResponseSuccess(overhead) ||
-          (!kandangId && overhead.data?.overheads.length === 0) ||
-          (kandangId && !isResponseSuccess(overheadKandang)) ? (
+        ) : !isResponseSuccess(overhead) ? (
           <OverheadClosingSkeleton
             columns={columns}
             iconName='heroicons:chart-bar'
             title='Data Overhead Tidak Ditemukan'
             subtitle='Tidak ada data overhead untuk periode ini.'
           />
+        ) : kandangId && !isResponseSuccess(overheadKandang) ? (
+          <OverheadClosingSkeleton
+            columns={columns}
+            iconName='heroicons:chart-bar'
+            title='Data Overhead Tidak Ditemukan'
+            subtitle='Tidak ada data overhead untuk periode ini.'
+          />
+        ) : (!kandangId && overhead.data?.overheads.length === 0) ||
+          (kandangId &&
+            isResponseSuccess(overheadKandang) &&
+            overheadKandang.data?.overheads.length === 0) ? (
+          <OverheadClosingSkeleton
+            columns={columns}
+            iconName='heroicons:chart-bar'
+          />
         ) : (
           <Table<Overhead>
             data={