diff --git a/next-env.d.ts b/next-env.d.ts
index 1b3be08..830fb59 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,5 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 657aae2..cc57c3f 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -5,10 +5,10 @@ import { AppRouterCacheProvider } from '@mui/material-nextjs/v15-appRouter';
 import { Bai_Jamjuree, Inter } from 'next/font/google';
 import { type Metadata } from 'next';
 import { GoogleAnalytics } from '@next/third-parties/google';
-import Link from 'next/link';
 
 import theme from '@src/utils/theme';
 import { ToastProvider } from '@src/components/toast/ToastProvider';
+import NavBar from '@src/components/NavBar';
 
 const inter = Inter({
   subsets: ['latin'],
@@ -57,17 +57,15 @@ export default function RootLayout({
       >
         <AppRouterCacheProvider>
           <ThemeProvider theme={theme}>
-            <ToastProvider>{children}</ToastProvider>
+            <ToastProvider>
+              <NavBar />
+              {children}
+            </ToastProvider>
           </ThemeProvider>
         </AppRouterCacheProvider>
         {process.env.NEXT_PUBLIC_VERCEL_ENV === 'production' && (
           <GoogleAnalytics gaId="G-3NDS0P32CZ" />
         )}
-        <nav>
-          <Link href="/profile" className="px-3 py-1 hover:underline">
-            Profile
-          </Link>
-        </nav>
       </body>
     </html>
   );
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 652c2f2..8118d2e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,5 +1,4 @@
 import type { Metadata } from 'next';
-import NavBar from '@components/NavBar';
 
 export const metadata: Metadata = {
   alternates: {
@@ -9,9 +8,9 @@ export const metadata: Metadata = {
 
 const Home = () => {
   return (
-    <>
-      <NavBar />
-    </>
+    <div className="p-8">
+      {/* Page content goes here */}
+    </div>
   );
 };
 
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index 85b5d43..260ccd1 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -1,41 +1,103 @@
-import React from 'react';
+'use client';
+
+import React, { useState } from 'react';
 import Link from 'next/link';
 import Image from 'next/image';
-import { IconButton, Tooltip } from '@mui/material';
+import { IconButton } from '@mui/material';
+import {
+  InfoOutlined as InfoIcon,
+  HelpOutline as HelpIcon,
+  Share as ShareIcon,
+  AccountCircle as AccountCircleIcon,
+} from '@mui/icons-material';
 
 export default function NavBar() {
+  const [searchQuery, setSearchQuery] = useState('');
+
+  const handleSearch = (e: React.FormEvent) => {
+    e.preventDefault();
+    console.log('Searching for:', searchQuery);
+  };
+
   return (
-    <>
-      <div className="bg-darken relative flex flex-wrap items-center gap-x-2 gap-y-0 overflow-hidden border-b-1 px-4 py-1 sm:flex-nowrap md:gap-x-4 md:px-8 md:py-1 lg:gap-x-8 lg:px-16">
+    <nav className="relative flex items-center gap-4 overflow-hidden px-4 py-3 md:px-8 lg:px-16" style={{
+      background: 'linear-gradient(to right, #C1C3FF, #DEBCF2, #FFC6C1)'
+    }}>
+
+      {/* Logo */}
+      <Link
+        href="/"
+        className="font-display flex flex-shrink-0 items-center gap-2 text-lg font-bold md:text-xl"
+      >
         <Image
-          src={'/background.png'}
-          alt="background"
-          className="-z-10 object-cover"
-          fill
+          src="/icon-white.svg"
+          alt="UTD Notebook Logo"
+          width={32}
+          height={32}
+          className="h-8 w-8"
         />
+        UTD NOTEBOOK
+      </Link>
+
+      {/* Search Bar */}
+      <form
+        onSubmit={handleSearch}
+        className="flex max-w-2xl flex-1 items-center gap-2"
+      >
+        <input
+          type="text"
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          placeholder="ex. GOVT 2306"
+          className="flex-1 rounded-lg border-2 border-white bg-white px-4 py-2 transition-all focus:border-cornflower-500 focus:outline-none"
+          style={{ color: '#6B7280' }}
+        />
+        <button
+          type="submit"
+          className="rounded-lg px-6 py-2 font-semibold text-white transition-colors"
+          style={{ backgroundColor: '#573DFF' }}
+          onMouseEnter={(e) => e.currentTarget.style.backgroundColor = '#4532CC'}
+          onMouseLeave={(e) => e.currentTarget.style.backgroundColor = '#573DFF'}
+        >
+          Search
+        </button>
+      </form>
+
+      {/* Right Side Icons */}
+      <div className="ml-auto flex items-center gap-2">
+        <IconButton
+          size="medium"
+          sx={{ color: '#ffffff', '&:hover': { backgroundColor: 'rgba(255, 255, 255, 0.1)' } }}
+          aria-label="Info"
+        >
+          <InfoIcon />
+        </IconButton>
+
+        <IconButton
+          size="medium"
+          sx={{ color: '#ffffff', '&:hover': { backgroundColor: 'rgba(255, 255, 255, 0.1)' } }}
+          aria-label="Help"
+        >
+          <HelpIcon />
+        </IconButton>
+
+        <IconButton
+          size="medium"
+          sx={{ color: '#ffffff', '&:hover': { backgroundColor: 'rgba(255, 255, 255, 0.1)' } }}
+          aria-label="Share"
+        >
+          <ShareIcon />
+        </IconButton>
 
-        <Link
-          href="/"
-          className="font-display flex items-center gap-2 text-lg font-medium md:text-xl md:font-bold"
+        <IconButton
+          size="large"
+          sx={{ color: '#ffffff', '&:hover': { backgroundColor: 'rgba(255, 255, 255, 0.1)' } }}
+          aria-label="Profile"
+          href="/profile"
         >
-          UTD Notebook
-        </Link>
-
-        <div className="ml-auto flex items-center gap-x-2 md:gap-x-4">
-          <Tooltip title="Profile">
-            <IconButton size="medium" href="/profile">
-              <div className="relative size-10 flex-shrink-0 md:size-12">
-                <Image
-                  src="/icon-white.svg"
-                  alt="profile picture"
-                  fill
-                  className="rounded-full border-2 border-white object-cover"
-                />
-              </div>
-            </IconButton>
-          </Tooltip>
-        </div>
+          <AccountCircleIcon fontSize="large" />
+        </IconButton>
       </div>
-    </>
+    </nav>
   );
 }
diff --git a/tsconfig.json b/tsconfig.json
index cfc7134..4953e7c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,12 +10,13 @@
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
     "noUncheckedIndexedAccess": true,
+    "ignoreDeprecations": "6.0",
     "baseUrl": ".",
     "paths": {
       "@src/*": ["./src/*"],