diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 570f67d..abe9d49 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -5,7 +5,8 @@ import "./globals.css";
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
-  title: "DYNAMIC SCHOOL - Premium Education Excellence",  description: "Master your skills with DYNAMIC SCHOOL. Premium education combining Oxford-style academic excellence with modern teaching methodologies."};
+  title: "DYNAMIC SCHOOL - Premium Education Excellence",  description: "Master your skills with DYNAMIC SCHOOL. Premium education combining Oxford-style academic excellence with modern teaching methodologies."
+};
 
 export default function RootLayout({
   children,
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 69a1ca9..facfe49 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -67,7 +67,8 @@ export default function HomePage() {
           brandName="DYNAMIC SCHOOL"
           navItems={navItems}
           button={{
-            text: "Register Now",            href: "/register"}}
+            text: "Register Now",            href: "/register"
+          }}
         />
       </div>
 
@@ -82,22 +83,29 @@ export default function HomePage() {
           background={{ variant: "radial-gradient" }}
           buttons={[
             {
-              text: "Register for a Course",              href: "/register"},
+              text: "Register for a Course",              href: "/register"
+            },
             {
-              text: "Check Your Level",              href: "/test"},
+              text: "Check Your Level",              href: "/test"
+            },
           ]}
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-vector/lecture-conference-hall-banner-set_1284-17649.jpg",              imageAlt: "Modern classroom setting"},
+              imageSrc: "http://img.b2bpic.net/free-vector/lecture-conference-hall-banner-set_1284-17649.jpg",              imageAlt: "Modern classroom setting"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/colleagues-doing-team-work-project_23-2149361536.jpg?_wi=1",              imageAlt: "Students engaged in learning"},
+              imageSrc: "http://img.b2bpic.net/free-photo/colleagues-doing-team-work-project_23-2149361536.jpg?_wi=1",              imageAlt: "Students engaged in learning"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=1",              imageAlt: "Experienced teacher presenting"},
+              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=1",              imageAlt: "Experienced teacher presenting"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/teenager-reading-near-gossiping-classmates_23-2147860644.jpg?_wi=1",              imageAlt: "Library and study area"},
+              imageSrc: "http://img.b2bpic.net/free-photo/teenager-reading-near-gossiping-classmates_23-2147860644.jpg?_wi=1",              imageAlt: "Library and study area"
+            },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-group-students-celebrating-their-graduation_23-2148201832.jpg?_wi=1",              imageAlt: "Student success and graduation"},
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-group-students-celebrating-their-graduation_23-2148201832.jpg?_wi=1",              imageAlt: "Student success and graduation"
+            },
           ]}
           mediaAnimation="slide-up"
         />
@@ -145,13 +153,17 @@ export default function HomePage() {
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",              value: "5,000+",              description: "Students Enrolled"},
+              id: "1",              value: "5,000+",              description: "Students Enrolled"
+            },
             {
-              id: "2",              value: "150+",              description: "Experienced Teachers"},
+              id: "2",              value: "150+",              description: "Experienced Teachers"
+            },
             {
-              id: "3",              value: "95%",              description: "Exam Success Rate"},
+              id: "3",              value: "95%",              description: "Exam Success Rate"
+            },
             {
-              id: "4",              value: "15+",              description: "Years of Excellence"},
+              id: "4",              value: "15+",              description: "Years of Excellence"
+            },
           ]}
           gridVariant="uniform-all-items-equal"
           animationType="slide-up"
@@ -169,19 +181,26 @@ export default function HomePage() {
           tagAnimation="slide-up"
           products={[
             {
-              id: "math",              name: "Mathematics",              price: "$500",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-back-school-essentials-with-notebook-calculator_23-2148587251.jpg?_wi=1",              imageAlt: "Mathematics course"},
+              id: "math",              name: "Mathematics",              price: "$500",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-back-school-essentials-with-notebook-calculator_23-2148587251.jpg?_wi=1",              imageAlt: "Mathematics course"
+            },
             {
-              id: "sat",              name: "SAT Preparation",              price: "$750",              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=1",              imageAlt: "SAT preparation course"},
+              id: "sat",              name: "SAT Preparation",              price: "$750",              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=1",              imageAlt: "SAT preparation course"
+            },
             {
-              id: "russian",              name: "Russian Language",              price: "$450",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-bavarian-girl-with-paper-pretzel_23-2148284384.jpg?_wi=1",              imageAlt: "Russian language course"},
+              id: "russian",              name: "Russian Language",              price: "$450",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-bavarian-girl-with-paper-pretzel_23-2148284384.jpg?_wi=1",              imageAlt: "Russian language course"
+            },
             {
-              id: "english",              name: "English Language",              price: "$500",              imageSrc: "http://img.b2bpic.net/free-photo/dictionary-definition-word_93675-129376.jpg?_wi=1",              imageAlt: "English language course"},
+              id: "english",              name: "English Language",              price: "$500",              imageSrc: "http://img.b2bpic.net/free-photo/dictionary-definition-word_93675-129376.jpg?_wi=1",              imageAlt: "English language course"
+            },
             {
-              id: "assa",              name: "ASSA Preparation",              price: "$600",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-adults-studying-together_23-2150331680.jpg?_wi=1",              imageAlt: "ASSA preparation course"},
+              id: "assa",              name: "ASSA Preparation",              price: "$600",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-adults-studying-together_23-2150331680.jpg?_wi=1",              imageAlt: "ASSA preparation course"
+            },
             {
-              id: "pochemuchka",              name: "Pochemuchka (Young Learners)",              price: "$350",              imageSrc: "http://img.b2bpic.net/free-photo/young-kids-making-diy-project-from-upcycled-materials_23-2149391103.jpg?_wi=1",              imageAlt: "Pochemuchka course for children"},
+              id: "pochemuchka",              name: "Pochemuchka (Young Learners)",              price: "$350",              imageSrc: "http://img.b2bpic.net/free-photo/young-kids-making-diy-project-from-upcycled-materials_23-2149391103.jpg?_wi=1",              imageAlt: "Pochemuchka course for children"
+            },
             {
-              id: "german-math",              name: "German Mathematics",              price: "$550",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-talking-man_23-2150171351.jpg?_wi=1",              imageAlt: "German mathematics course"},
+              id: "german-math",              name: "German Mathematics",              price: "$550",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-talking-man_23-2150171351.jpg?_wi=1",              imageAlt: "German mathematics course"
+            },
           ]}
           gridVariant="bento-grid"
           animationType="slide-up"
@@ -199,17 +218,23 @@ export default function HomePage() {
           tagAnimation="slide-up"
           testimonials={[
             {
-              id: "1",              name: "Sherzod Makhmudov",              handle: "SAT 2024 - 1580/1600",              testimonial: "DYNAMIC SCHOOL transformed my test preparation. The teachers made complex concepts crystal clear. I achieved my dream score!",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-holding-laptop_23-2148760459.jpg",              imageAlt: "Sherzod Makhmudov"},
+              id: "1",              name: "Sherzod Makhmudov",              handle: "SAT 2024 - 1580/1600",              testimonial: "DYNAMIC SCHOOL transformed my test preparation. The teachers made complex concepts crystal clear. I achieved my dream score!",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-holding-laptop_23-2148760459.jpg",              imageAlt: "Sherzod Makhmudov"
+            },
             {
-              id: "2",              name: "Madina Yusupova",              handle: "Mathematics Student",              testimonial: "The modern teaching methods and interactive classes made me love mathematics. I went from struggling to scoring A+.",              imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-grey-background_613910-11739.jpg",              imageAlt: "Madina Yusupova"},
+              id: "2",              name: "Madina Yusupova",              handle: "Mathematics Student",              testimonial: "The modern teaching methods and interactive classes made me love mathematics. I went from struggling to scoring A+.",              imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-grey-background_613910-11739.jpg",              imageAlt: "Madina Yusupova"
+            },
             {
-              id: "3",              name: "Rasul Niyazov",              handle: "English Learner",              testimonial: "The English teachers are native speakers who truly care. My confidence in English speaking improved dramatically in just months.",              imageSrc: "http://img.b2bpic.net/free-photo/business-lady-explaining-work_1098-21741.jpg",              imageAlt: "Rasul Niyazov"},
+              id: "3",              name: "Rasul Niyazov",              handle: "English Learner",              testimonial: "The English teachers are native speakers who truly care. My confidence in English speaking improved dramatically in just months.",              imageSrc: "http://img.b2bpic.net/free-photo/business-lady-explaining-work_1098-21741.jpg",              imageAlt: "Rasul Niyazov"
+            },
             {
-              id: "4",              name: "Zarina Alimova",              handle: "Parent, ASSA Track",              testimonial: "My son's academic performance transformed completely. The personal attention and quality instruction are outstanding.",              imageSrc: "http://img.b2bpic.net/free-photo/happy-businessman-making-hand-gesture-with-cup-coffee-laptop-desk_23-2147955285.jpg",              imageAlt: "Zarina Alimova"},
+              id: "4",              name: "Zarina Alimova",              handle: "Parent, ASSA Track",              testimonial: "My son's academic performance transformed completely. The personal attention and quality instruction are outstanding.",              imageSrc: "http://img.b2bpic.net/free-photo/happy-businessman-making-hand-gesture-with-cup-coffee-laptop-desk_23-2147955285.jpg",              imageAlt: "Zarina Alimova"
+            },
             {
-              id: "5",              name: "Timur Mirjaliev",              handle: "Young Learners Graduate",              testimonial: "Pochemuchka program made learning fun and engaging. My daughter developed genuine love for learning.",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiling-kids-carrying-plastic-bags_23-2148472441.jpg",              imageAlt: "Timur Mirjaliev"},
+              id: "5",              name: "Timur Mirjaliev",              handle: "Young Learners Graduate",              testimonial: "Pochemuchka program made learning fun and engaging. My daughter developed genuine love for learning.",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiling-kids-carrying-plastic-bags_23-2148472441.jpg",              imageAlt: "Timur Mirjaliev"
+            },
             {
-              id: "6",              name: "Nasiba Rahimova",              handle: "University Applicant",              testimonial: "DYNAMIC SCHOOL prepared me perfectly for university entrance exams. I gained acceptance to my top choice university.",              imageSrc: "http://img.b2bpic.net/free-photo/students-holding-notebooks-standing-smiling_23-2147657106.jpg",              imageAlt: "Nasiba Rahimova"},
+              id: "6",              name: "Nasiba Rahimova",              handle: "University Applicant",              testimonial: "DYNAMIC SCHOOL prepared me perfectly for university entrance exams. I gained acceptance to my top choice university.",              imageSrc: "http://img.b2bpic.net/free-photo/students-holding-notebooks-standing-smiling_23-2147657106.jpg",              imageAlt: "Nasiba Rahimova"
+            },
           ]}
           animationType="slide-up"
           textboxLayout="default"
diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx
index 0b53dac..11aa96c 100644
--- a/src/app/register/page.tsx
+++ b/src/app/register/page.tsx
@@ -1,14 +1,16 @@
 "use client";
 
-import Link from "next/link";
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
+import SplitAbout from "@/components/sections/about/SplitAbout";
+import MetricCardTwo from "@/components/sections/metrics/MetricCardTwo";
 import ProductCardThree from "@/components/sections/product/ProductCardThree";
-import FaqDouble from "@/components/sections/faq/FaqDouble";
+import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
 import ContactCenter from "@/components/sections/contact/ContactCenter";
 import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
-import { Award, Mail } from "lucide-react";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import Link from "next/link";
+import { Award, Users, TrendingUp, Lightbulb, Mail } from "lucide-react";
 
 export default function RegisterPage() {
   const navItems = [
@@ -21,8 +23,7 @@ export default function RegisterPage() {
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "All Courses", href: "/courses" },
         { label: "Level Test", href: "/test" },
         { label: "Register", href: "/register" },
@@ -30,8 +31,7 @@ export default function RegisterPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Our Teachers", href: "/teachers" },
         { label: "Contact", href: "/contact" },
@@ -39,8 +39,7 @@ export default function RegisterPage() {
       ],
     },
     {
-      title: "Connect",
-      items: [
+      title: "Connect",      items: [
         { label: "Telegram", href: "https://telegram.me/dynamicschool" },
         { label: "Phone", href: "tel:+998712345678" },
         { label: "Email", href: "mailto:info@dynamicschool.uz" },
@@ -56,119 +55,119 @@ export default function RegisterPage() {
       borderRadius="rounded"
       contentWidth="small"
       sizing="largeSmallSizeMediumTitles"
-      background="aurora"
+      background="circleGradient"
       cardStyle="glass-depth"
       primaryButtonStyle="primary-glow"
       secondaryButtonStyle="glass"
       headingFontWeight="extrabold"
     >
-      <div id="nav" data-section="nav">
+      {/* Navbar */}
+      <div id="nav" data-section="nav" className="relative z-50">
         <NavbarLayoutFloatingOverlay
           brandName="DYNAMIC SCHOOL"
           navItems={navItems}
           button={{
-            text: "Register Now",
-            href: "/register",
+            text: "Register Now",            href: "/register"
           }}
         />
       </div>
 
+      {/* Hero Section */}
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
-          title="Enroll in Your Course Today"
-          description="Start your educational journey with DYNAMIC SCHOOL. Choose from our comprehensive courses and unlock your potential with expert instruction."
-          tag="Begin Learning"
+          title="Start Your Learning Journey"
+          description="Register now and join thousands of students already transforming their education with DYNAMIC SCHOOL. Choose your course and begin today."
+          tag="Register Now"
           tagIcon={Award}
           tagAnimation="slide-up"
-          background={{ variant: "aurora" }}
+          background={{ variant: "plain" }}
           buttons={[
-            { text: "Browse All Courses", href: "/courses" },
-            { text: "Take Level Test First", href: "/test" },
+            {
+              text: "View All Courses",              href: "/courses"
+            },
+            {
+              text: "Check Your Level",              href: "/test"
+            },
           ]}
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/colleagues-doing-team-work-project_23-2149361536.jpg?_wi=2",
-              imageAlt: "Student enrollment process",
+              imageSrc: "http://img.b2bpic.net/free-vector/lecture-conference-hall-banner-set_1284-17649.jpg",              imageAlt: "Registration and enrollment"
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=3",
-              imageAlt: "Course learning environment",
+              imageSrc: "http://img.b2bpic.net/free-photo/colleagues-doing-team-work-project_23-2149361536.jpg?_wi=1",              imageAlt: "Student community"
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-adults-studying-together_23-2150331680.jpg?_wi=3",
-              imageAlt: "Group learning session",
-            },
-            {
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-group-students-celebrating-their-graduation_23-2148201832.jpg?_wi=2",
-              imageAlt: "Student success celebration",
-            },
-            {
-              imageSrc: "http://img.b2bpic.net/free-photo/lecture-conference-hall-banner-set_1284-17649.jpg",
-              imageAlt: "Modern classroom facility",
+              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=1",              imageAlt: "Quality education"
             },
           ]}
           mediaAnimation="slide-up"
         />
       </div>
 
-      <div id="courses" data-section="courses">
-        <ProductCardThree
-          products={[
+      {/* Why Register Section */}
+      <div id="why-register" data-section="why-register">
+        <SplitAbout
+          title="Why Register at DYNAMIC SCHOOL?"
+          description="Joining our community means access to world-class education, expert instructors, and proven learning outcomes."
+          tag="Benefits"
+          tagAnimation="slide-up"
+          bulletPoints={[
             {
-              id: "math",
-              name: "Mathematics",
-              price: "$500",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-back-school-essentials-with-notebook-calculator_23-2148587251.jpg?_wi=4",
-              imageAlt: "Mathematics course",
+              title: "Structured Curriculum",              description: "Our carefully designed courses follow proven educational methodologies to ensure effective learning.",              icon: Award,
             },
             {
-              id: "sat",
-              name: "SAT Preparation",
-              price: "$750",
-              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=4",
-              imageAlt: "SAT preparation course",
+              title: "Expert Guidance",              description: "Learn from highly qualified teachers with years of experience and dedication to student success.",              icon: Users,
             },
             {
-              id: "russian",
-              name: "Russian Language",
-              price: "$450",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-bavarian-girl-with-paper-pretzel_23-2148284384.jpg?_wi=3",
-              imageAlt: "Russian language course",
-            },
-            {
-              id: "english",
-              name: "English Language",
-              price: "$500",
-              imageSrc: "http://img.b2bpic.net/free-photo/dictionary-definition-word_93675-129376.jpg?_wi=3",
-              imageAlt: "English language course",
-            },
-            {
-              id: "assa",
-              name: "ASSA Preparation",
-              price: "$600",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-adults-studying-together_23-2150331680.jpg?_wi=4",
-              imageAlt: "ASSA preparation course",
-            },
-            {
-              id: "pochemuchka",
-              name: "Pochemuchka (Young Learners)",
-              price: "$350",
-              imageSrc: "http://img.b2bpic.net/free-photo/young-kids-making-diy-project-from-upcycled-materials_23-2149391103.jpg?_wi=3",
-              imageAlt: "Pochemuchka course for children",
-            },
-            {
-              id: "german-math",
-              name: "German Mathematics",
-              price: "$550",
-              imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-talking-man_23-2150171351.jpg?_wi=3",
-              imageAlt: "German mathematics course",
+              title: "Proven Results",              description: "95% of our students achieve their educational goals with measurable improvements in their academic performance.",              icon: TrendingUp,
             },
           ]}
-          title="Choose Your Course"
-          description="Select from our comprehensive range of programs designed for all proficiency levels"
-          tag="Available Programs"
+          imageSrc="http://img.b2bpic.net/free-photo/woman-two-students-looking-tablet_259150-60236.jpg?_wi=1"
+          imageAlt="Student registration process"
+          mediaAnimation="slide-up"
+          imagePosition="right"
+          textboxLayout="default"
+          useInvertedBackground={false}
+          buttons={[
+            {
+              text: "Enroll Now",              href: "#contact"
+            }
+          ]}
+          buttonAnimation="slide-up"
+        />
+      </div>
+
+      {/* Available Courses Section */}
+      <div id="available-courses" data-section="available-courses">
+        <ProductCardThree
+          title="Our Courses"
+          description="Choose from our comprehensive selection of courses designed for different levels and learning goals."
+          tag="Course Selection"
           tagAnimation="slide-up"
+          products={[
+            {
+              id: "math",              name: "Mathematics",              price: "$500",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-back-school-essentials-with-notebook-calculator_23-2148587251.jpg?_wi=1",              imageAlt: "Mathematics course"
+            },
+            {
+              id: "sat",              name: "SAT Preparation",              price: "$750",              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=1",              imageAlt: "SAT preparation course"
+            },
+            {
+              id: "russian",              name: "Russian Language",              price: "$450",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-bavarian-girl-with-paper-pretzel_23-2148284384.jpg?_wi=1",              imageAlt: "Russian language course"
+            },
+            {
+              id: "english",              name: "English Language",              price: "$500",              imageSrc: "http://img.b2bpic.net/free-photo/dictionary-definition-word_93675-129376.jpg?_wi=1",              imageAlt: "English language course"
+            },
+            {
+              id: "assa",              name: "ASSA Preparation",              price: "$600",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-adults-studying-together_23-2150331680.jpg?_wi=1",              imageAlt: "ASSA preparation course"
+            },
+            {
+              id: "pochemuchka",              name: "Pochemuchka (Young Learners)",              price: "$350",              imageSrc: "http://img.b2bpic.net/free-photo/young-kids-making-diy-project-from-upcycled-materials_23-2149391103.jpg?_wi=1",              imageAlt: "Pochemuchka course for children"
+            },
+            {
+              id: "german-math",              name: "German Mathematics",              price: "$550",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-talking-man_23-2150171351.jpg?_wi=1",              imageAlt: "German mathematics course"
+            },
+          ]}
           gridVariant="bento-grid"
           animationType="slide-up"
           textboxLayout="default"
@@ -176,75 +175,57 @@ export default function RegisterPage() {
         />
       </div>
 
-      <div id="registration-faq" data-section="registration-faq">
-        <FaqDouble
-          title="Registration Questions"
-          description="Everything you need to know about enrolling at DYNAMIC SCHOOL"
-          tag="Help & Support"
+      {/* Student Testimonials */}
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardSix
+          title="Success Stories from Our Students"
+          description="See what real students have achieved after joining DYNAMIC SCHOOL."
+          tag="Testimonials"
           tagAnimation="slide-up"
-          faqs={[
+          testimonials={[
             {
-              id: "1",
-              title: "What is the enrollment process?",
-              content: "1. Browse our courses and select one that matches your level. 2. Take our level test if you're unsure about placement. 3. Complete the registration form with your details. 4. Choose your preferred schedule. 5. Make payment through our secure gateway. 6. Receive access to your course materials.",
+              id: "1",              name: "Sherzod Makhmudov",              handle: "SAT 2024 - 1580/1600",              testimonial: "DYNAMIC SCHOOL transformed my test preparation. The teachers made complex concepts crystal clear. I achieved my dream score!",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-holding-laptop_23-2148760459.jpg",              imageAlt: "Sherzod Makhmudov"
             },
             {
-              id: "2",
-              title: "What documents do I need to register?",
-              content: "You'll need a valid email address and contact information. For students under 18, parental consent may be required. Professional background or previous academic records can help with placement but are not mandatory.",
+              id: "2",              name: "Madina Yusupova",              handle: "Mathematics Student",              testimonial: "The modern teaching methods and interactive classes made me love mathematics. I went from struggling to scoring A+.",              imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-grey-background_613910-11739.jpg",              imageAlt: "Madina Yusupova"
             },
             {
-              id: "3",
-              title: "When can I start my course?",
-              content: "Most courses start the following Monday after registration and payment confirmation. Intensive programs may have dedicated start dates. Check individual course pages for exact start dates and cohort information.",
+              id: "3",              name: "Rasul Niyazov",              handle: "English Learner",              testimonial: "The English teachers are native speakers who truly care. My confidence in English speaking improved dramatically in just months.",              imageSrc: "http://img.b2bpic.net/free-photo/business-lady-explaining-work_1098-21741.jpg",              imageAlt: "Rasul Niyazov"
             },
             {
-              id: "4",
-              title: "What is your refund policy?",
-              content: "We offer full refunds if you withdraw within 7 days of registration. Partial refunds are available up to 2 weeks into the course. After 2 weeks, no refunds are given, but course transfers are allowed.",
+              id: "4",              name: "Zarina Alimova",              handle: "Parent, ASSA Track",              testimonial: "My son's academic performance transformed completely. The personal attention and quality instruction are outstanding.",              imageSrc: "http://img.b2bpic.net/free-photo/happy-businessman-making-hand-gesture-with-cup-coffee-laptop-desk_23-2147955285.jpg",              imageAlt: "Zarina Alimova"
             },
             {
-              id: "5",
-              title: "How do I choose between online and in-person?",
-              content: "Both formats have identical curriculum and experienced teachers. Online classes offer flexibility; in-person classes provide direct interaction. You can choose based on your schedule and learning preference.",
+              id: "5",              name: "Timur Mirjaliev",              handle: "Young Learners Graduate",              testimonial: "Pochemuchka program made learning fun and engaging. My daughter developed genuine love for learning.",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiling-kids-carrying-plastic-bags_23-2148472441.jpg",              imageAlt: "Timur Mirjaliev"
             },
             {
-              id: "6",
-              title: "Are there group discounts available?",
-              content: "Yes! Groups of 3+ students receive 10-15% discounts. Corporate training packages for businesses are also available. Contact our sales team for custom quotes.",
-            },
-            {
-              id: "7",
-              title: "What payment methods do you accept?",
-              content: "We accept bank transfers, credit/debit cards (Visa, Mastercard), and online payment systems (click, payme, apelsin). All payments are processed through a secure encrypted gateway.",
-            },
-            {
-              id: "8",
-              title: "Do you offer scholarships?",
-              content: "Merit-based scholarships are available for high-achieving students. Financial assistance is also available for students demonstrating need. Apply during registration or contact our admissions office.",
+              id: "6",              name: "Nasiba Rahimova",              handle: "University Applicant",              testimonial: "DYNAMIC SCHOOL prepared me perfectly for university entrance exams. I gained acceptance to my top choice university.",              imageSrc: "http://img.b2bpic.net/free-photo/students-holding-notebooks-standing-smiling_23-2147657106.jpg",              imageAlt: "Nasiba Rahimova"
             },
           ]}
-          faqsAnimation="slide-up"
+          animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
+          speed={40}
         />
       </div>
 
+      {/* Contact/Registration Section */}
       <div id="contact" data-section="contact">
         <ContactCenter
-          tag="Get In Touch"
-          title="Have Questions Before Registering?"
-          description="Our enrollment team is ready to help you find the perfect course and answer any questions about our programs, schedules, or registration process."
+          tag="Get Started"
           tagIcon={Mail}
+          title="Ready to Register?"
+          description="Join our learning community today. Fill in your email to complete your registration and start your educational transformation."
           tagAnimation="slide-up"
-          background={{ variant: "radial-gradient" }}
+          background={{ variant: "plain" }}
           useInvertedBackground={false}
           inputPlaceholder="Enter your email address"
-          buttonText="Subscribe Now"
-          termsText="We respect your privacy. Unsubscribe anytime. By subscribing, you agree to our Terms and receive educational updates."
+          buttonText="Register Now"
+          termsText="By registering, you agree to our Terms and Conditions and will receive course information and updates from DYNAMIC SCHOOL."
         />
       </div>
 
+      {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterBaseReveal
           columns={footerColumns}
@@ -253,4 +234,4 @@ export default function RegisterPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/src/app/test/page.tsx b/src/app/test/page.tsx
index 736664e..2057804 100644
--- a/src/app/test/page.tsx
+++ b/src/app/test/page.tsx
@@ -1,17 +1,18 @@
 "use client";
 
-import Link from "next/link";
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
 import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import SplitAbout from "@/components/sections/about/SplitAbout";
 import MetricCardTwo from "@/components/sections/metrics/MetricCardTwo";
-import FaqDouble from "@/components/sections/faq/FaqDouble";
+import ProductCardThree from "@/components/sections/product/ProductCardThree";
+import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
 import ContactCenter from "@/components/sections/contact/ContactCenter";
 import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
-import { Award, Lightbulb, TrendingUp, Mail } from "lucide-react";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import Link from "next/link";
+import { Award, Users, TrendingUp, Lightbulb, Mail, CheckCircle } from "lucide-react";
 
-export default function LevelTestPage() {
+export default function TestPage() {
   const navItems = [
     { name: "Home", id: "/" },
     { name: "About", id: "/about" },
@@ -22,8 +23,7 @@ export default function LevelTestPage() {
 
   const footerColumns = [
     {
-      title: "Product",
-      items: [
+      title: "Product",      items: [
         { label: "All Courses", href: "/courses" },
         { label: "Level Test", href: "/test" },
         { label: "Register", href: "/register" },
@@ -31,8 +31,7 @@ export default function LevelTestPage() {
       ],
     },
     {
-      title: "Company",
-      items: [
+      title: "Company",      items: [
         { label: "About Us", href: "/about" },
         { label: "Our Teachers", href: "/teachers" },
         { label: "Contact", href: "/contact" },
@@ -40,8 +39,7 @@ export default function LevelTestPage() {
       ],
     },
     {
-      title: "Connect",
-      items: [
+      title: "Connect",      items: [
         { label: "Telegram", href: "https://telegram.me/dynamicschool" },
         { label: "Phone", href: "tel:+998712345678" },
         { label: "Email", href: "mailto:info@dynamicschool.uz" },
@@ -57,120 +55,108 @@ export default function LevelTestPage() {
       borderRadius="rounded"
       contentWidth="small"
       sizing="largeSmallSizeMediumTitles"
-      background="aurora"
+      background="circleGradient"
       cardStyle="glass-depth"
       primaryButtonStyle="primary-glow"
       secondaryButtonStyle="glass"
       headingFontWeight="extrabold"
     >
-      <div id="nav" data-section="nav">
+      {/* Navbar */}
+      <div id="nav" data-section="nav" className="relative z-50">
         <NavbarLayoutFloatingOverlay
           brandName="DYNAMIC SCHOOL"
           navItems={navItems}
           button={{
-            text: "Register Now",
-            href: "/register",
+            text: "Register Now",            href: "/register"
           }}
         />
       </div>
 
+      {/* Hero Section */}
       <div id="hero" data-section="hero">
         <HeroBillboardGallery
-          title="Take Your Level Test"
-          description="Determine your current proficiency level with our comprehensive assessment. This test helps us recommend the perfect course for your needs and learning goals."
-          tag="Assessment"
-          tagIcon={Award}
+          title="Assess Your Learning Level"
+          description="Take our comprehensive level assessment test to determine the right course for your current skills and learning objectives. Get personalized recommendations based on your results."
+          tag="Level Assessment"
+          tagIcon={CheckCircle}
           tagAnimation="slide-up"
-          background={{ variant: "aurora" }}
+          background={{ variant: "plain" }}
           buttons={[
-            { text: "Start Test Now", href: "#test-form" },
-            { text: "Learn About Levels", href: "/about" },
+            {
+              text: "Start the Test",              href: "#test-info"
+            },
+            {
+              text: "View Courses",              href: "/courses"
+            },
           ]}
           buttonAnimation="slide-up"
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=3",
-              imageAlt: "Assessment preparation",
+              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=1",              imageAlt: "Level assessment testing"
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=2",
-              imageAlt: "Student assessment session",
+              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=1",              imageAlt: "Assessment results review"
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-different-people-studying-together_23-2149204775.jpg?_wi=3",
-              imageAlt: "Collaborative test environment",
-            },
-            {
-              imageSrc: "http://img.b2bpic.net/free-photo/teenager-reading-near-gossiping-classmates_23-2147860644.jpg?_wi=2",
-              imageAlt: "Reading comprehension test",
-            },
-            {
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-back-school-essentials-with-notebook-calculator_23-2148587251.jpg?_wi=3",
-              imageAlt: "Test materials and resources",
+              imageSrc: "http://img.b2bpic.net/free-photo/colleagues-doing-team-work-project_23-2149361536.jpg?_wi=1",              imageAlt: "Personalized course recommendations"
             },
           ]}
           mediaAnimation="slide-up"
         />
       </div>
 
-      <div id="test-benefits" data-section="test-benefits">
+      {/* Test Information Section */}
+      <div id="test-info" data-section="test-info">
         <SplitAbout
-          title="Why Take Our Level Test?"
-          description="Our diagnostic assessment provides comprehensive insights into your current proficiency and helps us tailor your educational journey."
-          tag="Test Benefits"
+          title="How Our Level Test Works"
+          description="Our comprehensive assessment is designed to accurately evaluate your current proficiency and match you with the ideal course for your skill level."
+          tag="Assessment Process"
           tagAnimation="slide-up"
           bulletPoints={[
             {
-              title: "Personalized Placement",
-              description: "Get placed in the course level that matches your current skills and learning pace for optimal progress.",
-              icon: TrendingUp,
+              title: "Comprehensive Evaluation",              description: "The test covers all essential skills and knowledge areas relevant to your chosen subject.",              icon: CheckCircle,
             },
             {
-              title: "Identify Strengths & Gaps",
-              description: "Understand your strong areas and areas for improvement to focus your study efforts effectively.",
-              icon: Lightbulb,
+              title: "Instant Results",              description: "Receive your score and proficiency level immediately after completing the assessment.",              icon: TrendingUp,
             },
             {
-              title: "Quick Assessment",
-              description: "Complete the entire test in just 20 minutes and receive instant results with detailed feedback.",
-              icon: Award,
+              title: "Personalized Recommendations",              description: "Get customized course suggestions based on your test results and learning goals.",              icon: Lightbulb,
             },
           ]}
-          imageSrc="http://img.b2bpic.net/free-photo/woman-two-students-looking-tablet_259150-60236.jpg?_wi=4"
-          imageAlt="Student assessment with instructor"
+          imageSrc="http://img.b2bpic.net/free-photo/woman-two-students-looking-tablet_259150-60236.jpg?_wi=1"
+          imageAlt="Online assessment platform"
           mediaAnimation="slide-up"
           imagePosition="right"
           textboxLayout="default"
           useInvertedBackground={false}
+          buttons={[
+            {
+              text: "Take the Test",              href: "#register-test"
+            }
+          ]}
+          buttonAnimation="slide-up"
         />
       </div>
 
+      {/* Test Statistics Section */}
       <div id="test-stats" data-section="test-stats">
         <MetricCardTwo
-          title="Test Statistics"
-          description="Comprehensive insights into test-taker performance and outcomes"
-          tag="By the Numbers"
+          title="Assessment Statistics"
+          description="Key metrics from students who have taken our level tests."
+          tag="Performance Data"
           tagAnimation="slide-up"
           metrics={[
             {
-              id: "1",
-              value: "20 min",
-              description: "Average Test Duration",
+              id: "1",              value: "10K+",              description: "Tests Completed"
             },
             {
-              id: "2",
-              value: "100%",
-              description: "Placement Accuracy",
+              id: "2",              value: "98%",              description: "Accuracy Rate"
             },
             {
-              id: "3",
-              value: "5 min",
-              description: "Results Delivery Time",
+              id: "3",              value: "5min",              description: "Average Duration"
             },
             {
-              id: "4",
-              value: "6 Levels",
-              description: "Available Placements",
+              id: "4",              value: "7",              description: "Language Options"
             },
           ]}
           gridVariant="uniform-all-items-equal"
@@ -180,75 +166,91 @@ export default function LevelTestPage() {
         />
       </div>
 
-      <div id="test-faq" data-section="test-faq">
-        <FaqDouble
-          title="Level Test FAQ"
-          description="Common questions about our assessment and placement process"
-          tag="Help & Support"
+      {/* Test Options Section */}
+      <div id="test-options" data-section="test-options">
+        <ProductCardThree
+          title="Available Tests"
+          description="Choose the test that matches your learning goals and current level."
+          tag="Select Your Test"
           tagAnimation="slide-up"
-          faqs={[
+          products={[
             {
-              id: "1",
-              title: "How long is the level test?",
-              content: "Our level test takes approximately 20 minutes to complete. It includes sections on reading, writing, listening, and speaking skills depending on your course selection.",
+              id: "math-test",              name: "Mathematics Level Test",              price: "Free",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-back-school-essentials-with-notebook-calculator_23-2148587251.jpg?_wi=1",              imageAlt: "Mathematics level test"
             },
             {
-              id: "2",
-              title: "When will I get my results?",
-              content: "You will receive your test results immediately after completion. Your personalized level report and course recommendations will be available on your dashboard right away.",
+              id: "english-test",              name: "English Level Test",              price: "Free",              imageSrc: "http://img.b2bpic.net/free-photo/dictionary-definition-word_93675-129376.jpg?_wi=1",              imageAlt: "English language level test"
             },
             {
-              id: "3",
-              title: "Can I retake the test?",
-              content: "Yes, you can retake the test after 7 days if you wish to challenge your placement or if you want to try a different course track.",
+              id: "russian-test",              name: "Russian Language Test",              price: "Free",              imageSrc: "http://img.b2bpic.net/free-photo/close-up-bavarian-girl-with-paper-pretzel_23-2148284384.jpg?_wi=1",              imageAlt: "Russian language level test"
             },
             {
-              id: "4",
-              title: "Is the test graded?",
-              content: "The test is diagnostic in nature and helps determine your proficiency level. It is not graded as pass/fail, but rather places you in the appropriate course level.",
+              id: "sat-test",              name: "SAT Practice Test",              price: "$25",              imageSrc: "http://img.b2bpic.net/free-photo/student-preparing-exam-panicking_23-2147844722.jpg?_wi=1",              imageAlt: "SAT practice test"
             },
             {
-              id: "5",
-              title: "What skills are assessed?",
-              content: "Our test assesses reading comprehension, writing ability, listening skills, grammar knowledge, and vocabulary level relevant to your chosen course.",
+              id: "assa-test",              name: "ASSA Practice Test",              price: "$25",              imageSrc: "http://img.b2bpic.net/free-photo/side-view-adults-studying-together_23-2150331680.jpg?_wi=1",              imageAlt: "ASSA practice test"
             },
             {
-              id: "6",
-              title: "Do I need any special software?",
-              content: "No special software is required. The test runs directly in your web browser. Ensure you have a stable internet connection and a quiet environment.",
-            },
-            {
-              id: "7",
-              title: "What if I'm not sure about my level after?",
-              content: "Our instructors can review your results and help you choose the best course. You can also contact our support team for personalized guidance.",
-            },
-            {
-              id: "8",
-              title: "Can I skip the test and choose my level?",
-              content: "While the test is recommended for accurate placement, you can consult with our advisors to manually choose a course level if you prefer.",
+              id: "combo-test",              name: "Comprehensive Assessment",              price: "$40",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-people-studying-math_23-2150444931.jpg?_wi=1",              imageAlt: "Comprehensive assessment package"
             },
           ]}
-          faqsAnimation="slide-up"
+          gridVariant="bento-grid"
+          animationType="slide-up"
           textboxLayout="default"
           useInvertedBackground={false}
         />
       </div>
 
-      <div id="contact" data-section="contact">
-        <ContactCenter
-          tag="Get In Touch"
-          title="Ready to Find Your Perfect Level?"
-          description="Take the test today and discover which course aligns perfectly with your current skills and learning goals. Join thousands of successful students at DYNAMIC SCHOOL."
-          tagIcon={Mail}
+      {/* Student Success Section */}
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardSix
+          title="Success Through Assessment"
+          description="Students who took our level test found the right course and achieved their goals."
+          tag="Student Results"
           tagAnimation="slide-up"
-          background={{ variant: "radial-gradient" }}
+          testimonials={[
+            {
+              id: "1",              name: "Sherzod Makhmudov",              handle: "SAT 2024 - 1580/1600",              testimonial: "The level test showed I needed advanced SAT prep. This accuracy helped me register for the perfect course and score 1580!",              imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-holding-laptop_23-2148760459.jpg",              imageAlt: "Sherzod Makhmudov"
+            },
+            {
+              id: "2",              name: "Madina Yusupova",              handle: "Mathematics Student",              testimonial: "The assessment identified gaps in my fundamentals. After enrolling in the recommended intermediate course, I improved dramatically.",              imageSrc: "http://img.b2bpic.net/free-photo/attractive-blond-business-woman-white-shirt-grey-background_613910-11739.jpg",              imageAlt: "Madina Yusupova"
+            },
+            {
+              id: "3",              name: "Rasul Niyazov",              handle: "English Learner",              testimonial: "I wasn't sure what level to start at. The test gave me confidence I was in the right class and now I'm speaking fluently!",              imageSrc: "http://img.b2bpic.net/free-photo/business-lady-explaining-work_1098-21741.jpg",              imageAlt: "Rasul Niyazov"
+            },
+            {
+              id: "4",              name: "Zarina Alimova",              handle: "Parent",              testimonial: "The test helped my son identify exactly what he needed to work on. His focused learning led to excellent results.",              imageSrc: "http://img.b2bpic.net/free-photo/happy-businessman-making-hand-gesture-with-cup-coffee-laptop-desk_23-2147955285.jpg",              imageAlt: "Zarina Alimova"
+            },
+            {
+              id: "5",              name: "Timur Mirjaliev",              handle: "Young Learner Parent",              testimonial: "The placement test ensured my daughter was in an age-appropriate class. She's loved learning from day one!",              imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiling-kids-carrying-plastic-bags_23-2148472441.jpg",              imageAlt: "Timur Mirjaliev"
+            },
+            {
+              id: "6",              name: "Nasiba Rahimova",              handle: "Test Taker",              testimonial: "The detailed feedback from the test showed me exactly what to focus on for my university exams. Incredibly helpful!",              imageSrc: "http://img.b2bpic.net/free-photo/students-holding-notebooks-standing-smiling_23-2147657106.jpg",              imageAlt: "Nasiba Rahimova"
+            },
+          ]}
+          animationType="slide-up"
+          textboxLayout="default"
           useInvertedBackground={false}
-          inputPlaceholder="Enter your email address"
-          buttonText="Subscribe Now"
-          termsText="We respect your privacy. Unsubscribe anytime. By subscribing, you agree to our Terms and receive educational updates."
+          speed={40}
         />
       </div>
 
+      {/* Registration Section */}
+      <div id="register-test" data-section="register-test">
+        <ContactCenter
+          tag="Ready to Test?"
+          tagIcon={Mail}
+          title="Start Your Assessment Today"
+          description="Register to take your level test and discover which course is right for you. Our assessment takes just 5-10 minutes and provides instant results with personalized recommendations."
+          tagAnimation="slide-up"
+          background={{ variant: "plain" }}
+          useInvertedBackground={false}
+          inputPlaceholder="Enter your email address"
+          buttonText="Take Test Now"
+          termsText="By registering, you agree to our Terms and will receive your test results and course recommendations from DYNAMIC SCHOOL."
+        />
+      </div>
+
+      {/* Footer */}
       <div id="footer" data-section="footer">
         <FooterBaseReveal
           columns={footerColumns}
@@ -257,4 +259,4 @@ export default function LevelTestPage() {
       </div>
     </ThemeProvider>
   );
-}
\ No newline at end of file
+}