diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 6b92ad8..14ffc0c 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -6,28 +6,29 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
 
-const products = [
-  {
-    id: "1",    name: "AI Assistant Pro",    price: "$49.99",    imageSrc: "http://img.b2bpic.net/free-photo/blue-glowing-artificial-intelligence-brain-background_53876-135832.jpg",    imageAlt: "AI Assistant Pro software icon"
-  },
-  {
-    id: "2",    name: "Smart Scheduler Watch",    price: "$199.99",    imageSrc: "http://img.b2bpic.net/free-photo/smartwatch-with-augmented-reality_1134-124.jpg",    imageAlt: "Smartwatch displaying a calendar"
-  },
-  {
-    id: "3",    name: "Productivity Boost E-book",    price: "$9.99",    imageSrc: "http://img.b2bpic.net/free-photo/close-up-desk-with-book-glasses_23-2148455806.jpg",    imageAlt: "E-book on a desk"
-  },
-  {
-    id: "4",    name: "Team Collaboration Hub",    price: "$99.99",    imageSrc: "http://img.b2bpic.net/free-photo/group-diverse-people-working-office_23-2149307049.jpg",    imageAlt: "Team collaborating on a large screen"
-  },
-  {
-    id: "5",    name: "AI Planner Extended License",    price: "$249.99",    imageSrc: "http://img.b2bpic.net/free-photo/futuristic-office-work-station_23-2150190561.jpg",    imageAlt: "Futuristic office workspace"
-  },
-  {
-    id: "6",    name: "Data Analytics Module",    price: "$149.99",    imageSrc: "http://img.b2bpic.net/free-photo/business-graph-with-upward-arrow_1134-43.jpg",    imageAlt: "Data analytics dashboard"
-  }
-];
-
 export default function ShopPage() {
+  const commonNavItems = [
+    { name: "Home", id: "/" },
+    { name: "Planner", id: "/planner" },
+    { name: "Reminders", id: "/reminders" },
+    { name: "Shop", id: "/shop" },
+    { name: "Cart", id: "/cart" },
+    { name: "Features", id: "/#features" },
+    { name: "About", id: "/#about" },
+    { name: "Pricing", id: "/#pricing" },
+    { name: "Testimonials", id: "/#testimonials" },
+    { name: "FAQ", id: "/#faq" },
+    { name: "Newsletter", id: "/#newsletter" },
+    { name: "Contact", id: "/#contact" }
+  ];
+
+  const products = [
+    { onProductClick: () => 'product1', id: 'product1', name: 'AI Smart Scheduler', price: '$29.99', imageSrc: '/images/product-1.png', imageAlt: 'AI Smart Scheduler' },
+    { onProductClick: () => 'product2', id: 'product2', name: 'Task Manager Pro', price: '$19.99', imageSrc: '/images/product-2.png', imageAlt: 'Task Manager Pro' },
+    { onProductClick: () => 'product3', id: 'product3', name: 'Goal Tracker Elite', price: '$39.99', imageSrc: '/images/product-3.png', imageAlt: 'Goal Tracker Elite' },
+    { onProductClick: () => 'product4', id: 'product4', name: 'Reminder Buddy', price: '$9.99', imageSrc: '/images/product-4.png', imageAlt: 'Reminder Buddy' }
+  ];
+
   return (
     <ThemeProvider
       defaultButtonVariant="bounce-effect"
@@ -44,40 +45,20 @@ export default function ShopPage() {
       <ReactLenis root>
         <div id="nav" data-section="nav">
           <NavbarStyleApple
-            navItems={[
-              {
-                name: "Home", id: "#home"},
-              {
-                name: "Features", id: "#features"},
-              {
-                name: "About", id: "#about"},
-              {
-                name: "Pricing", id: "#pricing"},
-              {
-                name: "Testimonials", id: "#testimonials"},
-              {
-                name: "FAQ", id: "#faq"},
-              {
-                name: "Contact", id: "#contact"},
-              {
-                name: "Shop", id: "/shop"},
-              {
-                name: "Cart", id: "/cart"}
-            ]}
+            navItems={commonNavItems}
             brandName="AI Planner Pro"
           />
         </div>
 
-        <div id="shop-products" data-section="shop-products" className="py-20 min-h-screen">
+        <div id="shop-products" data-section="shop-products" className="py-20">
           <ProductCardOne
             title="Our Products"
-            description="Discover intelligent tools and resources to boost your productivity."
-            products={products.map(product => ({
-              ...product,
-              onProductClick: () => window.location.href = `/shop/${product.id}`
-            }))}
+            description="Explore our range of powerful AI planning tools."
+            products={products}
             gridVariant="three-columns-all-equal-width"
             animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
           />
         </div>
 
@@ -87,23 +68,23 @@ export default function ShopPage() {
             columns={[
               {
                 title: "Product", items: [
-                  { label: "Features", href: "#features"},
-                  { label: "Pricing", href: "#pricing"},
+                  { label: "Features", href: "/#features"},
+                  { label: "Pricing", href: "/#pricing"},
                   { label: "Integrations", href: "#"},
                   { label: "Shop", href: "/shop"}
                 ],
               },
               {
                 title: "Company", items: [
-                  { label: "About Us", href: "#about"},
-                  { label: "Testimonials", href: "#testimonials"},
+                  { label: "About Us", href: "/#about"},
+                  { label: "Testimonials", href: "/#testimonials"},
                   { label: "Careers", href: "#"},
                 ],
               },
               {
                 title: "Support", items: [
-                  { label: "FAQ", href: "#faq"},
-                  { label: "Contact Us", href: "#contact"},
+                  { label: "FAQ", href: "/#faq"},
+                  { label: "Contact Us", href: "/#contact"},
                   { label: "Help Center", href: "#"},
                   { label: "Cart", href: "/cart"}
                 ],