diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 9b11893..39d5540 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -41,6 +41,23 @@ export default function ShopPage() {
         await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
     }, [cartItems, checkout, getCheckoutItems]);
 
+    const navItems = [
+        { name: 'Home', id: '/' },
+        { name: 'About', id: '/about' },
+        { name: 'Features', id: '/#features' },
+        { name: 'Showcase', id: '/#product' },
+        { name: 'News', id: '/blog' },
+        { name: 'Shop', id: '/shop' },
+        { name: 'Team', id: '/#team' },
+        { name: 'Contact', id: '/#contact' }
+    ];
+
+    const footerColumns = [
+        { items: [{ label: 'About Us', href: '/about' }, { label: 'Features', href: '#features' }, { label: 'News', href: '/blog' }] },
+        { items: [{ label: 'Community', href: '#product' }, { label: 'Team', href: '#team' }, { label: 'FAQ', href: '#faq' }] },
+        { items: [{ label: 'Contact', href: '#contact' }, { label: 'Privacy Policy', href: '#' }, { label: 'Terms of Service', href: '#' }] }
+    ];
+
     if (isLoading) {
         return (
             <ThemeProvider
@@ -59,16 +76,7 @@ export default function ShopPage() {
                     <div id="nav" data-section="nav">
                         <NavbarStyleApple
                             brandName="Star Wars Fan Club"
-                            navItems={[
-                                { name: 'Home', id: '/' },
-                                { name: 'About', id: '/#about' },
-                                { name: 'Features', id: '/#features' },
-                                { name: 'Showcase', id: '/#product' },
-                                { name: 'News', id: '/blog' },
-                                { name: 'Shop', id: '/shop' },
-                                { name: 'Team', id: '/#team' },
-                                { name: 'Contact', id: '/#contact' }
-                            ]}
+                            navItems={navItems}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
@@ -97,16 +105,7 @@ export default function ShopPage() {
                 <div id="nav" data-section="nav">
                     <NavbarStyleApple
                         brandName="Star Wars Fan Club"
-                        navItems={[
-                            { name: 'Home', id: '/' },
-                            { name: 'About', id: '/#about' },
-                            { name: 'Features', id: '/#features' },
-                            { name: 'Showcase', id: '/#product' },
-                            { name: 'News', id: '/blog' },
-                            { name: 'Shop', id: '/shop' },
-                            { name: 'Team', id: '/#team' },
-                            { name: 'Contact', id: '/#contact' }
-                        ]}
+                        navItems={navItems}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>
@@ -138,11 +137,7 @@ export default function ShopPage() {
                 </div>
                 <div id="footer" data-section="footer">
                     <FooterLogoEmphasis
-                        columns={[
-                            { items: [{ label: 'About Us', href: '#about' }, { label: 'Features', href: '#features' }, { label: 'News', href: '/blog' }] },
-                            { items: [{ label: 'Community', href: '#product' }, { label: 'Team', href: '#team' }, { label: 'FAQ', href: '#faq' }] },
-                            { items: [{ label: 'Contact', href: '#contact' }, { label: 'Privacy Policy', href: '#' }, { label: 'Terms of Service', href: '#' }] }
-                        ]}
+                        columns={footerColumns}
                         logoText="Star Wars Fan Club"
                         containerClassName="bg-background-accent text-foreground"
                     />