diff --git a/apps/dashboard/redirects.js b/apps/dashboard/redirects.js
index 837fa6a5c5c..bfe7f58ddce 100644
--- a/apps/dashboard/redirects.js
+++ b/apps/dashboard/redirects.js
@@ -62,6 +62,51 @@ const legacyDashboardToTeamRedirects = [
   },
 ];
 
+const projectRoute = "/team/:team_slug/:project_slug";
+
+const projectPageRedirects = [
+  {
+    source: `${projectRoute}/connect/pay/:path*`,
+    destination: `${projectRoute}/universal-bridge/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/connect/universal-bridge/:path*`,
+    destination: `${projectRoute}/universal-bridge/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/connect/account-abstraction/:path*`,
+    destination: `${projectRoute}/account-abstraction/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/connect/in-app-wallets/:path*`,
+    destination: `${projectRoute}/wallets/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/engine/cloud/vault/:path*`,
+    destination: `${projectRoute}/vault/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/engine/cloud/:path*`,
+    destination: `${projectRoute}/transactions/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/assets/:path*`,
+    destination: `${projectRoute}/tokens/:path*`,
+    permanent: false,
+  },
+  {
+    source: `${projectRoute}/nebula/:path*`,
+    destination: projectRoute,
+    permanent: false,
+  },
+];
+
 /** @type {import('next').NextConfig['redirects']} */
 async function redirects() {
   return [
@@ -326,14 +371,6 @@ async function redirects() {
       destination: "/",
       permanent: false,
     },
-    // pay > universal-bridge redirect
-    {
-      source: "/team/:team_slug/:project_slug/connect/pay/:path*",
-      destination:
-        "/team/:team_slug/:project_slug/connect/universal-bridge/:path*",
-      permanent: false,
-    },
-
     // all /learn/tutorials (and sub-routes) -> /learn/guides
     {
       source: "/learn/tutorials/:path*",
@@ -382,8 +419,8 @@ async function redirects() {
       destination: "/transactions",
       permanent: false,
     },
-
     ...legacyDashboardToTeamRedirects,
+    ...projectPageRedirects,
   ];
 }
 
diff --git a/apps/dashboard/src/@/components/blocks/Sidebar.tsx b/apps/dashboard/src/@/components/blocks/Sidebar.tsx
index 181abba4fc8..4b8ef9e5c83 100644
--- a/apps/dashboard/src/@/components/blocks/Sidebar.tsx
+++ b/apps/dashboard/src/@/components/blocks/Sidebar.tsx
@@ -9,6 +9,7 @@ export type SidebarBaseLink = {
   label: React.ReactNode;
   exactMatch?: boolean;
   icon?: React.FC<{ className?: string }>;
+  isActive?: (pathname: string) => boolean;
 };
 
 export type SidebarLink =
diff --git a/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx b/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx
index 87403d09605..a2ab0beca42 100644
--- a/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx
+++ b/apps/dashboard/src/@/components/blocks/SidebarLayout.tsx
@@ -123,6 +123,7 @@ function RenderSidebarGroup(props: {
                   className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent"
                   activeClassName="text-foreground bg-accent"
                   exactMatch={link.exactMatch}
+                  isActive={link.isActive}
                   onClick={() => {
                     sidebar.setOpenMobile(false);
                   }}
diff --git a/apps/dashboard/src/@/components/ui/NavLink.tsx b/apps/dashboard/src/@/components/ui/NavLink.tsx
index 11bfb2948f4..195d979f977 100644
--- a/apps/dashboard/src/@/components/ui/NavLink.tsx
+++ b/apps/dashboard/src/@/components/ui/NavLink.tsx
@@ -11,15 +11,18 @@ export type NavButtonProps = {
   href: string;
   exactMatch?: boolean;
   onClick?: () => void;
+  isActive?: (pathname: string) => boolean;
 };
 
 export function NavLink(props: React.PropsWithChildren<NavButtonProps>) {
   const pathname = usePathname();
-  const isActive = pathname
-    ? props.exactMatch
-      ? pathname === props.href
-      : pathname.startsWith(props.href)
-    : false;
+  const isActive = props.isActive
+    ? props.isActive(pathname)
+    : pathname
+      ? props.exactMatch
+        ? pathname === props.href
+        : pathname.startsWith(props.href)
+      : false;
   return (
     <Link
       href={props.href}
diff --git a/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx b/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx
index 426efa6e74b..be92f89d645 100644
--- a/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx
+++ b/apps/dashboard/src/app/(app)/account/contracts/DeployedContractsPageHeader.tsx
@@ -16,7 +16,7 @@ export function DeployedContractsPageHeader(props: {
   const [importModalOpen, setImportModalOpen] = useState(false);
 
   return (
-    <div className="border-b">
+    <div>
       <ImportModal
         client={props.client}
         isOpen={importModalOpen}
@@ -28,24 +28,28 @@ export function DeployedContractsPageHeader(props: {
         type="contract"
       />
 
-      <div className="container flex max-w-7xl flex-col gap-3 py-10 lg:flex-row lg:items-center lg:justify-between">
+      <div className="container flex max-w-7xl flex-col gap-3 pt-10 pb-5 lg:flex-row lg:items-center lg:justify-between">
         <div>
           <h1 className="font-semibold text-2xl tracking-tight lg:text-3xl">
             Contracts
           </h1>
+          <p className="text-muted-foreground">
+            Deploy and manage contracts for your project
+          </p>
         </div>
         <div className="flex gap-3 [&>*]:grow">
           <Button
-            className="gap-2 bg-card"
+            className="gap-1.5 bg-card"
+            size="sm"
             variant="outline"
             onClick={() => {
               setImportModalOpen(true);
             }}
           >
-            <DownloadIcon className="size-4" />
+            <DownloadIcon className="size-4 text-muted-foreground" />
             Import contract
           </Button>
-          <Button asChild className="gap-2">
+          <Button asChild className="gap-1.5" size="sm">
             <Link href="/explore">
               <PlusIcon className="size-4" />
               Deploy contract
diff --git a/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx b/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx
index 8c344a524e3..3de8bbc0ea3 100644
--- a/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx
+++ b/apps/dashboard/src/app/(app)/account/contracts/_components/DeployedContractsPage.tsx
@@ -3,7 +3,6 @@ import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { ContractTable } from "components/contract-components/tables/contract-table";
 import { Suspense } from "react";
 import type { ThirdwebClient } from "thirdweb";
-import { DeployedContractsPageHeader } from "../DeployedContractsPageHeader";
 import { DeployViaCLIOrImportCard } from "./DeployViaCLIOrImportCard";
 import { getSortedDeployedContracts } from "./getSortedDeployedContracts";
 
@@ -16,24 +15,16 @@ export function DeployedContractsPage(props: {
   projectSlug: string;
 }) {
   return (
-    <div className="flex grow flex-col">
-      <DeployedContractsPageHeader
+    <div className="container flex max-w-7xl grow flex-col">
+      <Suspense fallback={<Loading />}>
+        <DeployedContractsPageAsync {...props} />
+      </Suspense>
+      <div className="h-8" />
+      <DeployViaCLIOrImportCard
+        client={props.client}
         teamId={props.teamId}
         projectId={props.projectId}
-        client={props.client}
       />
-      <div className="h-6" />
-      <div className="container flex max-w-7xl grow flex-col">
-        <Suspense fallback={<Loading />}>
-          <DeployedContractsPageAsync {...props} />
-        </Suspense>
-        <div className="h-8" />
-        <DeployViaCLIOrImportCard
-          client={props.client}
-          teamId={props.teamId}
-          projectId={props.projectId}
-        />
-      </div>
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx
index 0807345da07..b0f472b3b61 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx
@@ -19,9 +19,10 @@ import { SmartAccountIcon } from "../../../../../(dashboard)/(chain)/components/
 
 export function ProjectSidebarLayout(props: {
   layoutPath: string;
+  engineLinkType: "cloud" | "dedicated";
   children: React.ReactNode;
 }) {
-  const { layoutPath, children } = props;
+  const { layoutPath, engineLinkType, children } = props;
 
   return (
     <FullWidthSidebarLayout
@@ -62,9 +63,18 @@ export function ProjectSidebarLayout(props: {
           icon: CoinsIcon,
         },
         {
-          href: `${layoutPath}/engine`,
+          href:
+            engineLinkType === "cloud"
+              ? `${layoutPath}/transactions`
+              : `${layoutPath}/engine/dedicated`,
           label: "Transactions",
           icon: ArrowLeftRightIcon,
+          isActive: (pathname) => {
+            return (
+              pathname.startsWith(`${layoutPath}/transactions`) ||
+              pathname.startsWith(`${layoutPath}/engine/dedicated`)
+            );
+          },
         },
         {
           href: `${layoutPath}/insight`,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/layout.tsx
new file mode 100644
index 00000000000..b493795e74e
--- /dev/null
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/layout.tsx
@@ -0,0 +1,66 @@
+import { getProject } from "@/api/projects";
+import { getTeamBySlug } from "@/api/team";
+import { TabPathLinks } from "@/components/ui/tabs";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { DeployedContractsPageHeader } from "@app/account/contracts/DeployedContractsPageHeader";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
+import { loginRedirect } from "@app/login/loginRedirect";
+import { redirect } from "next/navigation";
+
+export default async function Layout(props: {
+  children: React.ReactNode;
+  params: Promise<{ team_slug: string; project_slug: string }>;
+}) {
+  const params = await props.params;
+
+  const [authToken, team, project] = await Promise.all([
+    getAuthToken(),
+    getTeamBySlug(params.team_slug),
+    getProject(params.team_slug, params.project_slug),
+  ]);
+
+  if (!authToken) {
+    loginRedirect(`/team/${params.team_slug}/${params.project_slug}/contracts`);
+  }
+
+  if (!team) {
+    redirect("/team");
+  }
+
+  if (!project) {
+    redirect(`/team/${params.team_slug}`);
+  }
+
+  const client = getClientThirdwebClient({
+    jwt: authToken,
+    teamId: team.id,
+  });
+
+  const layoutPath = `/team/${params.team_slug}/${params.project_slug}/contracts`;
+
+  return (
+    <div className="flex grow flex-col">
+      <DeployedContractsPageHeader
+        teamId={team.id}
+        projectId={project.id}
+        client={client}
+      />
+      <TabPathLinks
+        scrollableClassName="container max-w-7xl"
+        links={[
+          {
+            name: "Contracts",
+            path: layoutPath,
+            exactMatch: true,
+          },
+          {
+            name: "Webhooks",
+            path: `${layoutPath}/webhooks`,
+          },
+        ]}
+      />
+      <div className="h-6" />
+      {props.children}
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx
index 7be3f69ec33..70dc663bc13 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/page.tsx
@@ -1,10 +1,10 @@
 import { getProject } from "@/api/projects";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { DeployedContractsPage } from "@app/account/contracts/_components/DeployedContractsPage";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
+import { loginRedirect } from "@app/login/loginRedirect";
 import { redirect } from "next/navigation";
-import { DeployedContractsPage } from "../../../../../account/contracts/_components/DeployedContractsPage";
-import { getAuthToken } from "../../../../../api/lib/getAuthToken";
-import { loginRedirect } from "../../../../../login/loginRedirect";
 import { FooterLinksSection } from "../components/footer/FooterLinksSection";
 
 export default async function Page(props: {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/webhooks/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/webhooks/page.tsx
new file mode 100644
index 00000000000..da204fe0da7
--- /dev/null
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/contracts/webhooks/page.tsx
@@ -0,0 +1,38 @@
+import { getProject } from "@/api/projects";
+import { getTeamBySlug } from "@/api/team";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
+import { loginRedirect } from "@app/login/loginRedirect";
+import { redirect } from "next/navigation";
+import { ContractsWebhooksPageContent } from "../../webhooks/contract-webhooks/contract-webhooks-page";
+
+export default async function Page(props: {
+  params: Promise<{ team_slug: string; project_slug: string }>;
+}) {
+  const params = await props.params;
+
+  const [authToken, team, project] = await Promise.all([
+    getAuthToken(),
+    getTeamBySlug(params.team_slug),
+    getProject(params.team_slug, params.project_slug),
+  ]);
+
+  if (!authToken) {
+    loginRedirect(
+      `/team/${params.team_slug}/${params.project_slug}/contracts/webhooks`,
+    );
+  }
+
+  if (!team) {
+    redirect("/team");
+  }
+
+  if (!project) {
+    redirect(`/team/${params.team_slug}`);
+  }
+
+  return (
+    <div className="container flex max-w-7xl grow flex-col">
+      <ContractsWebhooksPageContent project={project} authToken={authToken} />
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx
index 950cfa42a6f..6d0d5a1eea0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(general)/layout.tsx
@@ -52,26 +52,21 @@ export default async function Layout(props: {
         </div>
       </header>
 
-      <div className="relative">
-        <div className="absolute right-0 bottom-0 left-0 h-[1px] bg-border" />
-        <div className="container max-w-7xl">
-          <TabPathLinks
-            className="pt-2"
-            bottomLineClassName="hidden"
-            links={[
-              {
-                name: "Engine Instances",
-                path: `${linkPrefix}`,
-                exactMatch: true,
-              },
-              {
-                name: "Import Engine",
-                path: `${linkPrefix}/import`,
-              },
-            ]}
-          />
-        </div>
-      </div>
+      <TabPathLinks
+        className="pt-2"
+        scrollableClassName="container max-w-7xl"
+        links={[
+          {
+            name: "Engine Instances",
+            path: `${linkPrefix}`,
+            exactMatch: true,
+          },
+          {
+            name: "Import Engine",
+            path: `${linkPrefix}/import`,
+          },
+        ]}
+      />
 
       <div className="container max-w-7xl pt-8 pb-10">{props.children}</div>
     </div>
@@ -100,7 +95,7 @@ function EngineLegacyBannerUI(props: {
         <div className="flex justify-start gap-3">
           <Button className="flex items-center gap-2" asChild size="sm">
             <Link
-              href={`/team/${props.teamSlug}/${props.projectSlug}/engine/cloud`}
+              href={`/team/${props.teamSlug}/${props.projectSlug}/transactions`}
             >
               <EngineIcon className="size-4" /> Try Engine Cloud
             </Link>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
index 62b92329d9a..b822d45e13d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/dedicated/(instance)/[engineId]/overview/components/engine-overview.tsx
@@ -141,7 +141,8 @@ function BackendWalletsSection(props: {
                   chainId={chainId}
                   onChange={setChainId}
                   className="min-w-40 max-w-52 lg:max-w-60"
-                  popoverContentClassName="!w-[80vw] md:!w-[500px]"
+                  popoverContentClassName="!w-[80vw] md:!w-[400px]"
+                  disableChainId
                   align="end"
                   client={props.client}
                 />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx
deleted file mode 100644
index 9e4757b2f77..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/page.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { getProject } from "@/api/projects";
-import { redirect } from "next/navigation";
-import { getAuthToken } from "../../../../../api/lib/getAuthToken";
-import { getEngineInstances } from "./dedicated/_utils/getEngineInstances";
-
-export default async function TransactionsAnalyticsPage(props: {
-  params: Promise<{ team_slug: string; project_slug: string }>;
-  searchParams: Promise<{
-    from?: string | string[] | undefined;
-    to?: string | string[] | undefined;
-    interval?: string | string[] | undefined;
-  }>;
-}) {
-  const { team_slug, project_slug } = await props.params;
-  const authToken = await getAuthToken();
-
-  if (!authToken) {
-    redirect("/team");
-  }
-
-  const [project, engineInstances] = await Promise.all([
-    getProject(team_slug, project_slug),
-    getEngineInstances({ authToken, teamIdOrSlug: team_slug }),
-  ]);
-
-  if (!project) {
-    redirect(`/team/${team_slug}`);
-  }
-
-  const projectEngineCloudService = project.services.find(
-    (service) => service.name === "engineCloud",
-  );
-
-  const managementAccessToken =
-    projectEngineCloudService?.managementAccessToken;
-
-  // if we have a management access token, redirect to the engine cloud layout
-  if (managementAccessToken) {
-    redirect(`/team/${team_slug}/${project_slug}/engine/cloud`);
-  }
-
-  // if we have any legacy engine instances, redirect to the legacy engine layout
-  if (engineInstances.data?.length && engineInstances.data.length > 0) {
-    redirect(`/team/${team_slug}/${project_slug}/engine/dedicated`);
-  }
-
-  // otherwise, redirect to the engine cloud layout
-  redirect(`/team/${team_slug}/${project_slug}/engine/cloud`);
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx
index 7a7e3cdbf57..966bd25f341 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/layout.tsx
@@ -1,4 +1,4 @@
-import { getProject, getProjects } from "@/api/projects";
+import { type Project, getProject, getProjects } from "@/api/projects";
 import { getTeamBySlug, getTeams } from "@/api/team";
 import { Button } from "@/components/ui/button";
 import { SidebarProvider } from "@/components/ui/sidebar";
@@ -16,6 +16,7 @@ import {
 import { TeamHeaderLoggedIn } from "../../../components/TeamHeader/team-header-logged-in.client";
 import { ProjectSidebarLayout } from "./components/ProjectSidebarLayout";
 import { SaveLastUsedProject } from "./components/SaveLastUsedProject";
+import { getEngineInstances } from "./engine/dedicated/_utils/getEngineInstances";
 
 export default async function ProjectLayout(props: {
   children: React.ReactNode;
@@ -59,6 +60,11 @@ export default async function ProjectLayout(props: {
     teamId: team.id,
   });
 
+  const engineLinkType = await getEngineLinkType({
+    authToken,
+    project,
+  });
+
   return (
     <SidebarProvider>
       <div className="flex h-dvh min-w-0 grow flex-col">
@@ -88,7 +94,10 @@ export default async function ProjectLayout(props: {
             client={client}
           />
         </div>
-        <ProjectSidebarLayout layoutPath={layoutPath}>
+        <ProjectSidebarLayout
+          layoutPath={layoutPath}
+          engineLinkType={engineLinkType}
+        >
           {props.children}
         </ProjectSidebarLayout>
       </div>
@@ -109,3 +118,32 @@ export default async function ProjectLayout(props: {
     </SidebarProvider>
   );
 }
+
+async function getEngineLinkType(params: {
+  authToken: string;
+  project: Project;
+}) {
+  const projectEngineCloudService = params.project.services.find(
+    (service) => service.name === "engineCloud",
+  );
+
+  const engineCloudToken = projectEngineCloudService?.managementAccessToken;
+
+  // if we have a management access token, link to engine cloud page
+  let engineLinkType: "cloud" | "dedicated" = "cloud";
+
+  // if we don't have a engine cloud management access token, check if there are any legacy engine instances
+  if (!engineCloudToken) {
+    const engineInstances = await getEngineInstances({
+      authToken: params.authToken,
+      teamIdOrSlug: params.project.teamId,
+    });
+
+    // if we have any legacy engine instances, link to the legacy engine page
+    if (engineInstances.data && engineInstances.data.length > 0) {
+      engineLinkType = "dedicated";
+    }
+  }
+
+  return engineLinkType;
+}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/analytics-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/analytics-page.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/analytics-page.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/analytics-page.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/filter.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/filter.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/filter.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/filter.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/ftux.client.tsx
similarity index 95%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/ftux.client.tsx
index 79cd708767e..e9d83ed943d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/ftux.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/ftux.client.tsx
@@ -5,7 +5,7 @@ import { type Step, StepsCard } from "components/dashboard/StepsCard";
 import Link from "next/link";
 import { useMemo, useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
-import { CreateVaultAccountButton } from "../../../vault/components/create-vault-account.client";
+import { CreateVaultAccountButton } from "../../vault/components/create-vault-account.client";
 import CreateServerWallet from "../server-wallets/components/create-server-wallet.client";
 import type { Wallet } from "../server-wallets/wallet-table/types";
 import { SendTestTransaction } from "./send-test-tx.client";
@@ -107,7 +107,11 @@ export const EngineChecklist: React.FC<Props> = (props) => {
     return null;
   }
   return (
-    <StepsCard title="Setup Your Engine" steps={finalSteps} delay={1000} />
+    <StepsCard
+      title="Get Started with Transactions"
+      steps={finalSteps}
+      delay={1000}
+    />
   );
 };
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/send-test-tx.client.tsx
similarity index 99%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/send-test-tx.client.tsx
index b45ae04d337..5b0f62b753b 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/send-test-tx.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/send-test-tx.client.tsx
@@ -263,7 +263,7 @@ export function SendTestTransaction(props: {
               onClick={() => {
                 if (props.walletId) {
                   router.replace(
-                    `/team/${props.teamSlug}/${props.project.slug}/engine/cloud`,
+                    `/team/${props.teamSlug}/${props.project.slug}/transactions`,
                   );
                 } else {
                   router.refresh();
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/summary.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/summary.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/summary.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/summary.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-chart/tx-chart-ui.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart-ui.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-chart/tx-chart-ui.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-chart/tx-chart.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-chart/tx-chart.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-chart/tx-chart.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/tx-table-ui.tsx
similarity index 99%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/tx-table-ui.tsx
index ad5333d358c..877fbcf50a0 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table-ui.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/tx-table-ui.tsx
@@ -138,7 +138,7 @@ export function TransactionsTableUI(props: {
                     className="cursor-pointer hover:bg-accent/50"
                     onClick={() => {
                       router.push(
-                        `/team/${props.teamSlug}/${props.project.slug}/engine/cloud/tx/${tx.id}`,
+                        `/team/${props.teamSlug}/${props.project.slug}/transactions/tx/${tx.id}`,
                       );
                     }}
                   >
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/tx-table.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/tx-table.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/tx-table.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/types.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/types.ts
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/tx-table/types.ts
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/tx-table/types.ts
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/utils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/utils.ts
similarity index 88%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/utils.ts
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/utils.ts
index 69ca753fd9d..a66a7e79469 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/analytics/utils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/analytics/utils.ts
@@ -6,6 +6,9 @@ export function storeUserAccessToken(projectId: string, accessToken: string) {
 }
 
 export function getUserAccessToken(projectId: string) {
+  if (typeof localStorage === "undefined") {
+    return null;
+  }
   return localStorage.getItem(
     `thirdweb:engine-cloud-user-access-token-${projectId}`,
   );
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/components/scalar.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/explorer/components/scalar.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/components/scalar.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/explorer/components/scalar.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/explorer/page.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/explorer/page.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/explorer/page.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/layout.tsx
similarity index 78%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/layout.tsx
index 13be81a2cd5..d1158fbe6fb 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/layout.tsx
@@ -3,7 +3,6 @@ import { Button } from "@/components/ui/button";
 import { TabPathLinks } from "@/components/ui/tabs";
 import { NEXT_PUBLIC_ENGINE_CLOUD_URL } from "@/constants/public-envs";
 import Link from "next/link";
-import { EngineIcon } from "../../../../../../(dashboard)/(chain)/components/server/icons/EngineIcon";
 
 export default async function Page(props: {
   params: Promise<{ team_slug: string; project_slug: string }>;
@@ -23,8 +22,8 @@ function TransactionsLayout(props: {
   teamSlug: string;
   children: React.ReactNode;
 }) {
-  const engineBaseSlug = `/team/${props.teamSlug}/${props.projectSlug}/engine`;
-  const engineLayoutSlug = `${engineBaseSlug}/cloud`;
+  const projectLayoutPath = `/team/${props.teamSlug}/${props.projectSlug}`;
+  const layoutPath = `${projectLayoutPath}/transactions`;
 
   return (
     <div className="flex grow flex-col">
@@ -36,12 +35,6 @@ function TransactionsLayout(props: {
             <div className="flex flex-col">
               <h1 className="mb-0.5 flex items-center gap-2 font-semibold text-3xl tracking-tight">
                 Transactions{" "}
-                <Badge
-                  variant="success"
-                  className="mt-0.5 flex items-center gap-2 text-sm"
-                >
-                  <EngineIcon className="size-4" /> Engine Cloud
-                </Badge>
                 <Badge
                   variant="outline"
                   className="mt-0.5 flex items-center gap-2 text-sm"
@@ -60,7 +53,7 @@ function TransactionsLayout(props: {
                 </Link>
               </div>
             </div>
-            <Link href={`${engineBaseSlug}/dedicated`}>
+            <Link href={`${projectLayoutPath}/engine/dedicated`}>
               <Button variant="outline">View Dedicated Engine</Button>
             </Link>
           </div>
@@ -74,16 +67,16 @@ function TransactionsLayout(props: {
           links={[
             {
               name: "Transactions",
-              path: `${engineLayoutSlug}`,
+              path: `${layoutPath}`,
               exactMatch: true,
             },
             {
               name: "API Explorer",
-              path: `${engineLayoutSlug}/explorer`,
+              path: `${layoutPath}/explorer`,
             },
             {
               name: "Server Wallets",
-              path: `${engineLayoutSlug}/server-wallets`,
+              path: `${layoutPath}/server-wallets`,
             },
           ]}
         />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/analytics.ts
similarity index 96%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/analytics.ts
index 4bd8057bf2e..05cc58dfc37 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/analytics.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/analytics.ts
@@ -1,6 +1,6 @@
 import { NEXT_PUBLIC_ENGINE_CLOUD_URL } from "@/constants/public-envs";
-import type { TransactionStats } from "../../../../../../../../../types/analytics";
-import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
+import type { TransactionStats } from "types/analytics";
 import type {
   Transaction,
   TransactionsResponse,
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/utils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/utils.ts
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/utils.ts
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/utils.ts
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/vault.client.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/vault.client.ts
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/lib/vault.client.ts
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/lib/vault.client.ts
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/page.tsx
similarity index 98%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/page.tsx
index 8e6575b3807..cf8625bbf69 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/page.tsx
@@ -1,9 +1,9 @@
 import { getProject } from "@/api/projects";
 import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
 import { createVaultClient, listEoas } from "@thirdweb-dev/vault-sdk";
 import { notFound, redirect } from "next/navigation";
-import { getAuthToken } from "../../../../../../api/lib/getAuthToken";
 import { TransactionsAnalyticsPageContent } from "./analytics/analytics-page";
 import { EngineChecklist } from "./analytics/ftux.client";
 import { TransactionAnalyticsSummary } from "./analytics/summary";
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/create-server-wallet.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/components/create-server-wallet.client.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/create-server-wallet.client.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/components/create-server-wallet.client.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/components/try-it-out.tsx
similarity index 92%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/components/try-it-out.tsx
index 7c45fca4cbd..50b7885938d 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/components/try-it-out.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/components/try-it-out.tsx
@@ -11,7 +11,7 @@ export function TryItOut() {
   const [activeTab, setActiveTab] = useState<string>("sdk");
 
   return (
-    <div className="flex flex-col gap-6 overflow-hidden rounded-lg border border-border bg-card p-6">
+    <div className="flex flex-col gap-4 overflow-hidden rounded-lg border border-border bg-card p-4">
       <div className="flex flex-row items-center gap-4">
         <div className="flex flex-1 flex-col gap-4 rounded-lg rounded-b-none lg:flex-row lg:justify-between">
           <div>
@@ -25,8 +25,10 @@ export function TryItOut() {
           </div>
         </div>
       </div>
+
       <div>
         <TabButtons
+          tabClassName="!text-sm"
           tabs={[
             {
               name: "thirdweb SDK",
@@ -61,10 +63,10 @@ export function TryItOut() {
           ]}
         />
 
-        <div className="h-4" />
+        <div className="h-2" />
 
         {activeTab === "sdk" && (
-          <div className="flex flex-col gap-4">
+          <div className="flex flex-col gap-6">
             <Alert variant="info" className="bg-background">
               <CircleAlertIcon className="size-5" />
               <AlertTitle>Using the thirdweb SDK on the backend</AlertTitle>
@@ -114,22 +116,26 @@ export function TryItOut() {
                 </p>
               </AlertDescription>
             </Alert>
-            <h3 className="font-semibold text-lg tracking-tight">
-              Installation
-            </h3>
-            <CodeClient
-              lang="shell"
-              code={"npm install thirdweb"}
-              className="bg-background"
-            />
-            <h3 className="font-semibold text-lg tracking-tight">
-              Usage example: Minting a ERC1155 NFT to a user
-            </h3>
-            <CodeClient
-              lang="ts"
-              code={sdkExample()}
-              className="bg-background"
-            />
+            <div className="space-y-2">
+              <h3 className="font-semibold text-lg tracking-tight">
+                Installation
+              </h3>
+              <CodeClient
+                lang="shell"
+                code={"npm install thirdweb"}
+                className="bg-background"
+              />
+            </div>
+            <div className="space-y-2">
+              <h3 className="font-semibold text-lg tracking-tight">
+                Usage example: Minting a ERC1155 NFT to a user
+              </h3>
+              <CodeClient
+                lang="ts"
+                code={sdkExample()}
+                className="bg-background"
+              />
+            </div>
           </div>
         )}
         {activeTab === "curl" && (
@@ -140,7 +146,7 @@ export function TryItOut() {
           />
         )}
         {activeTab === "js" && (
-          <div className="flex flex-col gap-4">
+          <div className="flex flex-col gap-4 pt-2">
             <p className="text-muted-foreground text-sm">
               A lightweight, type safe wrapper package of the Engine HTTP API is
               available on{" "}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/page.tsx
similarity index 97%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/page.tsx
index 592794fc9f5..dd78d3b70ac 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/page.tsx
@@ -1,9 +1,9 @@
 import { getProject } from "@/api/projects";
 import { NEXT_PUBLIC_THIRDWEB_VAULT_URL } from "@/constants/public-envs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
 import { createVaultClient, listEoas } from "@thirdweb-dev/vault-sdk";
 import { notFound } from "next/navigation";
-import { getAuthToken } from "../../../../../../../api/lib/getAuthToken";
 import type { Wallet } from "./wallet-table/types";
 import { ServerWalletsTable } from "./wallet-table/wallet-table";
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/types.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/types.ts
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/types.ts
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/types.ts
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/wallet-table-ui.client.tsx
similarity index 73%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/wallet-table-ui.client.tsx
index ad2b0320436..8dc84d8b319 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table-ui.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/wallet-table-ui.client.tsx
@@ -89,7 +89,7 @@ export function ServerWalletsTableUI({
         />
       </div>
 
-      <TableContainer className="rounded-none border-x-0">
+      <TableContainer className="rounded-none border-x-0 border-b-0">
         <Table>
           <TableHeader>
             <TableRow>
@@ -137,60 +137,63 @@ export function ServerWalletsTableUI({
           </TableBody>
         </Table>
       </TableContainer>
-      <div className="flex flex-col items-center p-6">
-        <div className="mb-4 text-muted-foreground text-sm">
-          Found {totalRecords} server wallets
+
+      {totalPages > 1 && (
+        <div className="flex flex-col items-center border-t p-6">
+          <div className="mb-4 text-muted-foreground text-sm">
+            Found {totalRecords} server wallets
+          </div>
+          <Pagination>
+            <PaginationContent>
+              <PaginationItem>
+                <Link
+                  href={`/team/${teamSlug}/${project.slug}/transactions/server-wallets?page=${
+                    currentPage > 1 ? currentPage - 1 : 1
+                  }`}
+                  passHref
+                  legacyBehavior
+                >
+                  <PaginationPrevious
+                    className={
+                      currentPage <= 1 ? "pointer-events-none opacity-50" : ""
+                    }
+                  />
+                </Link>
+              </PaginationItem>
+              {Array.from({ length: totalPages }, (_, i) => i + 1).map(
+                (pageNumber) => (
+                  <PaginationItem key={`page-${pageNumber}`}>
+                    <Link
+                      href={`/team/${teamSlug}/${project.slug}/transactions/server-wallets?page=${pageNumber}`}
+                      passHref
+                    >
+                      <PaginationLink isActive={currentPage === pageNumber}>
+                        {pageNumber}
+                      </PaginationLink>
+                    </Link>
+                  </PaginationItem>
+                ),
+              )}
+              <PaginationItem>
+                <Link
+                  href={`/team/${teamSlug}/${project.slug}/transactions/server-wallets?page=${
+                    currentPage < totalPages ? currentPage + 1 : totalPages
+                  }`}
+                  passHref
+                >
+                  <PaginationNext
+                    className={
+                      currentPage >= totalPages
+                        ? "pointer-events-none opacity-50"
+                        : ""
+                    }
+                  />
+                </Link>
+              </PaginationItem>
+            </PaginationContent>
+          </Pagination>
         </div>
-        <Pagination>
-          <PaginationContent>
-            <PaginationItem>
-              <Link
-                href={`/team/${teamSlug}/${project.slug}/engine/cloud/server-wallets?page=${
-                  currentPage > 1 ? currentPage - 1 : 1
-                }`}
-                passHref
-                legacyBehavior
-              >
-                <PaginationPrevious
-                  className={
-                    currentPage <= 1 ? "pointer-events-none opacity-50" : ""
-                  }
-                />
-              </Link>
-            </PaginationItem>
-            {Array.from({ length: totalPages }, (_, i) => i + 1).map(
-              (pageNumber) => (
-                <PaginationItem key={`page-${pageNumber}`}>
-                  <Link
-                    href={`/team/${teamSlug}/${project.slug}/engine/cloud/server-wallets?page=${pageNumber}`}
-                    passHref
-                  >
-                    <PaginationLink isActive={currentPage === pageNumber}>
-                      {pageNumber}
-                    </PaginationLink>
-                  </Link>
-                </PaginationItem>
-              ),
-            )}
-            <PaginationItem>
-              <Link
-                href={`/team/${teamSlug}/${project.slug}/engine/cloud/server-wallets?page=${
-                  currentPage < totalPages ? currentPage + 1 : totalPages
-                }`}
-                passHref
-              >
-                <PaginationNext
-                  className={
-                    currentPage >= totalPages
-                      ? "pointer-events-none opacity-50"
-                      : ""
-                  }
-                />
-              </Link>
-            </PaginationItem>
-          </PaginationContent>
-        </Pagination>
-      </div>
+      )}
     </div>
   );
 }
@@ -260,7 +263,7 @@ function SendTestTransaction(props: {
       size="sm"
       onClick={() => {
         router.push(
-          `/team/${props.teamSlug}/${props.project.slug}/engine/cloud?testTxWithWallet=${props.wallet.id}`,
+          `/team/${props.teamSlug}/${props.project.slug}/transactions?testTxWithWallet=${props.wallet.id}`,
         );
       }}
     >
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/wallet-table.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/server-wallets/wallet-table/wallet-table.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/server-wallets/wallet-table/wallet-table.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/layout.tsx
similarity index 97%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/layout.tsx
index 849b1af7bb7..b9be32f43ed 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/layout.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/layout.tsx
@@ -12,7 +12,7 @@ export default function TransactionLayout({
     <div className="flex flex-col gap-4">
       <div className="flex items-center gap-2">
         <Link
-          href={`/team/${params.team_slug}/${params.project_slug}/engine/cloud`}
+          href={`/team/${params.team_slug}/${params.project_slug}/transactions`}
           className="flex items-center gap-1 text-muted-foreground text-sm hover:text-foreground"
         >
           <ChevronLeftIcon className="size-4" />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/page.tsx
similarity index 83%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/page.tsx
index 85d5001fd0c..bf16789ca24 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/page.tsx
@@ -1,8 +1,8 @@
 import { getProject } from "@/api/projects";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
+import { loginRedirect } from "@app/login/loginRedirect";
 import { notFound, redirect } from "next/navigation";
-import { getAuthToken } from "../../../../../../../../api/lib/getAuthToken";
-import { loginRedirect } from "../../../../../../../../login/loginRedirect";
 import { getSingleTransaction } from "../../lib/analytics";
 import { TransactionDetailsUI } from "./transaction-details-ui";
 
@@ -19,7 +19,7 @@ export default async function TransactionPage({
   ]);
 
   if (!authToken) {
-    loginRedirect(`/team/${team_slug}/${project_slug}/engine/cloud/tx/${id}`);
+    loginRedirect(`/team/${team_slug}/${project_slug}/transactions/tx/${id}`);
   }
 
   if (!project) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/transaction-details-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/transaction-details-ui.tsx
similarity index 100%
rename from apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/engine/cloud/tx/[id]/transaction-details-ui.tsx
rename to apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/transactions/tx/[id]/transaction-details-ui.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/create-vault-account.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/create-vault-account.client.tsx
index 5dcc541c7cc..7adf7b79855 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/create-vault-account.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/create-vault-account.client.tsx
@@ -23,13 +23,13 @@ import {
 } from "lucide-react";
 import { useState } from "react";
 import { toast } from "sonner";
-import { storeUserAccessToken } from "../../engine/cloud/analytics/utils";
+import { storeUserAccessToken } from "../../transactions/analytics/utils";
 import {
   createManagementAccessToken,
   createWalletAccessToken,
   initVaultClient,
   maskSecret,
-} from "../../engine/cloud/lib/vault.client";
+} from "../../transactions/lib/vault.client";
 
 export function CreateVaultAccountButton(props: {
   project: Project;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/list-access-tokens.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/list-access-tokens.client.tsx
index 175fd32010f..a350c090373 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/list-access-tokens.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/list-access-tokens.client.tsx
@@ -20,7 +20,7 @@ import {
   SERVER_WALLET_MANAGEMENT_ACCESS_TOKEN_PURPOSE,
   createWalletAccessToken,
   initVaultClient,
-} from "../../engine/cloud/lib/vault.client";
+} from "../../transactions/lib/vault.client";
 
 export default function ListAccessTokens(props: {
   project: Project;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx
index dae5b3fd31f..c7c44b7f5fc 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/vault/components/rotate-admin-key.client.tsx
@@ -31,7 +31,7 @@ import {
   createWalletAccessToken,
   initVaultClient,
   maskSecret,
-} from "../../engine/cloud/lib/vault.client";
+} from "../../transactions/lib/vault.client";
 
 export default function RotateAdminKeyButton(props: { project: Project }) {
   const [modalOpen, setModalOpen] = useState(false);
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
index e776ff1f282..78befad46de 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
@@ -19,7 +19,7 @@ import { FilterDetailsStep } from "./FilterDetailsStep";
 import ReviewStep from "./ReviewStep";
 
 import { createWebhook } from "@/api/insight/webhooks";
-import { XIcon } from "lucide-react";
+import { PlusIcon, XIcon } from "lucide-react";
 import type { ThirdwebClient } from "thirdweb";
 import { useAbiMultiFetch } from "../hooks/useAbiProcessing";
 import { useTestWebhook } from "../hooks/useTestWebhook";
@@ -45,7 +45,7 @@ interface CreateWebhookModalProps {
   client: ThirdwebClient;
 }
 
-export function CreateWebhookModal({
+export function CreateContractWebhookButton({
   projectClientId,
   supportedChainIds,
   client,
@@ -224,7 +224,10 @@ export function CreateWebhookModal({
   return (
     <Dialog open={isOpen}>
       <DialogTrigger asChild>
-        <Button onClick={handleOpenModal}>New Webhook</Button>
+        <Button onClick={handleOpenModal} className="gap-1.5" size="sm">
+          <PlusIcon className="size-4" />
+          Create Webhook
+        </Button>
       </DialogTrigger>
 
       <DialogContent
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
index 3bee109778a..5b678816eb9 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
@@ -18,7 +18,7 @@ import { useMemo, useState } from "react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
 import { useTestWebhook } from "../hooks/useTestWebhook";
-import { CreateWebhookModal } from "./CreateWebhookModal";
+import { CreateContractWebhookButton } from "./CreateWebhookModal";
 import { RelativeTime } from "./RelativeTime";
 
 function getEventType(filters: WebhookFilters): string {
@@ -37,7 +37,7 @@ interface WebhooksTableProps {
   client: ThirdwebClient;
 }
 
-export function WebhooksTable({
+export function ContractsWebhooksTable({
   webhooks,
   projectClientId,
   client,
@@ -216,22 +216,22 @@ export function WebhooksTable({
   }, [webhooks]);
 
   return (
-    <div className="w-full">
-      <div className="mb-4 flex items-center justify-end">
-        <CreateWebhookModal
-          projectClientId={projectClientId}
-          supportedChainIds={supportedChainIds}
-          client={client}
-        />
-      </div>
+    <div className="w-full overflow-hidden rounded-lg border">
       <TWTable
         data={sortedWebhooks}
         columns={columns}
         isPending={false}
         isFetched={true}
         title="Webhooks"
-        tableContainerClassName="mt-4"
+        tableContainerClassName="border-none rounded-none"
       />
+      <div className="flex items-end justify-end gap-3 border-t bg-card px-6 py-4">
+        <CreateContractWebhookButton
+          projectClientId={projectClientId}
+          supportedChainIds={supportedChainIds}
+          client={client}
+        />
+      </div>
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx
new file mode 100644
index 00000000000..c7be5dcda25
--- /dev/null
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx
@@ -0,0 +1,93 @@
+import {
+  type WebhookResponse,
+  getSupportedWebhookChains,
+  getWebhooks,
+} from "@/api/insight/webhooks";
+import type { Project } from "@/api/projects";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { CreateContractWebhookButton } from "../components/CreateWebhookModal";
+import { ContractsWebhooksTable } from "../components/WebhooksTable";
+
+export async function ContractsWebhooksPageContent(props: {
+  project: Project;
+  authToken: string;
+}) {
+  let webhooks: WebhookResponse[] = [];
+  let errorMessage = "";
+  let supportedChainIds: number[] = [];
+
+  const projectClientId = props.project.publishableKey;
+
+  try {
+    const webhooksRes = await getWebhooks(projectClientId);
+    if (webhooksRes.error) {
+      errorMessage = webhooksRes.error;
+    } else if (webhooksRes.data) {
+      webhooks = webhooksRes.data;
+    }
+
+    const supportedChainsRes = await getSupportedWebhookChains();
+    if ("chains" in supportedChainsRes) {
+      supportedChainIds = supportedChainsRes.chains;
+    } else {
+      errorMessage = supportedChainsRes.error;
+    }
+  } catch (error) {
+    errorMessage = "Failed to load webhooks. Please try again later.";
+    console.error("Error loading project or webhooks", error);
+  }
+
+  if (errorMessage) {
+    return (
+      <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-destructive bg-destructive/10 p-12 text-center">
+        <div>
+          <h3 className="mb-1 font-medium text-destructive text-lg">
+            Unable to load webhooks
+          </h3>
+          <p className="text-muted-foreground">{errorMessage}</p>
+        </div>
+      </div>
+    );
+  }
+
+  const client = getClientThirdwebClient({
+    jwt: props.authToken,
+    teamId: props.project.teamId,
+  });
+
+  return (
+    <div className="flex grow flex-col">
+      {errorMessage ? (
+        <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-destructive bg-destructive/10 p-12 text-center">
+          <div>
+            <h3 className="mb-1 font-medium text-destructive text-lg">
+              Unable to load webhooks
+            </h3>
+            <p className="text-muted-foreground">{errorMessage}</p>
+          </div>
+        </div>
+      ) : webhooks.length > 0 ? (
+        <ContractsWebhooksTable
+          webhooks={webhooks}
+          projectClientId={projectClientId}
+          client={client}
+          supportedChainIds={supportedChainIds}
+        />
+      ) : (
+        <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-border p-12 text-center">
+          <div>
+            <h3 className="mb-1 font-medium text-lg">No webhooks found</h3>
+            <p className="text-muted-foreground">
+              Create a webhook to get started.
+            </p>
+          </div>
+          <CreateContractWebhookButton
+            client={client}
+            projectClientId={projectClientId}
+            supportedChainIds={supportedChainIds}
+          />
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
index 9d254d2c52c..7bf9d89e587 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/page.tsx
@@ -1,23 +1,12 @@
-import {
-  type WebhookResponse,
-  getSupportedWebhookChains,
-  getWebhooks,
-} from "@/api/insight/webhooks";
 import { getProject } from "@/api/projects";
 import { UnderlineLink } from "@/components/ui/UnderlineLink";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { getAuthToken } from "@app/api/lib/getAuthToken";
 import { notFound } from "next/navigation";
-import { getAuthToken } from "../../../../../api/lib/getAuthToken";
-import { CreateWebhookModal } from "./components/CreateWebhookModal";
-import { WebhooksTable } from "./components/WebhooksTable";
+import { ContractsWebhooksPageContent } from "./contract-webhooks/contract-webhooks-page";
 
 export default async function WebhooksPage({
   params,
 }: { params: Promise<{ team_slug: string; project_slug: string }> }) {
-  let webhooks: WebhookResponse[] = [];
-  let errorMessage = "";
-  let supportedChainIds: number[] = [];
-
   const [authToken, resolvedParams] = await Promise.all([
     getAuthToken(),
     params,
@@ -32,32 +21,6 @@ export default async function WebhooksPage({
     notFound();
   }
 
-  const projectClientId = project.publishableKey;
-
-  try {
-    const webhooksRes = await getWebhooks(projectClientId);
-    if (webhooksRes.error) {
-      errorMessage = webhooksRes.error;
-    } else if (webhooksRes.data) {
-      webhooks = webhooksRes.data;
-    }
-
-    const supportedChainsRes = await getSupportedWebhookChains();
-    if ("chains" in supportedChainsRes) {
-      supportedChainIds = supportedChainsRes.chains;
-    } else {
-      errorMessage = supportedChainsRes.error;
-    }
-  } catch (error) {
-    errorMessage = "Failed to load webhooks. Please try again later.";
-    console.error("Error loading project or webhooks", error);
-  }
-
-  const client = getClientThirdwebClient({
-    jwt: authToken,
-    teamId: project.teamId,
-  });
-
   return (
     <div className="flex grow flex-col">
       <div className="border-b py-10">
@@ -80,37 +43,7 @@ export default async function WebhooksPage({
       </div>
       <div className="h-6" />
       <div className="container max-w-7xl">
-        {errorMessage ? (
-          <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-destructive bg-destructive/10 p-12 text-center">
-            <div>
-              <h3 className="mb-1 font-medium text-destructive text-lg">
-                Unable to load webhooks
-              </h3>
-              <p className="text-muted-foreground">{errorMessage}</p>
-            </div>
-          </div>
-        ) : webhooks.length > 0 ? (
-          <WebhooksTable
-            webhooks={webhooks}
-            projectClientId={projectClientId}
-            client={client}
-            supportedChainIds={supportedChainIds}
-          />
-        ) : (
-          <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-border p-12 text-center">
-            <div>
-              <h3 className="mb-1 font-medium text-lg">No webhooks found</h3>
-              <p className="text-muted-foreground">
-                Create a webhook to get started.
-              </p>
-            </div>
-            <CreateWebhookModal
-              client={client}
-              projectClientId={projectClientId}
-              supportedChainIds={supportedChainIds}
-            />
-          </div>
-        )}
+        <ContractsWebhooksPageContent project={project} authToken={authToken} />
       </div>
       <div className="h-20" />
     </div>
diff --git a/apps/dashboard/src/components/dashboard/StepsCard.tsx b/apps/dashboard/src/components/dashboard/StepsCard.tsx
index 3e9542fd985..385072b75fd 100644
--- a/apps/dashboard/src/components/dashboard/StepsCard.tsx
+++ b/apps/dashboard/src/components/dashboard/StepsCard.tsx
@@ -37,7 +37,7 @@ export const StepsCard: React.FC<StepsCardProps> = ({
   return (
     <div className={cn("rounded-lg border border-border bg-card p-4 lg:p-6")}>
       {/* Title + Desc */}
-      <h2 className="mb-3 text-left font-semibold text-xl tracking-tight lg:text-2xl">
+      <h2 className="mb-3 text-left font-semibold text-xl tracking-tight">
         {title}
       </h2>