diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
index 6cb05ef..30a881d 100644
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import React from 'react';
-import Link from 'next/link';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { useBlogPosts } from "@/hooks/useBlogPosts";
 
@@ -18,14 +17,15 @@ export default function BlogPage() {
     const { posts, isLoading } = useBlogPosts();
 
     const navItems = [
-        { name: "Home", id: "/" },
-        { name: "Shop", id: "/shop" },
-        { name: "About", id: "/#about" },
-        { name: "Features", id: "/#features" },
-        { name: "Testimonials", id: "/#testimonials" },
-        { name: "FAQ", id: "/#faq" },
-        { name: "Contact", id: "/#contact" },
-    ];
+        { name: 'Home', id: '/' },
+        { name: 'Shop', id: '/shop' },
+        { name: 'Blog', id: '/blog' },
+        { name: 'About', id: '/#about' },
+        { name: 'Features', id: '/#features' },
+        { name: 'Testimonials', id: '/#testimonials' },
+        { name: 'FAQ', id: '/#faq' },
+        { name: 'Contact', id: '/#contact' },
+      ];
 
     return (
         <ThemeProvider
@@ -59,7 +59,7 @@ export default function BlogPage() {
                 <main className="pt-24">
                      <div id="blog" data-section="blog">
                         <BlogCardTwo
-                            blogPosts={posts}
+                            posts={posts}
                             title="From Our Blog"
                             description="Explore the latest stories, tips, and insights from our team."
                             animationType="slide-up"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index f938476..9484476 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import React from 'react';
-import Link from 'next/link';
 import { Award, CheckCircle, Heart, HelpCircle, Mail, MessageSquare, Sparkles } from 'lucide-react';
 import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
 
@@ -17,13 +16,14 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
 
 export default function LandingPage() {
   const navItems = [
+    { name: 'Home', id: '/' },
     { name: 'Shop', id: '/shop' },
-    { name: 'About', id: '#about' },
-    { name: 'Features', id: '#features' },
-    { name: 'Testimonials', id: '#testimonials' },
-    { name: 'FAQ', id: '#faq' },
-    { name: 'Contact', id: '#contact' },
     { name: 'Blog', id: '/blog' },
+    { name: 'About', id: '/#about' },
+    { name: 'Features', id: '/#features' },
+    { name: 'Testimonials', id: '/#testimonials' },
+    { name: 'FAQ', id: '/#faq' },
+    { name: 'Contact', id: '/#contact' },
   ];
 
   return (
@@ -179,7 +179,7 @@ export default function LandingPage() {
           textBoxClassName="text-foreground"
           textBoxTitleClassName="text-foreground"
           textBoxDescriptionClassName="text-foreground"
-          tagClassName="text-accent"
+          textBoxTagClassName="text-accent"
           quoteCardClassName="bg-background/80 shadow-soft-shadow"
           testimonialTitleClassName="text-foreground"
           quoteClassName="text-foreground/90"
@@ -212,7 +212,7 @@ export default function LandingPage() {
           textBoxClassName="text-foreground"
           textBoxTitleClassName="text-foreground"
           textBoxDescriptionClassName="text-foreground"
-          tagClassName="text-accent"
+          textBoxTagClassName="text-accent"
           faqsContainerClassName="bg-card shadow-soft-shadow"
           accordionTitleClassName="text-foreground"
           accordionIconClassName="text-primary-cta"
diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx
index cf2d7af..92bc813 100644
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -2,7 +2,6 @@
 
 import { Suspense, use, useCallback } from "react";
 import { useRouter } from "next/navigation";
-import Link from 'next/link';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -17,15 +16,15 @@ interface ProductPageProps {
 }
 
 const navItems = [
-    { name: "Home", id: "/" },
-    { name: "Shop", id: "/shop" },
-    { name: "About", id: "/#about" },
-    { name: "Features", id: "/#features" },
-    { name: "Testimonials", id: "/#testimonials" },
-    { name: "FAQ", id: "/#faq" },
-    { name: "Contact", id: "/#contact" },
-    { name: "Blog", id: "/blog" },
-];
+    { name: 'Home', id: '/' },
+    { name: 'Shop', id: '/shop' },
+    { name: 'Blog', id: '/blog' },
+    { name: 'About', id: '/#about' },
+    { name: 'Features', id: '/#features' },
+    { name: 'Testimonials', id: '/#testimonials' },
+    { name: 'FAQ', id: '/#faq' },
+    { name: 'Contact', id: '/#contact' },
+  ];
 
 
 export default function ProductPage({ params }: ProductPageProps) {
diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 75bc78e..57947f6 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -2,21 +2,21 @@
 
 import { Suspense } from "react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import Link from 'next/link';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
 import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
 import { useProductCatalog } from "@/hooks/useProductCatalog";
 
 const navItems = [
-    { name: "Home", id: "/" },
-    { name: "About", id: "/#about" },
-    { name: "Features", id: "/#features" },
-    { name: "Testimonials", id: "/#testimonials" },
-    { name: "FAQ", id: "/#faq" },
-    { name: "Contact", id: "/#contact" },
-    { name: "Blog", id: "/blog" },
-];
+    { name: 'Home', id: '/' },
+    { name: 'Shop', id: '/shop' },
+    { name: 'Blog', id: '/blog' },
+    { name: 'About', id: '/#about' },
+    { name: 'Features', id: '/#features' },
+    { name: 'Testimonials', id: '/#testimonials' },
+    { name: 'FAQ', id: '/#faq' },
+    { name: 'Contact', id: '/#contact' },
+  ];
 
 function ShopPageContent() {
     const {