diff --git a/src/components/TeamSection.tsx b/src/components/TeamSection.tsx
index e243b75..bcfb91b 100644
--- a/src/components/TeamSection.tsx
+++ b/src/components/TeamSection.tsx
@@ -5,6 +5,7 @@ import { Autoplay, Pagination } from "swiper/modules";
 import { Swiper, SwiperSlide } from "swiper/react";
 
 import { useTeam } from "@/hooks/queires/useTeam";
+import { Link } from "react-router-dom";
 
 export default function TeamSection() {
   const { data: teamdata } = useTeam();
@@ -85,16 +86,16 @@ export default function TeamSection() {
                       />
                     </div>
                     <div className="absolute inset-0 rounded-full bg-background/80 backdrop-blur-sm flex items-center justify-center gap-3 opacity-0 group-hover:opacity-100 transition-opacity duration-300">
-                      <a href={member.linkedin} target="_blank">
+                      <Link to={member.linkedin} target="_blank">
                         <Linkedin className="w-5 h-5 cursor-pointer hover:text-primary transition-colors" />
-                      </a>
-                      <a href={member.twitter} target="_blank">
+                      </Link>
+                      <Link to={member.twitter} target="_blank">
                         <Twitter className="w-5 h-5 cursor-pointer hover:text-primary transition-colors" />
-                      </a>
-                      <a href={member.github} target="_blank">
+                      </Link>
+                      <Link to={member.github} target="_blank">
                         {" "}
                         <Github className="w-5 h-5 cursor-pointer hover:text-primary transition-colors" />
-                      </a>
+                      </Link>
                     </div>
                   </div>
 
diff --git a/src/pages/BlogArticle.tsx b/src/pages/BlogArticle.tsx
index 1d37d3b..f0de011 100644
--- a/src/pages/BlogArticle.tsx
+++ b/src/pages/BlogArticle.tsx
@@ -205,9 +205,9 @@ export default function BlogArticle() {
                       <li className="text-muted-foreground">{children}</li>
                     ),
                     a: ({ href, children }) => (
-                      <a href={href} className="text-primary hover:underline">
+                      <Link to={href} className="text-primary hover:underline">
                         {children}
-                      </a>
+                      </Link>
                     ),
                     strong: ({ children }) => (
                       <strong className="font-bold text-foreground">
@@ -337,24 +337,24 @@ export default function BlogArticle() {
                 <p className="text-muted-foreground mb-4">{post.author.bio}</p>
                 <div className="flex gap-3 justify-center md:justify-start">
                   {post.author.twitter && (
-                    <a
-                      href={`https://twitter.com/${post.author.twitter}`}
+                    <Link
+                      to={`https://twitter.com/${post.author.twitter}`}
                       target="_blank"
                       rel="noopener noreferrer"
                       className="p-2 rounded-full glass hover:neon-glow transition-all"
                     >
                       <Twitter className="w-5 h-5" />
-                    </a>
+                    </Link>
                   )}
                   {post.author.linkedin && (
-                    <a
-                      href={`https://linkedin.com/in/${post.author.linkedin}`}
+                    <Link
+                      to={`https://linkedin.com/in/${post.author.linkedin}`}
                       target="_blank"
                       rel="noopener noreferrer"
                       className="p-2 rounded-full glass hover:neon-glow transition-all"
                     >
                       <Linkedin className="w-5 h-5" />
-                    </a>
+                    </Link>
                   )}
                 </div>
               </div>
diff --git a/src/pages/NotFound.tsx b/src/pages/NotFound.tsx
index 7bc2234..1b30452 100644
--- a/src/pages/NotFound.tsx
+++ b/src/pages/NotFound.tsx
@@ -1,4 +1,4 @@
-import { useLocation } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import { useEffect } from "react";
 
 const NotFound = () => {
@@ -13,9 +13,9 @@ const NotFound = () => {
       <div className="text-center">
         <h1 className="mb-4 text-4xl font-bold">404</h1>
         <p className="mb-4 text-xl text-muted-foreground">Oops! Page not found</p>
-        <a href="/" className="text-primary underline hover:text-primary/90">
+        <Link to="/" className="text-primary underline hover:text-primary/90">
           Return to Home
-        </a>
+        </Link>
       </div>
     </div>
   );
diff --git a/src/pages/ProjectDetails.tsx b/src/pages/ProjectDetails.tsx
index 8956028..0cfc0d5 100644
--- a/src/pages/ProjectDetails.tsx
+++ b/src/pages/ProjectDetails.tsx
@@ -202,8 +202,8 @@ export default function ProjectDetails() {
                   transition={{ duration: 0.5, delay: 0.4 }}
                   className="flex flex-wrap gap-4"
                 >
-                  <a
-                    href={project.liveUrl}
+                  <Link
+                    to={project.liveUrl}
                     target="_blank"
                     rel="noopener noreferrer"
                     className="w-full sm:w-auto"
@@ -212,10 +212,10 @@ export default function ProjectDetails() {
                       <ExternalLink className="w-4 h-4" />
                       View Live
                     </Button>
-                  </a>
+                  </Link>
                   {project.codeUrl && (
-                    <a
-                      href={project.codeUrl}
+                    <Link
+                      to={project.codeUrl}
                       target="_blank"
                       rel="noopener noreferrer"
                       className="w-full sm:w-auto"
@@ -227,7 +227,7 @@ export default function ProjectDetails() {
                         <Github className="w-4 h-4 text-muted-foreground" />
                         View Code
                       </Button>
-                    </a>
+                    </Link>
                   )}
                 </motion.div>
               </div>
diff --git a/src/pages/Projects.tsx b/src/pages/Projects.tsx
index 28bfdc3..343b7b8 100644
--- a/src/pages/Projects.tsx
+++ b/src/pages/Projects.tsx
@@ -167,20 +167,22 @@ export default function Projects() {
 
                       {/* Quick Links */}
                       <div className="absolute top-4 right-4 flex gap-2 opacity-0 group-hover:opacity-100 transition-opacity duration-300">
-                        <a
-                          href={project.liveUrl}
+                        <Link
+                        target="_blank"
+                          to={project.liveUrl}
                           className="p-2 rounded-full glass hover:bg-primary/20 transition-colors"
                           aria-label="View live project"
                         >
                           <ExternalLink className="w-4 h-4" />
-                        </a>
-                        <a
-                          href={project.githubUrl}
+                        </Link>
+                        <Link 
+                        target="_blank"
+                          to={project.githubUrl}
                           className="p-2 rounded-full glass hover:bg-primary/20 transition-colors"
                           aria-label="View on GitHub"
                         >
                           <Github className="w-4 h-4" />
-                        </a>
+                        </Link>
                       </div>
                     </div>