diff --git a/src/components/common/AuthMode.tsx b/src/components/common/AuthMode.tsx
index 231a2b1b..77e14ff2 100644
--- a/src/components/common/AuthMode.tsx
+++ b/src/components/common/AuthMode.tsx
@@ -41,7 +41,7 @@ export const AuthMode: Component = () => {
                             type="submit"
                             formaction={`/${lang}/login`}
                         >
-                            {t("pageTitles.signIn")}
+                            {t("buttons.signInTitle")}
                         </button>
                     </form>
                 </div>
diff --git a/src/components/common/MobileProfileBtn.tsx b/src/components/common/MobileProfileBtn.tsx
index c2fc3296..d96fcac4 100644
--- a/src/components/common/MobileProfileBtn.tsx
+++ b/src/components/common/MobileProfileBtn.tsx
@@ -115,7 +115,7 @@ export const MobileProfileBtn = () => {
                 </div>
                 <div class="mt-2">
                     <div>
-                        <a href={`/${lang}`}>{t("pageTitles.home")}</a>
+                        <a href={`/${lang}`}>{t("buttons.home")}</a>
                     </div>
                     <div>
                         <a href={`mailto:MAIL@.com`}>{t("menus.contactUs")}</a>
diff --git a/src/components/common/ProfileBtn.tsx b/src/components/common/ProfileBtn.tsx
index 4213e52b..7b959dcc 100644
--- a/src/components/common/ProfileBtn.tsx
+++ b/src/components/common/ProfileBtn.tsx
@@ -115,7 +115,7 @@ export const ProfileBtn = () => {
                 </div>
                 <div class="mt-2">
                     <div>
-                        <a href={`/${lang}`}>{t("pageTitles.home")}</a>
+                        <a href={`/${lang}`}>{t("buttons.home")}</a>
                     </div>
                     <div>
                         <a href={`mailto:MAIL@.com`}>{t("menus.contactUs")}</a>
diff --git a/src/components/common/SignUpButton.tsx b/src/components/common/SignUpButton.tsx
index 5d669198..43fd5eec 100644
--- a/src/components/common/SignUpButton.tsx
+++ b/src/components/common/SignUpButton.tsx
@@ -16,7 +16,7 @@ export const SignUpBtn: Component = () => {
     return (
         <div>
             <button class="btn-primary ml-2" type="submit" onclick={signup}>
-                {t("pageTitles.signUp")}
+                {t("buttons.signUp")}
             </button>
         </div>
     );
diff --git a/src/components/common/cart/CartAuthMode.tsx b/src/components/common/cart/CartAuthMode.tsx
index 7ec90756..fce01dbb 100644
--- a/src/components/common/cart/CartAuthMode.tsx
+++ b/src/components/common/cart/CartAuthMode.tsx
@@ -60,7 +60,7 @@ export const CartAuthMode: Component<Props> = (props) => {
                             type="submit"
                             formaction={`/${lang}/login`}
                         >
-                            {t("pageTitles.signIn")}
+                            {t("buttons.signIn")}
                         </button>
                     </form>
                 </div>
diff --git a/src/components/home/Home.tsx b/src/components/home/Home.tsx
index 6594fc8c..d724a481 100644
--- a/src/components/home/Home.tsx
+++ b/src/components/home/Home.tsx
@@ -120,9 +120,9 @@ export const Home: Component<Props> = (props) => {
                         </Show>
 
                         <div class="ml-1">
-                            <h1 class="text-ptext1 dark:text-ptext1 md:text-2xl">
+                            <h2 class="text-ptext1 dark:text-ptext1 md:text-2xl">
                                 {t("homePageText.becomeCreator")}
-                            </h1>
+                            </h2>
                             <p class="text-center text-sm italic text-ptext2 dark:text-ptext1 md:text-lg">
                                 {t("homePageText.clickToBecomeCreator")}
                             </p>
@@ -141,7 +141,7 @@ export const Home: Component<Props> = (props) => {
 
                 <div id="popular-resources" class="my-1 w-full md:mb-8">
                     <div class="py-1 text-center text-lg md:my-4 md:text-2xl">
-                        {t("pageTitles.popularResources")}
+                        {t("homePagetext.popularResources")}
                     </div>
                     <div class="md:max-w-auto flex h-[515px] max-w-full justify-start overflow-x-auto md:h-auto md:overflow-x-auto">
                         <HomeCard posts={popularPosts()} lang={lang()} />
@@ -150,7 +150,7 @@ export const Home: Component<Props> = (props) => {
 
                 <div id="home-subject-filter" class="md:mb-8">
                     <div class="py-1 text-center text-lg md:my-4 md:text-2xl">
-                        {t("pageTitles.shopBySubject")}
+                        {t("homePageText.shopBySubject")}
                     </div>
                     {props.subjectCarousel}
                 </div>
@@ -171,7 +171,7 @@ export const Home: Component<Props> = (props) => {
 
                 <div id="new-resources" class="md:mb-8">
                     <div class="py-1 text-center text-lg md:my-4 md:text-2xl">
-                        {t("pageTitles.newResources")}
+                        {t("homePageText.newResources")}
                     </div>
                     <div class="md:max-w-auto flex h-[515px] max-w-full justify-start overflow-x-auto md:h-auto md:overflow-x-auto">
                         <HomeCard posts={newPosts()} lang={lang()} />
@@ -180,7 +180,7 @@ export const Home: Component<Props> = (props) => {
 
                 <div id="home-grade-filter" class="md:mb-8">
                     <div class="py-1 text-center text-lg md:my-4 md:text-2xl">
-                        {t("pageTitles.shopByGrade")}
+                        {t("homePageText.shopByGrade")}
                     </div>
                     <HomeGradeCarousel lang={lang()} />
                 </div>
diff --git a/src/components/members/CreatorRegistrationRouting.tsx b/src/components/members/CreatorRegistrationRouting.tsx
index 3c583b2a..d0494f35 100644
--- a/src/components/members/CreatorRegistrationRouting.tsx
+++ b/src/components/members/CreatorRegistrationRouting.tsx
@@ -30,7 +30,7 @@ export const CreatorRegistrationRouting = () => {
 
             setIsUserCreator(true);
             if (data![0]) {
-                setCreateText(t("pageTitles.viewCreatorAccount"));
+                setCreateText(t("buttons.viewCreatorAccount"));
                 setCreatorRouting(`/${lang}/creator/profile`);
             }
         } catch (error) {
diff --git a/src/components/posts/CreatePostsRouting.tsx b/src/components/posts/CreatePostsRouting.tsx
index 11f81c48..c0772fa0 100644
--- a/src/components/posts/CreatePostsRouting.tsx
+++ b/src/components/posts/CreatePostsRouting.tsx
@@ -37,7 +37,7 @@ export const CreatePostsRouting = () => {
     return (
         <Show when={isUserCreator()}>
             <a href={`/${lang}/posts/createpost`} class=" " id="createPostLink">
-                {t("pageTitles.createPost")}
+                {t("buttons.createPost")}
             </a>
         </Show>
     );
diff --git a/src/components/services/ResourcesMain.tsx b/src/components/services/ResourcesMain.tsx
index 1ec71ef9..f4f5a2c2 100644
--- a/src/components/services/ResourcesMain.tsx
+++ b/src/components/services/ResourcesMain.tsx
@@ -372,12 +372,30 @@ export const ResourcesView: Component = () => {
                     clearPriceFilter={clearPriceFilter}
                 />
 
-                <Show when={screenSize() === "sm"}>
-                    <div class="mb-2 w-full rounded-lg bg-btn1 py-2 dark:bg-btn1-DM">
-                        <h1 class="text-lg text-btn1Text dark:text-ptext1">
-                            {t("pageTitles.services")}
-                        </h1>
-                    </div>
+
+            <Show when={screenSize() === "sm"}>
+                <div class="mb-2 rounded-lg bg-btn1 py-2 dark:bg-btn1-DM">
+                    <h1 class="text-lg text-btn1Text dark:text-ptext1">
+                        {t("hElementText.services")}
+                    </h1>
+                </div>
+            </Show>
+
+            <div class="flex w-full flex-col items-center md:h-full md:w-auto md:flex-row md:items-start">
+                <Show when={screenSize() !== "sm"}>
+                    <FiltersMobile
+                        clearSubjects={clearSubjects}
+                        clearGrade={clearGrade}
+                        clearAllFilters={clearAllFilters}
+                        clearFilters={clearFilters()}
+                        filterPostsByGrade={filterPostsByGrade}
+                        filterPostsBySubject={setCategoryFilter}
+                        secularFilter={filterPostsBySecular}
+                        clearSecular={clearSecular}
+                        clearResourceTypes={clearResourceTypes}
+                        filterPostsByResourceTypes={filterPostsByResourceTypes}
+                    />
+
                 </Show>
 
                 <div class="w-11/12 items-center md:w-8/12 md:flex-1">
@@ -392,7 +410,7 @@ export const ResourcesView: Component = () => {
                     <Show when={screenSize() !== "sm"}>
                         <div class="mb-2 flex w-full items-center justify-center rounded-lg bg-btn1 opacity-80 dark:bg-btn1-DM md:h-24">
                             <h1 class="text-center text-lg text-ptext1-DM dark:text-ptext1 md:text-3xl">
-                                {t("pageTitles.services")}
+                                {t("hElementText.services")}
                             </h1>
                         </div>
                     </Show>
diff --git a/src/i18n/UI/English.ts b/src/i18n/UI/English.ts
index a847ee71..e50162e1 100644
--- a/src/i18n/UI/English.ts
+++ b/src/i18n/UI/English.ts
@@ -2,44 +2,54 @@ export const English = {
   textDirection: "ltr",
   siteDescription: "Your community for quality learning resources.",
 
-  pageTitles: {
+
+  h1ElementText: {
     services: "Resource Catalog",
     signUp: "Sign Up",
-    login: "Login",
-    home: "Home",
-    signIn: "Sign In",
-    createUserAccount: "Create User Profile",
-    editUserAccount: "Edit User Profile",
-    viewUserAccount: "My User Profile",
-    createPost: "List Resource",
-    createCreatorAccount: "Create Creator Profile",
-    editCreatorAccount: "Edit Creator Profile",
-    viewCreatorAccount: "My Creator Profile",
-    userViewCreatorAccount: "Creator Profile",
-    page404: "404 - Page Not Found",
-    requestPasswordReset: "Request Password Reset",
+    faq: "Frequently Asked Questions",
+    marketplacetax: "Marketplace Sales Tax Collection",
     resetPassword: "Set New Password",
+    community: "Community Guidelines",
+    copyright: "Copyright and Trademark Policy",
     terms: "Terms and Conditions",
+    login: "Login",
     privacy: "Privacy Policy",
-    acceptableUse: "Acceptable Use Policy",
-    about: "About Us",
-    impact: "Impact",
-    fullPost: "View Full Post",
     offline: "Offline",
-    faq: "Frequently Asked Questions",
-    viewCart: "My Cart",
-    popularResources: "Popular Resources",
-    shopBySubject: "Shop by Subject",
-    newResources: "New Resources",
-    shopByGrade: "Shop by Grade",
-    community: "Community Guidelines",
-    sellerFeePayout: "Seller Fees and Payout Rates",
-    copyright: "Copyright and Trademark Policy",
-    marketplacetax: "Marketplace Sales Tax Collection",
+    createCreatorAccount: "Create Creator Profile",
+    requestPasswordReset: "Request Password Reset",
+    page404: "404 - Page Not Found",
+    createPost: "List Resource in LearnGrove",
   },
 
-  pageMetaTitle: {
-    home: "Homepage Learngrove, the site that you can find all your learning and teaching resources"
+  pageMetaTitles: {
+    services: "Resource Catalog of LearnGrove",
+    signUp: "Sign Up into your LearnGrove Account",
+    login: "Login into your LearnGrove Account",
+    home: "Home Learngrove a website where you can find your learning and teaching resources",
+    signIn: "Sign In into your LearnGrove Account",
+    createUserAccount: "Create User Profile in LearnGrove",
+    editUserAccount: "Edit your User Profile in LearnGrove ",
+    viewUserAccount: "My User Profile in LearnGrove",
+    createPost: "List Resource in LearnGrove",
+    createCreatorAccount: "Create Creator Profile in LearnGrove ",
+    editCreatorAccount: "Edit Creator Profile of your LearnGrove Account",
+    viewCreatorAccount: "My Creator Profile Account in LearnGrove",
+    userViewCreatorAccount: "Creator Profile in LearnGrove",
+    page404: "404 - Page Not Found",
+    requestPasswordReset: "Request Password Reset for your LearnGrove Account",
+    resetPassword: "Set New Password for your LearnGrove Account",
+    terms: "Terms and Conditions of LearnGrove",
+    privacy: "Privacy Policy of LearnGrove",
+    acceptableUse: "Acceptable Use Policy of Resources in LearnGrove",
+    about: "About Us, the LearnGrove Team",
+    impact: "Impact",
+    fullPost: "View Full Post",
+    offline: "Offline",
+    faq: "Frequently Asked Questions in LearnGrove",
+    community: "Community Guidelines of LearnGrove",
+    sellerFeePayout: "Seller Fees and Payout Rates of LearnGrove",
+    copyright: "Copyright and Trademark Policy of LearnGrove",
+    marketplacetax: "Marketplace Sales Tax Collection for your Resources in LearnGrove",
   },
 
   pageDescriptions: {
@@ -137,6 +147,11 @@ export const English = {
     editPost: "Edit",
     getLinks: "Get Links",
     checkoutAsGuest: "Checkout As Guest",
+    home: "Home",
+    signInTitle: "Sign in",
+    privacy: "Privacy Policy",
+    terms: "Terms and Conditions",
+    createPost: "List Resource",
     reviewResource: "Review",
     createFavoriteList: "Create New Favorite List",
     createList: "Create List",
@@ -320,6 +335,10 @@ export const English = {
       "Click here to learn more about our community and commitment",
     contribute: "Contribute to the LearnGrove Community",
     clickToContribute: "Click here to share your input",
+    shopBySubject: "Shop by Subject",
+    popularResources: "Popular Resources",
+    newResources: "New Resources",
+    shopByGrade: "Shop by Grade",
   },
 
   menus: {
diff --git a/src/i18n/UI/French.ts b/src/i18n/UI/French.ts
index d0af2ea0..0fa3bdfd 100644
--- a/src/i18n/UI/French.ts
+++ b/src/i18n/UI/French.ts
@@ -2,44 +2,53 @@ export const French = {
   textDirection: "ltr",
   siteDescription: "Votre communauté pour des ressources d'apprentissage de qualité.",
 
-  pageTitles: {
+  h1ElementText: {
     services: "Catalogue de Ressources",
     signUp: "S'inscrire",
-    login: "Connexion",
-    home: "Maison",
-    signIn: "S'identifier",
-    createUserAccount: "Créer un profil user",
-    editUserAccount: "Modifier le profil user",
-    viewUserAccount: "Voir le profil user",
-    createPost: "Liste des Ressources",
-    createCreatorAccount: "Créer un profil fournisseur",
-    editCreatorAccount: "Modifier le profil du fournisseur",
-    viewCreatorAccount: "Mon profil fournisseur",
-    userViewCreatorAccount: "Profil du fournisseur",
-    page404: "404 - Page non trouvée",
+    faq: "Foire aux questions",
+    marketplacetax: "Collecte de la taxe de vente sur le marché",
+    resetPassword: "Définir un nouveau mot de passe",
+    community: "Lignes directrices de la communauté",
+    copyright: "Politique de droits d'auteur et de marques",
+    terms: "Termes et conditions",
+    login: "Se connecter",
+    privacy: "Politique de confidentialité",
+    offline: "Hors ligne",
+    createCreatorAccount: "Créer un profil de créateur",
     requestPasswordReset: "Demander la réinitialisation du mot de passe",
-    resetPassword: "réinitialiser le mot de passe",
-    terms: "Termes et Conditions",
-    privacy: "Politique de Confidentialité",
-    acceptableUse: "Politique d'utilisation acceptable",
-    about: "À Propos De Nous",
+    page404: "404 - Page introuvable",
+    createPost: "Répertorier les ressources dans LearnGrove",
+  },
+
+  pageMetaTitles: {
+    services: "Catalogue de ressources de LearnGrove",
+    signUp: "Inscrivez-vous à votre compte LearnGrove",
+    login: "Connectez-vous à votre compte LearnGrove",
+    home: "Page d'accueil de Learngrove, le site Web où vous pouvez trouver vos ressources d'apprentissage et d'enseignement",
+    signIn: "Connectez-vous à votre compte LearnGrove",
+    createUserAccount: "Créer un profil utilisateur dans LearnGrove",
+    editUserAccount: "Modifiez votre profil utilisateur dans LearnGrove",
+    viewUserAccount: "Mon profil d'utilisateur dans LearnGrove",
+    createPost: "Liste des ressources dans LearnGrove",
+    createCreatorAccount: "Créer un profil de créateur dans LearnGrove",
+    editCreatorAccount: "Modifier le profil du créateur de votre compte LearnGrove",
+    viewCreatorAccount: "Mon compte de profil de créateur dans LearnGrove",
+    userViewCreatorAccount: "Profil du créateur",
+    page404: "404 - Page Not Found",
+    requestPasswordReset: "Demander la réinitialisation du mot de passe de votre compte Learngrove",
+    resetPassword: "Définissez un nouveau mot de passe pour votre compte LearnGrove",
+    terms: "Conditions générales de LearnGrove",
+    privacy: "Politique de confidentialité de LearnGrove",
+    acceptableUse: "Politique d'utilisation acceptable des ressources de LearnGrove",
+    about: "À propos de nous, l'équipe LearnGrove",
     impact: "Impact",
-    fullPost: "Voir le message complet",
+    fullPost: "View Full Post",
     offline: "Hors ligne",
     faq: "Questions fréquemment posées",
-    viewCart: "Mon panier",
-    popularResources: "Ressources Populaires",
-    shopBySubject: "Magasiner par Sujet",
-    newResources: "de Nouvelles Ressources",
-    shopByGrade: "Magasiner par Catégorie",
-    community: "Règles de la communauté",
-    sellerFeePayout: "Frais du vendeur et taux de paiement",
-    copyright: "Politique de droits d'auteur et de marques",
-    marketplacetax: "Collecte des taxes de vente sur le marché",
-  },
-
-  pageMetaTitle: {
-    home: "Page d'accueil Learngrove, le site où vous pouvez trouver toutes vos ressources d'apprentissage et d'enseignement",
+    community: "Directives communautaires de LearnGrove",
+    sellerFeePayout: "Frais de vendeur et taux de paiement",
+    copyright: "Politique de droits d'auteur et de marque déposée de LearnGrove",
+    marketplacetax: "Collecte de la taxe de vente sur le marché pour vos ressources dans LearnGrove",
   },
 
   pageDescriptions: {
@@ -81,7 +90,6 @@ export const French = {
     community: "Lisez nos directives communautaires pour comprendre les principes qui favorisent le respect, la collaboration et un environnement favorable pour tous les membres.",
     sellerFeePayout: "Découvrez nos frais de vente et nos processus de paiement, y compris des informations détaillées sur les frais de transaction, les frais de paiement et les calendriers.",
     copyright: "Comprenez notre politique en matière de droits d'auteur et de marques déposées pour protéger vos droits de propriété intellectuelle et garantir le respect de nos directives pour l'utilisation de documents protégés par des droits d'auteur et des marques déposées.",
-    marketplacetax: "Découvrez notre collection de taxes de vente sur le marché et les implications fiscales.",
     taxCodeLearnMore: "En savoir plus sur les codes fiscaux pour les ressources LearnGrove",
   },
 
@@ -134,6 +142,11 @@ export const French = {
     editPost: "Editer",
     getLinks: "Obtenir des Liens",
     checkoutAsGuest: "Passer en tant qu'invite",
+    home: "Page d'accueil",
+    signInTitle: "Se Connecter",
+    privacy: "Politique de Confidentialité",
+    terms: "Termes et Conditions",
+    createPost: "Liste des Ressources",
     reviewResource: "Critique",
     createFavoriteList: "Ajouter une nouvelle liste de favoris",
     createList: "Ajouter une liste",
@@ -189,8 +202,8 @@ export const French = {
       "Aucun article ne correspond à cette recherche spécifique - veuillez essayer un autre filtre ou un autre mot clé",
     noStripeAccount:
       "Vous devez terminer votre inscription auprès de Stripe avant de publier des ressources.",
-      noUser: "Utilisateur non trouvé",
-      selectSubject: "Veuillez sélectionner au moins un sujet",
+    noUser: "Utilisateur non trouvé",
+    selectSubject: "Veuillez sélectionner au moins un sujet",
     emailNotProvided: "Email non fourni",
     comingSoon: "À venir!",
     report: "Signaler cette ressource à LearnGrove",
@@ -321,6 +334,10 @@ export const French = {
     clickToLearnMore: "Cliquez ici pour en savoir plus sur notre communauté et notre engagement",
     contribute: "Contribuer à la communauté LearnGrove",
     clickToContribute: "Cliquez ici pour partager votre contribution",
+    shopBySubject: "Acheter par sujet",
+    popularResources: "Ressources populaires",
+    newResources: "Nouvelles ressources",
+    shopByGrade: "Magasiner par catégorie",
   },
 
   menus: {
@@ -701,7 +718,7 @@ export const French = {
       { id: 102, name: 'Prévention et Sécurité Incendie', description: 'Prévention et Sécurité Incendie', ariaLabel: 'Prévention et Sécurité Incendie', subject_id: 8 },
       { id: 103, name: 'Santé', description: 'Santé', ariaLabel: 'Santé', subject_id: 6 },
       { id: 104, name: 'Patriotisme et Citoyenneté', description: 'Patriotisme et Citoyenneté', ariaLabel: 'Patriotisme et Citoyenneté', subject_id: 7 },
-            // Add more subtopics as needed
+      // Add more subtopics as needed
     ],
   },
 
diff --git a/src/i18n/UI/Spanish.ts b/src/i18n/UI/Spanish.ts
index 867864cb..d0e13c90 100644
--- a/src/i18n/UI/Spanish.ts
+++ b/src/i18n/UI/Spanish.ts
@@ -2,44 +2,52 @@ export const Spanish = {
   textDirection: "ltr",
   siteDescription: "Su comunidad para recursos de aprendizaje de calidad.",
 
-  pageTitles: {
-    services: "Catálogo de Recursos",
-    signUp: "Registrarse",
-    login: "Iniciar Sesión",
-    home: "Inicio",
-    signIn: "Iniciar Sesión",
-    createUserAccount: "Crear Perfil de Usere",
-    editUserAccount: "Editar Perfil de Usere",
-    viewUserAccount: "Ver Perfil de Usere",
-    createPost: "Lista de Recursos",
-    createCreatorAccount: "Crear Perfil de Proveedor",
-    editCreatorAccount: "Editar Perfil de Proveedor",
-    viewCreatorAccount: "Mi Perfil de proveedor",
-    userViewCreatorAccount: "Perfil del proveedor",
-    page404: "404 - Página no Encontrada",
-    requestPasswordReset: "Solicitud para Recuperar la Contraseña",
-    resetPassword: "Resetear la Contraseña",
-    terms: "Términos y Condiciones",
-    privacy: "Política de Privacidad",
-    acceptableUse: "Política de uso aceptable",
-    about: "Sobre nosotros",
-    impact: "Impacto",
-    fullPost: "Ver publicación completa",
-    offline: "Desconectado",
-    faq: "Preguntas frecuentes",
-    viewCart: "Mi carrito",
-    popularResources: "Recursos Populares",
-    shopBySubject: "Comprar por Tema",
-    newResources: "Nuevos Recursos",
-    shopByGrade: "Comprar por Grado",
-    community: "Principios de la Comunidad",
-    sellerFeePayout: "Tarifas del vendedor y tasas de pago",
-    copyright: "Política de derechos de autor y marcas comerciales",
-    marketplacetax: "Recaudación de impuestos sobre las ventas del mercado",
+  h1ElementText: {
+    services: "Catalogo de Recursos",
+    signUp: "Iniciar Sesion",
+    faq: "Preguntas Frecuentes",
+    marketplacetax: "Recaudacion de impuestos del sitio",
+    resetPassword: "Establecer nueva contraseña",
+    community: "Guia de la Comunidad",
+    copyright: "Política de Copyright",
+    terms: "Terminos y Condiciones",
+    login: "Login",
+    privacy: "Politica de Privacidad",
+    offline: "Fuera de Linea",
+    createCreatorAccount: "Crear Perfil de Creador",
+    requestPasswordReset: "Requerir una Nueva Contraseña",
+    page404: "404 - No se encuentra",
+    createPost: "Listar un Recurso en LearnGrove",
   },
 
-  pageMetaTitle: {
-    home: "Inicio Learngrove, el sitio donde podes encontrar todos los recursos para aprender y enseñar "
+  pageMetaTitles: {
+    services: "Catalogo de Recursos de LearnGrove",
+    signUp: "Registrarse y abrir una cuenta en LearnGrove ",
+    login: "Iniciar sesión en la cuenta de LearnGrove",
+    home: " Pagina Inicial de LearnGrove, el sitio web donde podes encontrar todos los recursos para aprender y enseñar",
+    signIn: "Iniciar Sesion en tu Cuenta de LearnGrove ",
+    createUserAccount: "Crear Perfil de Usuario en LearnGrove",
+    editUserAccount: "Editar tu Perfil de Usuario en LearnGrove",
+    viewUserAccount: "Mi Perfil de Usuario en Learngrove",
+    createPost: "Listar Recursos en LearnGrove",
+    createCreatorAccount: "Crear Perfil de Creador en LearnGrove",
+    editCreatorAccount: " Editar Perfil de Creador en LearnGrove",
+    viewCreatorAccount: " Mi Perfil de Creador en LearnGrove ",
+    userViewCreatorAccount: "Perfil del Creador ",
+    page404: "404 - Pagina No Encontrada",
+    requestPasswordReset: "Requerir una Nueva Contraseña para mi cuenta de LearnGrove",
+    resetPassword: "Requerir una Nueva Contraseña para mi cuenta de LearnGrove",
+    terms: "Terminos Y Condiciones de nuestro sitio Learngrove ",
+    privacy: " Política de Privacidad de LearnGrove",
+    acceptableUse: "Uso Aceptable de nuestro sitio LearnGrove",
+    about: "Sobre Nosotros, el equipo de LearnGrove",
+    impact: "Impacto",
+    fullPost: "Mirar el Post completo",
+    offline: "Fuera de Linea",
+    faq: "Frequently Asked Questions Preguntas Frecuentes dentro de LearnGrove",
+    community: "Guia de la Comunidad de LearnGrove",
+    sellerFeePayout: "Seller Fees and Payout Rates ",
+    copyright: "Política de derechos de autor y marcas comerciales de LearnGrove",
   },
 
   pageDescriptions: {
@@ -137,13 +145,18 @@ export const Spanish = {
     editPost: "Editar",
     getLinks: "Obtener enlaces",
     checkoutAsGuest: "Comprar como Invitado",
+    home: "Home",
+    signInTitle: "Iniciar sesión",
+    privacy: "Política de privacidad",
+    terms: "Términos y Condiciones",
+    createPost: "Listar Recursos",
     reviewResource: "Reseña",
     createFavoriteList: "Crear Nueva Lista de Favoritos",
     createList: "Crear Lista",
   },
 
   messages: {
-    noAccount: "¿No tienes una cuenta? Haz click aquí para ",
+    noAccount: "¿No tienes una cuenta? Hace click aquí para ",
     emailValid: "Dirección de correo electrónico válida",
     emailLackRequirements:
       "El correo electrónico no cumple con los requisitos",
@@ -156,8 +169,8 @@ export const Spanish = {
     phoneValid: "Número de teléfono válido",
     passwordMatch: "Las contraseñas no coinciden",
     passwordReset: "Restablecimiento de contraseña",
-    forgotPassword: "¿Olvidaste tu contraseña? Haz click aquí para",
-    alreadyAccount: "¿Ya tienes una cuenta? Haz click aquí para",
+    forgotPassword: "¿Olvidaste tu contraseña? Hace click aquí para",
+    alreadyAccount: "¿Ya tienes una cuenta? Hace click aquí para",
     error404: "Algo salió mal",
     onlyCreator: "Solo los proveedores pueden crear publicaciones.",
     signInAsCreator:
@@ -318,20 +331,24 @@ export const Spanish = {
     ariaLabel: "Imagen para el marcador de posición de información",
     becomeCreator:
       "¿Listo para convertirte en un creador de recursos de aprendizaje?",
-    clickToBecomeCreator: "¡Haz clic para comenzar!",
+    clickToBecomeCreator: "¡Hace clic para comenzar!",
     welcome: "¿Qué es LearnGrove?",
     clickToLearnMore:
       "Haga clic aquí para obtener más información sobre nuestra comunidad y compromiso",
     contribute: "Contribuir a la comunidad Learngrove",
     clickToContribute: "Haga clic aquí para compartir su opinión",
+    shopBySubject: "Comprar por Temas",
+    popularResources: "Recursos Populares",
+    newResources: "Nuevos Recursos",
+    shopByGrade: "Comprar por Grados",
   },
   menus: {
     resources: "Buscar Recursos",
-    contactUs: "Contáctenos",
+    contactUs: "Contáctanos",
     profile: "Perfil",
     ratingsReviews: "Puntajes y Reseñas",
     questions: "Preguntas",
-    freeDownload: "Descarga Gratis",
+    freeDownload: "Descargar Gratis",
     creatorResources: "Recursos",
     payouts: "Pagos",
     reviews: "Opiniones",
@@ -339,7 +356,7 @@ export const Spanish = {
     description: "Descripción",
     qA: "Sección de Preguntas",
     purchases: "Compras",
-    favorites: "Favoritas",
+    favorites: "Favoritos",
     following: "Siguiente",
     purchased: "Comprado el ",
     updated: "Actualizado el ",
diff --git a/src/i18n/uiType.ts b/src/i18n/uiType.ts
index 3227f686..38f00094 100644
--- a/src/i18n/uiType.ts
+++ b/src/i18n/uiType.ts
@@ -38,45 +38,39 @@ export interface uiObject {
     textDirection: string;
     siteDescription: string;
 
-    pageTitles: {
-        services: string;
-        signUp: string;
-        login: string;
-        home: string;
-        signIn: string;
-        createUserAccount: string;
-        editUserAccount: string;
-        viewUserAccount: string;
-        createPost: string;
-        createCreatorAccount: string;
-        editCreatorAccount: string;
-        viewCreatorAccount: string;
-        userViewCreatorAccount: string;
-        page404: string;
-        requestPasswordReset: string;
-        resetPassword: string;
-        terms: string;
-        privacy: string;
-        acceptableUse: string;
-        about: string;
-        impact: string;
-        fullPost: string;
-        offline: string;
-        faq: string;
-        viewCart: string;
-        popularResources: string;
-        shopBySubject: string;
-        newResources: string;
-        shopByGrade: string;
-        community: string;
-        sellerFeePayout: string;
-        copyright: string;
-        marketplacetax: string;
-    };
 
-    pageMetaTitle: {
-        home: string;
-    };
+
+  pageMetaTitles: {
+    services: string,
+    signUp: string,
+    login: string,
+    home: string,
+    signIn: string,
+    createUserAccount: string,
+    editUserAccount: string,
+    viewUserAccount: string,
+    createPost: string,
+    createCreatorAccount: string,
+    editCreatorAccount: string,
+    viewCreatorAccount: string,
+    userViewCreatorAccount: string,
+    page404: string,
+    requestPasswordReset: string,
+    resetPassword: string,
+    terms: string,
+    privacy: string,
+    acceptableUse: string,
+    about: string,
+    impact: string,
+    fullPost: string,
+    offline: string,
+    faq: string,
+    community: string,
+    sellerFeePayout: string,
+    copyright: string,
+    marketplacetax: string,
+  },
+
 
     pageDescriptions: {
         services: string;
@@ -108,59 +102,63 @@ export interface uiObject {
         taxCodeLearnMore: string;
     };
 
-    buttons: {
-        creatorProfile: string;
-        editProfile: string;
-        register: string;
-        uploadImage: string;
-        uploading: string;
-        loading: string;
-        login: string;
-        signUp: string;
-        signIn: string;
-        signOut: string;
-        returnHome: string;
-        reset: string;
-        post: string;
-        next: string;
-        previous: string;
-        delete: string;
-        contact: string;
-        phone: string;
-        saveProfile: string;
-        filters: string;
-        faq: string;
-        addToCart: string;
-        addAllToCart: string;
-        stripeSetup: string;
-        stripeLogin: string;
-        proceedToCheckout: string;
-        viewCart: string;
-        showMore: string;
-        showLess: string;
-        browseCatalog: string;
-        findResources: string;
-        download: string;
-        follow: string;
-        following: string;
-        top: string;
-        downloadResources: string;
-        addedToCart: string;
-        resetPassword: string;
-        finishStripeSetup: string;
-        requestStripePayout: string;
-        listResource: string;
-        continueShopping: string;
-        viewOrders: string;
-        reportResource: string;
-        updateResource: string;
-        editPost: string;
-        getLinks: string;
-        checkoutAsGuest: string;
-        reviewResource: string;
-        createFavoriteList: string;
-        createList: string;
-    };
+  buttons: {
+    creatorProfile: string;
+    editProfile: string;
+    register: string;
+    uploadImage: string;
+    uploading: string;
+    loading: string;
+    login: string;
+    signUp: string;
+    signIn: string;
+    signOut: string;
+    returnHome: string;
+    reset: string;
+    post: string;
+    next: string;
+    previous: string;
+    delete: string;
+    contact: string;
+    phone: string;
+    saveProfile: string;
+    filters: string;
+    faq: string;
+    addToCart: string;
+    stripeSetup: string;
+    stripeLogin: string;
+    proceedToCheckout: string;
+    viewCart: string;
+    showMore: string;
+    showLess: string;
+    browseCatalog: string;
+    findResources: string;
+    download: string;
+    follow: string;
+    following: string;
+    top: string;
+    downloadResources: string;
+    addedToCart: string;
+    resetPassword: string;
+    finishStripeSetup: string;
+    requestStripePayout: string;
+    listResource: string;
+    continueShopping: string;
+    viewOrders: string;
+    reportResource: string;
+    updateResource: string;
+    editPost: string;
+    getLinks: string;
+    checkoutAsGuest: string;
+    home: string;
+    signInTitle: string,
+    privacy: string,
+    terms: string,
+    createPost: string,
+    reviewResource: string,
+    createFavoriteList: string,
+    createList: string,
+  };
 
     messages: {
         noAccount: string;
diff --git a/src/lib/Auth.tsx b/src/lib/Auth.tsx
index f2e2a2c5..4c8794c5 100644
--- a/src/lib/Auth.tsx
+++ b/src/lib/Auth.tsx
@@ -408,7 +408,7 @@ export const Auth: Component = (props) => {
                             <div class="px-10">
                                 {t("messages.clickWrap1")}{" "}
                                 <span class="font-medium">
-                                    {t("pageTitles.signUp")}
+                                    {t("hElementText.signUp")}
                                 </span>{" "}
                                 {t("messages.clickWrap2")}{" "}
                                 <a
@@ -416,7 +416,7 @@ export const Auth: Component = (props) => {
                                     target="_blank"
                                     class="text-link2-DM hover:underline"
                                 >
-                                    {t("pageTitles.terms")}
+                                    {t("buttons.terms")}
                                 </a>{" "}
                                 &{" "}
                                 <a
@@ -424,7 +424,7 @@ export const Auth: Component = (props) => {
                                     target="_blank"
                                     class="text-link2-DM hover:underline"
                                 >
-                                    {t("pageTitles.privacy")}
+                                    {t("buttons.privacy")}
                                 </a>
                             </div>
                             <div class="mb-4 flex justify-center">
@@ -437,7 +437,7 @@ export const Auth: Component = (props) => {
                                     {loading() ? (
                                         <span>{t("buttons.loading")}</span>
                                     ) : (
-                                        <span>{t("pageTitles.signUp")}</span>
+                                        <span>{t("buttons.signUp")}</span>
                                     )}
                                 </button>
                             </div>
diff --git a/src/pages/404.astro b/src/pages/404.astro
index 73c9af86..89965629 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -7,12 +7,12 @@ const t = useTranslations(lang);
 ---
 
 <Layout
-    pageTitle={t("pageTitles.page404")}
+    pageTitle={t("pageMetaTitles.page404")}
     pageDescription={t("pageDescriptions.page404")}
 >
     <div class="flex-col place-content-center m-8 font-bold">
         <h1 class="text-5xl text-center m-4 text-ptext1 dark:text-ptext1-DM">
-            {t("pageTitles.page404")}
+            {t("h1ElementText.page404")}
         </h1>
         <h2 class="text-3xl text-center m-2 text-ptext1 dark:text-ptext1-DM">
             {t("messages.error404")}
diff --git a/src/pages/about.astro b/src/pages/about.astro
index 4cab4a9b..1d8b7f32 100644
--- a/src/pages/about.astro
+++ b/src/pages/about.astro
@@ -1,5 +1,4 @@
 ---
-
 import Layout from "@layouts/PageLayout.astro";
 import { getLangFromUrl, useTranslations } from "@i18n/utils";
 import { getCollection } from "astro:content";
@@ -8,12 +7,15 @@ import TeamAbout from "@src/components/common/TeamAbout.astro";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("about", ({ data }) => data.lang === lang && data.type === "about");
+const policyPage = await getCollection(
+    "about",
+    ({ data }) => data.lang === lang && data.type === "about"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.about")}
+    pageTitle={t("pageMetaTitles.about")}
     pageDescription={t("pageDescriptions.about")}
 >
     <div class="mx-6">
@@ -25,7 +27,7 @@ const { Content } = await policyPage[0].render();
         <div class="prose dark:prose-invert">
             <Content />
         </div>
-        <br/>
+        <br />
         <!-- <div>
             <TeamAbout />
         </div> -->
diff --git a/src/pages/cart.astro b/src/pages/cart.astro
index 54aacdac..15906e24 100644
--- a/src/pages/cart.astro
+++ b/src/pages/cart.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.viewCart")}
+    pageTitle={t("pageMetaTitles.viewCart")}
     pageDescription={t("pageDescriptions.viewCart")}
 >
     <div
diff --git a/src/pages/checkout.astro b/src/pages/checkout.astro
index 616835fd..affe06ea 100644
--- a/src/pages/checkout.astro
+++ b/src/pages/checkout.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.viewCart")}
+    pageTitle={t("pageMetaTitles.viewCart")}
     pageDescription={t("pageDescriptions.viewCart")}
     stickyFooter={false}
 >
diff --git a/src/pages/creator/[param].astro b/src/pages/creator/[param].astro
index 027f6201..2f21704e 100644
--- a/src/pages/creator/[param].astro
+++ b/src/pages/creator/[param].astro
@@ -11,8 +11,8 @@ const { param } = Astro.params;
 ---
 
 <Layout
-    pageTitle={t("pageTitles.userViewCreatorAccount") + " " + param}
-    pageDescription={t("pageTitles.userViewCreatorAccount") +
+    pageTitle={t("pageMetaTitles.userViewCreatorAccount") + " " + param}
+    pageDescription={t("pageDescriptions.userViewCreatorAccount") +
         " " +
         param +
         " " +
diff --git a/src/pages/creator/createaccount.astro b/src/pages/creator/createaccount.astro
index 93d937c1..898931d0 100644
--- a/src/pages/creator/createaccount.astro
+++ b/src/pages/creator/createaccount.astro
@@ -8,14 +8,14 @@ const t = useTranslations(lang);
 ---
 
 <Layout
-    pageTitle={t("pageTitles.createCreatorAccount")}
+    pageTitle={t("pageMetaTitles.createCreatorAccount")}
     pageDescription={t("pageDescriptions.createCreatorAccount")}
 >
     <div
         class="border border-border1 dark:border-border1-DM rounded flex flex-col items-center w-96"
     >
         <h1 class="text-xl text-ptext1 dark:text-ptext1-DM pt-4">
-            {t("pageTitles.createCreatorAccount")}
+            {t("h1ElementText.createCreatorAccount")}
         </h1>
         <div class="w-full px-6">
             <CreatorRegistration client:only="solid-js" />
diff --git a/src/pages/creator/profile.astro b/src/pages/creator/profile.astro
index a3a1624d..b216e46a 100644
--- a/src/pages/creator/profile.astro
+++ b/src/pages/creator/profile.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <Layout
-    pageTitle={t("pageTitles.viewCreatorAccount")}
+    pageTitle={t("pageMetaTitles.viewCreatorAccount")}
     stylesheets={`<link rel="stylesheet" href="/tinymce/skins/ui/oxide/skin.min.css">
   <link rel="stylesheet" href="/tinymce/skins/ui/oxide-dark/skin.min.css">
   <link rel="stylesheet" href="/tinymce/skins/content/default/content.min.css">
diff --git a/src/pages/faq.astro b/src/pages/faq.astro
index 315ab907..d54f987e 100644
--- a/src/pages/faq.astro
+++ b/src/pages/faq.astro
@@ -11,13 +11,13 @@ const { Content } = await faqPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.faq")}
+    pageTitle={t("pageMetaTitles.faq")}
     pageDescription={t("pageDescriptions.faq")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.faq")}
+                {t("hElementText.faq")}
             </h1>
         </div>
         <div class="prose dark:prose-invert">
diff --git a/src/pages/index.astro b/src/pages/index.astro
index fb4df03a..318d0071 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -10,7 +10,7 @@ const t = useTranslations(lang);
 ---
 
 <Layout
-    pageTitle={t("pageMetaTitle.home")}
+    pageTitle={t("pageMetaTitles.home")}
     pageDescription={t("pageDescriptions.home")}
 >
     <div class="w-full">
diff --git a/src/pages/login.astro b/src/pages/login.astro
index 89da08dc..dcc0af82 100644
--- a/src/pages/login.astro
+++ b/src/pages/login.astro
@@ -10,14 +10,14 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.login")}
+    pageTitle={t("pageMetaTitles.login")}
     pageDescription={t("pageDescriptions.login")}
 >
     <div>
         <div class="text-center mt-4 mb-8">
-            <h2 class="text-xl w-full italic text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.login")}
-            </h2>
+            <h1 class="text-xl w-full italic text-ptext1 dark:text-ptext1-DM">
+                {t("h1ElementText.login")}
+            </h1>
         </div>
         <div
             class="bg-background1 border-border1 border max-w-md max-h-max p-5 m-auto rounded-md dark:bg-background1-DM dark:border-border1-DM"
diff --git a/src/pages/offline.astro b/src/pages/offline.astro
index c6f5dcd0..bf8037e0 100644
--- a/src/pages/offline.astro
+++ b/src/pages/offline.astro
@@ -7,10 +7,10 @@ export const prerender = true;
 const t = useTranslations("en");
 ---
 
-<Layout pageTitle={t("pageTitles.offline")}>
+<Layout pageTitle={t("pageMetaTitles.offline")}>
     <div class="flex-col place-content-center m-8 font-bold">
         <h1 class="text-5xl text-center m-4 text-ptext1 dark:text-ptext1-DM">
-            {t("pageTitles.offline")}
+            {t("h1ElementText.offline")}
         </h1>
     </div>
 </Layout>
diff --git a/src/pages/password/request.astro b/src/pages/password/request.astro
index 85f064c4..6df88345 100644
--- a/src/pages/password/request.astro
+++ b/src/pages/password/request.astro
@@ -10,15 +10,15 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.requestPasswordReset")}
+    pageTitle={t("pageMetaTitles.requestPasswordReset")}
     pageDescription={t("pageDescriptions.requestPasswordReset")}
 >
     <div
         class="border border-border1 dark:border-border1-DM rounded flex flex-col items-center w-96"
     >
-        <h2 class="text-xl text-ptext1 dark:text-ptext1-DM py-4">
-            {t("pageTitles.requestPasswordReset")}
-        </h2>
+        <h1 class="text-xl text-ptext1 dark:text-ptext1-DM py-4">
+            {t("h1ElementText.requestPasswordReset")}
+        </h1>
         <div class="w-full px-6 py-4">
             <NewPassword client:only="solid-js" />
         </div>
diff --git a/src/pages/password/reset.astro b/src/pages/password/reset.astro
index cbc48eca..80173b3d 100644
--- a/src/pages/password/reset.astro
+++ b/src/pages/password/reset.astro
@@ -9,15 +9,15 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.resetPassword")}
+    pageTitle={t("pageMetaTitles.resetPassword")}
     pageDescription={t("pageDescriptions.resetPassword")}
 >
     <div
         class="border border-border1 dark:border-border1-DM rounded flex flex-col items-center w-96"
     >
-        <h2 class="text-xl text-ptext1 dark:text-ptext1-DM py-4">
-            {t("pageTitles.resetPassword")}
-        </h2>
+        <h1 class="text-xl text-ptext1 dark:text-ptext1-DM py-4">
+            {t("h1ElementText.resetPassword")}
+        </h1>
         <div class="w-full px-6 py-4">
             <SetNewPassword client:only="solid-js" />
         </div>
diff --git a/src/pages/policies/community.astro b/src/pages/policies/community.astro
index e21c50c0..2e1a56e2 100644
--- a/src/pages/policies/community.astro
+++ b/src/pages/policies/community.astro
@@ -6,18 +6,22 @@ import { getCollection } from "astro:content";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("policies", ({ data }) => data.lang === lang && data.policyType === "communityGuidelines");
+const policyPage = await getCollection(
+    "policies",
+    ({ data }) =>
+        data.lang === lang && data.policyType === "communityGuidelines"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.community")}
+    pageTitle={t("pageMetaTitles.community")}
     pageDescription={t("pageDescriptions.community")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.community")}
+                {t("h1ElementText.community")}
             </h1>
             <!-- <p>
                 {t("messages.translations")}
@@ -27,4 +31,4 @@ const { Content } = await policyPage[0].render();
             <Content />
         </div>
     </div>
-</Layout>
\ No newline at end of file
+</Layout>
diff --git a/src/pages/policies/copyright.astro b/src/pages/policies/copyright.astro
index c1f9b27e..4f63327e 100644
--- a/src/pages/policies/copyright.astro
+++ b/src/pages/policies/copyright.astro
@@ -6,18 +6,21 @@ import { getCollection } from "astro:content";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("policies", ({ data }) => data.lang === lang && data.policyType === "copyright");
+const policyPage = await getCollection(
+    "policies",
+    ({ data }) => data.lang === lang && data.policyType === "copyright"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.copyright")}
+    pageTitle={t("pageMetaTitles.copyright")}
     pageDescription={t("pageDescriptions.copyright")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.copyright")}
+                {t("h1ElementText.copyright")}
             </h1>
             <!-- <p>
                 {t("messages.translations")}
diff --git a/src/pages/policies/salestax.astro b/src/pages/policies/salestax.astro
index c48fb15c..349a7ad2 100644
--- a/src/pages/policies/salestax.astro
+++ b/src/pages/policies/salestax.astro
@@ -6,18 +6,21 @@ import { getCollection } from "astro:content";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("policies", ({ data }) => data.lang === lang && data.policyType === "marketplacetax");
+const policyPage = await getCollection(
+    "policies",
+    ({ data }) => data.lang === lang && data.policyType === "marketplacetax"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.marketplacetax")}
+    pageTitle={t("pageMetaTitles.marketplacetax")}
     pageDescription={t("pageDescriptions.marketplacetax")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.marketplacetax")}
+                {t("hElementText.marketplacetax")}
             </h1>
             <!-- <p>
                 {t("messages.translations")}
@@ -27,4 +30,4 @@ const { Content } = await policyPage[0].render();
             <Content />
         </div>
     </div>
-</Layout>
\ No newline at end of file
+</Layout>
diff --git a/src/pages/policies/seller.astro b/src/pages/policies/seller.astro
index aa4a4828..afec4eaa 100644
--- a/src/pages/policies/seller.astro
+++ b/src/pages/policies/seller.astro
@@ -6,18 +6,21 @@ import { getCollection } from "astro:content";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("policies", ({ data }) => data.lang === lang && data.policyType === "sellerFeePayout");
+const policyPage = await getCollection(
+    "policies",
+    ({ data }) => data.lang === lang && data.policyType === "sellerFeePayout"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.sellerFeePayout")}
+    pageTitle={t("pageMetaTitles.sellerFeePayout")}
     pageDescription={t("pageDescriptions.sellerFeePayout")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.sellerFeePayout")}
+                {t("hElementText.sellerFeePayout")}
             </h1>
             <!-- <p>
                 {t("messages.translations")}
@@ -27,4 +30,4 @@ const { Content } = await policyPage[0].render();
             <Content />
         </div>
     </div>
-</Layout>
\ No newline at end of file
+</Layout>
diff --git a/src/pages/posts/[param].astro b/src/pages/posts/[param].astro
index 2b1b65af..5926984c 100644
--- a/src/pages/posts/[param].astro
+++ b/src/pages/posts/[param].astro
@@ -11,8 +11,8 @@ const { param } = Astro.params;
 ---
 
 <Layout
-    pageTitle={t("pageTitles.userViewCreatorAccount") + " " + param}
-    pageDescription={t("pageTitles.userViewCreatorAccount") +
+    pageTitle={t("pageMetaTitles.userViewCreatorAccount") + " " + param}
+    pageDescription={t("pageDescriptions.userViewCreatorAccount") +
         " " +
         param +
         " " +
diff --git a/src/pages/posts/createpost.astro b/src/pages/posts/createpost.astro
index a3c20c41..f1fcda73 100644
--- a/src/pages/posts/createpost.astro
+++ b/src/pages/posts/createpost.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <Layout
-    pageTitle={t("pageTitles.createPost")}
+    pageTitle={t("pageMetaTitles.createPost")}
     stylesheets={`<link rel="stylesheet" href="/tinymce/skins/ui/oxide/skin.min.css">
   <link rel="stylesheet" href="/tinymce/skins/ui/oxide-dark/skin.min.css">
   <link rel="stylesheet" href="/tinymce/skins/content/default/content.min.css">
@@ -18,7 +18,7 @@ const t = useTranslations(lang);
 >
     <div class="rounded flex flex-col items-center w-96 md:w-4/6">
         <h1 class="text-xl text-ptext1 dark:text-ptext1-DM pt-4">
-            {t("pageTitles.createPost")}
+            {t("h1ElementText.createPost")}
         </h1>
         <div class="w-full px-6 pb-4">
             <CreateEditPost client:only="solid-js" mode="Create" />
diff --git a/src/pages/privacy.astro b/src/pages/privacy.astro
index 9f0b39be..bfeef9a8 100644
--- a/src/pages/privacy.astro
+++ b/src/pages/privacy.astro
@@ -6,18 +6,21 @@ import { getCollection } from "astro:content";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("policies", ({ data }) => data.lang === lang && data.policyType === "privacy");
+const policyPage = await getCollection(
+    "policies",
+    ({ data }) => data.lang === lang && data.policyType === "privacy"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.privacy")}
+    pageTitle={t("pageMetaTitles.privacy")}
     pageDescription={t("pageDescriptions.privacy")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.privacy")}
+                {t("h1ElementText.privacy")}
             </h1>
             <!-- <p>
                 {t("messages.translations")}
diff --git a/src/pages/resources.astro b/src/pages/resources.astro
index 78da35df..0f596c2b 100644
--- a/src/pages/resources.astro
+++ b/src/pages/resources.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.services")}
+    pageTitle={t("pageMetaTitles.services")}
     pageDescription={t("pageDescriptions.services")}
     stylesheets={`<link rel="preconnect" href=${import.meta.env.PUBLIC_VITE_SUPABASE_URL}`}
 >
diff --git a/src/pages/return.astro b/src/pages/return.astro
index 01ffe7fc..ca6649ab 100644
--- a/src/pages/return.astro
+++ b/src/pages/return.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.viewCart")}
+    pageTitle={t("pageMetaTitles.viewCart")}
     pageDescription={t("pageDescriptions.viewCart")}
     stickyFooter={false}
 >
diff --git a/src/pages/signup.astro b/src/pages/signup.astro
index a98a82c1..430804ad 100644
--- a/src/pages/signup.astro
+++ b/src/pages/signup.astro
@@ -12,13 +12,13 @@ const AuthData = { mode: "sign_up" };
 ---
 
 <PageLayout
-    pageTitle={t("pageTitles.signUp")}
+    pageTitle={t("pageMetaTitles.signUp")}
     pageDescription={t("pageDescriptions.signUp")}
 >
     <div>
         <div class="text-center mt-4 mb-8">
             <h2 class="text-xl w-full italic text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.signUp")}
+                {t("buttons.signUp")}
             </h2>
         </div>
         <div
diff --git a/src/pages/terms.astro b/src/pages/terms.astro
index 4a9300a1..ed0c61e0 100644
--- a/src/pages/terms.astro
+++ b/src/pages/terms.astro
@@ -6,18 +6,21 @@ import { getCollection } from "astro:content";
 const lang = getLangFromUrl(Astro.url);
 const t = useTranslations(lang);
 
-const policyPage = await getCollection("policies", ({ data }) => data.lang === lang && data.policyType === "terms");
+const policyPage = await getCollection(
+    "policies",
+    ({ data }) => data.lang === lang && data.policyType === "terms"
+);
 const { Content } = await policyPage[0].render();
 ---
 
 <Layout
-    pageTitle={t("pageTitles.terms")}
+    pageTitle={t("pageMetaTitles.terms")}
     pageDescription={t("pageDescriptions.terms")}
 >
     <div class="mx-6">
         <div class="mb-8">
             <h1 class="font-bold text-3xl mb-2 text-ptext1 dark:text-ptext1-DM">
-                {t("pageTitles.terms")}
+                {t("h1ElementText.terms")}
             </h1>
             <!-- <p>
                 {t("messages.translations")}
diff --git a/src/pages/user/profile.astro b/src/pages/user/profile.astro
index 5769cce2..62edd57d 100644
--- a/src/pages/user/profile.astro
+++ b/src/pages/user/profile.astro
@@ -8,7 +8,7 @@ const t = useTranslations(lang);
 ---
 
 <Layout
-    pageTitle={t("pageTitles.viewUserAccount")}
+    pageTitle={t("pageMetaTitles.viewUserAccount")}
     pageDescription={t("pageDescriptions.viewUserAccount")}
 >
     <div class="w-full">