diff --git a/app/[locale]/(protected)/contributor/report/components/columns.tsx b/app/[locale]/(protected)/contributor/report/components/columns.tsx
index e244576c..f12626f3 100644
--- a/app/[locale]/(protected)/contributor/report/components/columns.tsx
+++ b/app/[locale]/(protected)/contributor/report/components/columns.tsx
@@ -23,7 +23,7 @@ import { Link, useRouter } from "@/components/navigation";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";
 import { deleteBlog } from "@/service/blog/blog";
-import { error, loading } from "@/lib/swal";
+import { error, loading, close } from "@/lib/swal";
 import { useTranslations } from "next-intl";
 import axios from "axios";
 
@@ -126,6 +126,7 @@ const useTableColumns = ({
 
         const handleDownload = async (id: string) => {
           try {
+            loading();
             const response = await axios.get(
               `https://netidhub.com/api/media/report/download?id=${id}`,
               {
@@ -140,6 +141,7 @@ const useTableColumns = ({
             document.body.appendChild(link);
             link.click();
             link.remove();
+            close();
           } catch (error) {
             console.error("Download failed", error);
             MySwal.fire({
diff --git a/app/[locale]/(protected)/dashboard/executive-data/page.tsx b/app/[locale]/(protected)/dashboard/executive-data/page.tsx
index bee89e65..209eb27c 100644
--- a/app/[locale]/(protected)/dashboard/executive-data/page.tsx
+++ b/app/[locale]/(protected)/dashboard/executive-data/page.tsx
@@ -37,6 +37,7 @@ export default function ExecutiveDataDashboard() {
   const state = Cookies.get("state");
   const provState = Cookies.get("state-prov");
   const t = useTranslations("AnalyticsDashboard");
+  const [refreshTicket, setRefreshTicket] = useState(true);
 
   const [ticket1, setTicket1] = useState("");
   const [ticket2, setTicket2] = useState("");
@@ -44,6 +45,7 @@ export default function ExecutiveDataDashboard() {
   const [ticket4, setTicket4] = useState("");
   const [ticket5, setTicket5] = useState("");
   const [ticket6, setTicket6] = useState("");
+  const [ticket7, setTicket7] = useState("");
   const [isInternational, setIsInternational] = useState([false, false, false]);
 
   const baseUrl = "https://analytic.sitani.info/";
@@ -54,13 +56,40 @@ export default function ExecutiveDataDashboard() {
   const view1 =
     levelName == "MABES POLRI"
       ? isInternational[0]
-        ? "views/2023_08_MediaHUB-KtnMgt_Rev100/db-emg-issue-executive?"
-        : "views/2023_08_MediaHUB-KtnMgt_Rev100/db-emg-issue-executive?"
+        ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-polda-new?polda-selected=ALL"
+        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-polda-new?polda-selected=ALL"
       : safeLevelName.includes("POLDA")
-      ? `views/2023_08_MediaHUB-KtnMgt_Rev100/db-emg-issue?provinsi-polda=${state}&`
-      : `views/2023_08_MediaHUB-KtnMgt_Rev100/db-emg-issue?provinsi-polda=${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 view2 =
+    levelName == "MABES POLRI"
+      ? isInternational[1]
+        ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-content-interaction-per-satker?polda-selected=ALL"
+        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-satker?polda-selected=ALL"
+      : safeLevelName.includes("POLDA")
+      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-satker?polda-selected=SATKER POLRI&`
+      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-per-satker?polda-selected=SATKER POLRI&`;
+
+  const view3 =
+    levelName == "MABES POLRI"
+      ? isInternational[2]
+        ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-content-category-per-polda-new?polda-selected=ALL"
+        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-polda-new?polda-selected=ALL"
+      : safeLevelName.includes("POLDA")
+      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-polda-new?polda-selected=${state}&`
+      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-polda-new?polda-selected=${state}&`;
+
+  const view4 =
+    levelName == "MABES POLRI"
+      ? isInternational[1]
+        ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-satker?polda-selected=ALL"
+        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-satker?polda-selected=ALL"
+      : safeLevelName.includes("POLDA")
+      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-satker?polda-selected=SATKER POLRI&`
+      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-category-per-satker?polda-selected=SATKER POLRI&`;
+
+    const view5 =
     levelName == "MABES POLRI"
       ? isInternational[1]
         ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-published-produksi?"
@@ -69,7 +98,7 @@ export default function ExecutiveDataDashboard() {
       ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-polda-executive?polda-selected=${state}&`
       : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-published-produksi-polda-executive?polda-selected=${state}&`;
 
-  const view3 =
+  const view6 =
     levelName == "MABES POLRI"
       ? isInternational[2]
         ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-waktu-akses-pengguna?"
@@ -78,59 +107,14 @@ export default function ExecutiveDataDashboard() {
       ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-polda-executive?polda-selected=${state}&`
       : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-waktu-akses-pengguna-polda-executive?polda-selected=${state}&`;
 
-  const view4 =
-    levelName == "MABES POLRI"
-      ? isInternational[1]
-        ? "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-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"
-      ? isInternational[1]
-        ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?"
-        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?"
-      : safeLevelName.includes("POLDA")
-      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?provinsi-polda=${state}&`
-      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-polres?provinsi-polda=${state}&`;
-
-  const view6 =
-    levelName == "MABES POLRI"
-      ? isInternational[1]
-        ? "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?"
-        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?"
-      : safeLevelName.includes("POLDA")
-      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?satker-selected=${state}&`
-      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-satker?satker-selected=${state}&`;
-
   const view7 =
     levelName == "MABES POLRI"
       ? isInternational[2]
-        ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-penugasan?"
-        : "views/2023_09_db-penugasan_rev100/db-penugasan?"
+        ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-penugasan-vertical-bar?"
+        : "views/2023_09_db-penugasan_rev100/db-penugasan-vertical-bar?"
       : safeLevelName.includes("POLDA")
-      ? `views/2023_09_db-penugasan_rev100/db-penugasan?polda-selected=${state}&`
-      : `views/2023_09_db-penugasan_rev100/db-penugasan?polda-selected=${state}&`;
-
-  const view8 =
-    levelName == "MABES POLRI"
-      ? isInternational[2]
-        ? "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-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"
-      ? isInternational[3]
-        ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-konten-kategori?"
-        : "views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-konten-kategori?"
-      : safeLevelName.includes("POLDA")
-      ? `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-konten-kategori-polda?polda-selected=${state}&`
-      : `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-konten-kategori-polda?polda-selected=${state}&`;
+      ? `views/2023_09_db-penugasan_rev100/db-penugasan-vertical-bar?polda-selected=${state}&`
+      : `views/2023_09_db-penugasan_rev100/db-penugasan-vertical-bar?polda-selected=${state}&`;
 
   const param = ":embed=yes&:toolbar=no&:iframeSizedToWindow=true";
 
@@ -153,10 +137,13 @@ export default function ExecutiveDataDashboard() {
 
       const response6 = await generateTicket();
       setTicket6(response6?.data?.data);
+      
+      const response7 = await generateTicket();
+      setTicket7(response7?.data?.data);
     }
 
     initState();
-  }, [isInternational]);
+  }, [isInternational, refreshTicket]);
 
   // Hooks
   useEffect(() => {
@@ -178,7 +165,7 @@ export default function ExecutiveDataDashboard() {
       <SiteBreadcrumb />
       <div>
         <div className="my-3">
-          <Tabs defaultValue="content-publish" className="w-full">
+          <Tabs defaultValue="content-publish" className="w-full" onValueChange={() => setRefreshTicket(!refreshTicket)}>
             <TabsList className="flex-wrap bg-black">
               <TabsTrigger
                 value="content-publish"
@@ -217,19 +204,17 @@ export default function ExecutiveDataDashboard() {
                 {/* Polda */}
                 {(levelNumber === "1" || levelNumber === "2") && (
                   <Card
-                    className={`rounded-sm p-3 ${
-                      levelNumber === "2" ? "w-full" : "w-full"
-                    }`}
+                    className={`rounded-sm p-3 w-full`}
                   >
-                    <div className="flex flex-row justify-between">
+                    {/* <div className="flex flex-row justify-between">
                       <p className="text-base font-semibold">
                         Upload konten hari ini Polda
                       </p>
-                    </div>
+                    </div> */}
                     <div className="my-5">
                       {ticket1 == "w-full" ? (
                         <iframe
-                          src={`${baseUrl + view4 + param}`}
+                          src={`${baseUrl + view1 + param}`}
                           width="100%"
                           height="750"
                           className="w-full"
@@ -237,7 +222,7 @@ export default function ExecutiveDataDashboard() {
                         />
                       ) : (
                         <iframe
-                          src={`${url + ticket1}/${view4}${param}`}
+                          src={`${url + ticket1}/${view1}${param}`}
                           width="100%"
                           height="750"
                           frameBorder="0"
@@ -248,60 +233,26 @@ export default function ExecutiveDataDashboard() {
                 )}
 
                 {/* Satker */}
-                {(levelNumber === "1" || levelNumber === "3") && (
+                {(levelNumber === "1") && (
                   <Card
-                    className={`rounded-sm p-3 ${
-                      levelNumber === "3" ? "w-full" : "w-full"
-                    }`}
+                    className={`rounded-sm p-3 w-full`}
                   >
-                    <div className="flex flex-row justify-between">
+                    {/* <div className="flex flex-row justify-between">
                       <p className="text-base font-semibold">
                         Upload konten hari ini Satker
                       </p>
-                    </div>
+                    </div> */}
                     <div className="my-5">
                       {ticket2 == "" ? (
                         <iframe
-                          src={`${baseUrl + view6 + param}`}
+                          src={`${baseUrl + view2 + 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 ${
-                      levelNumber === "2" ? "w-full" : "w-full"
-                    }`}
-                  >
-                    <div className="flex flex-row justify-between">
-                      <p className="text-base font-semibold">
-                        Upload konten hari ini Polres
-                      </p>
-                    </div>
-                    <div className="my-5">
-                      {ticket3 == "" ? (
-                        <iframe
-                          src={`${baseUrl + view5 + param}`}
-                          width="100%"
-                          height="750"
-                          frameBorder="0"
-                        />
-                      ) : (
-                        <iframe
-                          src={`${url + ticket3}/${view5}${param}`}
+                          src={`${url + ticket2}/${view2}${param}`}
                           width="100%"
                           height="750"
                           frameBorder="0"
@@ -313,82 +264,63 @@ export default function ExecutiveDataDashboard() {
               </div>
             </TabsContent>
             <TabsContent value="content-category">
-              <Card className="px-3 py-3">
-                <p className="text-lg">
-                  <b>
-                    {isInternational[2]
-                      ? "INTERACTION OF THE MOST POPULAR CATEGORIES AND TITLES"
-                      : "INTERAKSI KATEGORI DAN JUDUL TERPOPULER"}
-                  </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(2, false)}
-                        className={` hover:text-white rounded-none
-                ${
-                  isInternational[2]
-                    ? "bg-white text-black "
-                    : "bg-black text-white "
-                }`}
-                      >
-                        Indonesia
-                      </Button>
-                      <Button
-                        onClick={() => handleInternational(2, true)}
-                        className={`hover:text-white rounded-none ${
-                          isInternational[1]
-                            ? "bg-black text-white "
-                            : "bg-white text-black "
-                        }
-              `}
-                      >
-                        {t("international")}
-                      </Button>
+              {(levelNumber === "1" || levelNumber === "2") && (
+                <Card className="px-3 py-3">
+                    <div className="my-5">
+                      {ticket3 == "" ? (
+                        <iframe
+                          src={`${baseUrl + view3 + param}`}
+                          width="100%"
+                          height="750"
+                          frameBorder="0"
+                        />
+                      ) : (
+                        <iframe
+                          src={`${`${url + ticket3}/${view3}${param}`}`}
+                          width="100%"
+                          height="750"
+                          frameBorder="0"
+                        />
+                      )}
                     </div>
-                  </div>
-                ) : (
-                  ""
-                )}
-                <div className="my-5">
-                  {ticket3 == "" ? (
-                    <iframe
-                      src={`${baseUrl + view8 + param}`}
-                      width="100%"
-                      height="750"
-                      frameBorder="0"
-                    />
-                  ) : (
-                    <iframe
-                      src={`${`${url + ticket3}/${view8}${param}`}`}
-                      width="100%"
-                      height="750"
-                      frameBorder="0"
-                    />
-                  )}
-                </div>
-              </Card>
+                </Card>
+              )}
+
+              {levelNumber === "1" && (
+                <Card className="px-3 py-3">
+                    <div className="my-5">
+                      {ticket4 == "" ? (
+                        <iframe
+                          src={`${baseUrl + view4 + param}`}
+                          width="100%"
+                          height="750"
+                          frameBorder="0"
+                        />
+                      ) : (
+                        <iframe
+                          src={`${`${url + ticket4}/${view4}${param}`}`}
+                          width="100%"
+                          height="750"
+                          frameBorder="0"
+                        />
+                      )}
+                    </div>
+                </Card>
+              )}
             </TabsContent>
             <TabsContent value="popular-content">
               <Card className="rounded-sm p-3 h-[750px]">
-                <div className="flex flex-row justify-between">
-                  <p className="text-base font-semibold">
-                    Konten Paling Populer
-                  </p>
-                </div>
                 <div className="my-5">
-                  {ticket4 == "" ? (
+                  {ticket5 == "" ? (
                     <iframe
-                      src={`${baseUrl + view2 + param}`}
+                      src={`${baseUrl + view5 + param}`}
                       width="100%"
                       height="650"
                       frameBorder="0"
                     />
                   ) : (
                     <iframe
-                      src={`${`${url + ticket4}/${view2}${param}`}`}
+                      src={`${`${url + ticket5}/${view5}${param}`}`}
                       width="100%"
                       height="650"
                       frameBorder="0"
@@ -400,22 +332,17 @@ export default function ExecutiveDataDashboard() {
 
             <TabsContent value="heatmap">
               <Card className="rounded-sm p-3 h-[750px]">
-                <div className="flex flex-row justify-between mx-3">
-                  <p className="text-base font-semibold">
-                    Heatmap Konten dan Kategori dengan Interaksi
-                  </p>
-                </div>
                 <div className="my-5">
-                  {ticket5 == "" ? (
+                  {ticket6 == "" ? (
                     <iframe
-                      src={`${baseUrl + view3 + param}`}
+                      src={`${baseUrl + view6 + param}`}
                       width="100%"
                       height="600"
                       frameBorder="0"
                     />
                   ) : (
                     <iframe
-                      src={`${`${url + ticket5}/${view3}${param}`}`}
+                      src={`${`${url + ticket6}/${view6}${param}`}`}
                       width="100%"
                       height="600"
                       frameBorder="0"
@@ -425,60 +352,25 @@ export default function ExecutiveDataDashboard() {
               </Card>
             </TabsContent>
             <TabsContent value="task">
-              <div className="grid grid-cols-12 gap-5">
-                <div className="lg:col-span-12 col-span-12">
-                  <Card className="px-3 py-3">
-                    {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(2, false)}
-                            className={` hover:text-white rounded-none
-                ${
-                  isInternational[2]
-                    ? "bg-white text-black "
-                    : "bg-black text-white "
-                }`}
-                          >
-                            Indonesia
-                          </Button>
-                          <Button
-                            onClick={() => handleInternational(2, 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">
-                      {ticket3 == "" ? (
-                        <iframe
-                          src={`${baseUrl + view7 + param}`}
-                          width="100%"
-                          height="750"
-                          frameBorder="0"
-                        />
-                      ) : (
-                        <iframe
-                          src={`${`${url + ticket3}/${view7}${param}`}`}
-                          width="100%"
-                          height="750"
-                          frameBorder="0"
-                        />
-                      )}
-                    </div>
-                  </Card>
+              <Card className="rounded-sm p-3 h-[750px]">
+                <div className="my-5">
+                  {ticket7 == "" ? (
+                    <iframe
+                      src={`${baseUrl + view7 + param}`}
+                      width="100%"
+                      height="750"
+                      frameBorder="0"
+                    />
+                  ) : (
+                    <iframe
+                      src={`${`${url + ticket7}/${view7}${param}`}`}
+                      width="100%"
+                      height="750"
+                      frameBorder="0"
+                    />
+                  )}
                 </div>
-              </div>
+              </Card>
             </TabsContent>
           </Tabs>
         </div>
diff --git a/utils/globals.tsx b/utils/globals.tsx
index 445354d9..4ec73d08 100644
--- a/utils/globals.tsx
+++ b/utils/globals.tsx
@@ -181,7 +181,7 @@ const LoadScript = () => {
     const script = document.createElement("script");
     script.src = "https://cdn.userway.org/widget.js";
     script.setAttribute("data-account", "X36s1DpjqB");
-    script.setAttribute("data-position", "3"); 
+    script.setAttribute("data-position", "5"); 
     script.async = true;
     document.head.appendChild(script);