diff --git a/README.md b/README.md
index 32fd572..eb822c7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=anoopkarnik_turborepo-saas-boilerplate-code&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=anoopkarnik_turborepo-saas-boilerplate-code)
 [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=anoopkarnik_turborepo-saas-boilerplate-code&metric=coverage)](https://sonarcloud.io/summary/new_code?id=anoopkarnik_turborepo-saas-boilerplate-code)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=anoopkarnik_turborepo-saas-boilerplate-code&metric=bugs)](https://sonarcloud.io/summary/new_code?id=anoopkarnik_turborepo-saas-boilerplate-code)
-https://img.shields.io/badge/clones-{count}-brightgreen
 
 [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=anoopkarnik_turborepo-saas-boilerplate-code&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=anoopkarnik_turborepo-saas-boilerplate-code)
 [![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=anoopkarnik_turborepo-saas-boilerplate-code&metric=duplicated_lines_density)](https://sonarcloud.io/summary/new_code?id=anoopkarnik_turborepo-saas-boilerplate-code)
diff --git a/apps/nextjs-app/app/(home)/scrape-flow/workflow/_components/nodes/NodeCard.tsx b/apps/nextjs-app/app/(home)/scrape-flow/workflow/_components/nodes/NodeCard.tsx
index c0c3aa4..dc18a70 100644
--- a/apps/nextjs-app/app/(home)/scrape-flow/workflow/_components/nodes/NodeCard.tsx
+++ b/apps/nextjs-app/app/(home)/scrape-flow/workflow/_components/nodes/NodeCard.tsx
@@ -11,7 +11,7 @@ const NodeCard = ({children,nodeId,isSelected}:{nodeId: string; children: React.
     const hasInvalidInputs = invalidInputs.some((input)=>input.nodeId === nodeId);
 
     return (
-        <div role='button' onDoubleClick={()=>{
+        <div role='button' tabIndex={0} onDoubleClick={()=>{
             const node = getNode(nodeId)
             if(!node) return;
             const {position,measured } = node
diff --git a/packages/ui/src/components/molecules/custom/v1/BreadcrumbsHeader.tsx b/packages/ui/src/components/molecules/custom/v1/BreadcrumbsHeader.tsx
index e09839c..2437686 100644
--- a/packages/ui/src/components/molecules/custom/v1/BreadcrumbsHeader.tsx
+++ b/packages/ui/src/components/molecules/custom/v1/BreadcrumbsHeader.tsx
@@ -15,14 +15,14 @@ export const BreadcrumbsHeader = () => {
             <Breadcrumb>
                 <BreadcrumbList>
                     <BreadcrumbItem>
-                        <div role="button" className='capitalize cursor-pointer hover:dark:text-white hover:text-black' onClick={() => router.push("/")}>
+                        <div tabIndex={0} role="button" className='capitalize cursor-pointer hover:dark:text-white hover:text-black' onClick={() => router.push("/")}>
                             Home
                         </div>
                     </BreadcrumbItem>
                     {paths.map((path, index) => (
                         <React.Fragment key={index}>
                             <BreadcrumbItem>
-                                <div role="button" className='capitalize cursor-pointer hover:dark:text-white hover:text-black' onClick={() => router.push(getFullPath(index))}>
+                                <div role="button" tabIndex={0} className='capitalize cursor-pointer hover:dark:text-white hover:text-black' onClick={() => router.push(getFullPath(index))}>
                                     {path}
                                 </div>
                             </BreadcrumbItem>
diff --git a/packages/ui/src/components/organisms/custom/landing/v1/ContactUs.tsx b/packages/ui/src/components/organisms/custom/landing/v1/ContactUs.tsx
index 215c2e0..e1fa747 100644
--- a/packages/ui/src/components/organisms/custom/landing/v1/ContactUs.tsx
+++ b/packages/ui/src/components/organisms/custom/landing/v1/ContactUs.tsx
@@ -10,10 +10,10 @@ const ContactUs = ({lastUpdated,companyName,address,email,contactNumber}:Contact
         <p className="mb-4">Registered Address: {address}</p>
         <p className="mb-4">Operational Address: {address}</p>
         <p className="mb-4">Contact Number: {contactNumber}</p>
-        <p className="mb-4"> Email Id: &nbsp; 
-          <a href={`https://mail.google.com/mail?view=cm&fs=1&to=${email}&su=SupportEmail`} className='text-blue-500 cursor-pointer'>
-            {email}
-          </a>
+        <p className="mb-4"> Email Id: &nbsp;
+        <a href={`https://mail.google.com/mail?view=cm&fs=1&to=${email}&su=SupportEmail`} className='text-blue-500 cursor-pointer'>
+          {email}
+        </a>
         </p>
 
     </div>
diff --git a/packages/ui/src/components/organisms/custom/landing/v1/Pricing.tsx b/packages/ui/src/components/organisms/custom/landing/v1/Pricing.tsx
index a138268..43ad4a5 100644
--- a/packages/ui/src/components/organisms/custom/landing/v1/Pricing.tsx
+++ b/packages/ui/src/components/organisms/custom/landing/v1/Pricing.tsx
@@ -13,8 +13,8 @@ const Pricing = ({pricingList,supportEmailAddress}: {pricingList: PricingProps[]
       <h2 className="text-3xl md:text-4xl font-bold text-center">
         Get
         <span className="bg-gradient-to-b from-primary/60 to-primary text-transparent bg-clip-text">
-          {" "}
-          Premium{" "}
+          &nbsp;
+          Premium &nbsp;
         </span>
         Access
       </h2>
diff --git a/packages/ui/src/components/organisms/custom/landing/v1/Services.tsx b/packages/ui/src/components/organisms/custom/landing/v1/Services.tsx
index 072c8aa..ce7dc9c 100644
--- a/packages/ui/src/components/organisms/custom/landing/v1/Services.tsx
+++ b/packages/ui/src/components/organisms/custom/landing/v1/Services.tsx
@@ -11,7 +11,7 @@ export const Services = ({services}:{services:ServiceProps[]}) => {
         <div>
           <h2 className="text-3xl md:text-4xl font-bold">
             <span className="bg-gradient-to-b from-primary/60 to-primary text-transparent bg-clip-text">
-              Client-Centric{" "}
+              Client-Centric &nbsp;
             </span>
             Services
           </h2>
diff --git a/packages/ui/src/components/organisms/custom/landing/v1/Team.tsx b/packages/ui/src/components/organisms/custom/landing/v1/Team.tsx
index fb26556..d536afc 100644
--- a/packages/ui/src/components/organisms/custom/landing/v1/Team.tsx
+++ b/packages/ui/src/components/organisms/custom/landing/v1/Team.tsx
@@ -38,7 +38,7 @@ export const Team = ({teamList}:{teamList:TeamProps[]}) => {
     >
       <h2 className="text-3xl md:text-4xl font-bold">
         <span className="bg-gradient-to-b from-primary/60 to-primary text-transparent bg-clip-text">
-          Our Dedicated{" "}
+          Our Dedicated &nbsp;
         </span>
         Crew
       </h2>
diff --git a/packages/ui/src/components/organisms/custom/landing/v1/Testimonials.tsx b/packages/ui/src/components/organisms/custom/landing/v1/Testimonials.tsx
index 2cc6d42..172e729 100644
--- a/packages/ui/src/components/organisms/custom/landing/v1/Testimonials.tsx
+++ b/packages/ui/src/components/organisms/custom/landing/v1/Testimonials.tsx
@@ -15,14 +15,13 @@ const Testimonials = ({testimonials}: {testimonials: TestimonialProps[]}) => {
       id="testimonials"
       className="container py-24 sm:py-32 relative"
     >
-      <h2 className="text-3xl md:text-4xl font-bold">
-        Discover Why
-        <span className="bg-gradient-to-b from-primary/60 to-primary text-transparent bg-clip-text">
-          {" "}
-          People Love{" "}
-        </span>
-        This Micro SaaS Boilerplate Code
-      </h2>
+       <h2 className="text-3xl md:text-4xl font-bold">
+            Discover Why &nbsp;
+            <span className="bg-gradient-to-b from-primary/60 to-primary text-transparent bg-clip-text">
+            People Love &nbsp;
+            </span>
+            This Micro SaaS Boilerplate Code
+        </h2>
 
       <p className="text-xl text-muted-foreground pt-4 pb-8">
         Tweets from our happy users who have used our product and loved it.
diff --git a/packages/ui/src/components/organisms/custom/landing/v2/Testimonials.tsx b/packages/ui/src/components/organisms/custom/landing/v2/Testimonials.tsx
index 512129a..a15a1c0 100644
--- a/packages/ui/src/components/organisms/custom/landing/v2/Testimonials.tsx
+++ b/packages/ui/src/components/organisms/custom/landing/v2/Testimonials.tsx
@@ -40,10 +40,9 @@ const Testimonials = ({testimonials}: {testimonials: TestimonialProps[]}) => {
         <div className="flex flex-col gap-10">
         <div>
             <h2 className="text-3xl md:text-4xl font-bold">
-                Discover Why
+                Discover Why &nbsp;
                 <span className="bg-gradient-to-b from-primary/60 to-primary text-transparent bg-clip-text">
-                {" "}
-                People Love{" "}
+                People Love &nbsp;
                 </span>
                 This Micro SaaS Boilerplate Code
             </h2>
@@ -51,32 +50,31 @@ const Testimonials = ({testimonials}: {testimonials: TestimonialProps[]}) => {
                 Tweets from our happy users who have used our product and loved it.
             </p>
         </div>
-
-          <Carousel setApi={setApi} className="w-full">
-            <CarouselContent>
-                {testimonials.map((testimonial: TestimonialProps) => (
-                    <CarouselItem className="lg:basis-1/4" key={testimonial.name}>
-                    <div className="bg-muted rounded-md p-6 min-h-[200px] ">
-                        <div className="flex flex-col justify-between ">
-                            <div className="flex flex-col">
-                                <h3 className="text-exmphasis tracking-tight">
-                                {testimonial.comment}
-                                </h3>
-                            </div>
-                            <p className="flex flex-row gap-2 text-sm items-center">
-                                <span className="text-muted-foreground">By</span>{" "}
-                                    <Avatar className="h-6 w-6">
-                                        <AvatarImage src={testimonial.image} />
-                                        <AvatarFallback>{testimonial.userName}</AvatarFallback>
-                                    </Avatar>
-                                <span>{testimonial.name}</span>
-                            </p>
-                        </div>
-                    </div>
-                    </CarouselItem>
-                ))}
-            </CarouselContent>
-          </Carousel>
+        <Carousel setApi={setApi} className="w-full">
+          <CarouselContent>
+              {testimonials.map((testimonial: TestimonialProps) => (
+                  <CarouselItem className="lg:basis-1/4" key={testimonial.name}>
+                  <div className="bg-muted rounded-md p-6 min-h-[200px] ">
+                      <div className="flex flex-col justify-between ">
+                          <div className="flex flex-col">
+                              <h3 className="text-exmphasis tracking-tight">
+                              {testimonial.comment}
+                              </h3>
+                          </div>
+                          <p className="flex flex-row gap-2 text-sm items-center">
+                              <span className="text-muted-foreground">By</span>{" "}
+                                  <Avatar className="h-6 w-6">
+                                      <AvatarImage src={testimonial.image} />
+                                      <AvatarFallback>{testimonial.userName}</AvatarFallback>
+                                  </Avatar>
+                              <span>{testimonial.name}</span>
+                          </p>
+                      </div>
+                  </div>
+                  </CarouselItem>
+              ))}
+          </CarouselContent>
+        </Carousel>
         </div>
       </div>
       {/* Shadow effect */}
diff --git a/packages/ui/src/components/templates/home/Settings.tsx b/packages/ui/src/components/templates/home/Settings.tsx
index dfc0a62..8f97eca 100644
--- a/packages/ui/src/components/templates/home/Settings.tsx
+++ b/packages/ui/src/components/templates/home/Settings.tsx
@@ -29,6 +29,7 @@ import MyConnectionsSettings from "../../organisms/custom/home/MyConnectionsSett
 import SessionSettings from "../../organisms/custom/home/SessionSettings"
 import PlansBilling from "../../organisms/custom/home/PlansBilling"
 import { useSession } from "next-auth/react"
+import { Button } from "../../atoms/shadcn/button"
 
 const data = {
   nav: [
@@ -117,10 +118,10 @@ export function SettingsDialog({children, open: controlledOpen, onOpenChange: se
                           asChild
                           className={cn("cursor-pointer hover:bg-accent2", item.name === currentOpenedTab && "bg-accent2")}
                         >
-                          <div className="cursor-pointer" onClick={()=>setCurrentOpenedTab(item.name)}>
+                          <Button variant={'secondary'} className="cursor-pointer shadow-none" onClick={()=>setCurrentOpenedTab(item.name)}>
                             <item.icon />
                             <span>{item.name}</span>
-                          </div>
+                          </Button>
                         </SidebarMenuButton>
                       </SidebarMenuItem>
                     ))}