diff --git a/src/components/Banners/BannerActionCall.js b/src/components/Banners/BannerActionCall.js
index 7035e5b0..625f4e08 100644
--- a/src/components/Banners/BannerActionCall.js
+++ b/src/components/Banners/BannerActionCall.js
@@ -1,11 +1,10 @@
 import React from "react"
 import { Link } from "gatsby"
-
 import { getImage, GatsbyImage } from "gatsby-plugin-image"
 import "./BannerActionCall.scss"
 
 const BannerActionCall = ({ banner }) => {
-  const icon = getImage(banner?.logo?.localFile)
+  const icon = getImage(banner?.image?.localFile)
 
   return (
     <div className="bannerActCall">
diff --git a/src/components/Banners/BannerActionCall.scss b/src/components/Banners/BannerActionCall.scss
index 4b800aa5..d6848e68 100644
--- a/src/components/Banners/BannerActionCall.scss
+++ b/src/components/Banners/BannerActionCall.scss
@@ -18,7 +18,7 @@
     max-width: 195px;
   }
   &__logo {
-    flex-basis: 80px;
+    flex-basis: 60px;
     padding-bottom: 30px;
   }
   &__title {
@@ -67,7 +67,7 @@
       margin-top: 7rem;
     }
     &__logo {
-      flex-basis: 135px;
+      flex-basis: 110px;
       padding-bottom: 65px;
       //   transform: translateY(-10%);
     }
diff --git a/src/components/Banners/BannerBgImage.js b/src/components/Banners/BannerBgImage.js
index 4fa9dcea..f224026b 100644
--- a/src/components/Banners/BannerBgImage.js
+++ b/src/components/Banners/BannerBgImage.js
@@ -2,22 +2,18 @@ import React from "react"
 import { Link } from "gatsby"
 import { getImage } from "gatsby-plugin-image"
 import { BgImage } from "gbimage-bridge"
-import { useBanner } from "../../hooks/index"
 import showdown from "showdown"
 import "./BannerBgImage.scss"
 
 import { useTheme } from "../../context/themeContext"
 
 const BannerBgImage = ({ banner }) => {
-  const dataBanner = useBanner()
+
   const { theme } = useTheme()
 
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { image, imageDarkMode, link, summary } = bannerSelected
+  const { bgImage, bgImageDarkMode, link, title } = banner
 
-  const titles = summary
+  const titles = title
   let converter = new showdown.Converter()
   let post = titles
   let html = converter.makeHtml(post)
@@ -26,12 +22,12 @@ const BannerBgImage = ({ banner }) => {
     return { __html: html }
   }
 
-  const imagen = getImage(image?.localFile)
-  const imagenDM = getImage(imageDarkMode?.localFile)
+  const imagen = getImage(bgImage?.localFile)
+  const imagenDM = getImage(bgImageDarkMode?.localFile)
 
   return (
     <div className="bannerBgImage">
-      {bannerSelected.type === "bgImage" ? (
+      {banner.bgImage ? (
         <BgImage
           image={theme === "dark" && imagenDM ? imagenDM : imagen}
           className="bannerBgImage__bgImage"
diff --git a/src/components/Banners/BannerISO.js b/src/components/Banners/BannerISO.js
index bae980ee..4a77edf6 100644
--- a/src/components/Banners/BannerISO.js
+++ b/src/components/Banners/BannerISO.js
@@ -1,18 +1,13 @@
 import React from "react"
 import { getImage, GatsbyImage } from "gatsby-plugin-image"
-import { useBanner } from "../../hooks/index"
 import showdown from "showdown"
 import "./BannerISO.scss"
 
-const BannerISO = ({ banner, title }) => {
-  const dataBanner = useBanner()
+const BannerISO = ({ banner }) => {
 
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { logo, summary } = bannerSelected
+  const { title, subtitle, image, imageDarkMode } = banner
 
-  const titles = summary
+  const titles = subtitle
   let converter = new showdown.Converter()
   let post = titles
   let html = converter.makeHtml(post)
@@ -31,7 +26,7 @@ const BannerISO = ({ banner, title }) => {
           ></div>
         </div>
         <div className="bannerISO__image ">
-          <GatsbyImage image={getImage(logo?.localFile)} alt={`img-${title}`} />
+          <GatsbyImage image={getImage(image?.localFile)} alt={`img-${title}`} />
         </div>
       </div>
     </div>
diff --git a/src/components/Banners/BannerLogo.js b/src/components/Banners/BannerLogo.js
index 38f3eca5..e0b35557 100644
--- a/src/components/Banners/BannerLogo.js
+++ b/src/components/Banners/BannerLogo.js
@@ -7,21 +7,15 @@ import { useTheme } from "../../context/themeContext"
 
 import "./BannerLogo.scss"
 
-const BannerLogo = ({ banner, title }) => {
+const BannerLogo = ({ banner }) => {
   const { theme } = useTheme()
+  const { bgImage, bgImageDarkMode, image, imageDarkMode, title } = banner
 
-  const dataBanner = useBanner()
-
-  const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
-    ban => ban.strapiId === banner.id
-  )
-  const { image, imageDarkMode, logo, logoDarkMode, summary } = bannerSelected
-
-  const imagen = getImage(image?.localFile)
-  const logoImage = getImage(logo?.localFile)
+  const imagen = getImage(bgImage?.localFile)
+  const logoImage = getImage(image?.localFile)
   // Version Dark Mode
-  const imagenDM = getImage(imageDarkMode?.localFile)
-  const logoDM = getImage(logoDarkMode?.localFile)
+  const imagenDM = getImage(bgImageDarkMode?.localFile)
+  const logoDM = getImage(imageDarkMode?.localFile)
 
   return (
     <>
@@ -40,14 +34,14 @@ const BannerLogo = ({ banner, title }) => {
           <h1 className="BannerLogo__Title">{title}</h1>
         </BgImage>
       )}
-
-      {summary ? (
+{/* 
+      {title ? (
         <div className="BannerLogo__summary">
           <div className="container ">
-            <p className="BannerLogo__summary__txt">{summary}</p>
+            <p className="BannerLogo__summary__txt">{title}</p>
           </div>
         </div>
-      ) : null}
+      ) : null} */}
     </>
   )
 }
diff --git a/src/components/Banners/BannerTop.js b/src/components/Banners/BannerTop.js
index 0da47be5..43bc26d4 100644
--- a/src/components/Banners/BannerTop.js
+++ b/src/components/Banners/BannerTop.js
@@ -6,11 +6,11 @@ import "./BannerTop.scss"
 import { useTheme } from "../../context/themeContext"
 
 const BannerTop = ({ banner }) => {
-  const { image, imageDarkMode, title, summary } = banner
+  const { bgImage, bgImageDarkMode, title, summary } = banner
   const { theme } = useTheme()
 
-  const imageBanner = getImage(image?.localFile)
-  const imageDM = getImage(imageDarkMode?.localFile)
+  const imageBanner = getImage(bgImage?.localFile)
+  const imageDM = getImage(bgImageDarkMode?.localFile)
 
   return (
     <div className="banner">
diff --git a/src/components/Banners/BannerTop.scss b/src/components/Banners/BannerTop.scss
index 0664b29d..7c55eeb6 100644
--- a/src/components/Banners/BannerTop.scss
+++ b/src/components/Banners/BannerTop.scss
@@ -25,13 +25,14 @@
 
     &__txt {
       color: $white;
-      font-size: 15px;
+      font-size: $medium;
       padding: 23px 16px;
       font-weight: $normal;
-      line-height: 18px;
+      line-height: 25px;
       letter-spacing: 0em;
       text-align: center;
       margin: 20px 0 20px;
+      font-weight: bold;
     }
   }
 }
diff --git a/src/components/BitwayPage/BitwayContainer.js b/src/components/BitwayPage/BitwayContainer.js
index bb67396a..5cf99426 100755
--- a/src/components/BitwayPage/BitwayContainer.js
+++ b/src/components/BitwayPage/BitwayContainer.js
@@ -7,7 +7,7 @@ import Gallery from "./Gallery/Gallery"
 import Paragraph from "./Paragraph/Paragraph"
 import "./BitwayContainer.scss"
 import BannerActionCall from "../Banners/BannerActionCall"
-import { useBanner } from "../../hooks"
+
 
 const BitwayPage = () => {
   const {
@@ -15,13 +15,7 @@ const BitwayPage = () => {
   } = useBitwayPage()
 
   const sections = nodes[0]?.sections
-
-  const bannerData = useBanner()
-
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "bitway" && banner.type === "actionCall"
-  )
-
+  const bannerActionCall  = nodes[0]?.actionCallBanner
   const { pageTitle, pageDescription, pageKeywords } = nodes[0]?.SEO
 
   // vista desktop
diff --git a/src/components/BitwayPage/Gallery/Gallery.scss b/src/components/BitwayPage/Gallery/Gallery.scss
index 7ddfd139..d30356bb 100644
--- a/src/components/BitwayPage/Gallery/Gallery.scss
+++ b/src/components/BitwayPage/Gallery/Gallery.scss
@@ -20,7 +20,7 @@
 .bitway-gallery {
   display: grid;
   grid-template-rows: 400px;
-  gap: 20px;
+  gap: 10px;
   overflow: hidden;
 }
 
@@ -44,7 +44,7 @@
   background: #1ECAD380;
   color: white;
   font-family: Roboto;
-  font-size: 45px;
+  font-size: 35px;
   font-style: normal;
   font-weight: 700;
   line-height: 51px;
@@ -59,7 +59,7 @@
   }
 
   .bitway-gallery-item-inner {
-    font-size: 25px;
+    font-size: 20px;
   }
   
   
diff --git a/src/components/BitwayPage/Paragraph/Paragraph.scss b/src/components/BitwayPage/Paragraph/Paragraph.scss
index 81ef9b7d..f495b174 100644
--- a/src/components/BitwayPage/Paragraph/Paragraph.scss
+++ b/src/components/BitwayPage/Paragraph/Paragraph.scss
@@ -9,7 +9,7 @@
     font-weight: 400;
     line-height: 30px;
     letter-spacing: 0em;
-    text-align: left;
+    text-align: justify;
   }
   & > div > p {
     font-family: $primary-font;
@@ -18,7 +18,7 @@
     font-weight: 400;
     line-height: 30px;
     letter-spacing: 0em;
-    text-align: left;
+    text-align: justify;
     // padding: 0 80px 20px;
     & * {
       font-size: 20px;
@@ -39,10 +39,10 @@
     font-size: $large;
     font-style: normal;
     font-weight: 700;
-    line-height: 51px;
+    line-height: 40px;
     letter-spacing: 0em;
     text-align: center;
-    margin: 80px 0 45px;
+    margin: 40px 0 45px;
     & span {
       font-size: $large;
       background-color: $blue;
@@ -71,7 +71,7 @@
       font-weight: 400;
       line-height: 26px;
       letter-spacing: 0em;
-      text-align: left;
+      text-align: justify;
     }
     & > div > p {
       font-family: $primary-font;
@@ -80,7 +80,7 @@
       font-weight: 400;
       line-height: 26px;
       letter-spacing: 0em;
-      text-align: left;
+      text-align: justify;
       // padding: 0 20px 0px 0px;
       & * {
         font-size: 15px;
diff --git a/src/components/BlogPage/BlogContainer.js b/src/components/BlogPage/BlogContainer.js
index 45715857..b24c4f05 100644
--- a/src/components/BlogPage/BlogContainer.js
+++ b/src/components/BlogPage/BlogContainer.js
@@ -1,27 +1,20 @@
 import React from "react"
-import { useBanner, useBlog } from "../../hooks"
-
+import { useBlog } from "../../hooks"
 import Layout from "../../components/layout"
 import BlogGrid from "./BlogGrid/BlogGrid"
 import BlogArticle from "./BlogArticle/BlogArticle"
-
 import { Seo, BannerActionCall } from "../index"
 
 import "./BlogContainer.scss"
 
 const Blog = () => {
-  const bannerData = useBanner()
+
   const blogData = useBlog()
+
   const data = blogData?.allStrapiBlogCategory?.nodes
   const dataArticles = blogData?.allStrapiArticle?.nodes
-
-  const bannerBlog = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "blog" && banner.type === "bgColor"
-  )
-
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "blog" && banner.type === "actionCall"
-  )
+  const bannerActionCall = blogData?.allStrapiBlogPage?.nodes[0]?.actionCallBanner
+  const title = blogData?.allStrapiBlogPage?.nodes[0]?.title
 
   const filterArticle = data.map(category => dataArticles.filter(article => category.name === article.blog_category.name))
 
@@ -42,9 +35,9 @@ const Blog = () => {
       )}
       {data.length > 0 && (
         <div className="blog__container">
-          {bannerBlog && (
+          {title && (
             <div className="banner__container">
-              <h3 dangerouslySetInnerHTML={{ __html: bannerBlog.summary }} />
+              <h3 dangerouslySetInnerHTML={{ __html: title }} />
             </div>
           )}
           
diff --git a/src/components/BlogPage/BlogContainer.scss b/src/components/BlogPage/BlogContainer.scss
index 031d9ac5..1a9cfef8 100644
--- a/src/components/BlogPage/BlogContainer.scss
+++ b/src/components/BlogPage/BlogContainer.scss
@@ -29,8 +29,10 @@
             background-color: $blue;
             overflow: hidden;
             transform: skew(-20deg);
+            margin-left: 10px;
 
             p {
+                font-size: $medium;
                 padding: 10px;
                 margin-bottom: 0;
                 color: $white;
@@ -55,6 +57,10 @@
             span {
                 margin-top: 0;
                 margin-left: 15px;
+
+                p{
+                    font-size: $large;
+                }
             }
         }
     }
diff --git a/src/components/Cards/Cards.scss b/src/components/Cards/Cards.scss
index 96846776..ca9b54ba 100644
--- a/src/components/Cards/Cards.scss
+++ b/src/components/Cards/Cards.scss
@@ -8,7 +8,6 @@
   &__title {
     color: $primary;
     font-weight: $max-bold;
-    font-size: $medium;
     line-height: $large;
     text-align: center;
     padding: 90px 5px 19px;
@@ -16,6 +15,9 @@
     flex-direction: column;
     align-items: center;
     gap: 20px;
+    h3{
+      font-size: $medium;
+    }
     &-logo {
       margin: 0 0;
     }
@@ -42,13 +44,14 @@
       font-weight: $normal;
       font-size: 15px;
       line-height: 20px;
+      text-align: justify;
     }
   }
   &__submodules {
     background-color: none;
     color: $primary;
     position: relative;
-    padding: 0 45px;
+    padding: 0 10px;
 
     &__title {
       margin: 2em 0 30px 0;
@@ -96,10 +99,12 @@
       transform: translate(60%, 60%);
     }
     &__title {
-      font-size: $large;
       text-align: start;
       flex-direction: row;
       align-items: flex-end;
+      h3{
+        font-size: $large;
+      }
       &-logo {
         width: 115px;
         display: flex;
diff --git a/src/components/EdTechPage/EdTechContainer.js b/src/components/EdTechPage/EdTechContainer.js
index 5e8b8b12..fcc0031d 100644
--- a/src/components/EdTechPage/EdTechContainer.js
+++ b/src/components/EdTechPage/EdTechContainer.js
@@ -1,5 +1,5 @@
 import * as React from "react"
-import { useEdTech, useBanner } from "../../hooks"
+import { useEdTech } from "../../hooks"
 import { BannerTop, BannerActionCall, Seo } from "../index"
 import Layout from "../layout"
 
@@ -9,17 +9,12 @@ import "./EdtechContainer.scss"
 const EdTech = () => {
   const data = useEdTech()
 
-  const bannerData = useBanner()
   const edTechs = data?.allStrapiEdteches?.nodes
 
   const content = edTechs.map(tech => <Cards key={tech.id} tech={tech} />)
 
-  const bannerTop = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "edtech" && banner.type === "top"
-  )
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "edtech" && banner.type === "actionCall"
-  )
+  const bannerTop = data?.allStrapiEdTechPage?.nodes[0].topBanner
+  const bannerActionCall = data?.allStrapiEdTechPage?.nodes[0].actionCallBanner
 
   const {
     pageTitle,
diff --git a/src/components/HomePage/HomeContainer/HomeContainer.js b/src/components/HomePage/HomeContainer/HomeContainer.js
index 802dd022..18f7cdaf 100644
--- a/src/components/HomePage/HomeContainer/HomeContainer.js
+++ b/src/components/HomePage/HomeContainer/HomeContainer.js
@@ -1,17 +1,34 @@
 import * as React from "react"
 import { useHomePage } from "../../../hooks/index"
 import Layout from "../../layout"
-import { Seo, CustomSection } from "../../index"
+import {
+  Seo,
+  CustomSection,
+  BannerLogo,
+  BannerBgImage,
+  BannerISO,
+  ServiceCards,
+  EdTechCards,
+  PartnersSection,
+} from "../../index"
 
 import "./HomeContainer.scss"
 
 const Home = () => {
-
   const data = useHomePage()
-  
-  const homeSections = data?.allStrapiHome?.nodes[0]?.sections
-  const { pageTitle, pageDescription, pageKeywords } = data?.allStrapiHome?.nodes[0]?.pageMetadata || {}
 
+  const homeSections = data?.allStrapiHome?.nodes[0]?.sections
+  const { pageTitle, pageDescription, pageKeywords } =
+    data?.allStrapiHome?.nodes[0]?.pageMetadata || {}
+  const {
+    topHomeBanner,
+    infoImgBanner,
+    infoBgBanner,
+    infoBanner,
+    servicesBlock,
+    partnersBlock,
+    edtechBlock,
+  } = data?.allStrapiHome?.nodes[0]
 
   return (
     <Layout>
@@ -22,9 +39,29 @@ const Home = () => {
           keywords={pageKeywords}
         />
       )}
-      {homeSections && (
-        <CustomSection sections={homeSections} />
+      {topHomeBanner && <BannerLogo banner={topHomeBanner} />}
+      {servicesBlock && (
+        <ServiceCards
+          title={servicesBlock?.title}
+          services={servicesBlock?.services}
+        />
+      )}
+      {edtechBlock && (
+        <EdTechCards
+          title={edtechBlock.title}
+          edteches={edtechBlock.edteches}
+        />
+      )}
+      {infoBgBanner && <BannerBgImage banner={infoBgBanner} />}
+      {infoImgBanner && <BannerISO banner={infoImgBanner} />}
+      {partnersBlock && (
+        <PartnersSection
+          title={partnersBlock.title}
+          partners={partnersBlock.partners}
+        />
       )}
+      {infoBanner && <BannerBgImage banner={infoBanner} />}
+      {homeSections && <CustomSection sections={homeSections} />}
     </Layout>
   )
 }
diff --git a/src/components/JobsPage/JobsPage.js b/src/components/JobsPage/JobsPage.js
index 3b45abb8..54f2f475 100644
--- a/src/components/JobsPage/JobsPage.js
+++ b/src/components/JobsPage/JobsPage.js
@@ -8,7 +8,7 @@ import './JobsPage.scss'
 
 export default function JobsPage() {
     const jobsData = useJobsPage()
-    const banner = jobsData?.strapiJobsPage?.banner
+    const title = jobsData?.strapiJobsPage?.title
     const { pageTitle, pageDescription, pageKeywords } = jobsData?.strapiJobsPage?.pageMetadata || {}
 
     return (
@@ -20,7 +20,7 @@ export default function JobsPage() {
                     keywords={pageKeywords}
                 />
             )}
-            <MarkdownView markdown={banner} className="banner__head" />
+            <MarkdownView markdown={title} className="banner__head" />
             <div id="cats-portal-widget" className="container widget-container"></div>
             <Helmet>
                 <script>
diff --git a/src/components/JobsPage/JobsPage.scss b/src/components/JobsPage/JobsPage.scss
index 187df634..e5695abd 100644
--- a/src/components/JobsPage/JobsPage.scss
+++ b/src/components/JobsPage/JobsPage.scss
@@ -1,12 +1,5 @@
 @import "../../styles/global.scss";
 
-.cats-job-title {
-  a {
-    color: $title-jobs;
-    font-weight: 700;    
-  }
-}
-
 .cats-multiselect{
   &-label {
     color: $primary !important;
@@ -40,8 +33,20 @@
   > div {
     overflow-x: hidden !important;
   }
+
+  &-title {
+    overflow: hidden;
+    a {
+      color: $title-jobs;
+      font-weight: 700; 
+      font-size: $medium;
+      padding-bottom: 10px;   
+    }
+  }
+
   &-column-value {
     color: $primary !important;
+    font-size: $small;
   }
 
   &:hover {
@@ -116,7 +121,42 @@
   }
 }
 
+.cats-mobile{
+  &-column-name{
+    font-size:$small;
+  }
+}
+
 @media (min-width: $breakpoint-tablet) {
+
+  .cats-column-name {
+    span{
+      font-size: $large;
+    }
+  }
+  .cats-job {
+  
+    &-title {
+      a {
+        font-size: $large;  
+      }
+    }
+  
+    &-column-value {
+      font-size: $medium;
+    }
+  }
+
+  .cats-mobile{
+    &-column-name{
+      font-size:$medium;
+    }
+  }
+
+  .cats-multiselect-label{
+    font-size: $large;
+  }
+
   .widget-container {
     margin-top: 70px !important;
   }
@@ -136,3 +176,11 @@
     }
   }
 }
+
+@media (min-width: $breakpoint-desktop) {
+  .cats-job {
+    &-column-value {
+      font-size: $large;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/components/ServiceCards/ServiceCards.js b/src/components/ServiceCards/ServiceCards.js
index c7f6ec44..abd7def7 100644
--- a/src/components/ServiceCards/ServiceCards.js
+++ b/src/components/ServiceCards/ServiceCards.js
@@ -18,7 +18,7 @@ const ServiceCards = ({ title, services }) => {
   }
 
   const servicios = services?.map((service, idx) => (
-      <div key={idx} className="col-12 col-md-3 ServiceCards__card">
+      <div key={idx} className="col-12 col-md-7 col-lg-3 ServiceCards__card">
         <div className="ServiceCards__image">
           <GatsbyImage
             image={theme === "dark" && getImage(service?.iconDarkMode?.localFile) ? getImage(service?.iconDarkMode?.localFile) : getImage(service?.icon?.localFile)}
diff --git a/src/components/ServiceCards/ServiceCards.scss b/src/components/ServiceCards/ServiceCards.scss
index 5ceb3884..f3729d7e 100644
--- a/src/components/ServiceCards/ServiceCards.scss
+++ b/src/components/ServiceCards/ServiceCards.scss
@@ -26,7 +26,7 @@
     h6,
     p,
     span {
-      font-size: $second-large;
+      font-size: $large;
       font-weight: $extra-bold;
       color: $blue;
       margin-bottom: 30px;
@@ -57,7 +57,7 @@
     justify-content: center;
   }
   &__title {
-    font-size: $large;
+    font-size: $medium;
     font-weight: $max-bold;
     text-align: center;
     max-width: 200px;
@@ -70,7 +70,7 @@
   }
   &__link {
     color: $blue;
-    font-size: $large;
+    font-size: $medium;
     font-weight: $max-bold;
     border-bottom: 4px solid $yellow;
     margin-bottom: 0;
@@ -81,7 +81,7 @@
   }
 }
 
-@media (min-width: $breakpoint-tablet) {
+@media (min-width: $breakpoint-desktop) {
   .ServiceCards {
     &__mainTitle {
       h1,
@@ -99,5 +99,14 @@
     &__intro {
       font-size: $medium;
     }
+
+    &__link {
+      font-size: $large;
+    }
+
+    &__title {
+      font-size: $large;
+    }
   }
 }
+
diff --git a/src/components/ServicesPage/ServicesSection.js b/src/components/ServicesPage/ServicesSection.js
index 77bf3fa2..f716194d 100644
--- a/src/components/ServicesPage/ServicesSection.js
+++ b/src/components/ServicesPage/ServicesSection.js
@@ -1,5 +1,5 @@
 import React from "react"
-import { useServices, useBanner } from "../../hooks"
+import { useServices, useBanner, useServicePage } from "../../hooks"
 import Layout from "../layout"
 import { BannerTop, BannerActionCall, ServiceCard, Seo } from "../index"
 
@@ -9,18 +9,16 @@ const ServicesSection = () => {
   const servicesData = useServices()
   const bannerData = useBanner()
 
+  const servicesPageData = useServicePage()
+
   const servicesList = servicesData?.allStrapiServices?.nodes
 
   const servicesToDisplay = servicesList?.map(service => (
     <ServiceCard key={service.id} service={service} />
   ))
 
-  const bannerTop = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "services" && banner.type === "top"
-  )
-  const bannerActionCall = bannerData?.allStrapiBanners?.nodes.find(
-    banner => banner.page === "services" && banner.type === "actionCall"
-  )
+  const bannerTop = servicesPageData?.strapiServicesPage?.topBanner
+  const bannerActionCall = servicesPageData?.strapiServicesPage?.actionCallBanner
 
   const {
     pageDescription,
diff --git a/src/components/ServicesPage/ServicesSection.scss b/src/components/ServicesPage/ServicesSection.scss
index 469227df..6d0cf3e2 100644
--- a/src/components/ServicesPage/ServicesSection.scss
+++ b/src/components/ServicesPage/ServicesSection.scss
@@ -10,6 +10,8 @@
     p {
       color: $primary;
       font-size: $small;
+      text-align: justify;
+      margin-bottom: 10px;
     }
   }
   &__icon {
@@ -20,7 +22,7 @@
     color: $primary;
     font-weight: $bold;
     font-size: $medium;
-    margin-bottom: 45px;
+    margin-bottom: 25px;
   }
   &__block {
     @extend %border-shadowed;
diff --git a/src/components/SubModulesEdTech/SubmodulesEdTech.scss b/src/components/SubModulesEdTech/SubmodulesEdTech.scss
index b307bc3c..2549d723 100644
--- a/src/components/SubModulesEdTech/SubmodulesEdTech.scss
+++ b/src/components/SubModulesEdTech/SubmodulesEdTech.scss
@@ -10,7 +10,7 @@
       margin-bottom: 0;
     }
     p {
-      text-align: start;
+      text-align: justify;
       margin-top: 20px;
     }
   }
@@ -20,6 +20,15 @@
   }
 }
 
+
+@media screen and (min-width: $breakpoint-tablet) {
+  .Submodules {
+    &__image {
+      padding-left: 30px;
+    }
+  }
+}
+
 @media screen and (min-width: 992px) {
   .Submodules {
     padding: 65px 0 50px 0;
@@ -33,6 +42,7 @@
     &__text {
       h4 {
         font-size: $large;
+        line-height: 25px;
       }
       p {
         font-size: $medium;
@@ -40,6 +50,7 @@
     }
     &__image {
       transform: translateX(20%);
+     
     }
   }
 }
diff --git a/src/components/SubmoduleItems/SubModuleItem.scss b/src/components/SubmoduleItems/SubModuleItem.scss
index f4ef436e..2853a55f 100644
--- a/src/components/SubmoduleItems/SubModuleItem.scss
+++ b/src/components/SubmoduleItems/SubModuleItem.scss
@@ -9,7 +9,7 @@
       margin-bottom: 0;
     }
     p {
-      text-align: start;
+      text-align: justify;
       margin-top: 20px;
     }
   }
@@ -24,6 +24,14 @@
   }
 }
 
+@media screen and (min-width: $breakpoint-tablet) {
+  .SubmoduleItem  {
+    &__image {
+      padding-left: 20px;
+    }
+  }
+}
+
 @media screen and (min-width: 992px) {
   .SubmoduleItem {
     &__image {
diff --git a/src/hooks/index.js b/src/hooks/index.js
index 94e86cb1..82cc5fc6 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -7,6 +7,7 @@ import useHomePage from "./useHomePage"
 import useContactPage from "./useContactPage"
 import useBlog from './useBlog'
 import useJobsPage from "./useJobsPage"
+import useServicePage from "./useServicePage"
 
 export {
   useServices,
@@ -18,4 +19,5 @@ export {
   useContactPage,
   useBlog,
   useJobsPage,
+  useServicePage
 }
diff --git a/src/hooks/useBitwayPage.js b/src/hooks/useBitwayPage.js
index b103bee4..c203a9c3 100755
--- a/src/hooks/useBitwayPage.js
+++ b/src/hooks/useBitwayPage.js
@@ -10,6 +10,27 @@ const useBitwayPage = () => {
             pageTitle
             pageKeywords
           }
+          actionCallBanner {
+            title
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            link {
+              name
+              pathTo
+            }
+          }
           sections {
             body
             id
@@ -25,6 +46,13 @@ const useBitwayPage = () => {
                   }
                 }
               }
+              imageDark {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
             }
           }
         }
diff --git a/src/hooks/useBlog.js b/src/hooks/useBlog.js
index d27001f8..7cbe94dc 100644
--- a/src/hooks/useBlog.js
+++ b/src/hooks/useBlog.js
@@ -27,11 +27,33 @@ const useBlog = () => {
       }
       allStrapiBlogPage {
         nodes {
+          title
           seo: pageMetadata {
             pageTitle
             pageKeywords
             pageDescription
           }
+          actionCallBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/hooks/useEdTech.js b/src/hooks/useEdTech.js
index 23256ee9..f8540b25 100644
--- a/src/hooks/useEdTech.js
+++ b/src/hooks/useEdTech.js
@@ -3,28 +3,44 @@ import { useStaticQuery, graphql } from "gatsby"
 const useEdTech = () => {
   const query = useStaticQuery(graphql`
     {
-      allStrapiBanners(filter: { page: { eq: "edtech" } }) {
+      allStrapiEdTechPage {
         nodes {
-          enable
-          page
-          type
-          title
-          summary
-          link {
-            pathTo
-            name
-          }
-          logo {
-            localFile {
-              childImageSharp {
-                gatsbyImageData
+          topBanner {
+            title
+            summary
+            bgImageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            bgImage {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
               }
             }
           }
-          image {
-            localFile {
-              childImageSharp {
-                gatsbyImageData
+          actionCallBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
               }
             }
           }
diff --git a/src/hooks/useHomePage.js b/src/hooks/useHomePage.js
index c92a24db..72c0e215 100644
--- a/src/hooks/useHomePage.js
+++ b/src/hooks/useHomePage.js
@@ -5,11 +5,155 @@ const useHomePage = () => {
     {
       allStrapiHome {
         nodes {
+          servicesBlock {
+            type
+            title
+            enable
+            services {
+              homeTitle
+              homeIntro
+              iconDarkMode {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              icon {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+            }
+          }
+          partnersBlock {
+            title
+            partners {
+              text
+              imageDark {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              image {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              caption
+            }
+          }
+          edtechBlock {
+            type
+            title
+            enable
+            edteches {
+              homeTitle
+              homeIntro
+              homeIconDarkMode {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+              homeIcon {
+                localFile {
+                  childImageSharp {
+                    gatsbyImageData
+                  }
+                }
+              }
+            }
+          }
           pageMetadata {
             pageDescription
             pageKeywords
             pageTitle
           }
+          topHomeBanner {
+            title
+            bgImageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            bgImage {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
+          infoImgBanner {
+            title
+            subtitle
+            imageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            image {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
+          infoBgBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+            bgImageDarkMode {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+            bgImage {
+              localFile {
+                childImageSharp {
+                  gatsbyImageData
+                }
+              }
+            }
+          }
+          infoBanner {
+            title
+            link {
+              name
+              pathTo
+            }
+          }
           sections {
             title
             type
diff --git a/src/hooks/useJobsPage.js b/src/hooks/useJobsPage.js
index 888337c3..be3bd342 100644
--- a/src/hooks/useJobsPage.js
+++ b/src/hooks/useJobsPage.js
@@ -4,7 +4,7 @@ const useJobsPage = () => {
     const query = useStaticQuery(graphql`
     {
       strapiJobsPage {
-        banner
+        title
         pageMetadata {
           pageDescription
           pageKeywords
diff --git a/src/hooks/useServicePage.js b/src/hooks/useServicePage.js
new file mode 100644
index 00000000..7ac3ad33
--- /dev/null
+++ b/src/hooks/useServicePage.js
@@ -0,0 +1,58 @@
+import { useStaticQuery, graphql } from "gatsby"
+
+const useServicePage = () => {
+  const query = useStaticQuery(graphql`
+    {
+      strapiServicesPage {
+        topBanner {
+          title
+          summary
+          bgImageDarkMode {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+          bgImage {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+        }
+        actionCallBanner {
+          title
+          link {
+            name
+            pathTo
+          }
+          imageDarkMode {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+          image {
+            localFile {
+              childImageSharp {
+                gatsbyImageData
+              }
+            }
+          }
+        }
+        pageMetadata {
+          pageDescription
+          pageKeywords
+          pageTitle
+        }
+
+      }
+    }
+  `)
+  return query
+}
+
+export default useServicePage
diff --git a/src/schema/schema.js b/src/schema/schema.js
index cbd6dc16..9113c2ce 100644
--- a/src/schema/schema.js
+++ b/src/schema/schema.js
@@ -24,6 +24,30 @@ type StrapiServicesPage implements Node {
   ): Date
   pageMetadata: StrapiServicesPagePageMetadata
   strapiId: Int
+  topBanner: StrapiServicesPageTopBanner
+  actionCallBanner: StrapiServicesPageActionCallBanner
+}
+
+type StrapiServicesPageTopBanner {
+  id: Int
+  title: String
+  summary: String
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiServicesPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiServicesPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiServicesPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
 type StrapiServicesPagePageMetadata {
@@ -92,8 +116,149 @@ type StrapiHome implements Node {
   sections: [StrapiHomeSections]
   pageMetadata: StrapiHomePageMetadata
   strapiId: Int
+  topHomeBanner: StrapiHomeTopHomeBanner
+  infoBgBanner: StrapiHomeInfoBgBanner
+  infoImgBanner: StrapiHomeInfoImgBanner
+  infoBanner: StrapiHomeInfoBanner
+  servicesBlock: StrapiHomeServicesBlock
+  edtechBlock: StrapiHomeEdtechBlock
+  partnersBlock: StrapiHomePartnersBlock
+}
+
+type StrapiHomeTopHomeBanner {
+  id: Int
+  title: String
+  image: LocalFile
+  imageDarkMode: LocalFile
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiHomeInfoBgBanner {
+  id: Int
+  title: String
+  link: StrapiHomeInfoBgBannerLink
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiHomeInfoBgBannerLink {
+  id: Int
+  name: String
+  pathTo: String
+}
+
+type StrapiHomeInfoImgBanner {
+  id: Int
+  title: String
+  subtitle: String
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiHomeInfoBanner {
+  id: Int
+  title: String
+  link: StrapiHomeInfoBannerLink
+}
+
+type StrapiHomeInfoBannerLink {
+  id: Int
+  name: String
+  pathTo: String
+}
+
+type StrapiHomeServicesBlock {
+  id: Int
+  title: String
+  type: String
+  enable: Boolean
+  services: [StrapiHomeServicesBlockServices]
+}
+
+type StrapiHomeServicesBlockServices {
+  id: Int
+  title: String
+  description: String
+  visible: Boolean
+  homeIntro: String
+  homeTitle: String
+  published_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  created_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  updated_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  icon: LocalFile
+  iconDarkMode: LocalFile
+}
+
+type StrapiHomeEdtechBlock {
+  id: Int
+  title: String
+  type: String
+  enable: Boolean
+  edteches: [StrapiHomeEdtechBlockEdteches]
 }
 
+type StrapiHomeEdtechBlockEdteches {
+  id: Int
+  title: String
+  content: String
+  homeIntro: String
+  homeTitle: String
+  published_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  created_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  updated_at(
+    formatString: String
+    fromNow: Boolean
+    difference: String
+    locale: String
+  ): Date
+  icon: LocalFile
+  homeIcon: LocalFile
+  iconDarkMode: LocalFile
+  homeIconDarkMode: LocalFile
+}
+
+type StrapiHomePartnersBlock {
+  id: Int
+  title: String
+  partners: [StrapiHomePartnersBlockPartners]
+}
+
+type StrapiHomePartnersBlockPartners {
+  id: Int
+  text: String
+  caption: String
+  image: LocalFile
+  imageDark: LocalFile
+}
+
+
+
 type StrapiHomePageMetadata {
   id: Int
   pageTitle: String
@@ -384,6 +549,30 @@ type StrapiEdTechPage implements Node {
   SEO: StrapiEdTechPageSEO
   banners: [StrapiEdTechPageBanners]
   strapiId: Int
+  topBanner: StrapiEdTechPageTopBanner
+  actionCallBanner: StrapiEdTechPageActionCallBanner
+}
+
+type StrapiEdTechPageTopBanner {
+  id: Int
+  title: String
+  summary: String
+  bgImage: LocalFile
+  bgImageDarkMode: LocalFile
+}
+
+type StrapiEdTechPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiEdTechPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiEdTechPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
 type StrapiEdTechPageSEO {
@@ -497,8 +686,24 @@ type StrapiBitwayPage implements Node {
   strapiId: Int
   banners: [StrapiBitwayPageBanners]
   banner: [StrapiBitwayPageBanner]
+  actionCallBanner: StrapiBitwayPageActionCallBanner
+}
+
+type StrapiBitwayPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiBitwayPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiBitwayPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
+
 type StrapiBitwayPageBanner {
   id: Int
   enable: Boolean
@@ -557,6 +762,7 @@ type StrapiBitwayPageSectionsGalleryImage {
   text: String
   caption: String
   image: LocalFile
+  imageDark: LocalFile
 }
 
 type StrapiBlogCategory implements Node {
@@ -1088,6 +1294,22 @@ type StrapiBlogPage implements Node {
   ): Date
   pageMetadata: StrapiBlogPagePageMetadata
   strapiId: Int
+  title: String
+  actionCallBanner: StrapiBlogPageActionCallBanner
+}
+
+type StrapiBlogPageActionCallBanner {
+  id: Int
+  title: String
+  link: StrapiBlogPageActionCallBannerLink
+  image: LocalFile
+  imageDarkMode: LocalFile
+}
+
+type StrapiBlogPageActionCallBannerLink {
+  id: Int
+  name: String
+  pathTo: String
 }
 
 type StrapiBlogPagePageMetadata {
@@ -1199,7 +1421,7 @@ type StrapiJobsPage implements Node {
   parent: Node
   children: [Node!]!
   internal: Internal!
-  banner: String
+  title: String
   published_at(
     formatString: String
     fromNow: Boolean
diff --git a/src/templates/BlogItemDetail.scss b/src/templates/BlogItemDetail.scss
index 6fce87d1..7892da2e 100644
--- a/src/templates/BlogItemDetail.scss
+++ b/src/templates/BlogItemDetail.scss
@@ -42,19 +42,23 @@
     em {
       font-size: $small;
       line-height: 24px;
+      text-align: justify;
     }
 
-    ul {
-      padding: 1rem;
+    ul,
+    ol {
+      padding: 0.5rem;
       margin-top: -1rem;
+      margin-left: 0;
 
       li {
         margin-left: 1rem;
         font-size: $small;
+        text-align: justify;
 
         &::marker {
           color: $blue;
-          font-size: 1rem;
+          font-size: $small;
         }
       }
     }
@@ -221,9 +225,20 @@
 @media (min-width: $breakpoint-tablet) {
   .detail {
     &__description {
-      ul {
+      p,
+      strong,
+      em {
+        font-size: 18px;
+      }
+
+      ul,
+      ol {
         li {
           font-size: 18px;
+
+          &::marker {
+            font-size: 18px;
+          }
         }
       }
 
@@ -297,10 +312,24 @@
       p,
       strong,
       em {
-        font-size: 18px;
+        font-size: $medium;
         line-height: 34px;
       }
 
+      ul,
+      ol {
+        li {
+          font-size: $medium;
+          &::marker {
+            font-size: $medium;
+          }
+        }
+      }
+
+      a {
+        font-size: $medium;
+      }
+
       img {
         max-width: 85%;
       }