diff --git a/src/components/pages/uniformity/UniformityChart.tsx b/src/components/pages/uniformity/UniformityChart.tsx
index 2b104623..12587202 100644
--- a/src/components/pages/uniformity/UniformityChart.tsx
+++ b/src/components/pages/uniformity/UniformityChart.tsx
@@ -22,71 +22,71 @@ interface GaugeChartData {
 const UniformityChart = () => {
   // TODO: Replace with actual API call
   const barChartData: BarChartData[] = [
-    // {
-    //   name: '48-52',
-    //   uv: 80,
-    // },
-    // {
-    //   name: '52-56',
-    //   uv: 120,
-    // },
-    // {
-    //   name: '56-60',
-    //   uv: 160,
-    // },
-    // {
-    //   name: '60-64',
-    //   uv: 200,
-    // },
-    // {
-    //   name: '64-68',
-    //   uv: 160,
-    // },
-    // {
-    //   name: '68-72',
-    //   uv: 120,
-    // },
-    // {
-    //   name: '72-76',
-    //   uv: 80,
-    // },
-    // {
-    //   name: '76-80',
-    //   uv: 120,
-    // },
-    // {
-    //   name: '84-88',
-    //   uv: 160,
-    // },
-    // {
-    //   name: '88-92',
-    //   uv: 200,
-    // },
-    // {
-    //   name: '92-96',
-    //   uv: 160,
-    // },
+    {
+      name: '48-52',
+      uv: 80,
+    },
+    {
+      name: '52-56',
+      uv: 120,
+    },
+    {
+      name: '56-60',
+      uv: 160,
+    },
+    {
+      name: '60-64',
+      uv: 200,
+    },
+    {
+      name: '64-68',
+      uv: 160,
+    },
+    {
+      name: '68-72',
+      uv: 120,
+    },
+    {
+      name: '72-76',
+      uv: 80,
+    },
+    {
+      name: '76-80',
+      uv: 120,
+    },
+    {
+      name: '84-88',
+      uv: 160,
+    },
+    {
+      name: '88-92',
+      uv: 200,
+    },
+    {
+      name: '92-96',
+      uv: 160,
+    },
   ];
 
   // TODO: Replace with actual API call
-  const gaugeChartData: GaugeChartData = {
-    value: 0,
-    label: '',
-    kandang: 'Kandang Cirangga',
-    week: 'Week 2',
-    currentValue: 512,
-    totalValue: 1024,
-  };
-
   // const gaugeChartData: GaugeChartData = {
-  //   value: 52,
-  //   label: 'Uniformity',
+  //   value: 0,
+  //   label: '',
   //   kandang: 'Kandang Cirangga',
   //   week: 'Week 2',
   //   currentValue: 512,
   //   totalValue: 1024,
   // };
 
+  const gaugeChartData: GaugeChartData = {
+    value: 52,
+    label: 'Uniformity',
+    kandang: 'Kandang Cirangga',
+    week: 'Week 2',
+    currentValue: 512,
+    totalValue: 1024,
+  };
+
   return (
     <section className='w-full grid grid-cols-1 xl:grid-cols-2 2xl:grid-cols-4 gap-4'>
       <Card
diff --git a/src/components/pages/uniformity/UniformityTable.tsx b/src/components/pages/uniformity/UniformityTable.tsx
index 72a9d2ad..e2a9618d 100644
--- a/src/components/pages/uniformity/UniformityTable.tsx
+++ b/src/components/pages/uniformity/UniformityTable.tsx
@@ -8,7 +8,6 @@ import { ColumnDef, SortingState } from '@tanstack/react-table';
 import { cn, formatDate } from '@/lib/helper';
 import Button from '@/components/Button';
 import UniformityChart from '@/components/pages/uniformity/UniformityChart';
-// import UniformityStat from '@/components/pages/uniformity/chart/UniformityStat';
 import { useTableFilter } from '@/services/hooks/useTableFilter';
 import { UniformityApi } from '@/services/api/uniformity';
 import { type Uniformity } from '@/types/api/uniformity/uniformity';
@@ -20,7 +19,7 @@ import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import toast from 'react-hot-toast';
 import Card from '@/components/Card';
-import UniformityTableSkeleton from './skeleton/UniformityTableSkeleton';
+import UniformityTableSkeleton from '@/components/pages/uniformity/skeleton/UniformityTableSkeleton';
 import RequirePermission from '@/components/helper/RequirePermission';
 import { useUniformityStore } from '@/stores/uniformity/uniformity.store';
 import FloatingActionsButton from '@/components/FloatingActionsButton';
@@ -423,12 +422,6 @@ const UniformityTable = ({ refresh }: { refresh?: () => void }) => {
 
       <div className='my-4 divider'></div>
 
-      {/*<section>
-        <UniformityStat />
-      </section>*/}
-
-      <div className='my-4'></div>
-
       <section>
         <UniformityChart />
       </section>
diff --git a/src/components/pages/uniformity/detail/UniformityDetail.tsx b/src/components/pages/uniformity/detail/UniformityDetail.tsx
index 3176f96f..72e7bd9e 100644
--- a/src/components/pages/uniformity/detail/UniformityDetail.tsx
+++ b/src/components/pages/uniformity/detail/UniformityDetail.tsx
@@ -13,7 +13,7 @@ import RequirePermission from '@/components/helper/RequirePermission';
 import { UniformityDetail as UniformityDetailType } from '@/types/api/uniformity/uniformity';
 import { formatDate } from '@/lib/helper';
 import { useUiStore } from '@/stores/ui/ui.store';
-import UniformityDetailsPreview from './UniformityDetailsPreview';
+import UniformityDetailsPreview from '@/components/pages/uniformity/detail/UniformityDetailsPreview';
 import {
   getStatusColor,
   getStatusIndicatorColor,