diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 688eb9c4ca..4cbb71700e 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,10 +1,11 @@
+import { Providers } from "@/components/Providers"
+import { PostHogPageViews } from "@/components/Providers/PostHogPageViews"
 import { dystopian, inter } from "fonts"
 import type { Metadata } from "next"
-import { type ReactNode } from "react"
+import { type ReactNode, Suspense } from "react"
 import "./globals.css"
-import { TooltipProvider } from "@/components/ui/Tooltip"
 import { cn } from "@/lib/utils"
-import { ThemeProvider } from "next-themes"
+import NextTopLoader from "nextjs-toploader"
 
 interface RootLayoutProps {
   children: ReactNode
@@ -20,17 +21,15 @@ export default function RootLayout({ children }: RootLayoutProps) {
   return (
     <html lang="en" suppressHydrationWarning>
       <head />
-
       <body className={cn(dystopian.variable, inter.variable)}>
-        <ThemeProvider
-          attribute="data-theme"
-          storageKey="chakra-ui-color-mode"
-          defaultTheme="system"
-          enableSystem
-          disableTransitionOnChange
-        >
-          <TooltipProvider>{children}</TooltipProvider>
-        </ThemeProvider>
+        <NextTopLoader showSpinner={false} color="#eff6ff" height={3} />
+        <Providers>
+          {children}
+
+          <Suspense>
+            <PostHogPageViews />
+          </Suspense>
+        </Providers>
       </body>
     </html>
   )
diff --git a/src/v2/components/Header/Header.tsx b/src/v2/components/Header/Header.tsx
index 13ff82e542..b32aa8c806 100644
--- a/src/v2/components/Header/Header.tsx
+++ b/src/v2/components/Header/Header.tsx
@@ -1,10 +1,12 @@
 "use client"
 
+import { Account } from "../Account"
 import { NavMenu } from "./NavMenu"
 
 const Header = () => (
   <header className="relative flex h-16 w-full items-center justify-between p-2">
     <NavMenu />
+    <Account />
   </header>
 )
 
