diff --git a/app/[locale]/(protected)/dashboard/executive-data/page.tsx b/app/[locale]/(protected)/dashboard/executive-data/page.tsx
index 0d7408e0..bee89e65 100644
--- a/app/[locale]/(protected)/dashboard/executive-data/page.tsx
+++ b/app/[locale]/(protected)/dashboard/executive-data/page.tsx
@@ -84,8 +84,8 @@ export default function ExecutiveDataDashboard() {
         ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?"
         : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?"
       : safeLevelName.includes("POLDA")
-      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?polda-selected=${state}&`
-      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda?polda-selected=${state}&`;
+      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-polda-new?polda-selected=${state}&`
+      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-polda-new?polda-selected=${state}&`;
 
   const view5 =
     levelName == "MABES POLRI"
@@ -120,8 +120,8 @@ export default function ExecutiveDataDashboard() {
         ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-konten-kategori-top10?"
         : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-konten-kategori-top10?"
       : safeLevelName.includes("POLDA")
-      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-konten-kategori-top10-polda?polda-selected=${state}&`
-      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-konten-kategori-top10-polda?polda-selected=${state}&`;
+      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda-new?polda-selected=${state}&`
+      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polda-new?polda-selected=${state}&`;
 
   const view9 =
     levelName == "MABES POLRI"
@@ -369,61 +369,6 @@ export default function ExecutiveDataDashboard() {
                     />
                   )}
                 </div>
-                <p className="text-lg">
-                  <b>
-                    {isInternational[3]
-                      ? "INTERACTIONS OF CATEGORY AND ACCESS TIME"
-                      : "INTERAKSI KATEGORI DAN WAKTU AKSES"}
-                  </b>
-                </p>
-                {levelName === "MABES POLRI" ? (
-                  <div className="flex flex-col gap-1">
-                    <p>{t("choose_category")}</p>
-                    <div className="flex flex-row gap-1 border-2 w-fit">
-                      <Button
-                        onClick={() => handleInternational(3, false)}
-                        className={` hover:text-white rounded-none
-                ${
-                  isInternational[2]
-                    ? "bg-white text-black "
-                    : "bg-black text-white "
-                }`}
-                      >
-                        Indonesia
-                      </Button>
-                      <Button
-                        onClick={() => handleInternational(3, true)}
-                        className={`hover:text-white rounded-none ${
-                          isInternational[1]
-                            ? "bg-black text-white "
-                            : "bg-white text-black "
-                        }
-              `}
-                      >
-                        {t("international")}
-                      </Button>
-                    </div>
-                  </div>
-                ) : (
-                  ""
-                )}
-                <div className="my-5">
-                  {ticket4 == "" ? (
-                    <iframe
-                      src={`${baseUrl + view9 + param}`}
-                      width="100%"
-                      height="750"
-                      frameBorder="0"
-                    />
-                  ) : (
-                    <iframe
-                      src={`${`${url + ticket4}/${view9}${param}`}`}
-                      width="100%"
-                      height="750"
-                      frameBorder="0"
-                    />
-                  )}
-                </div>
               </Card>
             </TabsContent>
             <TabsContent value="popular-content">
diff --git a/app/[locale]/(protected)/dashboard/executive/page.tsx b/app/[locale]/(protected)/dashboard/executive/page.tsx
index e161b04c..e9851ec4 100644
--- a/app/[locale]/(protected)/dashboard/executive/page.tsx
+++ b/app/[locale]/(protected)/dashboard/executive/page.tsx
@@ -149,9 +149,7 @@ export default function ExecutiveDashboard() {
             }`}
           >
             <div className="flex flex-row justify-between">
-              <p className="text-base font-semibold">
-                Upload konten hari ini Polda
-              </p>
+              <p className="text-base font-semibold">Publish Konten Polda</p>
             </div>
             <div className="my-5">
               {ticket1 == "" ? (
@@ -173,39 +171,6 @@ export default function ExecutiveDashboard() {
           </Card>
         )}
 
-        {/* Satker */}
-        {(levelNumber === "1" || levelNumber === "3") && (
-          <Card
-            className={`rounded-sm p-3 ${
-              levelNumber === "3" ? "w-full" : "w-4/12"
-            }`}
-          >
-            <div className="flex flex-row justify-between">
-              <p className="text-base font-semibold">
-                Upload konten hari ini Satker
-              </p>
-            </div>
-            <div className="my-5">
-              {ticket2 == "" ? (
-                <iframe
-                  src={`${baseUrl + view6 + param}`}
-                  width="100%"
-                  height="750"
-                  frameBorder="0"
-                />
-              ) : (
-                <iframe
-                  src={`${url + ticket2}/${view6}${param}`}
-                  width="100%"
-                  height="750"
-                  frameBorder="0"
-                />
-              )}
-            </div>
-          </Card>
-        )}
-
-        {/* Polres */}
         {(levelNumber === "1" || levelNumber === "2") && (
           <Card
             className={`rounded-sm p-3 ${
@@ -213,9 +178,7 @@ export default function ExecutiveDashboard() {
             }`}
           >
             <div className="flex flex-row justify-between">
-              <p className="text-base font-semibold">
-                Upload konten hari ini Polres
-              </p>
+              <p className="text-base font-semibold">Publish Konten Polres</p>
             </div>
             <div className="my-5">
               {ticket3 == "" ? (
@@ -236,6 +199,36 @@ export default function ExecutiveDashboard() {
             </div>
           </Card>
         )}
+
+        {/* Satker */}
+        {(levelNumber === "1" || levelNumber === "3") && (
+          <Card
+            className={`rounded-sm p-3 ${
+              levelNumber === "3" ? "w-full" : "w-4/12"
+            }`}
+          >
+            <div className="flex flex-row justify-between">
+              <p className="text-base font-semibold">Publish Konten Satker</p>
+            </div>
+            <div className="my-5">
+              {ticket2 == "" ? (
+                <iframe
+                  src={`${baseUrl + view6 + param}`}
+                  width="100%"
+                  height="750"
+                  frameBorder="0"
+                />
+              ) : (
+                <iframe
+                  src={`${url + ticket2}/${view6}${param}`}
+                  width="100%"
+                  height="750"
+                  frameBorder="0"
+                />
+              )}
+            </div>
+          </Card>
+        )}
       </div>
       <div className="w-full mt-3">
         <Card className="rounded-sm p-3 h-[750px]">
diff --git a/components/partials/auth/login-form.tsx b/components/partials/auth/login-form.tsx
index bc179c58..68695b3f 100644
--- a/components/partials/auth/login-form.tsx
+++ b/components/partials/auth/login-form.tsx
@@ -228,15 +228,17 @@ const LoginForm = () => {
             Number(profile?.data?.data?.roleId) == 18 ||
             Number(profile?.data?.data?.roleId) == 19
           ) {
-            if (
-              profile?.data?.data?.roleId === 18 ||
-              profile?.data?.data?.roleId === 2
-            ) {
+            if (profile?.data?.data?.roleId === 18) {
               window.location.href = "/in/dashboard/executive-data";
               // router.push('/admin/dashboard');
               Cookies.set("status", "login", {
                 expires: 1,
               });
+            } else if (profile?.data?.data?.roleId === 2) {
+              window.location.href = "/in/dashboard/executive";
+              Cookies.set("status", "login", {
+                expires: 1,
+              });
             } else if (
               profile?.data?.data?.userLevel?.id == 794 ||
               profile?.data?.data?.userLevel?.parentLevelId == 761
diff --git a/lib/menus.ts b/lib/menus.ts
index e6b9346a..df3c15fa 100644
--- a/lib/menus.ts
+++ b/lib/menus.ts
@@ -3017,9 +3017,9 @@ export function getMenuList(pathname: string, t: any): Group[] {
               icon: "material-symbols:dashboard",
               submenus: [
                 {
-                  href: "/dashboard/executive-data",
+                  href: "/dashboard/executive",
                   label: "Executive",
-                  active: pathname === "/dashboard/executive-data",
+                  active: pathname === "/dashboard/executive",
                   icon: "heroicons:arrow-trending-up",
                   children: [],
                 },
@@ -3348,9 +3348,9 @@ export function getMenuList(pathname: string, t: any): Group[] {
               icon: "material-symbols:dashboard",
               submenus: [
                 {
-                  href: "/dashboard/executive-data",
+                  href: "/dashboard/executive",
                   label: "Executive",
-                  active: pathname === "/dashboard/executive-data",
+                  active: pathname === "/dashboard/executive",
                   icon: "heroicons:arrow-trending-up",
                   children: [],
                 },