diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index d04083f..ea04477 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,4 +1,4 @@
-use client";
+"use client";
 
 import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -10,6 +10,14 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
 
+    const navItems = [
+        { name: "Home", id: "/" },
+        { name: "About Us", id: "/#about" },
+        { name: "Services", id: "/#services" },
+        { name: "Testimonials", id: "/#testimonials" },
+        { name: "Contact", id: "/#contact" }
+    ];
+
     return (
         <ThemeProvider
             defaultButtonVariant="text-shift"
@@ -26,9 +34,9 @@ export default function BlogPage() {
             <ReactLenis root>
                 <div id="nav" data-section="nav">
                     <NavbarLayoutFloatingInline
-                        navItems={[{ "name": "Home", "id": "/" }, { "name": "About Us", "id": "about" }, { "name": "Services", "id": "services" }, { "name": "Testimonials", "id": "testimonials" }, { "name": "Contact", "id": "contact" }]}
+                        navItems={navItems}
                         brandName="John's Business"
-                        button={{ "text": "Get a Quote", "href": "#contact" }}
+                        button={{ text: "Get a Quote", href: "/#contact" }}
                         className="py-3"
                         navItemClassName="text-foreground hover:text-primary-cta"
                         buttonClassName="bg-primary-cta text-primary-cta-text hover:bg-primary-cta/90 px-6 py-2 rounded-full"
@@ -55,7 +63,7 @@ export default function BlogPage() {
 
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
-                            columns={[{ "title": "Services", "items": [{ "label": "Plumbing", "href": "#services" }, { "label": "Electrical", "href": "#services" }, { "label": "HVAC", "href": "#services" }] }, { "title": "Company", "items": [{ "label": "About Us", "href": "#about" }, { "label": "Contact", "href": "#contact" }] }, { "title": "Follow Us", "items": [{ "label": "Facebook", "href": "https://facebook.com" }, { "label": "Instagram", "href": "https://instagram.com" }] }]}
+                            columns={[{ title: "Services", items: [{ label: "Plumbing", href: "/#services" }, { label: "Electrical", href: "/#services" }, { label: "HVAC", href: "/#services" }] }, { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Contact", href: "/#contact" }] }, { title: "Follow Us", items: [{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" }] }]}
                             copyrightText="© 2024 John's Blue Collar Business. All rights reserved."
                             ariaLabel="Footer navigation"
                             className="text-foreground"
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index b4dd590..8cc901b 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -74,6 +74,13 @@ function ProductPageContent({ params }: ProductPageProps) {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
+    const navItems = [{ name: "Home", id: "/" }];
+    const footerColumns = [
+        { title: "Services", items: [{ label: "Plumbing", href: "/#services" }, { label: "Electrical", href: "/#services" }, { label: "HVAC", href: "/#services" }] }, 
+        { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Contact", href: "/#contact" }] }, 
+        { title: "Follow Us", items: [{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" }] }
+    ];
+
     if (isLoading) {
         return (
             <ThemeProvider
@@ -91,7 +98,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingInline
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                            navItems={navItems}
                             brandName="John's Business"
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                             className="py-3"
@@ -105,27 +112,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                     </main>
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
-                            columns={[
-                                {
-                                    title: "Services",                                    items: [
-                                        { label: "Plumbing", href: "#services" },
-                                        { label: "Electrical", href: "#services" },
-                                        { label: "HVAC", href: "#services" },
-                                    ],
-                                },
-                                {
-                                    title: "Company",                                    items: [
-                                        { label: "About Us", href: "#about" },
-                                        { label: "Contact", href: "#contact" },
-                                    ],
-                                },
-                                {
-                                    title: "Follow Us",                                    items: [
-                                        { label: "Facebook", href: "https://facebook.com" },
-                                        { label: "Instagram", href: "https://instagram.com" },
-                                    ],
-                                },
-                            ]}
+                            columns={footerColumns}
                             copyrightText="© 2024 John's Blue Collar Business. All rights reserved."
                             ariaLabel="Footer navigation"
                             className="text-foreground"
@@ -156,7 +143,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingInline
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                            navItems={navItems}
                             brandName="John's Business"
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                             className="py-3"
@@ -178,27 +165,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                     </main>
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
-                            columns={[
-                                {
-                                    title: "Services",                                    items: [
-                                        { label: "Plumbing", href: "#services" },
-                                        { label: "Electrical", href: "#services" },
-                                        { label: "HVAC", href: "#services" },
-                                    ],
-                                },
-                                {
-                                    title: "Company",                                    items: [
-                                        { label: "About Us", href: "#about" },
-                                        { label: "Contact", href: "#contact" },
-                                    ],
-                                },
-                                {
-                                    title: "Follow Us",                                    items: [
-                                        { label: "Facebook", href: "https://facebook.com" },
-                                        { label: "Instagram", href: "https://instagram.com" },
-                                    ],
-                                },
-                            ]}
+                            columns={footerColumns}
                             copyrightText="© 2024 John's Blue Collar Business. All rights reserved."
                             ariaLabel="Footer navigation"
                             className="text-foreground"
@@ -228,7 +195,7 @@ function ProductPageContent({ params }: ProductPageProps) {
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingInline
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                        navItems={navItems}
                         brandName="John's Business"
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         className="py-3"
@@ -275,27 +242,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 </div>
                 <div id="footer" data-section="footer">
                     <FooterBaseReveal
-                        columns={[
-                            {
-                                title: "Services",                                items: [
-                                    { label: "Plumbing", href: "#services" },
-                                    { label: "Electrical", href: "#services" },
-                                    { label: "HVAC", href: "#services" },
-                                ],
-                            },
-                            {
-                                title: "Company",                                items: [
-                                    { label: "About Us", href: "#about" },
-                                    { label: "Contact", href: "#contact" },
-                                ],
-                            },
-                            {
-                                title: "Follow Us",                                items: [
-                                    { label: "Facebook", href: "https://facebook.com" },
-                                    { label: "Instagram", href: "https://instagram.com" },
-                                ],
-                            },
-                        ]}
+                        columns={footerColumns}
                         copyrightText="© 2024 John's Blue Collar Business. All rights reserved."
                         ariaLabel="Footer navigation"
                         className="text-foreground"
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 6bb1ba5..2fd24e7 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -41,6 +41,13 @@ function ShopPageContent() {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
+    const navItems = [{ name: "Home", id: "/" }];
+    const footerColumns = [
+        { title: "Services", items: [{ label: "Plumbing", href: "/#services" }, { label: "Electrical", href: "/#services" }, { label: "HVAC", href: "/#services" }] }, 
+        { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Contact", href: "/#contact" }] }, 
+        { title: "Follow Us", items: [{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" }] }
+    ];
+
     if (isLoading) {
         return (
             <ThemeProvider
@@ -58,7 +65,7 @@ function ShopPageContent() {
                 <ReactLenis root>
                     <div id="navbar" data-section="navbar">
                         <NavbarLayoutFloatingInline
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                            navItems={navItems}
                             brandName="John's Business"
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                             className="py-3"
@@ -72,27 +79,7 @@ function ShopPageContent() {
                     </main>
                     <div id="footer" data-section="footer">
                         <FooterBaseReveal
-                            columns={[
-                                {
-                                    title: "Services",                                    items: [
-                                        { label: "Plumbing", href: "#services" },
-                                        { label: "Electrical", href: "#services" },
-                                        { label: "HVAC", href: "#services" },
-                                    ],
-                                },
-                                {
-                                    title: "Company",                                    items: [
-                                        { label: "About Us", href: "#about" },
-                                        { label: "Contact", href: "#contact" },
-                                    ],
-                                },
-                                {
-                                    title: "Follow Us",                                    items: [
-                                        { label: "Facebook", href: "https://facebook.com" },
-                                        { label: "Instagram", href: "https://instagram.com" },
-                                    ],
-                                },
-                            ]}
+                            columns={footerColumns}
                             copyrightText="© 2024 John's Blue Collar Business. All rights reserved."
                             ariaLabel="Footer navigation"
                             className="text-foreground"
@@ -122,7 +109,7 @@ function ShopPageContent() {
             <ReactLenis root>
                 <div id="navbar" data-section="navbar">
                     <NavbarLayoutFloatingInline
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                        navItems={navItems}
                         brandName="John's Business"
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         className="py-3"
@@ -159,27 +146,7 @@ function ShopPageContent() {
                 </div>
                 <div id="footer" data-section="footer">
                     <FooterBaseReveal
-                        columns={[
-                            {
-                                title: "Services",                                items: [
-                                    { label: "Plumbing", href: "#services" },
-                                    { label: "Electrical", href: "#services" },
-                                    { label: "HVAC", href: "#services" },
-                                ],
-                            },
-                            {
-                                title: "Company",                                items: [
-                                    { label: "About Us", href: "#about" },
-                                    { label: "Contact", href: "#contact" },
-                                ],
-                            },
-                            {
-                                title: "Follow Us",                                items: [
-                                    { label: "Facebook", href: "https://facebook.com" },
-                                    { label: "Instagram", href: "https://instagram.com" },
-                                ],
-                            },
-                        ]}
+                        columns={footerColumns}
                         copyrightText="© 2024 John's Blue Collar Business. All rights reserved."
                         ariaLabel="Footer navigation"
                         className="text-foreground"