diff --git a/app/[locale]/(protected)/admin/add-experts/update/[id]/page.tsx b/app/[locale]/(protected)/admin/add-experts/update/[id]/page.tsx
index 3af56ee2..de79e295 100644
--- a/app/[locale]/(protected)/admin/add-experts/update/[id]/page.tsx
+++ b/app/[locale]/(protected)/admin/add-experts/update/[id]/page.tsx
@@ -37,32 +37,43 @@ import { Eye, EyeOff } from "lucide-react";
 import { useParams } from "next/navigation";
 
 const FormSchema = z.object({
-  name: z.string({
-    required_error: "Required",
-  }),
-  username: z.string({
-    required_error: "Required",
-  }),
-  password: z.string({
-    required_error: "Required",
-  }),
-  phoneNumber: z.string({
-    required_error: "Required",
-  }),
-  email: z.string({
-    required_error: "Required",
-  }),
-  skills: z.string({
-    required_error: "Required",
-  }),
-  experiences: z.string({
-    required_error: "Required",
-  }),
-  company: z.string({
-    required_error: "Required",
-  }),
+  name: z.string().optional(),
+  username: z.string().optional(),
+  password: z.string().optional(),
+  phoneNumber: z.string().optional(),
+  email: z.string().optional(),
+  skills: z.string().optional(),
+  experiences: z.string().optional(),
+  company: z.string().optional(),
 });
 
+// const FormSchema = z.object({
+//   name: z.string({
+//     required_error: "Required",
+//   }),
+//   username: z.string({
+//     required_error: "Required",
+//   }),
+//   password: z.string({
+//     required_error: "Required",
+//   }),
+//   phoneNumber: z.string({
+//     required_error: "Required",
+//   }),
+//   email: z.string({
+//     required_error: "Required",
+//   }),
+//   skills: z.string({
+//     required_error: "Required",
+//   }),
+//   experiences: z.string({
+//     required_error: "Required",
+//   }),
+//   company: z.string({
+//     required_error: "Required",
+//   }),
+// });
+
 export type Placements = {
   index: number;
   roleId?: string;
@@ -189,18 +200,35 @@ export default function UpdateExpertForm() {
 
     const dataReq = {
       id: detail?.id,
-      firstName: data.name,
-      username: data.username,
-      email: data.email,
-      password: data.password,
+      firstName: data.name || detail.fullname,
+      username: data.username || detail.username,
+      email: data.email || detail.email,
+      password: data.password || undefined,
       address: "",
       roleId: "EXP-ID",
-      phoneNumber: data.phoneNumber,
-      userCompetencyId: data.skills,
-      userExperienceId: data.experiences,
-      companyName: data.company,
+      phoneNumber: data.phoneNumber || detail.phoneNumber,
+      userCompetencyId:
+        data.skills || detail.userProfilesAdditional?.userCompetency?.id,
+      userExperienceId:
+        data.experiences || detail.userProfilesAdditional?.userExperienceId,
+      companyName: data.company || detail.userProfilesAdditional?.companyName,
+      isAdmin: true,
     };
 
+    // const dataReq = {
+    //   id: detail?.id,
+    //   firstName: data.name,
+    //   username: data.username,
+    //   email: data.email,
+    //   password: data.password,
+    //   address: "",
+    //   roleId: "EXP-ID",
+    //   phoneNumber: data.phoneNumber,
+    //   userCompetencyId: data.skills,
+    //   userExperienceId: data.experiences,
+    //   companyName: data.company,
+    // };
+
     loading();
     const res = await saveUserInternal(dataReq);
     const resData = res?.data?.data;
@@ -322,10 +350,15 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Nama Lengkap</FormLabel>
-                  <Input
+                  {/* <Input
                     defaultValue={detail?.fullname}
                     placeholder="Masukkan Nama Lengkap"
                     onChange={field.onChange}
+                  /> */}
+                  <Input
+                    {...field}
+                    defaultValue={detail?.fullname}
+                    placeholder="Masukkan Nama Lengkap"
                   />
 
                   <FormMessage />
@@ -338,13 +371,18 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Username</FormLabel>
-                  <Input
+                  {/* <Input
                     type="text"
                     defaultValue={detail?.username}
                     placeholder="Masukkan"
                     onChange={field.onChange}
+                  /> */}
+                  <Input
+                    {...field}
+                    type="text"
+                    defaultValue={detail?.username}
+                    placeholder="Masukkan"
                   />
-
                   <FormMessage />
                 </FormItem>
               )}
@@ -355,11 +393,17 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>No. HP</FormLabel>
-                  <Input
+                  {/* <Input
                     type="number"
                     defaultValue={detail?.phoneNumber}
                     placeholder="Masukkan No.Hp"
                     onChange={field.onChange}
+                  /> */}
+                  <Input
+                    {...field}
+                    type="number"
+                    defaultValue={detail?.phoneNumber}
+                    placeholder="Masukkan"
                   />
                   <FormMessage />
                 </FormItem>
@@ -371,17 +415,46 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Email</FormLabel>
-                  <Input
+                  {/* <Input
                     type="email"
                     defaultValue={detail?.email}
                     placeholder="Masukkan email"
                     onChange={field.onChange}
+                  /> */}
+                  <Input
+                    {...field}
+                    type="email"
+                    defaultValue={detail?.email}
+                    placeholder="Masukkan email"
                   />
                   <FormMessage />
                 </FormItem>
               )}
             />
             <FormField
+              control={form.control}
+              name="password"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Password (Opsional)</FormLabel>
+                  <div className="relative">
+                    <Input
+                      {...field}
+                      type={showPassword ? "text" : "password"}
+                      placeholder="Kosongkan jika tidak ingin mengubah password"
+                    />
+                    <button
+                      type="button"
+                      onClick={() => setShowPassword(!showPassword)}
+                      className="absolute right-3 top-1/2 -translate-y-1/2"
+                    >
+                      {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
+                    </button>
+                  </div>
+                </FormItem>
+              )}
+            />
+            {/* <FormField
               control={form.control}
               name="password"
               render={({ field }) => (
@@ -406,7 +479,7 @@ export default function UpdateExpertForm() {
                   <FormMessage />
                 </FormItem>
               )}
-            />
+            /> */}
             <FormField
               control={form.control}
               name="skills"
@@ -481,12 +554,21 @@ export default function UpdateExpertForm() {
               render={({ field }) => (
                 <FormItem>
                   <FormLabel>Nama Institusi/Perusahaan</FormLabel>
-                  <Input
+                  {/* <Input
                     type="text"
                     value={detail?.userProfilesAdditional?.companyName || ""}
                     placeholder="Nama Institusi/Perusahaan"
                     onChange={field.onChange}
+                  /> */}
+                  <Input
+                    {...field}
+                    type="text"
+                    defaultValue={
+                      detail?.userProfilesAdditional?.companyName || ""
+                    }
+                    placeholder="Nama Institusi/Perusahaan"
                   />
+
                   <FormMessage />
                 </FormItem>
               )}
diff --git a/app/[locale]/(protected)/admin/broadcast/campaign-list/component/table.tsx b/app/[locale]/(protected)/admin/broadcast/campaign-list/component/table.tsx
index 104e342d..0a285fe9 100644
--- a/app/[locale]/(protected)/admin/broadcast/campaign-list/component/table.tsx
+++ b/app/[locale]/(protected)/admin/broadcast/campaign-list/component/table.tsx
@@ -152,12 +152,12 @@ const CampaignListTable = () => {
       <div className="flex justify-between mb-10 items-center">
         <p className="text-xl font-medium text-default-900">Daftar Campaign</p>
         <div className="flex flex-row gap-2">
-          <Link href="/admin/broadcast/campaign-list/account-list">
+          {/* <Link href="/admin/broadcast/campaign-list/account-list">
             <Button color="primary" size="md" className="text-sm">
               <UserIcon />
               Daftar Akun
             </Button>
-          </Link>
+          </Link> */}
           <Link href="/admin/broadcast/campaign-list/create">
             <Button color="primary" size="md" className="text-sm">
               <NewCampaignIcon size={23} />
diff --git a/app/[locale]/(public)/all/filter/page.tsx b/app/[locale]/(public)/all/filter/page.tsx
index 2319d691..6953d455 100644
--- a/app/[locale]/(public)/all/filter/page.tsx
+++ b/app/[locale]/(public)/all/filter/page.tsx
@@ -569,18 +569,19 @@ export default function FilterPage() {
                       </label>
                     </li>
                   ))}
-                  <div className="mt-4 flex gap-2 justify-center items-center">
+                  <div className="mt-4 flex justify-center items-center gap-2 flex-wrap">
+                    {/* Tombol Prev */}
                     <button
                       onClick={() =>
                         setCategoryPage((prev) => Math.max(prev - 1, 1))
                       }
                       disabled={categoryPage === 1}
-                      className="px-3 py-1 border rounded disabled:opacity-50"
+                      className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
                     >
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
-                        width="24"
-                        height="24"
+                        width="16"
+                        height="16"
                         viewBox="0 0 24 24"
                       >
                         <path
@@ -590,20 +591,41 @@ export default function FilterPage() {
                       </svg>
                     </button>
 
-                    {Array.from({ length: categoryTotalPages }, (_, i) => (
-                      <button
-                        key={i}
-                        onClick={() => setCategoryPage(i + 1)}
-                        className={`px-3 py-1 border rounded ${
-                          categoryPage === i + 1
-                            ? "bg-[#bb3523] text-white"
-                            : ""
-                        }`}
-                      >
-                        {i + 1}
-                      </button>
-                    ))}
+                    {(() => {
+                      const maxVisible = 4;
+                      let startPage = Math.max(
+                        1,
+                        Math.min(
+                          categoryPage - Math.floor(maxVisible / 2),
+                          categoryTotalPages - maxVisible + 1
+                        )
+                      );
+                      const endPage = Math.min(
+                        categoryTotalPages,
+                        startPage + maxVisible - 1
+                      );
 
+                      const visiblePages = [];
+                      for (let i = startPage; i <= endPage; i++) {
+                        visiblePages.push(i);
+                      }
+
+                      return visiblePages.map((pageNum) => (
+                        <button
+                          key={pageNum}
+                          onClick={() => setCategoryPage(pageNum)}
+                          className={`px-3 py-1 border rounded text-sm transition-colors ${
+                            categoryPage === pageNum
+                              ? "bg-[#bb3523] text-white"
+                              : "bg-white dark:bg-gray-800"
+                          }`}
+                        >
+                          {pageNum}
+                        </button>
+                      ));
+                    })()}
+
+                    {/* Tombol Next */}
                     <button
                       onClick={() =>
                         setCategoryPage((prev) =>
@@ -611,12 +633,12 @@ export default function FilterPage() {
                         )
                       }
                       disabled={categoryPage === categoryTotalPages}
-                      className="px-3 py-1 border rounded disabled:opacity-50"
+                      className="px-2 py-1 border rounded disabled:opacity-50 flex items-center justify-center"
                     >
                       <svg
                         xmlns="http://www.w3.org/2000/svg"
-                        width="24"
-                        height="24"
+                        width="16"
+                        height="16"
                         viewBox="0 0 24 24"
                       >
                         <path
diff --git a/components/landing-page/content-category.tsx b/components/landing-page/content-category.tsx
index 7a435628..8b88aa7f 100644
--- a/components/landing-page/content-category.tsx
+++ b/components/landing-page/content-category.tsx
@@ -1,6 +1,4 @@
 import {
-  getCategoryData,
-  getPublicCategoryData,
   getPublicCategoryDataNew,
 } from "@/service/landing/landing";
 import React, { useEffect, useState } from "react";
@@ -8,15 +6,7 @@ import { Reveal } from "./Reveal";
 import { useTranslations } from "next-intl";
 import { usePathname } from "next/navigation";
 import { useParams } from "next/navigation";
-import Image from "next/image";
-import {
-  Carousel,
-  CarouselContent,
-  CarouselItem,
-  CarouselNext,
-  CarouselPrevious,
-} from "../ui/carousel";
-import { useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/routing";
 import { Button } from "../ui/button";
 import ImageBlurry from "../ui/image-blurry";
 
@@ -105,12 +95,13 @@ const ContentCategory = (props: { group?: string; type: string }) => {
             {(seeAllValue ? categories : categories?.slice(0, 4))?.map(
               (category: any) => (
                 <div key={category?.id}>
-                  <div
-                    onClick={() =>
-                      router.push(
-                        `${prefixPath}all/filter?category=${category?.id}`
-                      )
-                    }
+                  <Link
+                  href={prefixPath + `/all/filter?category=${category?.id}`}
+                    // onClick={() =>
+                    //   router.push(
+                    //     `${prefixPath}all/filter?category=${category?.id}`
+                    //   )
+                    // }
                     className="cursor-pointer relative group rounded-md overflow-hidden shadow-md hover:shadow-lg block"
                   >
                     {/* Gambar */}
@@ -142,7 +133,7 @@ const ContentCategory = (props: { group?: string; type: string }) => {
                         {category?.name}
                       </h3>
                     </div>
-                  </div>
+                  </Link>
                 </div>
               )
             )}