diff --git a/app/(app)/vault/page.tsx b/app/(app)/vault/page.tsx
index 833da9f..c530e12 100644
--- a/app/(app)/vault/page.tsx
+++ b/app/(app)/vault/page.tsx
@@ -124,10 +124,11 @@ export default function VaultPage() {
           <Link
             href="/builder"
             className="rounded-md border border-white/10 bg-white/5 px-3 py-1.5 text-sm hover:bg-white/10"
+            title="Create a new build in the builder"
           >
             New Build
           </Link>
-          <Link href="/account" className="text-sm opacity-80 hover:underline">
+          <Link href="/account" className="text-sm opacity-80 hover:underline" title={"Your account info"}>
             Account →
           </Link>
         </div>
diff --git a/components/ThemeToggle.tsx b/components/ThemeToggle.tsx
index e11d47d..f0d6764 100644
--- a/components/ThemeToggle.tsx
+++ b/components/ThemeToggle.tsx
@@ -24,11 +24,14 @@ export default function ThemeToggle() {
     document.documentElement.classList.toggle("dark", next === "dark");
   }
 
+  /**
+   * @TODO, the toggle doesn't look right, need to either fix or remove the toggle.
+   */
   return (
     <button
       type="button"
       onClick={toggle}
-      aria-label="Toggle theme"
+      aria-label="Toggle theme" title={`Toggle to ${theme === 'dark' ? 'light' : 'dark'}`}
       className="inline-flex items-center gap-2 rounded-md border border-zinc-700 bg-zinc-900/70 px-3 py-1.5 text-xs font-semibold text-zinc-200 hover:bg-zinc-800 transition-colors
                  dark:border-zinc-700 dark:bg-zinc-900/70 dark:text-zinc-200
                  border-zinc-300 bg-white text-zinc-900 hover:bg-zinc-100 dark:hover:bg-zinc-800"
diff --git a/components/TopNav.tsx b/components/TopNav.tsx
index 6dfb49c..fac9f6d 100644
--- a/components/TopNav.tsx
+++ b/components/TopNav.tsx
@@ -11,9 +11,11 @@ import ThemeToggle from "@/components/ThemeToggle";
 function NavLink({
   href,
   children,
+  title
 }: {
   href: string;
   children: React.ReactNode;
+  title?: string;
 }) {
   const pathname = usePathname();
   const active = pathname === href;
@@ -21,6 +23,7 @@ function NavLink({
   return (
     <Link
       href={href}
+      title={title}
       className={[
         "text-xs font-medium transition-colors",
         active ? "text-zinc-100" : "text-zinc-400 hover:text-zinc-100",
@@ -60,7 +63,7 @@ export function TopNav() {
             <span className="text-xs text-zinc-500">Checking session…</span>
           ) : isAuthenticated ? (
             <>
-              <NavLink href="/vault">Vault</NavLink>
+              <NavLink href="/vault" title={"Your builds"}>Vault</NavLink>
 
               {/* Email/displayName links to Account */}
               <Link
diff --git a/package-lock.json b/package-lock.json
index 914b921..b9a4ede 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1012,7 +1012,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1453,7 +1452,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.25",
         "caniuse-lite": "^1.0.30001754",
@@ -2136,7 +2134,6 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -2305,7 +2302,6 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -4535,7 +4531,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.7",
         "picocolors": "^1.0.0",
@@ -4785,7 +4780,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -4798,7 +4792,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -5803,7 +5796,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -5973,7 +5965,6 @@
       "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"