diff --git a/src/app/production/transfer-to-laying/page.tsx b/src/app/production/transfer-to-laying/page.tsx
index 5d790345..be8ff454 100644
--- a/src/app/production/transfer-to-laying/page.tsx
+++ b/src/app/production/transfer-to-laying/page.tsx
@@ -1,15 +1,25 @@
 import TransferToLayingsTable from '@/components/pages/production/transfer-to-laying/TransferToLayingsTable';
 import TransferToLayingFormModal from '@/components/pages/production/transfer-to-laying/TransferToLayingFormModal';
 import TransferToLayingDetailModal from '@/components/pages/production/transfer-to-laying/TransferToLayingDetailModal';
+import RequirePermission from '@/components/helper/RequirePermission';
 
 const TransferToLaying = () => {
   return (
     <section className='w-full'>
       <TransferToLayingsTable />
 
-      <TransferToLayingFormModal />
+      <RequirePermission
+        permissions={[
+          'lti.production.transfer_to_laying.create',
+          'lti.production.transfer_to_laying.update',
+        ]}
+      >
+        <TransferToLayingFormModal />
+      </RequirePermission>
 
-      <TransferToLayingDetailModal />
+      <RequirePermission permissions='lti.production.transfer_to_laying.detail'>
+        <TransferToLayingDetailModal />
+      </RequirePermission>
     </section>
   );
 };
diff --git a/src/components/Drawer.tsx b/src/components/Drawer.tsx
index bbc36782..fc0af9fb 100644
--- a/src/components/Drawer.tsx
+++ b/src/components/Drawer.tsx
@@ -16,7 +16,6 @@ interface DrawerProps {
   onBackdropClick?: () => void;
   closeOnBackdropClick?: boolean;
   expandedContent?: ReactNode;
-  expandedWidth?: string;
 }
 
 type DrawerClassName = {
@@ -25,6 +24,7 @@ type DrawerClassName = {
   drawerSide?: string;
   drawerOverlay?: string;
   drawerSidebarContent?: string;
+  drawerExpandedContent?: string;
 };
 
 const Drawer = ({
@@ -39,7 +39,6 @@ const Drawer = ({
   onBackdropClick,
   closeOnBackdropClick = true,
   expandedContent,
-  expandedWidth = 'w-[400px]',
 }: DrawerProps) => {
   const getDrawerClassNames = (): DrawerClassName => {
     const baseClassNames = {
@@ -56,6 +55,9 @@ const Drawer = ({
           ? 'w-full lg:min-w-[600px] lg:max-w-[600px]'
           : 'w-full max-w-[300px] lg:w-[300px]';
       }
+      if (className?.drawerSidebarContent) {
+        return '';
+      }
       return 'w-full sm:min-w-120 sm:w-fit';
     };
 
@@ -174,7 +176,7 @@ const Drawer = ({
             <div
               className={cn(
                 'border-l border-gray-200 bg-white flex flex-col h-full',
-                expandedWidth
+                className?.drawerExpandedContent
               )}
             >
               <div className='overflow-y-auto flex-1 h-full'>
diff --git a/src/components/pages/production/uniformity/UniformityPageWrapper.tsx b/src/components/pages/production/uniformity/UniformityPageWrapper.tsx
index 07f313b6..5c8f1313 100644
--- a/src/components/pages/production/uniformity/UniformityPageWrapper.tsx
+++ b/src/components/pages/production/uniformity/UniformityPageWrapper.tsx
@@ -58,7 +58,10 @@ export default function UniformityPageWrapper({
         zIndex='99999'
         sidebarContent={isOpen ? <div className=''>{children}</div> : null}
         expandedContent={expandedDrawerOpen ? expandedDrawerContent : null}
-        expandedWidth='w-[500px]'
+        className={{
+          drawerSidebarContent: 'w-[446px]',
+          drawerExpandedContent: 'w-[446px]',
+        }}
       />
     </>
   );
diff --git a/src/components/pages/production/uniformity/UniformityTable.tsx b/src/components/pages/production/uniformity/UniformityTable.tsx
index e9405dd6..a3530032 100644
--- a/src/components/pages/production/uniformity/UniformityTable.tsx
+++ b/src/components/pages/production/uniformity/UniformityTable.tsx
@@ -42,8 +42,6 @@ import {
   ProjectFlock,
 } from '@/types/api/production/project-flock';
 import {
-  getStatusColor,
-  getStatusIndicatorColor,
   getStatusText,
   getStatusBadgeColor,
 } from '@/components/pages/production/uniformity/uniformity-utils';
@@ -112,11 +110,19 @@ const UniformityConfirmationPreview = ({
 
   const columns: ColumnDef<DetailOptionType>[] = [
     {
-      header: 'Label',
+      accessorKey: 'label',
+      enableSorting: false,
+      header: () => (
+        <span className='font-medium text-sm leading-[150%]'>Label</span>
+      ),
       cell: (props) => props.row.original.label,
     },
     {
-      header: 'Value',
+      accessorKey: 'value',
+      enableSorting: false,
+      header: () => (
+        <span className='font-medium text-sm leading-[150%]'>Value</span>
+      ),
       cell: (props) => {
         const id = props.row.original.id;
         const value = props.row.original.value;
@@ -124,16 +130,10 @@ const UniformityConfirmationPreview = ({
         if (id === 'status') {
           return (
             <div className='w-full'>
-              <Badge
-                statusIndicator={true}
-                variant='soft'
-                className={{
-                  badge: `rounded-xl w-full justify-start border border-gray-200 text-black ${getStatusColor(value)}`,
-                  status: getStatusIndicatorColor(value),
-                }}
-              >
-                {getStatusText(value)}
-              </Badge>
+              <StatusBadge
+                color={getStatusBadgeColor(value)}
+                text={getStatusText(value)}
+              />
             </div>
           );
         }
@@ -214,7 +214,6 @@ const UniformityTable = () => {
   const [isBulkActionLoading, setIsBulkActionLoading] = useState(false);
   const [isPdfExportLoading, setIsPdfExportLoading] = useState(false);
   const [isExcelExportLoading, setIsExcelExportLoading] = useState(false);
-  const isAnyExportLoading = isPdfExportLoading || isExcelExportLoading;
 
   const singleDeleteModal = useModal();
   const successModal = useModal();
@@ -238,7 +237,7 @@ const UniformityTable = () => {
   const [filterEndDate, setFilterEndDate] = useState('');
   const [filterProjectFlockLocationId, setFilterProjectFlockLocationId] =
     useState<string>('');
-  const [filterErrors, setFilterErrors] = useState<Record<string, string>>({});
+  const [, setFilterErrors] = useState<Record<string, string>>({});
 
   const {
     setInputValue: setFilterLocationInputValue,
@@ -309,7 +308,6 @@ const UniformityTable = () => {
       ? projectFlockKandangLookupData.data
       : undefined;
 
-  // Update filterProjectFlockKandangId when lookup changes
   useEffect(() => {
     if (projectFlockKandangLookup?.id) {
       setFilterProjectFlockKandangId(projectFlockKandangLookup.id);
@@ -483,12 +481,6 @@ const UniformityTable = () => {
     [filterFormik]
   );
 
-  const handleApplyFilters = useCallback(() => {
-    handleFormSubmit(
-      new Event('submit') as unknown as React.FormEvent<HTMLFormElement>
-    );
-  }, [handleFormSubmit]);
-
   const selectedRowIds = useMemo(() => {
     return Object.keys(rowSelection)
       .filter((key) => rowSelection[key])
@@ -1076,7 +1068,7 @@ const UniformityTable = () => {
           modalBox: 'rounded-2xl',
         }}
       >
-        <div className='flex flex-col gap-4 mt-4'>
+        <div className='flex flex-col gap-4'>
           {createdUniformity ? (
             <UniformityConfirmationPreview
               uniformityDetail={createdUniformity}
@@ -1112,7 +1104,7 @@ const UniformityTable = () => {
           modalBox: 'rounded-2xl',
         }}
       >
-        <div className='flex flex-col gap-4 mt-4'>
+        <div className='flex flex-col gap-4'>
           <UniformityConfirmationPreview uniformity={selectedUniformity} />
         </div>
       </ConfirmationModal>
@@ -1136,7 +1128,7 @@ const UniformityTable = () => {
           modalBox: 'rounded-2xl',
         }}
       >
-        <div className='flex flex-col gap-4 mt-4'>
+        <div className='flex flex-col gap-4'>
           {selectedRowIds.length === 1 ? (
             <UniformityConfirmationPreview
               uniformity={selectedUniformities[0]}
@@ -1168,7 +1160,7 @@ const UniformityTable = () => {
           modalBox: 'rounded-2xl',
         }}
       >
-        <div className='flex flex-col gap-4 mt-4'>
+        <div className='flex flex-col gap-4'>
           <UniformityConfirmationPreview uniformity={selectedUniformity} />
         </div>
       </ConfirmationModal>
@@ -1192,7 +1184,7 @@ const UniformityTable = () => {
           modalBox: 'rounded-2xl',
         }}
       >
-        <div className='flex flex-col gap-4 mt-4'>
+        <div className='flex flex-col gap-4'>
           {selectedRowIds.length === 1 ? (
             <UniformityConfirmationPreview
               uniformity={selectedUniformities[0]}
@@ -1224,7 +1216,7 @@ const UniformityTable = () => {
           modalBox: 'rounded-2xl',
         }}
       >
-        <div className='flex flex-col gap-4 mt-4'>
+        <div className='flex flex-col gap-4'>
           {selectedRowIds.length === 1 ? (
             <UniformityConfirmationPreview
               uniformity={selectedUniformities[0]}
diff --git a/src/components/pages/production/uniformity/chart/UniformityBarChart.tsx b/src/components/pages/production/uniformity/chart/UniformityBarChart.tsx
index 82f0085c..f43aa244 100644
--- a/src/components/pages/production/uniformity/chart/UniformityBarChart.tsx
+++ b/src/components/pages/production/uniformity/chart/UniformityBarChart.tsx
@@ -164,7 +164,7 @@ const UniformityBarChart: React.FC<UniformityBarChartProps> = ({ data }) => {
   const margin = {
     top: 20,
     right: 30,
-    left: 20,
+    left: 0,
     bottom: 5,
   };
 
@@ -172,7 +172,7 @@ const UniformityBarChart: React.FC<UniformityBarChartProps> = ({ data }) => {
     <ResponsiveContainer
       width='100%'
       height='100%'
-      className='min-h-[300px] xl:min-h-[350px]'
+      className='min-h-[270px] xl:min-h-72'
     >
       <BarChart data={data} margin={margin} barGap={20}>
         <defs>
diff --git a/src/components/pages/production/uniformity/chart/UniformityGaugeChart.tsx b/src/components/pages/production/uniformity/chart/UniformityGaugeChart.tsx
index 54f8e4ec..8249e1d5 100644
--- a/src/components/pages/production/uniformity/chart/UniformityGaugeChart.tsx
+++ b/src/components/pages/production/uniformity/chart/UniformityGaugeChart.tsx
@@ -65,12 +65,12 @@ const UniformityGaugeChart: React.FC<UniformityGaugeChartProps> = ({
               </Pie>
             </PieChart>
           </ResponsiveContainer>
-          <div className='absolute inset-x-0 bottom-8 flex flex-col items-center justify-center'>
-            <span className='2xl:text-3xl text-2xl font-bold text-gray-800 mb-4'>
+          <div className='absolute inset-x-0 bottom-10 flex flex-col items-center justify-center'>
+            <span className='text-2xl font-medium text-base-content mb-4 leading-8'>
               {value}%
             </span>
-            <div className='mt-2 px-4 py-1 bg-base-100 rounded-full shadow-sm border border-gray-200'>
-              <span className='text-sm font-medium text-gray-700 mb-32'>
+            <div className='px-3.5 py-1 bg-base-100 rounded-full shadow-sm border border-base-content/10'>
+              <span className='text-lg font-medium text-base-content leading-6'>
                 {label}
               </span>
             </div>
@@ -81,7 +81,7 @@ const UniformityGaugeChart: React.FC<UniformityGaugeChartProps> = ({
         <button
           onClick={() => onWeekChange?.('prev')}
           disabled={!hasPrevWeek}
-          className='p-2 rounded-lg border border-gray-200 bg-white hover:bg-gray-50 disabled:opacity-30 disabled:cursor-not-allowed transition-colors shadow-sm'
+          className='p-1 rounded-lg border border-base-content/10 bg-white hover:bg-base-content/5 disabled:opacity-30 disabled:cursor-not-allowed transition-colors shadow-sm cursor-pointer'
           aria-label='Previous week'
         >
           <Icon icon='heroicons:chevron-left' width={20} height={20} />
@@ -89,21 +89,24 @@ const UniformityGaugeChart: React.FC<UniformityGaugeChartProps> = ({
         <Card
           variant='bordered'
           className={{
-            wrapper: 'max-w-xs',
+            wrapper: 'max-w-40 rounded-lg',
+            body: 'p-3',
           }}
         >
           <section className='flex items-center justify-center gap-4'>
             <div className='grid grid-cols-1 min-w-0 text-center'>
-              <div className='flex items-center justify-center space-x-2 text-[#18181B80] text-sm mb-1'>
-                <span className='text-[#0069E0] font-semibold truncate'>
+              <div className='flex items-center justify-center space-x-2 text-base-content/50 text-sm mb-1'>
+                <span className='text-primary font-semibold truncate'>
                   {week}
                 </span>
               </div>
-              <div className='text-xl font-bold text-[#18181B80]'>
-                <span className='text-[#0069E0] break-all'>
+              <div className='text-xl font-bold text-base-content/50'>
+                <span className='text-primary break-all'>
                   {formatNumber(currentValue ?? 0)}
                 </span>
-                <span className='mx-1 text-gray-400 text-base'>From</span>
+                <span className='mx-1 text-base-content/50 text-sm font-semibold leading-5'>
+                  From
+                </span>
                 <span className='break-all'>
                   {formatNumber(totalValue ?? 0)}
                 </span>
@@ -114,7 +117,7 @@ const UniformityGaugeChart: React.FC<UniformityGaugeChartProps> = ({
         <button
           onClick={() => onWeekChange?.('next')}
           disabled={!hasNextWeek}
-          className='p-2 rounded-lg border border-gray-200 bg-white hover:bg-gray-50 disabled:opacity-30 disabled:cursor-not-allowed transition-colors shadow-sm'
+          className='p-1 rounded-lg border border-base-content/10 bg-white hover:bg-base-content/5 disabled:opacity-30 disabled:cursor-not-allowed transition-colors shadow-sm cursor-pointer'
           aria-label='Next week'
         >
           <Icon icon='heroicons:chevron-right' width={20} height={20} />
diff --git a/src/components/pages/production/uniformity/detail/UniformityDetail.tsx b/src/components/pages/production/uniformity/detail/UniformityDetail.tsx
index 11087e44..7772e91b 100644
--- a/src/components/pages/production/uniformity/detail/UniformityDetail.tsx
+++ b/src/components/pages/production/uniformity/detail/UniformityDetail.tsx
@@ -7,7 +7,7 @@ import { ColumnDef } from '@tanstack/react-table';
 import Button from '@/components/Button';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
 import Table from '@/components/Table';
-import Badge from '@/components/Badge';
+import StatusBadge from '@/components/helper/StatusBadge';
 import Tooltip from '@/components/Tooltip';
 import RequirePermission from '@/components/helper/RequirePermission';
 import { UniformityDetail as UniformityDetailType } from '@/types/api/production/uniformity';
@@ -18,8 +18,7 @@ import { UniformityApi } from '@/services/api/uniformity';
 import useSWR from 'swr';
 import { isResponseSuccess } from '@/lib/api-helper';
 import {
-  getStatusColor,
-  getStatusIndicatorColor,
+  getStatusBadgeColor,
   getStatusText,
 } from '@/components/pages/production/uniformity/uniformity-utils';
 import { DetailOptionType } from '@/types/api/production/uniformity';
@@ -150,12 +149,18 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
     () => [
       {
         accessorKey: 'label',
-        header: 'Label',
+        enableSorting: false,
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Label</span>
+        ),
         cell: (props) => props.row.original.label,
       },
       {
         accessorKey: 'value',
-        header: 'Value',
+        enableSorting: false,
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Value</span>
+        ),
         cell: (props) => {
           const id = props.row.original.id;
           const { info_umum, latest_approval } = initialValues!;
@@ -178,16 +183,10 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
             if (status) {
               return (
                 <div className='w-full'>
-                  <Badge
-                    statusIndicator={true}
-                    variant='soft'
-                    className={{
-                      badge: `rounded-xl w-full justify-start border border-gray-200 text-black ${getStatusColor(status)}`,
-                      status: getStatusIndicatorColor(status),
-                    }}
-                  >
-                    {getStatusText(status)}
-                  </Badge>
+                  <StatusBadge
+                    color={getStatusBadgeColor(status)}
+                    text={getStatusText(status)}
+                  />
                 </div>
               );
             }
@@ -258,12 +257,18 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
     () => [
       {
         accessorKey: 'label',
-        header: 'Label',
+        enableSorting: false,
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Label</span>
+        ),
         cell: (props) => props.row.original.label,
       },
       {
         accessorKey: 'value',
-        header: 'Value',
+        enableSorting: false,
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Value</span>
+        ),
         cell: (props) => <span>{props.row.original.value}</span>,
       },
     ],
@@ -301,12 +306,18 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
     () => [
       {
         accessorKey: 'label',
-        header: 'Label',
+        enableSorting: false,
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Label</span>
+        ),
         cell: (props) => props.row.original.label,
       },
       {
         accessorKey: 'value',
-        header: 'Value',
+        enableSorting: false,
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Value</span>
+        ),
         cell: (props) => <span>{props.row.original.value}</span>,
       },
     ],
@@ -326,10 +337,10 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
       {/* Form Section */}
       <section className='w-full p-4'>
         {initialValues ? (
-          <div className='flex flex-col gap-4'>
+          <div className='flex flex-col gap-3'>
             {/* Info Umum */}
             <div className=''>
-              <h2 className='text-base font-medium text-base-content/50 font-roboto mb-5'>
+              <h2 className='text-base font-medium text-base-content/50 font-roboto leading-6 tracking-[0.15px] mb-1.5'>
                 Informasi Umum
               </h2>
               <Table<DetailOptionType>
@@ -346,7 +357,7 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
             {/* Sampling and Range */}
             {initialValues.sampling && (
               <div className=''>
-                <h2 className='text-base font-medium text-base-content/50 font-roboto mb-5'>
+                <h2 className='text-base font-medium text-base-content/50 font-roboto leading-6 tracking-[0.15px] mb-1.5'>
                   Sampling and Range
                 </h2>
                 <Table<DetailOptionType>
@@ -364,7 +375,7 @@ const UniformityDetail: React.FC<UniformityDetailProps> = ({
             {/* Result */}
             {initialValues.result && (
               <div className=''>
-                <h2 className='text-base font-medium text-base-content/50 font-roboto mb-5'>
+                <h2 className='text-base font-medium text-base-content/50 font-roboto leading-6 tracking-[0.15px] mb-1.5'>
                   Result
                 </h2>
                 <Table<DetailOptionType>
diff --git a/src/components/pages/production/uniformity/detail/UniformityDetailsPreview.tsx b/src/components/pages/production/uniformity/detail/UniformityDetailsPreview.tsx
index 04c43a02..1eb3a7ff 100644
--- a/src/components/pages/production/uniformity/detail/UniformityDetailsPreview.tsx
+++ b/src/components/pages/production/uniformity/detail/UniformityDetailsPreview.tsx
@@ -97,10 +97,10 @@ const UniformityDetailsPreview = ({
       {/* Form Section */}
       <section className='w-full p-4'>
         {info_umum ? (
-          <div className='flex flex-col gap-4'>
+          <div className='flex flex-col gap-3'>
             {/* Body Weight Details */}
             {uniformity_details && uniformity_details.length > 0 ? (
-              <div className='mt-4'>
+              <div className=''>
                 <Table<BodyWeightData>
                   data={tableData}
                   columns={columnsUniformity}
diff --git a/src/components/pages/production/uniformity/form/UniformityForm.tsx b/src/components/pages/production/uniformity/form/UniformityForm.tsx
index 257de339..8ab62d85 100644
--- a/src/components/pages/production/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityForm.tsx
@@ -507,11 +507,11 @@ const UniformityForm = ({
         />
 
         <section className='w-full p-4'>
-          <h2 className='text-base font-medium text-base-content/50 font-roboto'>
+          <h2 className='text-base font-medium text-base-content/50 font-roboto mb-1.5'>
             Informasi Umum
           </h2>
 
-          <form onSubmit={handleFormSubmit} className='flex flex-col gap-1.5'>
+          <form onSubmit={handleFormSubmit} className='flex flex-col'>
             <DateInput
               required
               label='Tanggal'
@@ -582,7 +582,7 @@ const UniformityForm = ({
                 <label
                   htmlFor='file-upload-input'
                   className={cn(
-                    "w-full text-sm font-normal leading-5 after:content-['*'] after:ml-0.5 after:text-red-500",
+                    "w-full text-xs font-semibold leading-5 after:content-['*'] after:ml-0.5 after:text-red-500 py-2",
                     formik.touched.document &&
                       formik.errors.document &&
                       'text-red-500'
@@ -598,8 +598,8 @@ const UniformityForm = ({
                   >
                     <Icon
                       icon='heroicons-solid:trash'
-                      width={20}
-                      height={20}
+                      width={15}
+                      height={15}
                       className='text-gray-400 hover:text-gray-600'
                     />
                   </button>
@@ -611,8 +611,8 @@ const UniformityForm = ({
                     >
                       <Icon
                         icon='heroicons:information-circle'
-                        width={20}
-                        height={20}
+                        width={15}
+                        height={15}
                         className='text-gray-400 hover:text-gray-600'
                       />
                     </Tooltip>
@@ -622,7 +622,7 @@ const UniformityForm = ({
 
               <section
                 className={cn(
-                  'h-full w-full border rounded-2xl border-dashed cursor-pointer mt-2',
+                  'h-full w-full border rounded-2xl border-dashed cursor-pointer',
                   formik.touched.document && formik.errors.document
                     ? 'border-red-500'
                     : 'border-gray-300'
@@ -758,12 +758,12 @@ const UniformityForm = ({
 
             {!isNextStep && (
               <>
-                <div className='border-t border-base-content/20 mt-3' />
+                <div className='border-t border-base-content/10 -mx-4 mt-4' />
                 <RequirePermission permissions='lti.production.uniformity.create'>
                   <Button
                     type='submit'
                     color='primary'
-                    className='w-full mt-4'
+                    className='w-full mt-4 px-3 py-2.5 text-sm text-base-100 rounded-lg shadow-sm'
                     disabled={formik.isSubmitting}
                   >
                     {formik.isSubmitting ? (
diff --git a/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx b/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx
index 314eabfd..3cc120fd 100644
--- a/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx
@@ -50,12 +50,16 @@ const UniformityPreviewForm = () => {
     () => [
       {
         accessorKey: 'number',
-        header: 'Number',
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Number</span>
+        ),
         cell: (props) => props.row.original.number,
       },
       {
         accessorKey: 'weight',
-        header: 'Weight (g)',
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Weight (g)</span>
+        ),
         cell: (props) => <span>{props.row.original.weight}</span>,
       },
     ],
@@ -89,7 +93,11 @@ const UniformityPreviewForm = () => {
               className={{ containerClassName: 'mb-5' }}
             />
             <RequirePermission permissions='lti.production.uniformity.create'>
-              <Button color='primary' onClick={handleNext} className='mb-10'>
+              <Button
+                color='primary'
+                onClick={handleNext}
+                className='mb-5 px-3 py-2.5 text-sm text-base-100 rounded-lg shadow-sm'
+              >
                 Next
               </Button>
             </RequirePermission>
diff --git a/src/components/pages/production/uniformity/form/UniformityResultForm.tsx b/src/components/pages/production/uniformity/form/UniformityResultForm.tsx
index 98db02fc..eaf51103 100644
--- a/src/components/pages/production/uniformity/form/UniformityResultForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityResultForm.tsx
@@ -120,13 +120,19 @@ const UniformityResultForm = () => {
     () => [
       {
         accessorKey: 'label',
-        header: 'Label',
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Label</span>
+        ),
         cell: (props) => props.row.original.label,
+        enableSorting: false,
       },
       {
         accessorKey: 'value',
-        header: 'Value',
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Value</span>
+        ),
         cell: (props) => <span>{props.row.original.value}</span>,
+        enableSorting: false,
       },
     ],
     []
@@ -160,13 +166,19 @@ const UniformityResultForm = () => {
     () => [
       {
         accessorKey: 'label',
-        header: 'Label',
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Label</span>
+        ),
         cell: (props) => props.row.original.label,
+        enableSorting: false,
       },
       {
         accessorKey: 'value',
-        header: 'Value',
+        header: () => (
+          <span className='font-medium text-sm leading-[150%]'>Value</span>
+        ),
         cell: (props) => <span>{props.row.original.value}</span>,
+        enableSorting: false,
       },
     ],
     []
@@ -227,7 +239,7 @@ const UniformityResultForm = () => {
       >
         <Button variant='link' className='p-0 text-error' onClick={handleClose}>
           <Tooltip content='Hapus' position='left'>
-            <Icon icon='heroicons-outline:trash' width={20} height={20} />
+            <Icon icon='heroicons-outline:trash' width={18} height={18} />
           </Tooltip>
         </Button>
       </DrawerHeader>
@@ -235,9 +247,9 @@ const UniformityResultForm = () => {
       {/* Form Section */}
       <section className='w-full p-4'>
         {verifyUniformityResult ? (
-          <div className='flex flex-col gap-4'>
+          <div className='flex flex-col gap-3'>
             <div className=''>
-              <h2 className='text-base font-medium text-base-content/50 font-roboto mb-5'>
+              <h2 className='text-base font-medium text-base-content/50 font-roboto leading-6 tracking-[0.15px] mb-1.5'>
                 Sampling and Range
               </h2>
               <Table<DetailOptionType>
@@ -252,7 +264,7 @@ const UniformityResultForm = () => {
             </div>
 
             <div className=''>
-              <h2 className='text-base font-medium text-base-content/50 font-roboto mb-5'>
+              <h2 className='text-base font-medium text-base-content/50 font-roboto leading-6 tracking-[0.15px] mb-1.5'>
                 Result
               </h2>
               <Table<DetailOptionType>
@@ -265,7 +277,7 @@ const UniformityResultForm = () => {
                 }}
               />
             </div>
-            <div className='mt-4'>
+            <div className=''>
               <Table<BodyWeightData>
                 data={tableData}
                 columns={columnsUniformity}
@@ -280,7 +292,7 @@ const UniformityResultForm = () => {
                 onClick={handleSubmit}
                 isLoading={isSubmitting}
                 disabled={!uniformityFormData}
-                className='mb-10'
+                className='mb-5 px-3 py-2.5 text-sm text-base-100 rounded-lg shadow-sm'
               >
                 Submit
               </Button>
diff --git a/src/components/pages/production/uniformity/uniformity-utils.ts b/src/components/pages/production/uniformity/uniformity-utils.ts
index 1b513de4..f25f9293 100644
--- a/src/components/pages/production/uniformity/uniformity-utils.ts
+++ b/src/components/pages/production/uniformity/uniformity-utils.ts
@@ -1,26 +1,8 @@
-export const weightStatusColorMap: Record<string, string> = {
-  ideal: 'bg-[#00D39033]',
-  outside: 'bg-error/10',
-};
-
-export const weightStatusIndicatorColorMap: Record<string, string> = {
-  ideal: 'bg-[#008000]',
-  outside: 'bg-error',
-};
-
 export const weightStatusTextMap: Record<string, string> = {
   ideal: 'Ideal',
   outside: 'Outside',
 };
 
-export const getWeightStatusColor = (status: string): string => {
-  return weightStatusColorMap[status] || 'bg-info';
-};
-
-export const getWeightStatusIndicatorColor = (status: string): string => {
-  return weightStatusIndicatorColorMap[status] || 'bg-info';
-};
-
 export const getWeightStatusText = (status: string): string => {
   return weightStatusTextMap[status] || status;
 };
@@ -39,24 +21,6 @@ export const getWeightStatusBadgeColor = (
   return weightStatusBadgeColorMap[status] || 'neutral';
 };
 
-export const statusColorMap: Record<string, string> = {
-  APPROVED: 'bg-[#00D39033]',
-  Disetujui: 'bg-[#00D39033]',
-  REJECTED: 'bg-error/10',
-  Ditolak: 'bg-error/10',
-  CREATED: 'bg-[#f3f3f4]',
-  Pengajuan: 'bg-[#f3f3f4]',
-};
-
-export const statusIndicatorColorMap: Record<string, string> = {
-  APPROVED: 'bg-[#008000]',
-  Disetujui: 'bg-[#008000]',
-  REJECTED: 'bg-error',
-  Ditolak: 'bg-error',
-  CREATED: 'bg-[#D9D9D9]',
-  Pengajuan: 'bg-[#D9D9D9]',
-};
-
 export const statusTextMap: Record<string, string> = {
   APPROVED: 'Disetujui',
   Disetujui: 'Disetujui',
@@ -66,14 +30,6 @@ export const statusTextMap: Record<string, string> = {
   Pengajuan: 'Pengajuan',
 };
 
-export const getStatusColor = (status: string): string => {
-  return statusColorMap[status] || 'bg-info';
-};
-
-export const getStatusIndicatorColor = (status: string): string => {
-  return statusIndicatorColorMap[status] || 'bg-info';
-};
-
 export const getStatusText = (status: string): string => {
   return statusTextMap[status] || status;
 };
diff --git a/src/config/constant.ts b/src/config/constant.ts
index 120b6b6a..9c6946f7 100644
--- a/src/config/constant.ts
+++ b/src/config/constant.ts
@@ -82,6 +82,8 @@ export const MAIN_DRAWER_LINKS: SidebarMenuItem[] = [
     permission: [
       'lti.production.project_flocks.list',
       'lti.production.recording.list',
+      'lti.production.transfer_to_laying.list',
+      'lti.production.uniformity.list',
     ],
     submenu: [
       {
@@ -97,6 +99,7 @@ export const MAIN_DRAWER_LINKS: SidebarMenuItem[] = [
       {
         text: 'Transfer ke Laying',
         link: '/production/transfer-to-laying',
+        permission: ['lti.production.transfer_to_laying.list'],
       },
       {
         text: 'Uniformity',