diff --git a/src/components/About/index.jsx b/src/components/About/index.jsx
new file mode 100644
index 0000000..7fb701b
--- /dev/null
+++ b/src/components/About/index.jsx
@@ -0,0 +1,114 @@
+import { Provider } from "react-redux";
+import ContentWrapper from "../../components/ContentWrapper/ContentWrapper";
+import Footer from "../../components/Footer/Footer";
+import Header from "../../components/Header/Header";
+import style from "./index.module.css";
+import { store } from "../redux/store";
+
+export default function Index() {
+  window.scrollTo({ top: 0, behavior: "instant" });
+  return (
+    <Provider store={store}>
+      <section className={style.color}>
+        <div className={style.image_box}>
+          <ContentWrapper>
+            <Header color={"#015C9F"} />
+            <div className={style.box}>
+              <h2>About Us</h2>
+              <p>
+                At aKadmy, we are dedicated to revolutionizing early childhood
+                education by providing schools and educators with cutting-edge
+                tools designed to enhance teaching and learning experiences. As
+                a Malaysian-developed platform, we take pride in offering
+                solutions that cater to the unique needs of educators,
+                particularly in international schools and early childhood
+                institutions.
+              </p>
+              <p>
+                Our platform is crafted to support early childhood practitioners
+                by offering a comprehensive suite of resources that streamline
+                lesson planning, enrich classroom activities, and foster
+                meaningful student engagement. With an intuitive interface and
+                high-quality educational content, aKadmy empowers teachers to
+                deliver world-class education that nurtures creativity, critical
+                thinking, and problem-solving in young learners.
+              </p>
+            </div>
+          </ContentWrapper>
+        </div>
+        <div className={style.curve}>
+          <img src="/assets/about_us_curve.webp" width={"100%"} />
+        </div>
+        <ContentWrapper>
+          <div className={`${style.flex}`}>
+            <div className={`${style.flex_1} ${style.mt}`}>
+              <h4>Driving Impact in Early Childhood Education</h4>
+              <p>
+                Through our partnership with Beanstalkedu, a global leader in
+                early education, aKadmy is able to offer premium educational
+                content that reflects the latest in pedagogical innovation and
+                global best practices. This collaboration allows us to blend
+                international standards with the unique cultural insights of
+                Malaysia, making our platform highly adaptable for diverse
+                learning environments across the globe.
+              </p>
+            </div>
+            <div className={style.flex_1}>
+              <img
+                src="/assets/about_1.webp"
+                width={"100%"}
+                alt="About aKadmy | Transforming Early Education with AI Solutions"
+              />
+            </div>
+          </div>
+        </ContentWrapper>
+        <div className={style.image_box}>
+          <ContentWrapper>
+            <div className={style.center}>
+              <h2>Our Mission and Vision</h2>
+              <br />
+              <p>
+                Our mission is to support schools and educators by providing a
+                holistic digital solution that not only simplifies day-to-day
+                teaching but also elevates the quality of education offered in
+                early childhood settings. Whether you're an international school
+                looking to enhance your curriculum or a teacher seeking
+                innovative resources, aKadmy provides the tools and content to
+                help you succeed.
+              </p>
+              <p>
+                As we continue to expand globally, aKadmy remains committed to
+                fostering strong partnerships with schools, educators, and
+                institutions, ensuring that every child has access to
+                high-quality, engaging, and effective learning experiences.
+              </p>
+            </div>
+          </ContentWrapper>
+        </div>
+        <ContentWrapper>
+          <div className={`${style.flex}`}>
+            <div className={style.flex_1}>
+              <img
+                src="/assets/about_1.webp"
+                width={"100%"}
+                alt="About aKadmy | Transforming Early Education with AI Solutions"
+              />
+            </div>
+            <div className={`${style.flex_1} ${style.mt}`}>
+              <h4>What we do</h4>
+              <p>
+                Together with <b>Beanstalkedu</b> and our educational partners,
+                we are building a future where every child can thrive in an
+                environment that is both inspiring and supportive.
+              </p>
+            </div>
+          </div>
+        </ContentWrapper>
+        <br />
+        <br />
+        <br />
+        <Footer page="AKADEMY_B2C" contact={true} />
+      </section>
+    </Provider>
+  );
+}
diff --git a/src/components/About/index.module.css b/src/components/About/index.module.css
new file mode 100644
index 0000000..baa40bb
--- /dev/null
+++ b/src/components/About/index.module.css
@@ -0,0 +1,64 @@
+.image_box {
+  background-image: linear-gradient(to right, #eff4ff, #d4f5fe, #dae4fe);
+  padding-bottom: 30px;
+}
+
+.box {
+  text-align: center;
+  padding-top: 100px;
+  height: 600px;
+}
+
+.curve {
+  margin-top: -120px;
+}
+
+.color {
+  color: #00548e;
+  width: 100%;
+}
+
+.box h2 {
+  padding: 20px 0px;
+}
+
+.flex {
+  display: flex;
+  margin: 40px 0;
+  position: relative;
+  z-index: 2;
+}
+
+.flex_1 {
+  flex: 1;
+}
+
+.center {
+  text-align: center;
+  padding: 80px 0;
+}
+
+.mt {
+  margin-top: 80px;
+}
+
+@media only screen and (max-width: 900px) {
+  .curve {
+    margin-top: -60px;
+  }
+  .flex {
+    display: block;
+  }
+  .mt {
+    margin-top: 20px;
+  }
+}
+
+@media only screen and (max-width: 500px) {
+  .box {
+    height: 740px;
+  }
+  .curve {
+    margin-top: -30px;
+  }
+}
diff --git a/src/components/Contact/index.jsx b/src/components/Contact/index.jsx
new file mode 100644
index 0000000..8e5be85
--- /dev/null
+++ b/src/components/Contact/index.jsx
@@ -0,0 +1,103 @@
+import { Box } from "@mui/material";
+import ContentWrapper from "../../components/ContentWrapper/ContentWrapper";
+import Footer from "../../components/Footer/Footer";
+import Header from "../../components/Header/Header";
+import ThreeFormFields from "../../components/form/ThreeFormFields";
+import style from "./index.module.css";
+import EmailOutlinedIcon from "@mui/icons-material/EmailOutlined";
+import LocationOnIcon from "@mui/icons-material/LocationOn";
+import FAQ from "../../components/FAQ/FAQ";
+import { conatctFaqs } from "../../components/data/faqs";
+import { Provider } from "react-redux";
+import { store } from "../redux/store";
+
+export default function Index() {
+  window.scrollTo({ top: 0, behavior: "instant" });
+  return (
+    <Provider store={store}>
+      <section className={style.section}>
+        <ContentWrapper>
+          <Header color={"#015C9F"} />
+          <div className={style.box}>
+            <h1>
+              We’d Love to Hear From You!
+              <br /> Contact Us
+            </h1>
+            <p>
+              Whether you have a question about our services, need assistance,
+              or just want to share your
+              <br /> thoughts, we’re here to listen.
+            </p>
+          </div>
+        </ContentWrapper>
+      </section>
+      <ContentWrapper>
+        {" "}
+        <div className={`${style.flex}`}>
+          <div className={`${style.flex_1} ${style.mt}`}>
+            <h4>Contact Information</h4>
+            <p>
+              Fill up the form and our team will get back to you within
+              <br /> 24 hours.
+              <br />
+              <EmailOutlinedIcon fontSize="small" />
+              &nbsp; Email: hello@akadmyapp.com
+            </p>
+            <br />
+          </div>
+          <div className={style.flex_1}>
+            <Box boxShadow={1} maxWidth={400} ml={"auto"} p={4}>
+              <b>Get in Touch</b>
+              <p>You can reach us anytime</p>
+              <ThreeFormFields formName="Contact" />
+            </Box>
+          </div>
+        </div>
+        <br />
+        <br />
+        <div className={`${style.flex}`}>
+          <div className={`${style.flex_1}`}>
+            <div>
+              <iframe
+                src="https://www.google.com/maps/embed?pb=!1m17!1m12!1m3!1d3984.090385602562!2d101.690635!3d3.070521!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m2!1m1!2zM8KwMDQnMTMuOSJOIDEwMcKwNDEnMjYuMyJF!5e0!3m2!1sen!2sin!4v1725867001750!5m2!1sen!2sin"
+                className={style.iframe_width}
+                loading="lazy"
+              />
+            </div>
+          </div>
+          <div className={`${style.flex_1}`} style={{ marginTop: "auto" }}>
+            <br />
+            <h4>Our Location</h4>
+            <p style={{ maxWidth: 400 }}>
+              Come visit us! Use the map below to easily find our location.
+              Whether you're planning a visit or just need directions, the map
+              will guide you right to our doorstep.
+              <div style={{ display: "flex", marginTop: "6px" }}>
+                <div>
+                  <LocationOnIcon sx={{ mt: 6 }} />
+                </div>
+                &nbsp;&nbsp;&nbsp;
+                <div>
+                  Address: Buzzapp Technologies Sdn Bhd,
+                  <br /> 38, 3rd Floor, Jalan Radin Anum,
+                  <br /> Bandar Baru Sri Petaling,
+                  <br /> Kuala Lumpur, Wilayah Persekutuan, 57000
+                  <br /> Malaysia
+                </div>
+              </div>
+            </p>
+            <br />
+            <br />
+          </div>
+        </div>
+      </ContentWrapper>
+      <FAQ color1="#0348A8" color2={"#72B3FF"} data={conatctFaqs} />
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <Footer page="AKADEMY_B2C" contact={true} />
+    </Provider>
+  );
+}
diff --git a/src/components/Contact/index.module.css b/src/components/Contact/index.module.css
new file mode 100644
index 0000000..059b819
--- /dev/null
+++ b/src/components/Contact/index.module.css
@@ -0,0 +1,53 @@
+.section {
+  width: 100%;
+  overflow: hidden;
+  background-image: linear-gradient(to right, #eff4ff, #d4f5fe, #dae4fe);
+  padding-bottom: 30px;
+}
+
+.box {
+  text-align: center;
+  color: #00548e;
+  padding-top: 100px;
+  height: 500px;
+}
+
+.color {
+  color: #00548e;
+  padding-top: 30px;
+}
+
+.box h1 {
+  padding: 20px 0px;
+}
+
+.flex {
+  display: flex;
+  margin: 40px 0;
+  position: relative;
+  z-index: 2;
+  color: #00548e;
+}
+
+.flex_1 {
+  flex: 1;
+}
+
+.mt {
+  margin-top: 80px;
+}
+
+.iframe_width {
+  width: 90%;
+  height: 460px;
+}
+
+@media only screen and (max-width: 600px) {
+  .flex {
+    display: block;
+  }
+  .iframe_width {
+    width: 100%;
+    height: 360px;
+  }
+}
diff --git a/src/components/TermCondition/index.jsx b/src/components/TermCondition/index.jsx
new file mode 100644
index 0000000..0479427
--- /dev/null
+++ b/src/components/TermCondition/index.jsx
@@ -0,0 +1,58 @@
+import ContentWrapper from "../ContentWrapper/ContentWrapper";
+import Footer from "../Footer/Footer";
+import Header from "../Header/Header";
+import { data } from "../../components/data/termConditions";
+import style from "./index.module.css";
+import { Provider } from "react-redux";
+import { store } from "../redux/store";
+
+export default function Index() {
+  window.scrollTo({ top: 0, behavior: "instant" });
+  return (
+    <Provider store={store}>
+      <section className={style.out_box}>
+        <div className={style.image_box}>
+          <ContentWrapper>
+            <Header color={"#015C9F"} />
+            <div className={style.box}>
+              <img src="/assets/tc.webp" />
+              <h2>Terms & Conditions</h2>
+              <p>
+                All the products and services are provided by aKadmy. These
+                Terms of Use ("Terms") govern your use of aKadmy’s website,
+                apps, and other products and services ("Services"). Some of our
+                Services are software that can be downloaded on a computer,
+                tablet, phone or any other device, you agree that we may update
+                our software automatically at any point of time, that these
+                Terms will apply to such updates. By using our Services, you
+                agree to be bound by these Terms, including the policies
+                referenced in them. If you do not agree to these Terms, please
+                refrain from using the Website or our suite of products.
+              </p>
+            </div>
+          </ContentWrapper>
+        </div>
+      </section>
+      <ContentWrapper>
+        {data.map((item) => (
+          <div className={style.color}>
+            <h4>{item.title}</h4>
+            {item.content.map((item) => (
+              <p style={{ paddingTop: "10px" }}>{item}</p>
+            ))}
+            <ul>{item.points && item.points.map((item) => <li>{item}</li>)}</ul>
+          </div>
+        ))}
+      </ContentWrapper>
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <br />
+      <Footer page="AKADEMY_B2C" contact={true} />
+    </Provider>
+  );
+}
diff --git a/src/components/TermCondition/index.module.css b/src/components/TermCondition/index.module.css
new file mode 100644
index 0000000..ca20208
--- /dev/null
+++ b/src/components/TermCondition/index.module.css
@@ -0,0 +1,31 @@
+.out_box {
+  width: 100%;
+  overflow: hidden;
+}
+
+.image_box {
+  width: 100%;
+  background-image: linear-gradient(to right, #eff4ff, #d4f5fe, #dae4fe);
+  padding-bottom: 30px;
+}
+
+.box {
+  text-align: center;
+  color: #00548e;
+  padding-top: 100px;
+}
+
+.color {
+  color: #00548e;
+  padding-top: 30px;
+}
+
+.box h2 {
+  padding: 20px 0px;
+}
+
+@media only screen and (max-width: 600px) {
+  .box {
+    padding-top: 10px;
+  }
+}
diff --git a/src/components/redux/purchaseSlice.js b/src/components/redux/purchaseSlice.js
index 8cba29e..9b41de2 100644
--- a/src/components/redux/purchaseSlice.js
+++ b/src/components/redux/purchaseSlice.js
@@ -274,7 +274,7 @@ export const purchaseSlice = createSlice({
     });
 
     builder.addCase(getPurchaseDetails.fulfilled, (state, action) => {
-      state.purchaseDetails = action.payload.data.data[0];
+      state.purchaseDetails = action.payload.data;
     });
     builder.addCase(getAllTeenybeansLanguages.fulfilled, (state, action) => {
       state.teenybeansLanguages = action.payload.data;
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index f270a18..ea05b2a 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -29,7 +29,7 @@ console.log('Astro.props', newSchema1, newSchema2, newSchema3)
 </script>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+		<link rel="icon" type="image/svg+xml" href="/assets/akademy-logo.png" />
     <meta name="google-site-verification" content="ULrPGBKj6_niSC1FkjuvDdM985OysHCWlzhTAKwra68" />
 		<meta name="generator" content={Astro.generator} />
 		<title>{title}</title>
diff --git a/src/pages/_404.astro b/src/pages/_404.astro
new file mode 100644
index 0000000..4d565c9
--- /dev/null
+++ b/src/pages/_404.astro
@@ -0,0 +1,12 @@
+---
+import Layout from "../layouts/Layout.astro";
+import HomePage from "../components/Home/Home.jsx";
+
+
+---
+
+<Layout >
+    <HomePage client:only="react" />
+</Layout>
+
+
diff --git a/src/pages/about-us.astro b/src/pages/about-us.astro
new file mode 100644
index 0000000..5003031
--- /dev/null
+++ b/src/pages/about-us.astro
@@ -0,0 +1,18 @@
+---
+import Layout from "../layouts/Layout.astro";
+import About from "../components/About/index.jsx";
+
+---
+
+<Layout 
+    title = "About aKadmy | Transforming Early Education with AI Solutions"
+    description = "Learn how aKadmy empowers preschools with AI-driven tools, enhancing education and streamlining management. Join us in transforming early childhood learning."
+    canonicalUrl = "https://akadmyapp.com/about-us"
+    keywords = "Learning, aKadmy, Early Education, Preschool, Engaging, playful"
+    ogImage = "/assets/akademy_Logo.png"
+    ogUrl = "https://akadmyapp.com"
+>
+    <About client:only="react" />
+</Layout>
+
+
diff --git a/src/pages/contact-us.astro b/src/pages/contact-us.astro
new file mode 100644
index 0000000..f7c3e62
--- /dev/null
+++ b/src/pages/contact-us.astro
@@ -0,0 +1,18 @@
+---
+import Layout from "../layouts/Layout.astro";
+import Contact from "../components/Contact/index.jsx";
+
+---
+
+<Layout 
+    title = "Learn more about aKadmy | We're Here to Support You"
+    description = "Have questions? Reach out to aKadmy for personalized support and discover how our solutions can elevate your preschool's education experience."
+    canonicalUrl = "https://akadmyapp.com/contact-us"
+    keywords = "Learning, aKadmy, Early Education, Preschool, Engaging, playful"
+    ogImage = "/assets/akademy_Logo.png"
+    ogUrl = "https://akadmyapp.com"
+>
+    <Contact client:only="react" />
+</Layout>
+
+
diff --git a/src/pages/term-and-conditions.astro b/src/pages/term-and-conditions.astro
new file mode 100644
index 0000000..3377b17
--- /dev/null
+++ b/src/pages/term-and-conditions.astro
@@ -0,0 +1,18 @@
+---
+import Layout from "../layouts/Layout.astro";
+import TermCondition from "../components/TermCondition/index.jsx";
+
+---
+
+<Layout 
+    title = "aKadmy Terms and Conditions | Your Trust, Our Commitment"
+    description = "aKadmy Terms and Conditions | Your Trust, Our Commitment"
+    canonicalUrl = "https://akadmyapp.com/term-and-conditions"
+    keywords = "Learning, aKadmy, Early Education, Preschool, Engaging, playful"
+    ogImage = "/assets/akademy_Logo.png"
+    ogUrl = "https://akadmyapp.com"
+>
+    <TermCondition client:only="react" />
+</Layout>
+
+