diff --git a/src/App.tsx b/src/App.tsx
index 2c65a2dd3..01befb4f9 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -35,6 +35,7 @@ import {
   SchemaResourceType,
   schemaResourceTypes
 } from "./components/SchemaResourcePage/resourceTypes";
+import { TopologyPageWrapper } from "./components/Topology/TopologyPageWrapper";
 import { ConfigPageContextProvider } from "./context/ConfigPageContext";
 import { useFeatureFlagsContext } from "./context/FeatureFlagsContext";
 import { HealthPageContextProvider } from "./context/HealthPageContext";
@@ -266,15 +267,63 @@ export function IncidentManagerRoutes({ sidebar }: { sidebar: ReactNode }) {
       />
 
       <Route path="topology" element={sidebar}>
-        <Route
-          path=":id"
-          element={withAuthorizationAccessCheck(
-            <TopologyPage />,
-            tables.database,
-            "read",
-            true
-          )}
-        />
+        <Route path=":id">
+          <Route
+            index
+            element={withAuthorizationAccessCheck(
+              <TopologyPage></TopologyPage>,
+              tables.database,
+              "read",
+              true
+            )}
+          />
+
+          <Route
+            path="changes"
+            element={withAuthorizationAccessCheck(
+              <TopologyPageWrapper catalogTab="Changes" />,
+              tables.database,
+              "read",
+              true
+            )}
+          />
+          <Route
+            path="insights"
+            element={withAuthorizationAccessCheck(
+              <TopologyPageWrapper catalogTab="Insights" />,
+              tables.database,
+              "read",
+              true
+            )}
+          />
+          <Route
+            path="relationships"
+            element={withAuthorizationAccessCheck(
+              <TopologyPageWrapper catalogTab="Relationships" />,
+              tables.database,
+              "read",
+              true
+            )}
+          />
+          <Route
+            path="playbooks"
+            element={withAuthorizationAccessCheck(
+              <TopologyPageWrapper catalogTab="Playbooks" />,
+              tables.database,
+              "read",
+              true
+            )}
+          />
+          <Route
+            path="checks"
+            element={withAuthorizationAccessCheck(
+              <TopologyPageWrapper catalogTab="Checks" />,
+              tables.database,
+              "read"
+            )}
+          />
+        </Route>
+
         <Route
           index
           element={withAuthorizationAccessCheck(
diff --git a/src/components/Configs/ConfigDetailsTabs.tsx b/src/components/Configs/ConfigDetailsTabs.tsx
index 6188f9f61..1a2e47496 100644
--- a/src/components/Configs/ConfigDetailsTabs.tsx
+++ b/src/components/Configs/ConfigDetailsTabs.tsx
@@ -14,18 +14,20 @@ import { TopologyCard } from "../Topology/TopologyCard";
 import { useConfigDetailsTabs } from "./ConfigTabsLinks";
 import ConfigSidebar from "./Sidebar/ConfigSidebar";
 
-type ConfigDetailsTabsProps = {
+export type ConfigTab =
+  | "Catalog"
+  | "Changes"
+  | "Insights"
+  | "Relationships"
+  | "Playbooks"
+  | "Checks";
+
+export type ConfigDetailsTabsProps = {
   refetch?: () => void;
   children: ReactNode;
   isLoading?: boolean;
   pageTitlePrefix: string;
-  activeTabName:
-    | "Catalog"
-    | "Changes"
-    | "Insights"
-    | "Relationships"
-    | "Playbooks"
-    | "Checks";
+  activeTabName: ConfigTab;
   className?: string;
 };
 
diff --git a/src/components/Configs/ConfigTabsLinks.tsx b/src/components/Configs/ConfigTabsLinks.tsx
index b3b9e75ad..84d965657 100644
--- a/src/components/Configs/ConfigTabsLinks.tsx
+++ b/src/components/Configs/ConfigTabsLinks.tsx
@@ -3,12 +3,13 @@ import { useParams } from "react-router-dom";
 import { ConfigItemDetails } from "../../api/types/configs";
 
 export function useConfigDetailsTabs(
-  countSummary?: ConfigItemDetails["summary"]
+  countSummary?: ConfigItemDetails["summary"],
+  basePath: `/${string}` = "/catalog"
 ) {
   const { id } = useParams<{ id: string }>();
 
   return [
-    { label: "Config", key: "Catalog", path: `/catalog/${id}` },
+    { label: "Config", key: "Catalog", path: `${basePath}/${id}` },
     {
       label: (
         <>
@@ -17,7 +18,7 @@ export function useConfigDetailsTabs(
         </>
       ),
       key: "Changes",
-      path: `/catalog/${id}/changes`
+      path: `${basePath}/${id}/changes`
     },
     {
       label: (
@@ -27,7 +28,7 @@ export function useConfigDetailsTabs(
         </>
       ),
       key: "Insights",
-      path: `/catalog/${id}/insights`
+      path: `${basePath}/${id}/insights`
     },
     {
       label: (
@@ -37,7 +38,7 @@ export function useConfigDetailsTabs(
         </>
       ),
       key: "Relationships",
-      path: `/catalog/${id}/relationships`
+      path: `${basePath}/${id}/relationships`
     },
     {
       label: (
@@ -47,7 +48,7 @@ export function useConfigDetailsTabs(
         </>
       ),
       key: "Playbooks",
-      path: `/catalog/${id}/playbooks`
+      path: `${basePath}/${id}/playbooks`
     },
     {
       label: (
@@ -57,7 +58,7 @@ export function useConfigDetailsTabs(
         </>
       ),
       key: "Checks",
-      path: `/catalog/${id}/checks`
+      path: `${basePath}/${id}/checks`
     }
   ];
 }
diff --git a/src/components/Topology/MergedTopologyConfigPage.tsx b/src/components/Topology/MergedTopologyConfigPage.tsx
new file mode 100644
index 000000000..51ce94ebd
--- /dev/null
+++ b/src/components/Topology/MergedTopologyConfigPage.tsx
@@ -0,0 +1,70 @@
+import { Topology } from "@flanksource-ui/api/types/topology";
+import IncidentDetailsPageSkeletonLoader from "@flanksource-ui/ui/SkeletonLoader/IncidentDetailsPageSkeletonLoader";
+import clsx from "clsx";
+import { useGetConfigByIdQuery } from "../../api/query-hooks";
+import TabbedLinks from "../../ui/Tabs/TabbedLinks";
+import { ConfigTab } from "../Configs/ConfigDetailsTabs";
+import { useConfigDetailsTabs } from "../Configs/ConfigTabsLinks";
+import { ErrorBoundary } from "../ErrorBoundary";
+import { TopologyCard } from "./TopologyCard";
+import { useTopologyCardWidth } from "./TopologyPopover/topologyPreference";
+
+type ConfigDetailsTabsForTopologyPageProps = {
+  configId: string;
+  topologies: Topology[];
+  activeTabName?: ConfigTab;
+  className?: string;
+  children: React.ReactNode;
+};
+
+export function MergedTopologyConfigPage({
+  children,
+  activeTabName = "Catalog",
+  className = "p-2",
+  configId: id,
+  topologies
+}: ConfigDetailsTabsForTopologyPageProps) {
+  const { data: configItem, isLoading: isLoadingConfig } =
+    useGetConfigByIdQuery(id!);
+
+  const configTabList = useConfigDetailsTabs(configItem?.summary, "/topology");
+
+  const [topologyCardSize] = useTopologyCardWidth();
+
+  return (
+    // eslint-disable-next-line react/jsx-no-useless-fragment
+    <>
+      {isLoadingConfig ? (
+        <IncidentDetailsPageSkeletonLoader />
+      ) : (
+        <div className={`flex h-full flex-row bg-gray-100`}>
+          <div className="flex flex-1 flex-col">
+            {topologies.length > 0 && (
+              <div className="flex max-h-[40%] w-full flex-wrap overflow-auto p-4">
+                {topologies.map((topology) => (
+                  <TopologyCard
+                    key={topology.id}
+                    topology={topology}
+                    size={topologyCardSize}
+                    menuPosition="absolute"
+                  />
+                ))}
+              </div>
+            )}
+
+            <TabbedLinks
+              activeTabName={activeTabName}
+              tabLinks={configTabList}
+              contentClassName={clsx(
+                "bg-white border border-t-0 border-gray-300 flex-1 overflow-y-auto",
+                className
+              )}
+            >
+              <ErrorBoundary>{children}</ErrorBoundary>
+            </TabbedLinks>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/src/components/Topology/TopologyPage/TopologyFilterBar.tsx b/src/components/Topology/TopologyPage/TopologyFilterBar.tsx
index 9430d7969..2b573ebeb 100644
--- a/src/components/Topology/TopologyPage/TopologyFilterBar.tsx
+++ b/src/components/Topology/TopologyPage/TopologyFilterBar.tsx
@@ -5,8 +5,8 @@ import FormikFilterForm from "@flanksource-ui/components/Forms/FormikFilterForm"
 import { StateOption } from "@flanksource-ui/components/ReactSelectDropdown";
 import { ComponentLabelsDropdown } from "@flanksource-ui/components/Topology/Dropdowns/ComponentLabelsDropdown";
 import { ComponentTypesDropdown } from "@flanksource-ui/components/Topology/Dropdowns/ComponentTypesDropdown";
-import { allOption } from "@flanksource-ui/pages/TopologyPage";
 import { useMemo } from "react";
+import { allOption } from "../TopologyPageWrapper";
 import TopologyPopOver from "../TopologyPopover";
 import { TopologySort } from "../TopologyPopover/topologySort";
 
diff --git a/src/components/Topology/TopologyPageWrapper.tsx b/src/components/Topology/TopologyPageWrapper.tsx
new file mode 100644
index 000000000..b2007b92d
--- /dev/null
+++ b/src/components/Topology/TopologyPageWrapper.tsx
@@ -0,0 +1,247 @@
+import { useComponentConfigRelationshipQuery } from "@flanksource-ui/api/query-hooks/useComponentConfigRelationshipQuery";
+import useTopologyPageQuery from "@flanksource-ui/api/query-hooks/useTopologyPageQuery";
+import { Topology } from "@flanksource-ui/api/types/topology";
+import { InfoMessage } from "@flanksource-ui/components/InfoMessage";
+import { SearchLayout } from "@flanksource-ui/components/Layout/SearchLayout";
+import { toastError } from "@flanksource-ui/components/Toast/toast";
+import { MergedTopologyConfigPage } from "@flanksource-ui/components/Topology/MergedTopologyConfigPage";
+import TopologySidebar from "@flanksource-ui/components/Topology/Sidebar/TopologySidebar";
+import { TopologyBreadcrumbs } from "@flanksource-ui/components/Topology/TopologyBreadcrumbs";
+import { TopologyCard } from "@flanksource-ui/components/Topology/TopologyCard";
+import TopologyFilterBar from "@flanksource-ui/components/Topology/TopologyPage/TopologyFilterBar";
+import { useTopologyCardWidth } from "@flanksource-ui/components/Topology/TopologyPopover/topologyPreference";
+import { Head } from "@flanksource-ui/ui/Head";
+import CardsSkeletonLoader from "@flanksource-ui/ui/SkeletonLoader/CardsSkeletonLoader";
+import { refreshButtonClickedTrigger } from "@flanksource-ui/ui/SlidingSideBar/SlidingSideBar";
+import { useAtom } from "jotai";
+import { useCallback, useEffect, useMemo, useRef } from "react";
+import { useParams, useSearchParams } from "react-router-dom";
+import LoadingBar, { LoadingBarRef } from "react-top-loading-bar";
+
+import { ConfigTab } from "../Configs/ConfigDetailsTabs";
+import {
+  getSortedTopology,
+  getSortLabels
+} from "./TopologyPopover/topologySort";
+
+export const allOption = {
+  All: {
+    id: "All",
+    name: "All",
+    description: "All",
+    value: "All"
+  }
+};
+
+export const saveSortBy = (val: string, sortLabels: any[]) => {
+  const sortItem = sortLabels.find((s) => s.value === val);
+  if (sortItem?.standard) {
+    localStorage.setItem(`topologyCardsSortByStandard`, val);
+    localStorage.removeItem(`topologyCardsSortByCustom`);
+  } else {
+    localStorage.setItem(`topologyCardsSortByCustom`, val);
+  }
+};
+
+export const saveSortOrder = (val: string) => {
+  localStorage.setItem(`topologyCardsSortOrder`, val);
+};
+
+export const getSortBy = (sortLabels: any[]) => {
+  const val = localStorage.getItem("topologyCardsSortByCustom");
+  const sortItem = sortLabels.find((s) => s.value === val);
+  if (!sortItem) {
+    localStorage.removeItem(`topologyCardsSortByCustom`);
+    return localStorage.getItem(`topologyCardsSortByStandard`) || "status";
+  }
+  return (
+    localStorage.getItem("topologyCardsSortByCustom") ||
+    localStorage.getItem("topologyCardsSortByStandard") ||
+    "status"
+  );
+};
+
+export const getSortOrder = () => {
+  return localStorage.getItem(`topologyCardsSortOrder`) || "asc";
+};
+
+type TopologyPageProps = {
+  catalogTab: ConfigTab;
+};
+
+export function TopologyPageWrapper({
+  catalogTab = "Catalog"
+}: TopologyPageProps) {
+  const { id } = useParams();
+
+  const [, setTriggerRefresh] = useAtom(refreshButtonClickedTrigger);
+
+  const [searchParams, setSearchParams] = useSearchParams({
+    sortBy: "status",
+    sortOrder: "desc"
+  });
+
+  const [topologyCardSize, setTopologyCardSize] = useTopologyCardWidth();
+
+  const refererId = searchParams.get("refererId") ?? undefined;
+
+  const loadingBarRef = useRef<LoadingBarRef>(null);
+
+  const {
+    data,
+    isLoading: isLoadingTopology,
+    refetch
+  } = useTopologyPageQuery();
+
+  // We probably need to fetch related configs at this point
+  const { data: topologyConfigs, isLoading: isLoadingConfigs } =
+    useComponentConfigRelationshipQuery({
+      topologyId: id,
+      hideDeleted: true
+    });
+
+  const isLoading = isLoadingTopology || isLoadingConfigs;
+
+  const currentTopology = useMemo(() => data?.components?.[0], [data]);
+
+  const showMergedTopologyConfigPage = useMemo(() => {
+    return topologyConfigs?.data?.length === 1;
+  }, [topologyConfigs?.data?.length]);
+
+  const topology = useMemo(() => {
+    let topologyData: Topology[] | undefined;
+
+    if (id) {
+      const x = Array.isArray(data?.components) ? data?.components : [];
+
+      if (x!.length > 1) {
+        console.warn("Multiple nodes for same id?");
+        toastError("Response has multiple components for the id.");
+      }
+
+      topologyData = x![0]?.components;
+
+      if (!topologyData) {
+        console.warn("Component doesn't have any child components.");
+        topologyData = data?.components;
+      }
+    } else {
+      topologyData = data?.components ?? [];
+    }
+
+    let components = topologyData?.filter(
+      (item) => (item.name || item.title) && item.id !== id
+    );
+
+    if (!components?.length && topologyData?.length) {
+      let filtered = topologyData?.find(
+        (x: Record<string, any>) => x.id === id
+      );
+      if (filtered) {
+        components = [filtered];
+      } else {
+        components = [];
+      }
+    }
+    return components;
+  }, [data?.components, id]);
+
+  const sortLabels = useMemo(() => {
+    if (!topology) {
+      return null;
+    }
+    return getSortLabels(topology);
+  }, [topology]);
+
+  const onRefresh = useCallback(() => {
+    refetch();
+    setTriggerRefresh((prev) => prev + 1);
+  }, [refetch, setTriggerRefresh]);
+
+  useEffect(() => {
+    if (!sortLabels) {
+      return;
+    }
+
+    const sortByFromURL = searchParams.get("sortBy");
+    const sortOrderFromURL = searchParams.get("sortOrder");
+
+    const sortByFromLocalStorage = getSortBy(sortLabels) || "status";
+    const sortOrderFromLocalStorage =
+      localStorage.getItem("topologyCardsSortOrder") || "desc";
+
+    if (!sortByFromURL && !sortOrderFromURL) {
+      searchParams.set("sortBy", sortByFromLocalStorage);
+      searchParams.set("sortOrder", sortOrderFromLocalStorage);
+    }
+
+    // this will replace the history, so that the back button will work as expected
+    setSearchParams(searchParams, { replace: true });
+  }, [searchParams, setSearchParams, sortLabels]);
+
+  const sortedTopologies = useMemo(
+    () =>
+      getSortedTopology(topology, getSortBy(sortLabels || []), getSortOrder()),
+    [sortLabels, topology]
+  );
+
+  return (
+    <>
+      <LoadingBar color="#374151" height={4} ref={loadingBarRef} />
+      <Head prefix="Topology" />
+      <SearchLayout
+        title={<TopologyBreadcrumbs topologyId={id} refererId={refererId} />}
+        onRefresh={onRefresh}
+        contentClass="p-0 h-full"
+        loading={isLoading}
+      >
+        <div className="flex h-full flex-row overflow-y-auto py-2">
+          <div className="flex h-full flex-1 flex-col overflow-y-auto">
+            <TopologyFilterBar
+              data={data}
+              setTopologyCardSize={setTopologyCardSize}
+              topologyCardSize={topologyCardSize}
+              sortLabels={sortLabels ?? []}
+            />
+            {isLoading && !topology?.length ? (
+              <CardsSkeletonLoader />
+            ) : showMergedTopologyConfigPage ? (
+              <MergedTopologyConfigPage
+                topologies={topology ?? []}
+                children={undefined}
+                activeTabName={catalogTab}
+                configId={topologyConfigs?.data?.[0]?.config_id!}
+              />
+            ) : (
+              <div className="flex w-full px-6 py-4 leading-1.21rel">
+                <div className="flex w-full flex-wrap">
+                  {sortedTopologies.map((item) => (
+                    <TopologyCard
+                      key={item.id}
+                      topology={item}
+                      size={topologyCardSize}
+                      menuPosition="absolute"
+                    />
+                  ))}
+                  {!topology?.length && !isLoading && (
+                    <InfoMessage
+                      className="my-8"
+                      message="There are no components matching this criteria"
+                    />
+                  )}
+                </div>
+              </div>
+            )}
+          </div>
+          {id && (
+            <TopologySidebar
+              topology={currentTopology}
+              refererId={refererId}
+              onRefresh={refetch}
+            />
+          )}
+        </div>
+      </SearchLayout>
+    </>
+  );
+}
diff --git a/src/pages/Topology/TopologyCatalogChanges.tsx b/src/pages/Topology/TopologyCatalogChanges.tsx
new file mode 100644
index 000000000..fdb85764b
--- /dev/null
+++ b/src/pages/Topology/TopologyCatalogChanges.tsx
@@ -0,0 +1,5 @@
+import { TopologyPageWrapper } from "@flanksource-ui/components/Topology/TopologyPageWrapper";
+
+export function TopologyCatalogChanges() {
+  return <TopologyPageWrapper catalogTab="Changes" />;
+}
diff --git a/src/pages/Topology/TopologyCatalogChecks.tsx b/src/pages/Topology/TopologyCatalogChecks.tsx
new file mode 100644
index 000000000..712cdc2c4
--- /dev/null
+++ b/src/pages/Topology/TopologyCatalogChecks.tsx
@@ -0,0 +1,5 @@
+import { TopologyPageWrapper } from "@flanksource-ui/components/Topology/TopologyPageWrapper";
+
+export function TopologyCatalogChecks() {
+  return <TopologyPageWrapper catalogTab="Checks" />;
+}
diff --git a/src/pages/Topology/TopologyCatalogInsights.tsx b/src/pages/Topology/TopologyCatalogInsights.tsx
new file mode 100644
index 000000000..c4f67d788
--- /dev/null
+++ b/src/pages/Topology/TopologyCatalogInsights.tsx
@@ -0,0 +1,5 @@
+import { TopologyPageWrapper } from "@flanksource-ui/components/Topology/TopologyPageWrapper";
+
+export function TopologyCatalogInsights() {
+  return <TopologyPageWrapper catalogTab="Insights" />;
+}
diff --git a/src/pages/Topology/TopologyCatalogPlaybooks.tsx b/src/pages/Topology/TopologyCatalogPlaybooks.tsx
new file mode 100644
index 000000000..2470f133a
--- /dev/null
+++ b/src/pages/Topology/TopologyCatalogPlaybooks.tsx
@@ -0,0 +1,5 @@
+import { TopologyPageWrapper } from "@flanksource-ui/components/Topology/TopologyPageWrapper";
+
+export function TopologyCatalogPlaybooks() {
+  return <TopologyPageWrapper catalogTab="Playbooks" />;
+}
diff --git a/src/pages/Topology/TopologyCatalogRelationships.tsx b/src/pages/Topology/TopologyCatalogRelationships.tsx
new file mode 100644
index 000000000..28150a961
--- /dev/null
+++ b/src/pages/Topology/TopologyCatalogRelationships.tsx
@@ -0,0 +1,5 @@
+import { TopologyPageWrapper } from "@flanksource-ui/components/Topology/TopologyPageWrapper";
+
+export function TopologyCatalogRelationships() {
+  return <TopologyPageWrapper catalogTab="Relationships" />;
+}
diff --git a/src/pages/TopologyPage.tsx b/src/pages/TopologyPage.tsx
index 589dcb9d2..e28ae26b9 100644
--- a/src/pages/TopologyPage.tsx
+++ b/src/pages/TopologyPage.tsx
@@ -1,215 +1,5 @@
-import useTopologyPageQuery from "@flanksource-ui/api/query-hooks/useTopologyPageQuery";
-import { Topology } from "@flanksource-ui/api/types/topology";
-import { InfoMessage } from "@flanksource-ui/components/InfoMessage";
-import { SearchLayout } from "@flanksource-ui/components/Layout/SearchLayout";
-import { toastError } from "@flanksource-ui/components/Toast/toast";
-import TopologySidebar from "@flanksource-ui/components/Topology/Sidebar/TopologySidebar";
-import { TopologyBreadcrumbs } from "@flanksource-ui/components/Topology/TopologyBreadcrumbs";
-import { TopologyCard } from "@flanksource-ui/components/Topology/TopologyCard";
-import TopologyFilterBar from "@flanksource-ui/components/Topology/TopologyPage/TopologyFilterBar";
-import { useTopologyCardWidth } from "@flanksource-ui/components/Topology/TopologyPopover/topologyPreference";
-import { Head } from "@flanksource-ui/ui/Head";
-import CardsSkeletonLoader from "@flanksource-ui/ui/SkeletonLoader/CardsSkeletonLoader";
-import { refreshButtonClickedTrigger } from "@flanksource-ui/ui/SlidingSideBar/SlidingSideBar";
-import { useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { useParams, useSearchParams } from "react-router-dom";
-import LoadingBar, { LoadingBarRef } from "react-top-loading-bar";
-import {
-  getSortLabels,
-  getSortedTopology
-} from "../components/Topology/TopologyPopover/topologySort";
-
-export const allOption = {
-  All: {
-    id: "All",
-    name: "All",
-    description: "All",
-    value: "All"
-  }
-};
-
-export const saveSortBy = (val: string, sortLabels: any[]) => {
-  const sortItem = sortLabels.find((s) => s.value === val);
-  if (sortItem?.standard) {
-    localStorage.setItem(`topologyCardsSortByStandard`, val);
-    localStorage.removeItem(`topologyCardsSortByCustom`);
-  } else {
-    localStorage.setItem(`topologyCardsSortByCustom`, val);
-  }
-};
-
-export const saveSortOrder = (val: string) => {
-  localStorage.setItem(`topologyCardsSortOrder`, val);
-};
-
-export const getSortBy = (sortLabels: any[]) => {
-  const val = localStorage.getItem("topologyCardsSortByCustom");
-  const sortItem = sortLabels.find((s) => s.value === val);
-  if (!sortItem) {
-    localStorage.removeItem(`topologyCardsSortByCustom`);
-    return localStorage.getItem(`topologyCardsSortByStandard`) || "status";
-  }
-  return (
-    localStorage.getItem("topologyCardsSortByCustom") ||
-    localStorage.getItem("topologyCardsSortByStandard") ||
-    "status"
-  );
-};
-
-export const getSortOrder = () => {
-  return localStorage.getItem(`topologyCardsSortOrder`) || "asc";
-};
+import { TopologyPageWrapper } from "@flanksource-ui/components/Topology/TopologyPageWrapper";
 
 export function TopologyPage() {
-  const { id } = useParams();
-
-  const [, setTriggerRefresh] = useAtom(refreshButtonClickedTrigger);
-
-  const [searchParams, setSearchParams] = useSearchParams({
-    sortBy: "status",
-    sortOrder: "desc"
-  });
-
-  const [topologyCardSize, setTopologyCardSize] = useTopologyCardWidth();
-
-  const refererId = searchParams.get("refererId") ?? undefined;
-
-  const loadingBarRef = useRef<LoadingBarRef>(null);
-
-  const { data, isLoading, refetch } = useTopologyPageQuery();
-
-  // We probably need to fetch related configs at this point
-
-  const currentTopology = useMemo(() => data?.components?.[0], [data]);
-
-  const topology = useMemo(() => {
-    let topologyData: Topology[] | undefined;
-
-    if (id) {
-      const x = Array.isArray(data?.components) ? data?.components : [];
-
-      if (x!.length > 1) {
-        console.warn("Multiple nodes for same id?");
-        toastError("Response has multiple components for the id.");
-      }
-
-      topologyData = x![0]?.components;
-
-      if (!topologyData) {
-        console.warn("Component doesn't have any child components.");
-        topologyData = data?.components;
-      }
-    } else {
-      topologyData = data?.components ?? [];
-    }
-
-    let components = topologyData?.filter(
-      (item) => (item.name || item.title) && item.id !== id
-    );
-
-    if (!components?.length && topologyData?.length) {
-      let filtered = topologyData?.find(
-        (x: Record<string, any>) => x.id === id
-      );
-      if (filtered) {
-        components = [filtered];
-      } else {
-        components = [];
-      }
-    }
-    return components;
-  }, [data?.components, id]);
-
-  const sortLabels = useMemo(() => {
-    if (!topology) {
-      return null;
-    }
-    return getSortLabels(topology);
-  }, [topology]);
-
-  const onRefresh = useCallback(() => {
-    refetch();
-    setTriggerRefresh((prev) => prev + 1);
-  }, [refetch, setTriggerRefresh]);
-
-  useEffect(() => {
-    if (!sortLabels) {
-      return;
-    }
-
-    const sortByFromURL = searchParams.get("sortBy");
-    const sortOrderFromURL = searchParams.get("sortOrder");
-
-    const sortByFromLocalStorage = getSortBy(sortLabels) || "status";
-    const sortOrderFromLocalStorage =
-      localStorage.getItem("topologyCardsSortOrder") || "desc";
-
-    if (!sortByFromURL && !sortOrderFromURL) {
-      searchParams.set("sortBy", sortByFromLocalStorage);
-      searchParams.set("sortOrder", sortOrderFromLocalStorage);
-    }
-
-    // this will replace the history, so that the back button will work as expected
-    setSearchParams(searchParams, { replace: true });
-  }, [searchParams, setSearchParams, sortLabels]);
-
-  const sortedTopologies = useMemo(
-    () =>
-      getSortedTopology(topology, getSortBy(sortLabels || []), getSortOrder()),
-    [sortLabels, topology]
-  );
-
-  return (
-    <>
-      <LoadingBar color="#374151" height={4} ref={loadingBarRef} />
-      <Head prefix="Topology" />
-      <SearchLayout
-        title={<TopologyBreadcrumbs topologyId={id} refererId={refererId} />}
-        onRefresh={onRefresh}
-        contentClass="p-0 h-full"
-        loading={isLoading}
-      >
-        <div className="flex h-full flex-row overflow-y-auto py-2">
-          <div className="flex h-full flex-1 flex-col overflow-y-auto">
-            <TopologyFilterBar
-              data={data}
-              setTopologyCardSize={setTopologyCardSize}
-              topologyCardSize={topologyCardSize}
-              sortLabels={sortLabels ?? []}
-            />
-            {isLoading && !topology?.length ? (
-              <CardsSkeletonLoader />
-            ) : (
-              <div className="flex w-full px-6 py-4 leading-1.21rel">
-                <div className="flex w-full flex-wrap">
-                  {sortedTopologies.map((item) => (
-                    <TopologyCard
-                      key={item.id}
-                      topology={item}
-                      size={topologyCardSize}
-                      menuPosition="absolute"
-                    />
-                  ))}
-                  {!topology?.length && !isLoading && (
-                    <InfoMessage
-                      className="my-8"
-                      message="There are no components matching this criteria"
-                    />
-                  )}
-                </div>
-              </div>
-            )}
-          </div>
-          {id && (
-            <TopologySidebar
-              topology={currentTopology}
-              refererId={refererId}
-              onRefresh={refetch}
-            />
-          )}
-        </div>
-      </SearchLayout>
-    </>
-  );
+  return <TopologyPageWrapper catalogTab="Catalog" />;
 }