diff --git a/src/app/account/page.tsx b/src/app/account/page.tsx
index a5bb2cf..945e311 100644
--- a/src/app/account/page.tsx
+++ b/src/app/account/page.tsx
@@ -11,6 +11,7 @@ export default function AccountPage() {
     { name: "Shop", id: "shop" },
     { name: "Game", id: "game" },
     { name: "Rewards", id: "rewards" },
+    { name: "Tracking", id: "tracking" },
   ];
 
   const footerColumns = [
@@ -155,4 +156,4 @@ export default function AccountPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 4258b94..a37a970 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -18,6 +18,7 @@ export default function HomePage() {
     { name: "Shop", id: "shop" },
     { name: "Game", id: "game" },
     { name: "Rewards", id: "rewards" },
+    { name: "Tracking", id: "tracking" },
   ];
 
   const footerColumns = [
@@ -125,65 +126,23 @@ export default function HomePage() {
           animationType="slide-up"
           products={[
             {
-              id: "organic-tomatoes",
-              brand: "Sunrise Farm",
-              name: "Organic Heirloom Tomatoes",
-              price: "$8.99/lb",
-              rating: 5,
-              reviewCount: "324",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=1",
-              imageAlt: "Fresh organic heirloom tomatoes",
-            },
+              id: "organic-tomatoes",              brand: "Sunrise Farm",              name: "Organic Heirloom Tomatoes",              price: "$8.99/lb",              rating: 5,
+              reviewCount: "324",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=1",              imageAlt: "Fresh organic heirloom tomatoes"},
             {
-              id: "farmer-lettuce",
-              brand: "Green Valley",
-              name: "Farmer's Market Lettuce Mix",
-              price: "$5.49",
-              rating: 4.8,
-              reviewCount: "287",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/fresh-green-lettuce-and-mixed-salad-gree-1773952722540-43afbb60.png?_wi=1",
-              imageAlt: "Fresh green lettuce mix",
-            },
+              id: "farmer-lettuce",              brand: "Green Valley",              name: "Farmer's Market Lettuce Mix",              price: "$5.49",              rating: 4.8,
+              reviewCount: "287",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/fresh-green-lettuce-and-mixed-salad-gree-1773952722540-43afbb60.png?_wi=1",              imageAlt: "Fresh green lettuce mix"},
             {
-              id: "local-carrots",
-              brand: "Root River Farm",
-              name: "Sweet Local Carrots",
-              price: "$4.99/lb",
-              rating: 4.9,
-              reviewCount: "401",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/beautiful-bundle-of-fresh-orange-carrots-1773952725629-55017105.png?_wi=1",
-              imageAlt: "Fresh orange sweet carrots",
-            },
+              id: "local-carrots",              brand: "Root River Farm",              name: "Sweet Local Carrots",              price: "$4.99/lb",              rating: 4.9,
+              reviewCount: "401",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/beautiful-bundle-of-fresh-orange-carrots-1773952725629-55017105.png?_wi=1",              imageAlt: "Fresh orange sweet carrots"},
             {
-              id: "berries-mixed",
-              brand: "Berry Hill",
-              name: "Mixed Organic Berries",
-              price: "$12.99/pint",
-              rating: 5,
-              reviewCount: "512",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/vibrant-mix-of-fresh-berries-strawberrie-1773952722632-8f257455.png?_wi=1",
-              imageAlt: "Fresh mixed organic berries",
-            },
+              id: "berries-mixed",              brand: "Berry Hill",              name: "Mixed Organic Berries",              price: "$12.99/pint",              rating: 5,
+              reviewCount: "512",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/vibrant-mix-of-fresh-berries-strawberrie-1773952722632-8f257455.png?_wi=1",              imageAlt: "Fresh mixed organic berries"},
             {
-              id: "apples-crisp",
-              brand: "Orchard Peak",
-              name: "Crisp Apple Variety Pack",
-              price: "$7.99",
-              rating: 4.7,
-              reviewCount: "198",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/variety-of-fresh-crisp-apples-red-green--1773952722619-4b793e4e.png?_wi=1",
-              imageAlt: "Variety of crisp fresh apples",
-            },
+              id: "apples-crisp",              brand: "Orchard Peak",              name: "Crisp Apple Variety Pack",              price: "$7.99",              rating: 4.7,
+              reviewCount: "198",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/variety-of-fresh-crisp-apples-red-green--1773952722619-4b793e4e.png?_wi=1",              imageAlt: "Variety of crisp fresh apples"},
             {
-              id: "corn-sweet",
-              brand: "Prairie Gold",
-              name: "Sweet Corn Bundle",
-              price: "$6.49/6ears",
-              rating: 4.9,
-              reviewCount: "267",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/bundle-of-fresh-sweet-corn-ears-with-gre-1773952722114-5ac5f7cb.png?_wi=1",
-              imageAlt: "Bundle of fresh sweet corn",
-            },
+              id: "corn-sweet",              brand: "Prairie Gold",              name: "Sweet Corn Bundle",              price: "$6.49/6ears",              rating: 4.9,
+              reviewCount: "267",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/bundle-of-fresh-sweet-corn-ears-with-gre-1773952722114-5ac5f7cb.png?_wi=1",              imageAlt: "Bundle of fresh sweet corn"},
           ]}
         />
       </div>
@@ -192,10 +151,7 @@ export default function HomePage() {
         <TextSplitAbout
           title="Supporting Sustainable Agriculture"
           description={[
-            "Greenwich Agro connects conscious consumers directly with local farmers who practice sustainable, organic agriculture. We believe in transparency, quality, and rewarding community participation.",
-            "Our GreenToken system incentivizes sustainable shopping choices. Every purchase earns tokens that unlock exclusive rewards, discounts, and access to our community features.",
-            "Join thousands of farmers and customers building a more sustainable food system together.",
-          ]}
+            "Greenwich Agro connects conscious consumers directly with local farmers who practice sustainable, organic agriculture. We believe in transparency, quality, and rewarding community participation.",            "Our GreenToken system incentivizes sustainable shopping choices. Every purchase earns tokens that unlock exclusive rewards, discounts, and access to our community features.",            "Join thousands of farmers and customers building a more sustainable food system together."]}
           buttons={[{ text: "Become a Farmer Partner", href: "/farmer-signup" }]}
           buttonAnimation="slide-up"
           useInvertedBackground={true}
@@ -216,26 +172,11 @@ export default function HomePage() {
           animationType="slide-up"
           features={[
             {
-              id: "token-earnings",
-              title: "Earn While Shopping",
-              description: "Get 1 GreenToken for every $1 spent on farm products. Tokens accumulate in your account and never expire.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/abstract-illustration-showing-earning-re-1773952722454-688ee654.png?_wi=1",
-              imageAlt: "GreenToken earning illustration",
-            },
+              id: "token-earnings",              title: "Earn While Shopping",              description: "Get 1 GreenToken for every $1 spent on farm products. Tokens accumulate in your account and never expire.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/abstract-illustration-showing-earning-re-1773952722454-688ee654.png?_wi=1",              imageAlt: "GreenToken earning illustration"},
             {
-              id: "token-redemption",
-              title: "Redeem for Rewards",
-              description: "Convert your tokens into exclusive discounts, free products, or early access to seasonal farmers market events.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/illustration-showing-redemption-or-gift--1773952722441-831a3fff.png?_wi=1",
-              imageAlt: "Token redemption rewards",
-            },
+              id: "token-redemption",              title: "Redeem for Rewards",              description: "Convert your tokens into exclusive discounts, free products, or early access to seasonal farmers market events.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/illustration-showing-redemption-or-gift--1773952722441-831a3fff.png?_wi=1",              imageAlt: "Token redemption rewards"},
             {
-              id: "token-bonuses",
-              title: "Bonus Opportunities",
-              description: "Play our Seed Clicker game and complete daily challenges to earn bonus tokens and unlock special achievements.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/gamification-illustration-showing-bonus--1773952723850-d36654fd.png?_wi=1",
-              imageAlt: "Bonus token opportunities",
-            },
+              id: "token-bonuses",              title: "Bonus Opportunities",              description: "Play our Seed Clicker game and complete daily challenges to earn bonus tokens and unlock special achievements.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/gamification-illustration-showing-bonus--1773952723850-d36654fd.png?_wi=1",              imageAlt: "Bonus token opportunities"},
           ]}
         />
       </div>
@@ -255,26 +196,11 @@ export default function HomePage() {
           animationType="slide-up"
           features={[
             {
-              id: "seed-clicks",
-              title: "Simple Click Mechanics",
-              description: "Click the seed button to start earning tokens. Every 10 clicks grants you 5 GreenTokens. No complex rules, just pure engagement.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/illustration-of-a-seed-or-click-game-mec-1773952723110-970b7fd7.png?_wi=1",
-              imageAlt: "Seed clicker game mechanics",
-            },
+              id: "seed-clicks",              title: "Simple Click Mechanics",              description: "Click the seed button to start earning tokens. Every 10 clicks grants you 5 GreenTokens. No complex rules, just pure engagement.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/illustration-of-a-seed-or-click-game-mec-1773952723110-970b7fd7.png?_wi=1",              imageAlt: "Seed clicker game mechanics"},
             {
-              id: "daily-limits",
-              title: "Smart Daily Limits",
-              description: "Earn up to 50 tokens per day through clicking. The limit resets daily, encouraging regular engagement without creating imbalance.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/illustration-showing-daily-reset-and-lim-1773952723043-e6d0ea76.png?_wi=1",
-              imageAlt: "Daily token limits illustration",
-            },
+              id: "daily-limits",              title: "Smart Daily Limits",              description: "Earn up to 50 tokens per day through clicking. The limit resets daily, encouraging regular engagement without creating imbalance.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/illustration-showing-daily-reset-and-lim-1773952723043-e6d0ea76.png?_wi=1",              imageAlt: "Daily token limits illustration"},
             {
-              id: "leaderboards",
-              title: "Community Competition",
-              description: "Compete with other users on weekly and monthly leaderboards. Top earners unlock special badges and exclusive rewards.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/leaderboard-and-competition-illustration-1773952724140-464fb0ad.png?_wi=1",
-              imageAlt: "Community leaderboards and rankings",
-            },
+              id: "leaderboards",              title: "Community Competition",              description: "Compete with other users on weekly and monthly leaderboards. Top earners unlock special badges and exclusive rewards.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/leaderboard-and-competition-illustration-1773952724140-464fb0ad.png?_wi=1",              imageAlt: "Community leaderboards and rankings"},
           ]}
         />
       </div>
@@ -292,59 +218,23 @@ export default function HomePage() {
           animationType="slide-up"
           testimonials={[
             {
-              id: "farmer-testimonial-1",
-              name: "Maria Chen",
-              role: "Organic Farmer",
-              company: "Sunrise Farm",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-woman-farmer--1773952721905-3fb09adf.png",
-              imageAlt: "Maria Chen, farmer",
-            },
+              id: "farmer-testimonial-1",              name: "Maria Chen",              role: "Organic Farmer",              company: "Sunrise Farm",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-woman-farmer--1773952721905-3fb09adf.png",              imageAlt: "Maria Chen, farmer"},
             {
-              id: "customer-testimonial-1",
-              name: "David Rodriguez",
-              role: "Community Organizer",
-              company: "Local Food Network",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-man-in-his-30-1773952722833-bbb856f8.png",
-              imageAlt: "David Rodriguez, community organizer",
-            },
+              id: "customer-testimonial-1",              name: "David Rodriguez",              role: "Community Organizer",              company: "Local Food Network",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-man-in-his-30-1773952722833-bbb856f8.png",              imageAlt: "David Rodriguez, community organizer"},
             {
-              id: "farmer-testimonial-2",
-              name: "Sarah Williams",
-              role: "Sustainable Farmer",
-              company: "Green Valley Farm",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-woman-in-her--1773952722793-b271871d.png",
-              imageAlt: "Sarah Williams, farmer",
-            },
+              id: "farmer-testimonial-2",              name: "Sarah Williams",              role: "Sustainable Farmer",              company: "Green Valley Farm",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-woman-in-her--1773952722793-b271871d.png",              imageAlt: "Sarah Williams, farmer"},
             {
-              id: "customer-testimonial-2",
-              name: "James Lee",
-              role: "Urban Gardener",
-              company: "City Farm Collective",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-man-in-his-30-1773952722776-aae5d470.png",
-              imageAlt: "James Lee, urban gardener",
-            },
+              id: "customer-testimonial-2",              name: "James Lee",              role: "Urban Gardener",              company: "City Farm Collective",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-man-in-his-30-1773952722776-aae5d470.png",              imageAlt: "James Lee, urban gardener"},
             {
-              id: "customer-testimonial-3",
-              name: "Emily Martinez",
-              role: "Food Enthusiast",
-              company: "Healthy Living Advocate",
-              rating: 4.8,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-woman-in-her--1773952722953-d2ed00c6.png",
-              imageAlt: "Emily Martinez, food enthusiast",
-            },
+              id: "customer-testimonial-3",              name: "Emily Martinez",              role: "Food Enthusiast",              company: "Healthy Living Advocate",              rating: 4.8,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-a-professional-woman-in-her--1773952722953-d2ed00c6.png",              imageAlt: "Emily Martinez, food enthusiast"},
             {
-              id: "farmer-testimonial-3",
-              name: "Robert Thompson",
-              role: "Family Farmer",
-              company: "Heritage Farm Co",
-              rating: 5,
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-an-experienced-male-farmer-i-1773952724115-c93ae7fa.png",
-              imageAlt: "Robert Thompson, family farmer",
-            },
+              id: "farmer-testimonial-3",              name: "Robert Thompson",              role: "Family Farmer",              company: "Heritage Farm Co",              rating: 5,
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/portrait-of-an-experienced-male-farmer-i-1773952724115-c93ae7fa.png",              imageAlt: "Robert Thompson, family farmer"},
           ]}
         />
       </div>
@@ -365,35 +255,17 @@ export default function HomePage() {
           faqsAnimation="slide-up"
           faqs={[
             {
-              id: "faq-1",
-              title: "How do I earn GreenTokens?",
-              content: "You earn 1 GreenToken for every $1 you spend on farm products. Additionally, you can earn bonus tokens by playing our Seed Clicker game (up to 50 per day), completing daily challenges, and referring friends to the platform.",
-            },
+              id: "faq-1",              title: "How do I earn GreenTokens?",              content: "You earn 1 GreenToken for every $1 you spend on farm products. Additionally, you can earn bonus tokens by playing our Seed Clicker game (up to 50 per day), completing daily challenges, and referring friends to the platform."},
             {
-              id: "faq-2",
-              title: "Can I redeem my GreenTokens?",
-              content: "Yes! GreenTokens can be redeemed for discounts on future purchases, free products, priority access to new farmer partnerships, and exclusive community events. Visit your Rewards page to see current redemption options.",
-            },
+              id: "faq-2",              title: "Can I redeem my GreenTokens?",              content: "Yes! GreenTokens can be redeemed for discounts on future purchases, free products, priority access to new farmer partnerships, and exclusive community events. Visit your Rewards page to see current redemption options."},
             {
-              id: "faq-3",
-              title: "How does the Seed Clicker game work?",
-              content: "Click the seed button to earn tokens. Every 10 clicks awards you 5 tokens. You can earn up to 50 tokens per day through clicking. The daily limit resets at midnight, and you can compete on leaderboards for additional rewards.",
-            },
+              id: "faq-3",              title: "How does the Seed Clicker game work?",              content: "Click the seed button to earn tokens. Every 10 clicks awards you 5 tokens. You can earn up to 50 tokens per day through clicking. The daily limit resets at midnight, and you can compete on leaderboards for additional rewards."},
             {
-              id: "faq-4",
-              title: "Is there a subscription required?",
-              content: "No! Greenwich Agro is completely free to use. There are no hidden fees or mandatory subscriptions. You can shop and earn tokens at your own pace.",
-            },
+              id: "faq-4",              title: "Is there a subscription required?",              content: "No! Greenwich Agro is completely free to use. There are no hidden fees or mandatory subscriptions. You can shop and earn tokens at your own pace."},
             {
-              id: "faq-5",
-              title: "How do I know the products are fresh?",
-              content: "All products are sourced directly from verified local farmers on our platform. Each farmer profile shows their farming practices, certifications, and customer reviews. Products are typically harvested within 24-48 hours of your order.",
-            },
+              id: "faq-5",              title: "How do I know the products are fresh?",              content: "All products are sourced directly from verified local farmers on our platform. Each farmer profile shows their farming practices, certifications, and customer reviews. Products are typically harvested within 24-48 hours of your order."},
             {
-              id: "faq-6",
-              title: "Can farmers sell on Greenwich Agro?",
-              content: "Yes! We welcome sustainable farmers to join our network. Complete our farmer verification process to list your products. We provide tools to manage inventory, pricing, and customer interactions directly through our platform.",
-            },
+              id: "faq-6",              title: "Can farmers sell on Greenwich Agro?",              content: "Yes! We welcome sustainable farmers to join our network. Complete our farmer verification process to list your products. We provide tools to manage inventory, pricing, and customer interactions directly through our platform."},
           ]}
         />
       </div>
@@ -406,4 +278,4 @@ export default function HomePage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 12fa47b..2c66667 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -15,6 +15,7 @@ export default function ShopPage() {
     { name: "Shop", id: "shop" },
     { name: "Game", id: "game" },
     { name: "Rewards", id: "rewards" },
+    { name: "Tracking", id: "tracking" },
   ];
 
   const footerColumns = [
@@ -81,9 +82,7 @@ export default function ShopPage() {
             id: item.id,
           }))}
           button={{
-            text: "Account",
-            href: "/account",
-          }}
+            text: "Account",            href: "/account"}}
         />
       </div>
 
@@ -102,65 +101,23 @@ export default function ShopPage() {
           animationType="slide-up"
           products={[
             {
-              id: "organic-tomatoes",
-              brand: "Sunrise Farm",
-              name: "Organic Heirloom Tomatoes",
-              price: "$8.99/lb",
-              rating: 5,
-              reviewCount: "324",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=2",
-              imageAlt: "Fresh organic heirloom tomatoes",
-            },
+              id: "organic-tomatoes",              brand: "Sunrise Farm",              name: "Organic Heirloom Tomatoes",              price: "$8.99/lb",              rating: 5,
+              reviewCount: "324",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=2",              imageAlt: "Fresh organic heirloom tomatoes"},
             {
-              id: "farmer-lettuce",
-              brand: "Green Valley",
-              name: "Farmer's Market Lettuce Mix",
-              price: "$5.49",
-              rating: 4.8,
-              reviewCount: "287",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/fresh-green-lettuce-and-mixed-salad-gree-1773952722540-43afbb60.png?_wi=2",
-              imageAlt: "Fresh green lettuce mix",
-            },
+              id: "farmer-lettuce",              brand: "Green Valley",              name: "Farmer's Market Lettuce Mix",              price: "$5.49",              rating: 4.8,
+              reviewCount: "287",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/fresh-green-lettuce-and-mixed-salad-gree-1773952722540-43afbb60.png?_wi=2",              imageAlt: "Fresh green lettuce mix"},
             {
-              id: "local-carrots",
-              brand: "Root River Farm",
-              name: "Sweet Local Carrots",
-              price: "$4.99/lb",
-              rating: 4.9,
-              reviewCount: "401",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/beautiful-bundle-of-fresh-orange-carrots-1773952725629-55017105.png?_wi=2",
-              imageAlt: "Fresh orange sweet carrots",
-            },
+              id: "local-carrots",              brand: "Root River Farm",              name: "Sweet Local Carrots",              price: "$4.99/lb",              rating: 4.9,
+              reviewCount: "401",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/beautiful-bundle-of-fresh-orange-carrots-1773952725629-55017105.png?_wi=2",              imageAlt: "Fresh orange sweet carrots"},
             {
-              id: "berries-mixed",
-              brand: "Berry Hill",
-              name: "Mixed Organic Berries",
-              price: "$12.99/pint",
-              rating: 5,
-              reviewCount: "512",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/vibrant-mix-of-fresh-berries-strawberrie-1773952722632-8f257455.png?_wi=2",
-              imageAlt: "Fresh mixed organic berries",
-            },
+              id: "berries-mixed",              brand: "Berry Hill",              name: "Mixed Organic Berries",              price: "$12.99/pint",              rating: 5,
+              reviewCount: "512",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/vibrant-mix-of-fresh-berries-strawberrie-1773952722632-8f257455.png?_wi=2",              imageAlt: "Fresh mixed organic berries"},
             {
-              id: "apples-crisp",
-              brand: "Orchard Peak",
-              name: "Crisp Apple Variety Pack",
-              price: "$7.99",
-              rating: 4.7,
-              reviewCount: "198",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/variety-of-fresh-crisp-apples-red-green--1773952722619-4b793e4e.png?_wi=2",
-              imageAlt: "Variety of crisp fresh apples",
-            },
+              id: "apples-crisp",              brand: "Orchard Peak",              name: "Crisp Apple Variety Pack",              price: "$7.99",              rating: 4.7,
+              reviewCount: "198",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/variety-of-fresh-crisp-apples-red-green--1773952722619-4b793e4e.png?_wi=2",              imageAlt: "Variety of crisp fresh apples"},
             {
-              id: "corn-sweet",
-              brand: "Prairie Gold",
-              name: "Sweet Corn Bundle",
-              price: "$6.49/6ears",
-              rating: 4.9,
-              reviewCount: "267",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/bundle-of-fresh-sweet-corn-ears-with-gre-1773952722114-5ac5f7cb.png?_wi=2",
-              imageAlt: "Bundle of fresh sweet corn",
-            },
+              id: "corn-sweet",              brand: "Prairie Gold",              name: "Sweet Corn Bundle",              price: "$6.49/6ears",              rating: 4.9,
+              reviewCount: "267",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/bundle-of-fresh-sweet-corn-ears-with-gre-1773952722114-5ac5f7cb.png?_wi=2",              imageAlt: "Bundle of fresh sweet corn"},
           ]}
         />
       </div>
@@ -178,26 +135,11 @@ export default function ShopPage() {
           animationType="slide-up"
           features={[
             {
-              id: "direct-farmers",
-              title: "Direct From Farmers",
-              description: "Skip the middleman and buy directly from verified local farmers. Get fresher produce while supporting sustainable agricultural practices.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/a-vibrant-agricultural-marketplace-scene-1773952724037-59dfe403.png?_wi=2",
-              imageAlt: "Direct farmer connection",
-            },
+              id: "direct-farmers",              title: "Direct From Farmers",              description: "Skip the middleman and buy directly from verified local farmers. Get fresher produce while supporting sustainable agricultural practices.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/a-vibrant-agricultural-marketplace-scene-1773952724037-59dfe403.png?_wi=2",              imageAlt: "Direct farmer connection"},
             {
-              id: "guaranteed-fresh",
-              title: "Guaranteed Fresh",
-              description: "All products are harvested within 24-48 hours of your order. Farm-to-table freshness with complete traceability and transparency.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=3",
-              imageAlt: "Fresh produce guarantee",
-            },
+              id: "guaranteed-fresh",              title: "Guaranteed Fresh",              description: "All products are harvested within 24-48 hours of your order. Farm-to-table freshness with complete traceability and transparency.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=3",              imageAlt: "Fresh produce guarantee"},
             {
-              id: "earn-rewards",
-              title: "Earn While Shopping",
-              description: "Every purchase earns you GreenTokens that accumulate for exclusive discounts, free products, and community rewards.",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/abstract-illustration-showing-earning-re-1773952722454-688ee654.png?_wi=3",
-              imageAlt: "Rewards and tokens",
-            },
+              id: "earn-rewards",              title: "Earn While Shopping",              description: "Every purchase earns you GreenTokens that accumulate for exclusive discounts, free products, and community rewards.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/abstract-illustration-showing-earning-re-1773952722454-688ee654.png?_wi=3",              imageAlt: "Rewards and tokens"},
           ]}
         />
       </div>
@@ -218,20 +160,11 @@ export default function ShopPage() {
           faqsAnimation="slide-up"
           faqs={[
             {
-              id: "shop-faq-1",
-              title: "What are the shipping costs?",
-              content: "Shipping costs depend on your location and order size. Orders over $50 qualify for free local delivery in our service area. Rural areas may have an additional fee. All shipping fees are calculated at checkout.",
-            },
+              id: "shop-faq-1",              title: "What are the shipping costs?",              content: "Shipping costs depend on your location and order size. Orders over $50 qualify for free local delivery in our service area. Rural areas may have an additional fee. All shipping fees are calculated at checkout."},
             {
-              id: "shop-faq-2",
-              title: "How quickly will I receive my order?",
-              content: "Most orders are delivered within 1-2 business days. Products are picked fresh from farms on the day of your order. During peak season, delivery may take up to 3 business days.",
-            },
+              id: "shop-faq-2",              title: "How quickly will I receive my order?",              content: "Most orders are delivered within 1-2 business days. Products are picked fresh from farms on the day of your order. During peak season, delivery may take up to 3 business days."},
             {
-              id: "shop-faq-3",
-              title: "What if I'm not satisfied with my order?",
-              content: "We offer a 100% satisfaction guarantee. If any product doesn't meet your expectations, contact our support team within 24 hours for a full refund or replacement.",
-            },
+              id: "shop-faq-3",              title: "What if I'm not satisfied with my order?",              content: "We offer a 100% satisfaction guarantee. If any product doesn't meet your expectations, contact our support team within 24 hours for a full refund or replacement."},
           ]}
         />
       </div>
@@ -244,4 +177,4 @@ export default function ShopPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/tracking/page.tsx b/src/app/tracking/page.tsx
new file mode 100644
index 0000000..373f3ab
--- /dev/null
+++ b/src/app/tracking/page.tsx
@@ -0,0 +1,193 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import HeroSplitKpi from "@/components/sections/hero/HeroSplitKpi";
+import FeatureCardThree from "@/components/sections/feature/featureCardThree/FeatureCardThree";
+import FaqSplitMedia from "@/components/sections/faq/FaqSplitMedia";
+import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
+import { MapPin, Truck, Clock, HelpCircle } from "lucide-react";
+
+export default function TrackingPage() {
+  const navItems = [
+    { name: "Home", id: "home" },
+    { name: "Shop", id: "shop" },
+    { name: "Game", id: "game" },
+    { name: "Rewards", id: "rewards" },
+    { name: "Tracking", id: "tracking" },
+  ];
+
+  const footerColumns = [
+    {
+      items: [
+        { label: "Shop", href: "/shop" },
+        { label: "Categories", href: "/categories" },
+        { label: "About Farmers", href: "#about" },
+        { label: "Sustainability", href: "/sustainability" },
+      ],
+    },
+    {
+      items: [
+        { label: "My Account", href: "/account" },
+        { label: "Orders", href: "/orders" },
+        { label: "Rewards", href: "/rewards" },
+        { label: "Game", href: "/game" },
+      ],
+    },
+    {
+      items: [
+        { label: "For Farmers", href: "/farmer-signup" },
+        { label: "Partnership", href: "/partnerships" },
+        { label: "Become a Partner", href: "/become-partner" },
+        { label: "Farmer Resources", href: "/farmer-resources" },
+      ],
+    },
+    {
+      items: [
+        { label: "Contact", href: "/contact" },
+        { label: "Support", href: "/support" },
+        { label: "Privacy Policy", href: "/privacy" },
+        { label: "Terms of Service", href: "/terms" },
+      ],
+    },
+    {
+      items: [
+        { label: "Blog", href: "/blog" },
+        { label: "Press", href: "/press" },
+        { label: "Careers", href: "/careers" },
+        { label: "Community", href: "/community" },
+      ],
+    },
+  ];
+
+  return (
+    <ThemeProvider
+      defaultButtonVariant="directional-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="mediumLarge"
+      sizing="largeSmall"
+      background="floatingGradient"
+      cardStyle="outline"
+      primaryButtonStyle="shadow"
+      secondaryButtonStyle="radial-glow"
+      headingFontWeight="medium"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarLayoutFloatingInline
+          brandName="Greenwich Agro"
+          navItems={navItems}
+          button={{ text: "Account", href: "/account" }}
+        />
+      </div>
+
+      <div id="tracking-hero" data-section="tracking-hero">
+        <HeroSplitKpi
+          title="Track Your Delivery in Real-Time"
+          description="Monitor your farm-fresh orders from the moment they leave the farmer to when they arrive at your door. Real-time location tracking and logistics updates for complete transparency."
+          tag="Delivery Tracking"
+          tagIcon={MapPin}
+          tagAnimation="slide-up"
+          buttons={[
+            { text: "Track Your Order", href: "#tracking-feature" },
+            { text: "Learn More", href: "#tracking-benefits" },
+          ]}
+          buttonAnimation="slide-up"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/a-vibrant-agricultural-marketplace-scene-1773952724037-59dfe403.png?_wi=1"
+          imageAlt="Delivery tracking interface"
+          mediaAnimation="slide-up"
+          imagePosition="right"
+          kpis={[
+            { value: "Real-Time", label: "Live Location Updates" },
+            { value: "24-48h", label: "Delivery Window" },
+            { value: "100%", label: "Transparent Tracking" },
+          ]}
+          enableKpiAnimation={true}
+          background={{ variant: "plain" }}
+        />
+      </div>
+
+      <div id="tracking-feature" data-section="tracking-feature">
+        <FeatureCardThree
+          title="Advanced Logistics & Location Tracking"
+          description="Our integrated tracking system gives you complete visibility into your order's journey. From farm pickup to your doorstep, stay informed every step of the way."
+          tag="Tracking Features"
+          tagIcon={Truck}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          gridVariant="three-columns-all-equal-width"
+          animationType="slide-up"
+          features={[
+            {
+              id: "real-time-location",              title: "Real-Time Location Tracking",              description: "See exactly where your delivery is on an interactive map. Get live updates as your order moves from the farm to your address with GPS precision.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/a-vibrant-agricultural-marketplace-scene-1773952724037-59dfe403.png?_wi=2",              imageAlt: "GPS tracking map interface"},
+            {
+              id: "delivery-alerts",              title: "Smart Delivery Alerts",              description: "Receive push notifications at each stage of your delivery. Get alerts when your order is picked, packed, out for delivery, and ready for delivery window confirmation.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/close-up-of-fresh-organic-heirloom-tomat-1773952722243-5b95d929.png?_wi=2",              imageAlt: "Delivery notification alerts"},
+            {
+              id: "logistics-info",              title: "Detailed Logistics Info",              description: "View comprehensive delivery details including carrier information, estimated arrival times, delivery instructions, and direct contact with your delivery partner.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/fresh-green-lettuce-and-mixed-salad-gree-1773952722540-43afbb60.png?_wi=2",              imageAlt: "Logistics information dashboard"},
+          ]}
+        />
+      </div>
+
+      <div id="tracking-benefits" data-section="tracking-benefits">
+        <FeatureCardThree
+          title="Why Real-Time Tracking Matters"
+          description="Experience complete peace of mind with our comprehensive tracking system. Never wonder where your fresh farm produce is again."
+          tag="Benefits"
+          tagIcon={Clock}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={true}
+          gridVariant="three-columns-all-equal-width"
+          animationType="slide-up"
+          features={[
+            {
+              id: "freshness-guarantee",              title: "Freshness Guarantee",              description: "Monitor how long your delivery is in transit. Our tracking ensures your farm-fresh produce is delivered at peak freshness with minimal handling time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/bundle-of-fresh-sweet-corn-ears-with-gre-1773952722114-5ac5f7cb.png?_wi=2",              imageAlt: "Fresh produce quality tracking"},
+            {
+              id: "transparency",              title: "Complete Transparency",              description: "Know exactly which farm your order came from and trace the complete journey. Support direct connections with farmers and understand the farm-to-table process.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/variety-of-fresh-crisp-apples-red-green--1773952722619-4b793e4e.png?_wi=2",              imageAlt: "Farm transparency information"},
+            {
+              id: "control-delivery",              title: "Control Your Delivery",              description: "Schedule delivery windows that work for you. Communicate directly with drivers and reschedule if needed. You're in complete control of your delivery experience.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/vibrant-mix-of-fresh-berries-strawberrie-1773952722632-8f257455.png?_wi=2",              imageAlt: "Delivery control options"},
+          ]}
+        />
+      </div>
+
+      <div id="tracking-faq" data-section="tracking-faq">
+        <FaqSplitMedia
+          title="Tracking & Delivery Questions"
+          description="Everything you need to know about real-time tracking, delivery windows, and logistics management."
+          tag="Tracking Help"
+          tagIcon={HelpCircle}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          mediaAnimation="slide-up"
+          mediaPosition="right"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BBAbmrzyCv9ReHBA5keCBu7vFL/faq-or-help-section-illustration-show-qu-1773952723496-2a6cb048.png?_wi=2"
+          imageAlt="Tracking help illustration"
+          faqsAnimation="slide-up"
+          faqs={[
+            {
+              id: "tracking-faq-1",              title: "How do I track my order?",              content: "Log into your account and navigate to 'My Orders'. Click on any active order to see real-time tracking information including location, estimated arrival time, and driver details. You'll also receive SMS and email notifications at key stages."},
+            {
+              id: "tracking-faq-2",              title: "When will I receive my delivery?",              content: "Most deliveries arrive within 24-48 hours of order placement. You'll receive a delivery window (typically 2-4 hours) the day before delivery. You can adjust this window through your account if needed."},
+            {
+              id: "tracking-faq-3",              title: "What if I miss my delivery?",              content: "If you're not available during your delivery window, the driver will attempt to reschedule. You can reschedule directly through the tracking interface or contact our support team to arrange an alternative time."},
+            {
+              id: "tracking-faq-4",              title: "Can I see which farm my order came from?",              content: "Yes! Your tracking page shows the specific farms that provided each item in your order, along with their certifications and farming practices. Click on any farm to learn more about their story."},
+            {
+              id: "tracking-faq-5",              title: "How is freshness maintained during delivery?",              content: "All deliveries use temperature-controlled vehicles and insulated packaging with ice packs. The tracking system monitors transit time to ensure minimal delay between farm and door. Most produce remains fresh for 5-7 days after delivery."},
+            {
+              id: "tracking-faq-6",              title: "What if there's an issue with my delivery?",              content: "Contact our support team immediately through the tracking interface. We offer 100% satisfaction guarantees. If anything is damaged or missing, we'll arrange a replacement or refund within 24 hours."},
+          ]}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterLogoEmphasis
+          logoText="Greenwich Agro"
+          columns={footerColumns}
+        />
+      </div>
+    </ThemeProvider>
+  );
+}