diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index 9aa70e4..257c8a9 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -100,14 +100,9 @@ export default function DashboardPage() {
           carouselMode="buttons"
           features={[
             {
-              title: "Quick Room Status",
-              description: "View your current room status and checkout eligibility",
-              bentoComponent: "phone",
-              statusIcon: CheckCircle,
+              title: "Quick Room Status",              description: "View your current room status and checkout eligibility",              bentoComponent: "phone",              statusIcon: CheckCircle,
               alertIcon: Home,
-              alertTitle: "Room Active",
-              alertMessage: "Your room is active and in good standing",
-              apps: [
+              alertTitle: "Room Active",              alertMessage: "Your room is active and in good standing",              apps: [
                 { name: "Rooms", icon: Home },
                 { name: "Checkout", icon: LogOut },
                 { name: "Status", icon: CheckCircle },
@@ -119,21 +114,14 @@ export default function DashboardPage() {
               ],
             },
             {
-              title: "Maintenance Requests",
-              description: "Submit and track all your maintenance requests in one place",
-              bentoComponent: "3d-task-list",
-              title: "Maintenance Pipeline",
-              items: [
+              title: "Maintenance Requests",              description: "Submit and track all your maintenance requests in one place",              bentoComponent: "3d-task-list",              items: [
                 { icon: AlertCircle, label: "Submit Request", time: "Instant" },
                 { icon: Clock, label: "Assigned", time: "4-6 hours" },
                 { icon: Wrench, label: "Resolved", time: "24-48 hours" },
               ],
             },
             {
-              title: "Payment Analytics",
-              description: "Track your fee payments and view detailed transaction history",
-              bentoComponent: "line-chart",
-            },
+              title: "Payment Analytics",              description: "Track your fee payments and view detailed transaction history",              bentoComponent: "line-chart"},
           ]}
           buttons={[{ text: "View Full Dashboard", href: "/dashboard" }]}
           buttonAnimation="slide-up"
@@ -144,10 +132,7 @@ export default function DashboardPage() {
         <TextSplitAbout
           title="Dashboard Features"
           description={[
-            "Access your personal dashboard to view all hostel-related information in one convenient location. Check room status, maintenance requests, and fee payments instantly.",
-            "Our intuitive interface makes it easy to submit maintenance requests, initiate room checkout, and manage your hostel account. Real-time notifications keep you updated on every action.",
-            "With 24/7 access to your dashboard, you're always in control of your hostel experience. No more waiting for emails or phone calls to get updates.",
-          ]}
+            "Access your personal dashboard to view all hostel-related information in one convenient location. Check room status, maintenance requests, and fee payments instantly.",            "Our intuitive interface makes it easy to submit maintenance requests, initiate room checkout, and manage your hostel account. Real-time notifications keep you updated on every action.",            "With 24/7 access to your dashboard, you're always in control of your hostel experience. No more waiting for emails or phone calls to get updates."]}
           useInvertedBackground={false}
           buttons={[{ text: "Log In Now", href: "https://dashboard.hostelhub.edu" }]}
           buttonAnimation="slide-up"
@@ -164,9 +149,7 @@ export default function DashboardPage() {
           description="Log in to your HostelHub dashboard and manage your accommodation, maintenance requests, and payments all in one place."
           buttons={[
             {
-              text: "Access Dashboard",
-              href: "https://dashboard.hostelhub.edu",
-            },
+              text: "Access Dashboard",              href: "https://dashboard.hostelhub.edu"},
             { text: "Need Help?", href: "/support" },
           ]}
           buttonAnimation="slide-up"
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 2763938..f8eade5 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -8,6 +8,7 @@ import FeatureBento from "@/components/sections/feature/FeatureBento";
 import TextSplitAbout from "@/components/sections/about/TextSplitAbout";
 import MetricCardSeven from "@/components/sections/metrics/MetricCardSeven";
 import TestimonialCardTwo from "@/components/sections/testimonial/TestimonialCardTwo";
+import FaqBase from "@/components/sections/faq/FaqBase";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
 import {
@@ -102,35 +103,20 @@ export default function HomePage() {
           background={{ variant: "radial-gradient" }}
           testimonials={[
             {
-              name: "Priya Singh",
-              handle: "2nd Year, Engineering",
-              testimonial:
-                "Finally, a hassle-free way to handle maintenance requests. Response time is incredible!",
-              rating: 5,
+              name: "Priya Singh",              handle: "2nd Year, Engineering",              testimonial:
+                "Finally, a hassle-free way to handle maintenance requests. Response time is incredible!",              rating: 5,
               imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=1",
-              imageAlt: "Priya Singh",
-            },
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Priya Singh"},
             {
-              name: "Aditya Patel",
-              handle: "1st Year, Business",
-              testimonial:
-                "The fee tracking feature saved me from missing a payment deadline. Highly recommend!",
-              rating: 5,
+              name: "Aditya Patel",              handle: "1st Year, Business",              testimonial:
+                "The fee tracking feature saved me from missing a payment deadline. Highly recommend!",              rating: 5,
               imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=2",
-              imageAlt: "Aditya Patel",
-            },
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Aditya Patel"},
             {
-              name: "Neha Sharma",
-              handle: "3rd Year, Commerce",
-              testimonial:
-                "Room checkout process is so smooth. No more documentation chaos.",
-              rating: 5,
+              name: "Neha Sharma",              handle: "3rd Year, Commerce",              testimonial:
+                "Room checkout process is so smooth. No more documentation chaos.",              rating: 5,
               imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=3",
-              imageAlt: "Neha Sharma",
-            },
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Neha Sharma"},
           ]}
           testimonialRotationInterval={5000}
           mediaAnimation="slide-up"
@@ -157,16 +143,11 @@ export default function HomePage() {
           carouselMode="buttons"
           features={[
             {
-              title: "Room Checkout",
-              description:
-                "Simple, streamlined checkout process with digital verification",
-              bentoComponent: "phone",
-              statusIcon: Lock,
+              title: "Room Checkout",              description:
+                "Simple, streamlined checkout process with digital verification",              bentoComponent: "phone",              statusIcon: Lock,
               alertIcon: CheckCircle,
-              alertTitle: "Checkout Confirmed",
-              alertMessage:
-                "Your room checkout has been processed successfully",
-              apps: [
+              alertTitle: "Checkout Confirmed",              alertMessage:
+                "Your room checkout has been processed successfully",              apps: [
                 { name: "Rooms", icon: Home },
                 { name: "Checkout", icon: LogOut },
                 { name: "Status", icon: CheckCircle },
@@ -178,29 +159,19 @@ export default function HomePage() {
               ],
             },
             {
-              title: "Issue Resolution Status",
-              description:
-                "Report issues and track resolution in real-time with status updates",
-              bentoComponent: "3d-task-list",
-              title: "Track Issues",
-              items: [
+              title: "Issue Resolution Status",              description:
+                "Report issues and track resolution in real-time with status updates",              bentoComponent: "3d-task-list",              items: [
                 { icon: AlertCircle, label: "Report Issue", time: "Immediate" },
                 { icon: Clock, label: "Under Review", time: "2-4 hours" },
                 { icon: Wrench, label: "In Progress", time: "24-48 hours" },
               ],
             },
             {
-              title: "Fee Management",
-              description:
-                "Track all hostel fees, payment history, and due dates",
-              bentoComponent: "line-chart",
-            },
+              title: "Fee Management",              description:
+                "Track all hostel fees, payment history, and due dates",              bentoComponent: "line-chart"},
             {
-              title: "Integrations",
-              description:
-                "Connect with payment gateways and admin systems seamlessly",
-              bentoComponent: "orbiting-icons",
-              centerIcon: Zap,
+              title: "Integrations",              description:
+                "Connect with payment gateways and admin systems seamlessly",              bentoComponent: "orbiting-icons",              centerIcon: Zap,
               items: [
                 { icon: CreditCard, ring: 1 },
                 { icon: Users, ring: 1 },
@@ -220,10 +191,7 @@ export default function HomePage() {
         <TextSplitAbout
           title="Why HostelHub?"
           description={[
-            "HostelHub is designed specifically for the modern student hostel experience. We understand the challenges of managing accommodation and have built a platform that puts you in control.",
-            "From instant maintenance reporting to transparent fee tracking, every feature is created with student needs in mind. Our system reduces administrative burden and increases response times for critical issues.",
-            "Join thousands of students who have already simplified their hostel management with HostelHub.",
-          ]}
+            "HostelHub is designed specifically for the modern student hostel experience. We understand the challenges of managing accommodation and have built a platform that puts you in control.",            "From instant maintenance reporting to transparent fee tracking, every feature is created with student needs in mind. Our system reduces administrative burden and increases response times for critical issues.",            "Join thousands of students who have already simplified their hostel management with HostelHub."]}
           useInvertedBackground={false}
           buttons={[{ text: "Start Using HostelHub", href: "/dashboard" }]}
           buttonAnimation="slide-up"
@@ -243,28 +211,16 @@ export default function HomePage() {
           carouselMode="buttons"
           metrics={[
             {
-              id: "1",
-              value: "50K+",
-              title: "Active Students",
-              items: ["Across 25+ hostels", "Growing daily"],
+              id: "1",              value: "50K+",              title: "Active Students",              items: ["Across 25+ hostels", "Growing daily"],
             },
             {
-              id: "2",
-              value: "99.2%",
-              title: "Issue Resolution Rate",
-              items: ["Average 24-hour response", "Real-time tracking"],
+              id: "2",              value: "99.2%",              title: "Issue Resolution Rate",              items: ["Average 24-hour response", "Real-time tracking"],
             },
             {
-              id: "3",
-              value: "₹2.5Cr",
-              title: "Fees Managed Annually",
-              items: ["Transparent payments", "Zero discrepancies"],
+              id: "3",              value: "₹2.5Cr",              title: "Fees Managed Annually",              items: ["Transparent payments", "Zero discrepancies"],
             },
             {
-              id: "4",
-              value: "100%",
-              title: "Student Satisfaction",
-              items: ["Highly rated platform", "Continuous improvements"],
+              id: "4",              value: "100%",              title: "Student Satisfaction",              items: ["Highly rated platform", "Continuous improvements"],
             },
           ]}
         />
@@ -282,75 +238,71 @@ export default function HomePage() {
           carouselMode="buttons"
           testimonials={[
             {
-              id: "1",
-              name: "Raj Kumar",
-              role: "Final Year Engineering",
-              testimonial:
-                "The maintenance reporting system saved me hours of running around. Issues are resolved so fast now!",
-              imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=4",
-              imageAlt: "Raj Kumar",
-              icon: Package,
+              id: "1",              name: "Raj Kumar",              role: "Final Year Engineering",              testimonial:
+                "The maintenance reporting system saved me hours of running around. Issues are resolved so fast now!",              imageSrc:
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Raj Kumar",              icon: Package,
             },
             {
-              id: "2",
-              name: "Ananya Gupta",
-              role: "2nd Year Medical",
-              testimonial:
-                "Fee tracking is transparent and accurate. No more confusion about what I owe or when it's due.",
-              imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=5",
-              imageAlt: "Ananya Gupta",
-              icon: Package,
+              id: "2",              name: "Ananya Gupta",              role: "2nd Year Medical",              testimonial:
+                "Fee tracking is transparent and accurate. No more confusion about what I owe or when it's due.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Ananya Gupta",              icon: Package,
             },
             {
-              id: "3",
-              name: "Vikram Singh",
-              role: "1st Year Management",
-              testimonial:
-                "The checkout process is incredibly smooth. Got my deposit back in days instead of weeks!",
-              imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=6",
-              imageAlt: "Vikram Singh",
-              icon: Package,
+              id: "3",              name: "Vikram Singh",              role: "1st Year Management",              testimonial:
+                "The checkout process is incredibly smooth. Got my deposit back in days instead of weeks!",              imageSrc:
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Vikram Singh",              icon: Package,
             },
             {
-              id: "4",
-              name: "Deepika Nair",
-              role: "3rd Year Commerce",
-              testimonial:
-                "Best platform for hostel management. Wish we had this when I started my first year.",
-              imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=7",
-              imageAlt: "Deepika Nair",
-              icon: Package,
+              id: "4",              name: "Deepika Nair",              role: "3rd Year Commerce",              testimonial:
+                "Best platform for hostel management. Wish we had this when I started my first year.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Deepika Nair",              icon: Package,
             },
             {
-              id: "5",
-              name: "Arjun Patel",
-              role: "2nd Year Law",
-              testimonial:
-                "Exceptional customer support. Any issues are resolved immediately with helpful guidance.",
-              imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=8",
-              imageAlt: "Arjun Patel",
-              icon: Package,
+              id: "5",              name: "Arjun Patel",              role: "2nd Year Law",              testimonial:
+                "Exceptional customer support. Any issues are resolved immediately with helpful guidance.",              imageSrc:
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Arjun Patel",              icon: Package,
             },
             {
-              id: "6",
-              name: "Kavya Sharma",
-              role: "Final Year IT",
-              testimonial:
-                "A game-changer for student housing. Finally, a platform that actually understands our needs!",
-              imageSrc:
-                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg?_wi=9",
-              imageAlt: "Kavya Sharma",
-              icon: Package,
+              id: "6",              name: "Kavya Sharma",              role: "Final Year IT",              testimonial:
+                "A game-changer for student housing. Finally, a platform that actually understands our needs!",              imageSrc:
+                "http://img.b2bpic.net/free-photo/portrait-delighted-hipster-male-student-with-crisp-hair_176532-8157.jpg",              imageAlt: "Kavya Sharma",              icon: Package,
             },
           ]}
         />
       </div>
 
+      <div id="faq" data-section="faq">
+        <FaqBase
+          title="Frequently Asked Questions"
+          description="Find answers to common questions about using HostelHub"
+          tag="Support"
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          faqsAnimation="slide-up"
+          faqs={[
+            {
+              id: "1",              title: "How do I report a maintenance issue?",              content:
+                "Simply log into your dashboard, navigate to the Maintenance section, click 'Report Issue', and describe the problem. Our team will review and respond within 2-4 hours. You'll receive real-time updates on the status of your report."},
+            {
+              id: "2",              title: "When can I check out my room?",              content:
+                "Room checkout can be initiated anytime from your dashboard after you've completed your semester or decided to leave. The system will guide you through the process and verify your room status before confirming checkout."},
+            {
+              id: "3",              title: "How do I check my fee status?",              content:
+                "Access the 'Fees' section in your dashboard to view all pending and paid fees. You'll see payment history, due dates, and can make payments directly through our secure payment gateway."},
+            {
+              id: "4",              title: "What happens after I submit a checkout request?",              content:
+                "Your request enters our verification queue. An admin will conduct a room inspection within 24-48 hours. Once approved, your deposit will be processed and transferred back to your registered bank account within 5-7 business days."},
+            {
+              id: "5",              title: "Can I track my maintenance issue status?",              content:
+                "Yes! Every maintenance report has a tracking ID. You can monitor progress in real-time, receive notifications at each stage, and communicate directly with maintenance staff through the platform."},
+            {
+              id: "6",              title: "Is my payment information secure?",              content:
+                "Absolutely. We use industry-standard SSL encryption and partner with trusted payment gateways. Your financial information is never stored on our servers and is compliant with all data protection regulations."},
+          ]}
+        />
+      </div>
+
       <div id="contact" data-section="contact">
         <ContactCTA
           tag="Get Started Today"