diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 351d189..250216c 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -8,8 +8,8 @@ import Link from "next/link";
 export default function ContactPage() {
   const navItems = [
     { name: "Home", id: "/" },
-    { name: "Features", id: "/" },
-    { name: "Pricing", id: "/" },
+    { name: "Features", id: "/#features" },
+    { name: "Pricing", id: "/pricing" },
     { name: "Studio", id: "https://studio.dieter.ai" },
     { name: "Contact", id: "/contact" },
   ];
@@ -44,13 +44,9 @@ export default function ContactPage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Launch Dieter Studio",
-              href: "https://studio.dieter.ai",
-            },
+              text: "Launch Dieter Studio",              href: "https://studio.dieter.ai"},
             {
-              text: "Book a Demo",
-              href: "mailto:hello@dieter.studio",
-            },
+              text: "Book a Demo",              href: "mailto:hello@dieter.studio"},
           ]}
         />
       </div>
@@ -73,12 +69,12 @@ export default function ContactPage() {
                   </Link>
                 </li>
                 <li>
-                  <Link href="/" className="hover:text-white transition">
+                  <a href="/#features" className="hover:text-white transition">
                     Features
-                  </Link>
+                  </a>
                 </li>
                 <li>
-                  <Link href="/" className="hover:text-white transition">
+                  <Link href="/pricing" className="hover:text-white transition">
                     Pricing
                   </Link>
                 </li>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index bea3418..1a3c53c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -16,7 +16,7 @@ export default function HomePage() {
   const navItems = [
     { name: "Home", id: "/" },
     { name: "Features", id: "features" },
-    { name: "Pricing", id: "pricing" },
+    { name: "Pricing", id: "/pricing" },
     { name: "Studio", id: "https://studio.dieter.ai" },
     { name: "Contact", id: "/contact" },
   ];
@@ -50,17 +50,11 @@ export default function HomePage() {
           background={{ variant: "glowing-orb" }}
           kpis={[
             {
-              value: "60s",
-              label: "Song Generation Time",
-            },
+              value: "60s",              label: "Song Generation Time"},
             {
-              value: "8+",
-              label: "Voice Styles & Languages",
-            },
+              value: "8+",              label: "Voice Styles & Languages"},
             {
-              value: "Multi-Stem",
-              label: "Professional Mixing",
-            },
+              value: "Multi-Stem",              label: "Professional Mixing"},
           ]}
           enableKpiAnimation={true}
           tag="Future of Music Production"
@@ -71,13 +65,9 @@ export default function HomePage() {
           imagePosition="right"
           buttons={[
             {
-              text: "Launch Studio",
-              href: "https://studio.dieter.ai",
-            },
+              text: "Launch Studio",              href: "https://studio.dieter.ai"},
             {
-              text: "Watch Demo",
-              href: "#features",
-            },
+              text: "Watch Demo",              href: "#features"},
           ]}
           buttonAnimation="slide-up"
         />
@@ -89,21 +79,11 @@ export default function HomePage() {
           description="Everything you need to create professional music without installing heavy software. Write, generate, mix, and export—all from one intuitive interface."
           negativeCard={{
             items: [
-              "Complex DAW software setup",
-              "Steep learning curve",
-              "Expensive plugins and licenses",
-              "Slow rendering times",
-              "Limited collaboration features",
-            ],
+              "Complex DAW software setup",              "Steep learning curve",              "Expensive plugins and licenses",              "Slow rendering times",              "Limited collaboration features"],
           }}
           positiveCard={{
             items: [
-              "Browser-based, instant access",
-              "AI-assisted songwriting & generation",
-              "No plugins needed, everything included",
-              "Real-time preview & playback",
-              "Integrated marketing guidance",
-            ],
+              "Browser-based, instant access",              "AI-assisted songwriting & generation",              "No plugins needed, everything included",              "Real-time preview & playback",              "Integrated marketing guidance"],
           }}
           animationType="slide-up"
           textboxLayout="default"
@@ -121,9 +101,7 @@ export default function HomePage() {
           useInvertedBackground={true}
           buttons={[
             {
-              text: "Explore Features",
-              href: "#pricing",
-            },
+              text: "Explore Features",              href: "#pricing"},
           ]}
           buttonAnimation="opacity"
         />
@@ -135,21 +113,11 @@ export default function HomePage() {
           description="Get intelligent suggestions on where to publish, how to promote, and which platforms maximize your reach and income potential."
           negativeCard={{
             items: [
-              "Music sits on your hard drive",
-              "Guess where to distribute",
-              "Manual metadata entry",
-              "No promotion strategy",
-              "Leave money on the table",
-            ],
+              "Music sits on your hard drive",              "Guess where to distribute",              "Manual metadata entry",              "No promotion strategy",              "Leave money on the table"],
           }}
           positiveCard={{
             items: [
-              "AI analyzes your track",
-              "Recommends best platforms",
-              "Auto-generates metadata & tags",
-              "Suggests promotional strategies",
-              "Identifies monetization paths",
-            ],
+              "AI analyzes your track",              "Recommends best platforms",              "Auto-generates metadata & tags",              "Suggests promotional strategies",              "Identifies monetization paths"],
           }}
           animationType="blur-reveal"
           textboxLayout="default"
@@ -162,59 +130,29 @@ export default function HomePage() {
         <TestimonialCardSixteen
           testimonials={[
             {
-              id: "1",
-              name: "Maya Rodriguez",
-              role: "Indie Artist",
-              company: "SoundWave Creative",
-              rating: 5,
+              id: "1",              name: "Maya Rodriguez",              role: "Indie Artist",              company: "SoundWave Creative",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/portrait-photo-of-a-confident-female-mus-1773052780034-5b4986c6.png",
-              imageAlt: "Maya Rodriguez - Indie Artist",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/portrait-photo-of-a-confident-female-mus-1773052780034-5b4986c6.png",              imageAlt: "Maya Rodriguez - Indie Artist"},
             {
-              id: "2",
-              name: "James Chen",
-              role: "Music Producer",
-              company: "Urban Beats Studio",
-              rating: 5,
+              id: "2",              name: "James Chen",              role: "Music Producer",              company: "Urban Beats Studio",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/professional-headshot-of-an-asian-male-m-1773052779817-d546d564.png",
-              imageAlt: "James Chen - Music Producer",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/professional-headshot-of-an-asian-male-m-1773052779817-d546d564.png",              imageAlt: "James Chen - Music Producer"},
             {
-              id: "3",
-              name: "Sofia Karlsson",
-              role: "Composer",
-              company: "Nordic Sound Lab",
-              rating: 5,
+              id: "3",              name: "Sofia Karlsson",              role: "Composer",              company: "Nordic Sound Lab",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/portrait-of-a-scandinavian-female-compos-1773052779600-ef8990d1.png",
-              imageAlt: "Sofia Karlsson - Composer",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/portrait-of-a-scandinavian-female-compos-1773052779600-ef8990d1.png",              imageAlt: "Sofia Karlsson - Composer"},
             {
-              id: "4",
-              name: "Alex Thompson",
-              role: "Electronic Artist",
-              company: "Synth Collective",
-              rating: 5,
+              id: "4",              name: "Alex Thompson",              role: "Electronic Artist",              company: "Synth Collective",              rating: 5,
               imageSrc:
-                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/professional-headshot-of-a-male-electron-1773052781333-48ae8552.png",
-              imageAlt: "Alex Thompson - Electronic Artist",
-            },
+                "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Ahi2vwDB5Ta9isxbMIvH8BKpyQ/professional-headshot-of-a-male-electron-1773052781333-48ae8552.png",              imageAlt: "Alex Thompson - Electronic Artist"},
           ]}
           kpiItems={[
             {
-              value: "15K+",
-              label: "Active Creators",
-            },
+              value: "15K+",              label: "Active Creators"},
             {
-              value: "500K+",
-              label: "Songs Generated",
-            },
+              value: "500K+",              label: "Songs Generated"},
             {
-              value: "98%",
-              label: "Satisfaction Rate",
-            },
+              value: "98%",              label: "Satisfaction Rate"},
           ]}
           animationType="slide-up"
           title="Loved by Creators Worldwide"
@@ -228,71 +166,33 @@ export default function HomePage() {
         <PricingCardTwo
           plans={[
             {
-              id: "starter",
-              badge: "Starter",
-              badgeIcon: Music,
-              price: "$9/mo",
-              subtitle: "Perfect for exploring",
-              buttons: [
+              id: "starter",              badge: "Starter",              badgeIcon: Music,
+              price: "$9/mo",              subtitle: "Perfect for exploring",              buttons: [
                 {
-                  text: "Start Free",
-                  href: "https://studio.dieter.ai/signup",
-                },
+                  text: "Start Free",                  href: "https://studio.dieter.ai/signup"},
               ],
               features: [
-                "5 song generations/month",
-                "Basic mixing tools",
-                "MP3 export",
-                "Community access",
-                "AI Director suggestions",
-              ],
+                "5 song generations/month",                "Basic mixing tools",                "MP3 export",                "Community access",                "AI Director suggestions"],
             },
             {
-              id: "pro",
-              badge: "Professional",
-              badgeIcon: Sparkles,
-              price: "$29/mo",
-              subtitle: "For serious creators",
-              buttons: [
+              id: "pro",              badge: "Professional",              badgeIcon: Sparkles,
+              price: "$29/mo",              subtitle: "For serious creators",              buttons: [
                 {
-                  text: "Get Started",
-                  href: "https://studio.dieter.ai/signup",
-                },
+                  text: "Get Started",                  href: "https://studio.dieter.ai/signup"},
                 {
-                  text: "View Details",
-                  href: "#",
-                },
+                  text: "View Details",                  href: "#"},
               ],
               features: [
-                "Unlimited song generations",
-                "Full mixing suite with EQ",
-                "WAV + MP3 exports",
-                "Stem packs for DAWs",
-                "Priority AI Director guidance",
-                "Beat detection & sync",
-              ],
+                "Unlimited song generations",                "Full mixing suite with EQ",                "WAV + MP3 exports",                "Stem packs for DAWs",                "Priority AI Director guidance",                "Beat detection & sync"],
             },
             {
-              id: "studio",
-              badge: "Studio Pro",
-              badgeIcon: Award,
-              price: "$79/mo",
-              subtitle: "For studios & labels",
-              buttons: [
+              id: "studio",              badge: "Studio Pro",              badgeIcon: Award,
+              price: "$79/mo",              subtitle: "For studios & labels",              buttons: [
                 {
-                  text: "Contact Sales",
-                  href: "https://studio.dieter.ai/contact",
-                },
+                  text: "Contact Sales",                  href: "https://studio.dieter.ai/contact"},
               ],
               features: [
-                "Unlimited everything",
-                "Video collaboration page",
-                "Cloud storage & backups",
-                "API access for integrations",
-                "Team collaboration",
-                "Advanced AI Director",
-                "White-label options",
-              ],
+                "Unlimited everything",                "Video collaboration page",                "Cloud storage & backups",                "API access for integrations",                "Team collaboration",                "Advanced AI Director",                "White-label options"],
             },
           ]}
           title="Simple, Transparent Pricing"
@@ -307,41 +207,23 @@ export default function HomePage() {
         <FaqBase
           faqs={[
             {
-              id: "1",
-              title: "What makes Dieter different from traditional DAWs?",
-              content:
-                "Dieter Studio runs entirely in your browser—no installation needed. It combines AI-powered songwriting and generation with professional mixing tools, making production faster and more intuitive. Plus, the integrated AI Director helps you monetize and promote your work automatically.",
-            },
+              id: "1",              title: "What makes Dieter different from traditional DAWs?",              content:
+                "Dieter Studio runs entirely in your browser—no installation needed. It combines AI-powered songwriting and generation with professional mixing tools, making production faster and more intuitive. Plus, the integrated AI Director helps you monetize and promote your work automatically."},
             {
-              id: "2",
-              title: "Can I import my own audio and stems?",
-              content:
-                "Yes! Pro and Studio Pro plans support importing audio files and working with existing stems. You can mix your own recordings alongside AI-generated tracks, and export everything as individual stems for use in external DAWs.",
-            },
+              id: "2",              title: "Can I import my own audio and stems?",              content:
+                "Yes! Pro and Studio Pro plans support importing audio files and working with existing stems. You can mix your own recordings alongside AI-generated tracks, and export everything as individual stems for use in external DAWs."},
             {
-              id: "3",
-              title: "What voice styles and languages are supported?",
-              content:
-                "We support 8+ voice styles including Afrikaans, German, Elf/Fantasy, Robotic, Alien, Country, and more. Each style is fully customizable in pitch, pace, and emotional tone. Additional languages are being added regularly.",
-            },
+              id: "3",              title: "What voice styles and languages are supported?",              content:
+                "We support 8+ voice styles including Afrikaans, German, Elf/Fantasy, Robotic, Alien, Country, and more. Each style is fully customizable in pitch, pace, and emotional tone. Additional languages are being added regularly."},
             {
-              id: "4",
-              title: "How does the AI Director help with monetization?",
-              content:
-                "The AI Director analyzes your finished track and recommends the best platforms for distribution (Spotify, Apple Music, etc.), suggests social media promotional angles, identifies licensing opportunities, and helps you maximize income through multiple revenue streams.",
-            },
+              id: "4",              title: "How does the AI Director help with monetization?",              content:
+                "The AI Director analyzes your finished track and recommends the best platforms for distribution (Spotify, Apple Music, etc.), suggests social media promotional angles, identifies licensing opportunities, and helps you maximize income through multiple revenue streams."},
             {
-              id: "5",
-              title: "Can I collaborate with other creators?",
-              content:
-                "Yes, Studio Pro plan includes full collaboration features. You can invite team members, work on projects together in real-time, share stems, and provide feedback directly within the studio. Video collaboration page is also available for visual project planning.",
-            },
+              id: "5",              title: "Can I collaborate with other creators?",              content:
+                "Yes, Studio Pro plan includes full collaboration features. You can invite team members, work on projects together in real-time, share stems, and provide feedback directly within the studio. Video collaboration page is also available for visual project planning."},
             {
-              id: "6",
-              title: "What file formats can I export?",
-              content:
-                "All plans support MP3 export. Pro and Studio Pro include WAV, stem packs (individual drum, bass, vocal, chord tracks), and ZIP project exports. High-quality 320kbps MP3 and 24-bit WAV available across all tiers.",
-            },
+              id: "6",              title: "What file formats can I export?",              content:
+                "All plans support MP3 export. Pro and Studio Pro include WAV, stem packs (individual drum, bass, vocal, chord tracks), and ZIP project exports. High-quality 320kbps MP3 and 24-bit WAV available across all tiers."},
           ]}
           title="Frequently Asked Questions"
           description="Everything you need to know about Dieter Studio."
@@ -359,13 +241,9 @@ export default function HomePage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Launch Dieter Studio",
-              href: "https://studio.dieter.ai",
-            },
+              text: "Launch Dieter Studio",              href: "https://studio.dieter.ai"},
             {
-              text: "Book a Demo",
-              href: "mailto:hello@dieter.studio",
-            },
+              text: "Book a Demo",              href: "mailto:hello@dieter.studio"},
           ]}
         />
       </div>
@@ -393,9 +271,9 @@ export default function HomePage() {
                   </a>
                 </li>
                 <li>
-                  <a href="#pricing" className="hover:text-white transition">
+                  <Link href="/pricing" className="hover:text-white transition">
                     Pricing
-                  </a>
+                  </Link>
                 </li>
               </ul>
             </div>
diff --git a/src/app/pricing/page.tsx b/src/app/pricing/page.tsx
index 9714699..147028a 100644
--- a/src/app/pricing/page.tsx
+++ b/src/app/pricing/page.tsx
@@ -12,7 +12,7 @@ export default function PricingPage() {
     { name: "Features", id: "/#features" },
     { name: "Pricing", id: "/pricing" },
     { name: "Studio", id: "https://studio.dieter.ai" },
-    { name: "Contact", id: "/#contact" },
+    { name: "Contact", id: "/contact" },
   ];
 
   return (
@@ -41,71 +41,33 @@ export default function PricingPage() {
         <PricingCardTwo
           plans={[
             {
-              id: "starter",
-              badge: "Starter",
-              badgeIcon: Music,
-              price: "$9/mo",
-              subtitle: "Perfect for exploring",
-              buttons: [
+              id: "starter",              badge: "Starter",              badgeIcon: Music,
+              price: "$9/mo",              subtitle: "Perfect for exploring",              buttons: [
                 {
-                  text: "Start Free",
-                  href: "https://studio.dieter.ai/signup",
-                },
+                  text: "Start Free",                  href: "https://studio.dieter.ai/signup"},
               ],
               features: [
-                "5 song generations/month",
-                "Basic mixing tools",
-                "MP3 export",
-                "Community access",
-                "AI Director suggestions",
-              ],
+                "5 song generations/month",                "Basic mixing tools",                "MP3 export",                "Community access",                "AI Director suggestions"],
             },
             {
-              id: "pro",
-              badge: "Professional",
-              badgeIcon: Sparkles,
-              price: "$29/mo",
-              subtitle: "For serious creators",
-              buttons: [
+              id: "pro",              badge: "Professional",              badgeIcon: Sparkles,
+              price: "$29/mo",              subtitle: "For serious creators",              buttons: [
                 {
-                  text: "Get Started",
-                  href: "https://studio.dieter.ai/signup",
-                },
+                  text: "Get Started",                  href: "https://studio.dieter.ai/signup"},
                 {
-                  text: "View Details",
-                  href: "#",
-                },
+                  text: "View Details",                  href: "#"},
               ],
               features: [
-                "Unlimited song generations",
-                "Full mixing suite with EQ",
-                "WAV + MP3 exports",
-                "Stem packs for DAWs",
-                "Priority AI Director guidance",
-                "Beat detection & sync",
-              ],
+                "Unlimited song generations",                "Full mixing suite with EQ",                "WAV + MP3 exports",                "Stem packs for DAWs",                "Priority AI Director guidance",                "Beat detection & sync"],
             },
             {
-              id: "studio",
-              badge: "Studio Pro",
-              badgeIcon: Award,
-              price: "$79/mo",
-              subtitle: "For studios & labels",
-              buttons: [
+              id: "studio",              badge: "Studio Pro",              badgeIcon: Award,
+              price: "$79/mo",              subtitle: "For studios & labels",              buttons: [
                 {
-                  text: "Contact Sales",
-                  href: "https://studio.dieter.ai/contact",
-                },
+                  text: "Contact Sales",                  href: "https://studio.dieter.ai/contact"},
               ],
               features: [
-                "Unlimited everything",
-                "Video collaboration page",
-                "Cloud storage & backups",
-                "API access for integrations",
-                "Team collaboration",
-                "Advanced AI Director",
-                "White-label options",
-              ],
+                "Unlimited everything",                "Video collaboration page",                "Cloud storage & backups",                "API access for integrations",                "Team collaboration",                "Advanced AI Director",                "White-label options"],
             },
           ]}
           title="Simple, Transparent Pricing"
@@ -124,13 +86,9 @@ export default function PricingPage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Launch Dieter Studio",
-              href: "https://studio.dieter.ai",
-            },
+              text: "Launch Dieter Studio",              href: "https://studio.dieter.ai"},
             {
-              text: "Schedule a Call",
-              href: "mailto:hello@dieter.studio",
-            },
+              text: "Schedule a Call",              href: "mailto:hello@dieter.studio"},
           ]}
         />
       </div>
diff --git a/src/app/studio/page.tsx b/src/app/studio/page.tsx
index 1527bf9..a5b391e 100644
--- a/src/app/studio/page.tsx
+++ b/src/app/studio/page.tsx
@@ -11,9 +11,9 @@ export default function StudioPage() {
   const navItems = [
     { name: "Home", id: "/" },
     { name: "Features", id: "/#features" },
-    { name: "Pricing", id: "/#pricing" },
+    { name: "Pricing", id: "/pricing" },
     { name: "Studio", id: "https://studio.dieter.ai" },
-    { name: "Contact", id: "/#contact" },
+    { name: "Contact", id: "/contact" },
   ];
 
   return (
diff --git a/src/app/video/page.tsx b/src/app/video/page.tsx
index fcfbeac..01f9590 100644
--- a/src/app/video/page.tsx
+++ b/src/app/video/page.tsx
@@ -12,7 +12,7 @@ export default function VideoPage() {
     { name: "Features", id: "/#features" },
     { name: "Pricing", id: "/pricing" },
     { name: "Studio", id: "https://studio.dieter.ai" },
-    { name: "Contact", id: "/#contact" },
+    { name: "Contact", id: "/contact" },
   ];
 
   return (
@@ -46,9 +46,7 @@ export default function VideoPage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Start Collaborating",
-              href: "https://studio.dieter.ai",
-            },
+              text: "Start Collaborating",              href: "https://studio.dieter.ai"},
           ]}
           buttonAnimation="slide-up"
         />
@@ -60,21 +58,11 @@ export default function VideoPage() {
           description="Professional-grade video tools designed for creative teams working on music videos, promotional content, and multimedia projects."
           negativeCard={{
             items: [
-              "Scattered file versions and folders",
-              "Difficulty syncing feedback across team",
-              "Time-consuming manual edits",
-              "No integrated asset management",
-              "Communication happens outside platform",
-            ],
+              "Scattered file versions and folders",              "Difficulty syncing feedback across team",              "Time-consuming manual edits",              "No integrated asset management",              "Communication happens outside platform"],
           }}
           positiveCard={{
             items: [
-              "Centralized project workspace",
-              "Real-time team collaboration",
-              "AI-powered editing suggestions",
-              "Integrated asset library",
-              "Built-in commenting & feedback system",
-            ],
+              "Centralized project workspace",              "Real-time team collaboration",              "AI-powered editing suggestions",              "Integrated asset library",              "Built-in commenting & feedback system"],
           }}
           animationType="slide-up"
           textboxLayout="default"
@@ -91,13 +79,9 @@ export default function VideoPage() {
           useInvertedBackground={false}
           buttons={[
             {
-              text: "Get Started Today",
-              href: "https://studio.dieter.ai",
-            },
+              text: "Get Started Today",              href: "https://studio.dieter.ai"},
             {
-              text: "Learn More",
-              href: "/#features",
-            },
+              text: "Learn More",              href: "/#features"},
           ]}
         />
       </div>