diff --git a/app/[locale]/(public)/(polda)/polda/[polda_name]/image/layout.tsx b/app/[locale]/(public)/(polda)/polda/[polda_name]/image/layout.tsx
deleted file mode 100644
index 96086704..00000000
--- a/app/[locale]/(public)/(polda)/polda/[polda_name]/image/layout.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-"use client";
-
-import LayoutProvider from "@/providers/layout.provider";
-import LayoutContentProvider from "@/providers/content.provider";
-import DashCodeSidebar from "@/components/partials/sidebar";
-import DashCodeFooter from "@/components/partials/footer";
-import ThemeCustomize from "@/components/partials/customizer";
-import DashCodeHeader from "@/components/partials/header";
-
-import { redirect } from "@/components/navigation";
-import Footer from "@/components/landing-page/footer";
-import Navbar from "@/components/landing-page/navbar";
-import NavbarKaltara from "@/components/landing-page/landing-polda-kaltara/navbar-polda-kaltara";
-import { useParams } from "next/navigation";
-import ContactUsKaltara from "@/components/landing-page/landing-polda-kaltara/contact-us-kaltara";
-import NewsTickerKaltara from "../../../tbnews/[polda_name]/components/news-tickers-kaltara";
-
-const layout = ({ children }: { children: React.ReactNode }) => {
-  const params = useParams();
-  const poldaName: any = params?.polda_name;
-  return poldaName === "kaltara" ? (
-    <>
-      <NavbarKaltara />
-      {children}
-      <ContactUsKaltara />
-      <NewsTickerKaltara />
-    </>
-  ) : (
-    <>
-      <Navbar />
-      {children}
-      <Footer />
-    </>
-  );
-};
-
-export default layout;
diff --git a/app/[locale]/(public)/(polda)/tbnews/[polda_name]/page.tsx b/app/[locale]/(public)/(polda)/tbnews/[polda_name]/page.tsx
index dbd15db9..051b3064 100644
--- a/app/[locale]/(public)/(polda)/tbnews/[polda_name]/page.tsx
+++ b/app/[locale]/(public)/(polda)/tbnews/[polda_name]/page.tsx
@@ -12,20 +12,33 @@ import SocialMedia from "./components/social-media";
 import NewsTickerKaltara from "./components/news-tickers-kaltara";
 import PpsSection from "./components/pps-section";
 import ContactUsKaltara from "@/components/landing-page/landing-polda-kaltara/contact-us-kaltara";
+import WelcomePolda from "@/components/landing-page/welcome-polda";
+import LatestContentKaltara from "@/components/landing-page/landing-polda-kaltara/latest-content-kaltara";
+import ContentCategoryKaltara from "@/components/landing-page/landing-polda-kaltara/content-category-kaltara";
 
 const PoldaKaltara = () => {
   return (
+    // <div>
+    //   <NavbarKaltara />
+    //   <HeroKaltara />
+    //   <PpsSection />
+    //   <LatestNews type="latest" />
+    //   <LatestNews type="popular" />
+    //   {/* <PopularNews /> */}
+    //   <SocialMedia />
+    //   <NationalNews />
+    //   <RegionalNews />
+    //   {/* <ContactUs /> */}
+    //   <ContactUsKaltara />
+    //   <NewsTickerKaltara />
+    // </div>
     <div>
       <NavbarKaltara />
-      <HeroKaltara />
-      <PpsSection />
-      <LatestNews type="latest" />
-      <LatestNews type="popular" />
-      {/* <PopularNews /> */}
-      <SocialMedia />
-      <NationalNews />
-      <RegionalNews />
-      {/* <ContactUs /> */}
+      {/* <SearchSectionKaltara /> */}
+      <WelcomePolda />
+      <LatestContentKaltara group="polda" type="latest" />
+      <LatestContentKaltara group="polda" type="popular" />
+      <ContentCategoryKaltara type="" group="polda" />
       <ContactUsKaltara />
       <NewsTickerKaltara />
     </div>