diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index a99c7ff..dc953ef 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -27,12 +27,13 @@ export default function AboutPage() {
     {
       title: "About",      items: [
         { label: "Our Mission", href: "/about" },
-        { label: "Success Stories", href: "/about" },
+        { label: "Success Stories", href: "/#testimonials" },
+        { label: "Team", href: "#" },
       ],
     },
     {
       title: "Support",      items: [
-        { label: "FAQ", href: "/adopt" },
+        { label: "FAQ", href: "/adopt#faq" },
         { label: "Contact Us", href: "/contact" },
         { label: "Privacy Policy", href: "#" },
       ],
@@ -55,7 +56,7 @@ export default function AboutPage() {
       <div id="nav" data-section="nav">
         <NavbarStyleApple
           brandName="Paw Haven"
-          navItems={navItems.map(item => ({...item, name: <Link href={item.id}>{item.name}</Link>}))}
+          navItems={navItems}
           logoHref="/"
         />
       </div>
@@ -70,8 +71,6 @@ export default function AboutPage() {
           buttons={[{ "text": "Get Involved", "href": "/contact" }]}
           buttonAnimation="slide-up"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          headingClassName="text-3xl md:text-5xl lg:text-6xl font-light leading-tight"
         />
       </div>
 
@@ -86,8 +85,6 @@ export default function AboutPage() {
           ]}
           metricsAnimation="slide-up"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          titleClassName="text-3xl md:text-5xl font-light"
         />
       </div>
 
@@ -110,9 +107,6 @@ export default function AboutPage() {
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          textBoxTitleClassName="text-3xl md:text-5xl font-light"
-          textBoxDescriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -121,7 +115,6 @@ export default function AboutPage() {
           columns={footerColumns}
           bottomLeftText="© 2024 Paw Haven. All rights reserved."
           bottomRightText="Made with Love for Animals"
-          className="py-10"
         />
       </div>
     </ThemeProvider>
diff --git a/src/app/adopt/page.tsx b/src/app/adopt/page.tsx
index 48fbdfd..9a980b8 100644
--- a/src/app/adopt/page.tsx
+++ b/src/app/adopt/page.tsx
@@ -27,12 +27,13 @@ export default function AdoptPage() {
     {
       title: "About",      items: [
         { label: "Our Mission", href: "/about" },
-        { label: "Success Stories", href: "/about" },
+        { label: "Success Stories", href: "/#testimonials" },
+        { label: "Team", href: "#" },
       ],
     },
     {
       title: "Support",      items: [
-        { label: "FAQ", href: "/adopt" },
+        { label: "FAQ", href: "/adopt#faq" },
         { label: "Contact Us", href: "/contact" },
         { label: "Privacy Policy", href: "#" },
       ],
@@ -55,7 +56,7 @@ export default function AdoptPage() {
       <div id="nav" data-section="nav">
         <NavbarStyleApple
           brandName="Paw Haven"
-          navItems={navItems.map(item => ({...item, name: <Link href={item.id}>{item.name}</Link>}))}
+          navItems={navItems}
           logoHref="/"
         />
       </div>
@@ -75,9 +76,6 @@ export default function AdoptPage() {
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          textBoxTitleClassName="text-3xl md:text-5xl font-light"
-          textBoxDescriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -95,26 +93,20 @@ export default function AdoptPage() {
           faqsAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          textBoxTitleClassName="text-3xl md:text-5xl font-light"
-          textBoxDescriptionClassName="text-lg md:text-xl"
         />
       </div>
 
       <div id="contact" data-section="contact">
         <ContactCenter
-          tag="Start Your Adoption Journey"
-          title="Ready to Welcome a New Friend?"
-          description="Your journey to finding a loyal companion starts here. Contact our adoption team to learn more about the next steps."
+          tag="Get Involved"
+          title="Your Support Makes a Difference"
+          description="Whether you're looking to adopt, volunteer, or donate, your help directly impacts the lives of animals in need. Contact us today!"
           background={{ "variant": "sparkles-gradient" }}
           inputPlaceholder="Your Email Address"
-          buttonText="Inquire Now"
+          buttonText="Get in Touch"
           termsText="By submitting, you agree to receive updates from Paw Haven."
           onSubmit={(email) => console.log(email)}
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          titleClassName="text-3xl md:text-5xl font-light"
-          descriptionClassName="text-lg md:text-xl"
         />
       </div>
       
@@ -123,7 +115,6 @@ export default function AdoptPage() {
           columns={footerColumns}
           bottomLeftText="© 2024 Paw Haven. All rights reserved."
           bottomRightText="Made with Love for Animals"
-          className="py-10"
         />
       </div>
     </ThemeProvider>
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 8dff5bb..ce5ac44 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -27,12 +27,13 @@ export default function ContactPage() {
     {
       title: "About",      items: [
         { label: "Our Mission", href: "/about" },
-        { label: "Success Stories", href: "/about" },
+        { label: "Success Stories", href: "/#testimonials" },
+        { label: "Team", href: "#" },
       ],
     },
     {
       title: "Support",      items: [
-        { label: "FAQ", href: "/adopt" },
+        { label: "FAQ", href: "/adopt#faq" },
         { label: "Contact Us", href: "/contact" },
         { label: "Privacy Policy", href: "#" },
       ],
@@ -55,7 +56,7 @@ export default function ContactPage() {
       <div id="nav" data-section="nav">
         <NavbarStyleApple
           brandName="Paw Haven"
-          navItems={navItems.map(item => ({...item, name: <Link href={item.id}>{item.name}</Link>}))}
+          navItems={navItems}
           logoHref="/"
         />
       </div>
@@ -71,9 +72,6 @@ export default function ContactPage() {
           termsText="By submitting, you agree to receive updates from Paw Haven."
           onSubmit={(email) => console.log(email)}
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          titleClassName="text-3xl md:text-5xl font-light"
-          descriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -91,9 +89,6 @@ export default function ContactPage() {
           faqsAnimation="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          textBoxTitleClassName="text-3xl md:text-5xl font-light"
-          textBoxDescriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -107,8 +102,6 @@ export default function ContactPage() {
           buttons={[{ "text": "Learn More About Us", "href": "/about" }]}
           buttonAnimation="slide-up"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          headingClassName="text-3xl md:text-5xl lg:text-6xl font-light leading-tight"
         />
       </div>
 
@@ -117,7 +110,6 @@ export default function ContactPage() {
           columns={footerColumns}
           bottomLeftText="© 2024 Paw Haven. All rights reserved."
           bottomRightText="Made with Love for Animals"
-          className="py-10"
         />
       </div>
     </ThemeProvider>
diff --git a/src/app/page.tsx b/src/app/page.tsx
index c885e17..0ec100c 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,12 +30,13 @@ export default function HomePage() {
     {
       title: "About",      items: [
         { label: "Our Mission", href: "/about" },
-        { label: "Success Stories", href: "/about" },
+        { label: "Success Stories", href: "/#testimonials" },
+        { label: "Team", href: "#" },
       ],
     },
     {
       title: "Support",      items: [
-        { label: "FAQ", href: "/adopt" },
+        { label: "FAQ", href: "/adopt#faq" },
         { label: "Contact Us", href: "/contact" },
         { label: "Privacy Policy", href: "#" },
       ],
@@ -58,7 +59,7 @@ export default function HomePage() {
       <div id="nav" data-section="nav">
         <NavbarStyleApple
           brandName="Paw Haven"
-          navItems={navItems.map(item => ({...item, name: <Link href={item.id}>{item.name}</Link>}))}
+          navItems={navItems}
           logoHref="/"
         />
       </div>
@@ -70,8 +71,8 @@ export default function HomePage() {
           background={{ "variant": "radial-gradient" }}
           tag="Paw Haven Animal Shelter"
           buttons={[
-            { "text": "Adopt a Pet", "href": "/adopt" },
-            { "text": "Support Our Cause", "href": "/contact" }
+            { "text": "Adopt a Pet", "href": "#adoptable-pets" },
+            { "text": "Support Our Cause", "href": "#contact" }
           ]}
           mediaItems={[
             { "imageSrc": "https://img.b2bpic.net/free-photo/pretty-girl-embarcing-cat-dog_8353-5281.jpg", "imageAlt": "Happy dog and cat together" },
@@ -82,11 +83,6 @@ export default function HomePage() {
           mediaAnimation="blur-reveal"
           tagAnimation="blur-reveal"
           buttonAnimation="blur-reveal"
-          className="min-h-svh md:min-h-screen"
-          titleClassName="text-4xl md:text-6xl lg:text-7xl font-light leading-tight"
-          descriptionClassName="text-lg md:text-xl font-light"
-          buttonClassName="font-medium text-lg px-8 py-3"
-          textBoxClassName="gap-6"
         />
       </div>
       
@@ -100,8 +96,6 @@ export default function HomePage() {
           buttons={[{ "text": "Learn More About Us", "href": "/about" }]}
           buttonAnimation="slide-up"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          headingClassName="text-3xl md:text-5xl lg:text-6xl font-light leading-tight"
         />
       </div>
 
@@ -120,9 +114,6 @@ export default function HomePage() {
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          textBoxTitleClassName="text-3xl md:text-5xl font-light"
-          textBoxDescriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -137,8 +128,6 @@ export default function HomePage() {
           ]}
           metricsAnimation="slide-up"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          titleClassName="text-3xl md:text-5xl font-light"
         />
       </div>
 
@@ -161,9 +150,6 @@ export default function HomePage() {
           animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          textBoxTitleClassName="text-3xl md:text-5xl font-light"
-          textBoxDescriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -178,9 +164,6 @@ export default function HomePage() {
           termsText="By submitting, you agree to receive updates from Paw Haven."
           onSubmit={(email) => console.log(email)}
           useInvertedBackground={false}
-          className="py-20 md:py-32"
-          titleClassName="text-3xl md:text-5xl font-light"
-          descriptionClassName="text-lg md:text-xl"
         />
       </div>
 
@@ -189,7 +172,6 @@ export default function HomePage() {
           columns={footerColumns}
           bottomLeftText="© 2024 Paw Haven. All rights reserved."
           bottomRightText="Made with Love for Animals"
-          className="py-10"
         />
       </div>
     </ThemeProvider>