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"