diff --git a/apps/dashboard/src/@/styles/globals.css b/apps/dashboard/src/@/styles/globals.css
index 8e3f9b529..f8bf56d95 100644
--- a/apps/dashboard/src/@/styles/globals.css
+++ b/apps/dashboard/src/@/styles/globals.css
@@ -139,3 +139,8 @@
     scrollbar-width: none; /* Firefox */
   }
 }
+
+body,
+html {
+  height: 100%;
+}
diff --git a/apps/dashboard/src/app/layout.tsx b/apps/dashboard/src/app/layout.tsx
index 9f591b6ab..ac9f18a8f 100644
--- a/apps/dashboard/src/app/layout.tsx
+++ b/apps/dashboard/src/app/layout.tsx
@@ -69,7 +69,7 @@ export default function RootLayout({
       <PostHogProvider>
         <body
           className={cn(
-            "h-screen bg-background font-sans antialiased",
+            "bg-background font-sans antialiased",
             fontSans.variable,
           )}
         >
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx
index 2e27f95d0..ca705bb83 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/layout.tsx
@@ -34,7 +34,7 @@ export default async function TeamLayout(props: {
   }
 
   return (
-    <div className="h-full flex flex-col">
+    <div className="flex flex-col grow">
       <div className="bg-muted/50">
         <TeamHeader
           currentProject={project}
@@ -63,7 +63,7 @@ export default async function TeamLayout(props: {
           ]}
         />
       </div>
-      <main className="grow">{props.children}</main>
+      <div className="grow flex flex-col">{props.children}</div>
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/account-abstraction/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/account-abstraction/page.tsx
new file mode 100644
index 000000000..c0cb5fd0f
--- /dev/null
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/account-abstraction/page.tsx
@@ -0,0 +1,9 @@
+export default function Page() {
+  return (
+    <div className="grow flex flex-col items-center justify-center">
+      <h1 className="text-4xl tracking-tighter text-muted-foreground">
+        Account Abstraction Settings
+      </h1>
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/in-app-wallets/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/in-app-wallets/page.tsx
new file mode 100644
index 000000000..997956d50
--- /dev/null
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/in-app-wallets/page.tsx
@@ -0,0 +1,9 @@
+export default function Page() {
+  return (
+    <div className="grow flex flex-col items-center justify-center">
+      <h1 className="text-4xl tracking-tighter text-muted-foreground">
+        In-App wallet Settings
+      </h1>
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/layout.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/layout.tsx
new file mode 100644
index 000000000..70cbd9851
--- /dev/null
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/layout.tsx
@@ -0,0 +1,38 @@
+import { SidebarLayout } from "@/components/blocks/SidebarLayout";
+
+export default function Layout(props: {
+  children: React.ReactNode;
+  params: {
+    team_slug: string;
+    project_slug: string;
+  };
+}) {
+  const { project_slug, team_slug } = props.params;
+  const layoutPath = `/team/${team_slug}/${project_slug}/settings`;
+
+  return (
+    <SidebarLayout
+      sidebarLinks={[
+        {
+          label: "General",
+          href: `${layoutPath}`,
+          exactMatch: true,
+        },
+        {
+          label: "In-App Wallets",
+          href: `${layoutPath}/in-app-wallets`,
+        },
+        {
+          label: "Account Abstraction",
+          href: `${layoutPath}/account-abstraction`,
+        },
+        {
+          label: "Pay",
+          href: `${layoutPath}/pay`,
+        },
+      ]}
+    >
+      {props.children}
+    </SidebarLayout>
+  );
+}
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/page.tsx
index 51af2b73e..2c0f47af4 100644
--- a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/page.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/page.tsx
@@ -1,7 +1,9 @@
 export default function Page() {
   return (
-    <div className="h-full py-6 container flex items-center justify-center">
-      <h1 className="text-4xl tracking-tighter text-muted-foreground">Usage</h1>
+    <div className="grow flex flex-col items-center justify-center">
+      <h1 className="text-4xl tracking-tighter text-muted-foreground">
+        General Settings
+      </h1>
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/pay/page.tsx b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/pay/page.tsx
new file mode 100644
index 000000000..19e55de33
--- /dev/null
+++ b/apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/pay/page.tsx
@@ -0,0 +1,9 @@
+export default function Page() {
+  return (
+    <div className="grow flex flex-col items-center justify-center">
+      <h1 className="text-4xl tracking-tighter text-muted-foreground">
+        Pay Settings
+      </h1>
+    </div>
+  );
+}
diff --git a/apps/dashboard/src/app/team/[team_slug]/layout.tsx b/apps/dashboard/src/app/team/[team_slug]/layout.tsx
index 4228ce8a3..b334d2694 100644
--- a/apps/dashboard/src/app/team/[team_slug]/layout.tsx
+++ b/apps/dashboard/src/app/team/[team_slug]/layout.tsx
@@ -1,13 +1,13 @@
 import { AppFooter } from "@/components/blocks/app-footer";
 import { TWAutoConnect } from "../../components/autoconnect";
 
-export default async function RootTeamLayout(props: {
+export default function RootTeamLayout(props: {
   children: React.ReactNode;
   params: { team_slug: string };
 }) {
   return (
     <div className="min-h-full flex flex-col bg-background">
-      <div className="grow">{props.children}</div>
+      <div className="grow flex flex-col">{props.children}</div>
       <TWAutoConnect />
       <AppFooter />
     </div>
diff --git a/apps/dashboard/src/app/team/components/TeamHeader/ProjectSelectorUI.tsx b/apps/dashboard/src/app/team/components/TeamHeader/ProjectSelectorUI.tsx
index a6d08e4d8..9756ceac6 100644
--- a/apps/dashboard/src/app/team/components/TeamHeader/ProjectSelectorUI.tsx
+++ b/apps/dashboard/src/app/team/components/TeamHeader/ProjectSelectorUI.tsx
@@ -56,7 +56,9 @@ export function ProjectSelectorUI(props: {
                     asChild
                   >
                     {/* TODO - when we have overview page, remove /connect */}
-                    <Link href={`/team/${team.slug}/${project.slug}/connect`}>
+                    <Link
+                      href={`/team/${team.slug}/${project.slug}/connect/analytics`}
+                    >
                       <div className="flex items-center gap-2">
                         {/* TODO - placeholder for now */}
                         <div className="size-4 bg-muted border rounded-full" />
diff --git a/apps/dashboard/src/pages/dashboard/settings/api-keys/[id].tsx b/apps/dashboard/src/pages/dashboard/settings/api-keys/[id].tsx
index efd1c95c5..56f2b3b85 100644
--- a/apps/dashboard/src/pages/dashboard/settings/api-keys/[id].tsx
+++ b/apps/dashboard/src/pages/dashboard/settings/api-keys/[id].tsx
@@ -1,4 +1,5 @@
-import { useApiKeys } from "@3rdweb-sdk/react/hooks/useApi";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { type ApiKey, useApiKeys } from "@3rdweb-sdk/react/hooks/useApi";
 import { useLoggedInUser } from "@3rdweb-sdk/react/hooks/useLoggedInUser";
 import { AppLayout } from "components/app-layouts/app";
 import { ApiKeyDetails } from "components/settings/ApiKeys/Details";
@@ -10,7 +11,6 @@ import { useEffect, useMemo, useState } from "react";
 import type { ThirdwebNextPage } from "utils/types";
 
 const SettingsApiKeyPage: ThirdwebNextPage = () => {
-  const [editing, setEditing] = useState(false);
   const keysQuery = useApiKeys();
   const router = useRouter();
   const { user } = useLoggedInUser();
@@ -27,20 +27,29 @@ const SettingsApiKeyPage: ThirdwebNextPage = () => {
     }
   }, [apiKey, keysQuery.isSuccess, router]);
 
-  if (!user) {
-    return null;
+  if (!user || !apiKey) {
+    return (
+      <div className="flex items-center justify-center">
+        <Spinner className="size-10" />
+      </div>
+    );
   }
 
-  if (!apiKey) {
-    return null;
-  }
+  return <APIKeyDetailsPage apiKey={apiKey} />;
+};
+
+function APIKeyDetailsPage(props: {
+  apiKey: ApiKey;
+}) {
+  const { apiKey } = props;
+  const [editing, setEditing] = useState(false);
 
   return editing ? (
     <EditApiKey apiKey={apiKey} onCancel={() => setEditing(false)} />
   ) : (
     <ApiKeyDetails apiKey={apiKey} onEdit={() => setEditing(true)} />
   );
-};
+}
 
 SettingsApiKeyPage.getLayout = (page, props) => (
   <AppLayout