diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 780db7e9d..a859c6229 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -745,7 +745,7 @@
         "type": "text",
         "placeholders": {}
     },
-"allRooms": "All Group Chats",
+    "allRooms": "All Group Chats",
     "@allRooms": {
         "type": "text",
         "placeholders": {}
@@ -2677,506 +2677,506 @@
     },
     "allChatsAndClasses": "All chats and spaces",
     "timeOfLastMessage": "Time of last sent message",
-  "totalMessages": "Total messages sent",
-  "waTooltip": "L2 use without assistance",
-  "changeDateRange": "Change date range",
-  "numberOfStudents": "Number of Students",
-  "@numberOfStudents": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classDescription": "Description",
-  "@classDescription": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classDescriptionDesc": "Set a description",
-  "@classDescriptionDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "requestToEnroll": "Request to Enroll",
-  "@requestToEnroll": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "requestAnExchange": "Request an Exchange",
-  "@requestAnExchange": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "findLanguageExchange": "Find a class exchange partner",
-  "@findLanguageExchange": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classAnalyticsDesc": "Detailed information on student engagement and language use",
-  "@classAnalyticsDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "addStudents": "Add students",
-  "@addStudents": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "copyClassLink": "Copy invite link",
-  "@copyClassLink": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "copyClassLinkDesc": "Clicking this link will take students to the app, direct them to make an account and they will automatically join this space.",
-  "@copyClassLink": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "copyClassCode": "Copy invite code",
-  "inviteStudentByUserName": "Invite student by username",
-  "@inviteStudentByUserName": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classSettings": "Class Settings",
-  "@classSettings": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classSettingsDesc": "Edit class languages and proficiency level.",
-  "@classSettingsDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "selectClassRoomDominantLanguage": "What is the base language of your class?",
-  "@selectClassRoomDominantLanguage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "selectTargetLanguage": "What language are you teaching?",
-  "@selectTargetLanguage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "whatIsYourClassLanguageLevel": "What is the average language level of your class?",
-  "@whatIsYourClassLanguageLevel": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "studentPermissions": "Student Permissions",
-  "@studentPermissions": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "interactiveTranslator": "Translation assistance",
-  "@interactiveTranslator": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "oneToOneChatsWithinClass": "Private Chats within Space",
-  "@oneToOneChatsWithinClass": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "oneToOneChatsWithinClassDesc": "If you allow private chats, students can initiate and use private chats with other space participants. Otherwise, they can only participate in groups chats.",
-  "@oneToOneChatsWithinClassDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "createGroupChats": "Create Group Chats",
-  "@createGroupChats": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "createGroupChatsDesc": "Toggle this on to allow students to create group chats within the class/exchange space.",
-  "@createGroupChatsDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "shareVideo": "Share Video",
-  "@shareVideo": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "shareVideoDesc": "Toggle this on to allow students to share videos in chats.",
-  "@shareVideoDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "sharePhotos": "Share Photos",
-  "@sharePhotos": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "sharePhotosDesc": "Toggle this on to allow students to share photos in chats.",
-  "@sharePhotosDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "shareFiles": "Share Files",
-  "@shareFiles": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "shareFilesDesc": "Toggle this on to allow students to share files in chats.",
-  "@shareFilesDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "shareLocationDesc": "Toggle this on to allow students to share location in chats.",
-  "@shareLocationDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "selectLanguageLevel": "Select language level",
-  "@selectLanguageLevel": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "noIdenticalLanguages": "Please choose different base and target languages",
-  "@noIdenticalLanguages": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "iWantALanguagePartnerFrom": "Is from:",
-  "@iWantALanguagePartnerFrom": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "worldWide": "Worldwide",
-  "@worldWide": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "noResults": "No results! Try broadening your search.",
-  "@noResults": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "searchBy": "Search by country and languages",
-  "@searchBy": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "iWantAConversationPartner": "I want a conversation partner who",
-  "@iWantAConversationPartner": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "iWantALanguagePartnerWhoSpeaks": "Speaks:",
-  "@iWantALanguagePartnerWhoSpeaks": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "iWantALanguagePartnerWhoIsLearning": "Is learning:",
-  "@iWantALanguagePartnerWhoIsLearning": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "yourBirthdayPlease": "Pangea Chat serves schools and other learning communities, ages 13 and up, around the world.\n\nIn order to protect our young learners, we ask our users to verify their age before connecting to our community.\n\nBefore you can search Pangea Chat for classes, rooms, and new friends, you must verify you are 18 or older.",
-  "@yourBirthdayPlease": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "invalidDob": "Invalid Date of Birth",
-  "@invalidDob": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "enterYourDob": "Enter your Date of Birth",
-  "@enterYourDob": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "getStarted": "Get Started",
-  "@getStarted": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "mustBe13": "User should be 13 years old",
-  "@mustBe13": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "yourBirthdayPleaseShort": "Please provide your date of birth",
-  "@yourBirthdayPleaseShort": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "errorPleaseRefresh": "We're looking into it! Please reload and try again.",
-  "@errorPleaseRefresh": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "joinWithClassCode": "Join class or exchange",
-  "@joinWithClassCode": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "joinWithClassCodeDesc": "Connect to a class or exchange space with the 6-digit invite code provided by the space administrator.",
-  "@joinWithClassCodeDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "joinWithClassCodeHint": "Enter invite code",
-  "@joinWithClassCodeHint": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "unableToFindClass": "We are unable to find the class or exchange. Please double-check the information with the space administrator. If you are still experiencing an issue, please contact support@pangea.chat.",
-  "@unableToFindClass": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelPreA1": "True Beginner (Pre A1)",
-  "@languageLevelPreA1": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelA1": "Beginner (A1)",
-  "@languageLevelA1": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelA2": "Elementary (A2)",
-  "@languageLevelA2": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelB1": "Intermediate (B1)",
-  "@languageLevelB1": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelB2": "Upper Intermediate (B2)",
-  "@languageLevelB2": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelC1": "Advanced (C1)",
-  "@languageLevelC1": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languageLevelC2": "Mastery (C2)",
-  "@languageLevelC2": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "changeTheNameOfTheClass": "Change the name",
-  "@changeTheNameOfTheClass": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "changeTheNameOfTheChat": "Change the name of the chat",
-  "@changeTheNameOfTheChat": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "welcomeToYourNewClass": "Welcome! 🙂",
-  "@welcomeToYourNewClass": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "welcomeToClass": "Welcome! 🙂\n- Try joining a chat!\n- Have fun chatting!",
-  "@welcomeToClass": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "welcomeToPangea18Plus": "Welcome to Pangea Chat! 🙂\nWhat's next?\nCreate or join a class!\nOr search for a conversation partner!",
-  "@welcomeToPangea18Plus": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "welcomeToPangeaMinor": "Welcome to Pangea Chat! 🙂\nWhat's next?\nJoin a class!\nAsk your teacher for an invite code.",
-  "@welcomeToPangeaMinor": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "findALanguagePartner": "Find a conversation partner",
-  "@findALanguagePartner": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "setToPublicSettingsTitle": "Want to find a conversation partner?",
-  "@setToPublicSettingsTitle": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "setToPublicSettingsDesc": "Before you can search for a conversation parter, you must set your profile visibility to public.",
-  "@setToPublicSettingsDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "accountSettings": "Account settings",
-  "@accountSettings": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "unableToFindClassCode": "Unable to find code.",
-  "@unableToFindClassCode": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "askPangeaBot": "Ask Pangea Bot for a contextual definition.",
-  "sorryNoResults": "Sorry, no results.",
-  "@sorryNoResults": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "ignoreInThisText": "Ignore",
-  "@ignoreInThisText": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "helpMeTranslate": "Help me translate!",
-  "@helpMeTranslate": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "needsItShortMessage": "Try interactive translation!",
-  "needsIGCShortMessage": "Try interactive grammar assistance!",
-  "@needsItShortMessage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "needsItMessage": "This message has too many words in your base language.",
-  "@needsItMessage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "needsIgcMessage": "This message has a grammar error.",
-  "tokenTranslationTitle": "A word is in your base language.", 
-  "@tokenTranslationTitle": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "spanTranslationDesc": "See possible translations below.",
-  "@spanTranslationDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "spanTranslationTitle": "Some words are in your base language.", 
-  "@spanTranslationTitle": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "l1SpanAndGrammarTitle": "Outside target language",
-  "l1SpanAndGrammarDesc": "This could in your base language or it could be a grammar error.",
-  "otherTitle": "You have an error.", 
-  "@otherTitle": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "otherDesc": "See possible corrections below.",
-  "@otherDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "countryInformation": "My country",
-  "@countryInformation": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "myLanguages": "My base and target language",
-  "@myLanguages": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "targetLanguage": "Target Language",
-  "@targetLanguage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "sourceLanguage": "Base language",
-  "@sourceLanguage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "languagesISpeak": "Languages I speak",
-  "@languagesISpeak": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "updateLanguage": "My languages",
-  "@updateLanguage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "whatLanguageYouWantToLearn": "What language do you want to learn?",
-  "@whatLanguageYouWantToLearn": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "whatIsYourBaseLanguage": "What is your base language? \n\nInteractive translation is only available for English and Spanish.",
-  "@whatIsYourBaseLanguage": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "saveChanges": "Save changes",
-  "@saveChanges": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "publicProfileTitle": "Public Profile",
-  "@publicProfileTitle": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "publicProfileDesc": "Your profile must be public in order to search or be found as a conversation partner.",
-  "@publicProfileDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "error502504Title": "Wow, there are a lot of students online!",
-  "@error502504Title": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "error502504Desc": "Translation and grammar tools may be slow or unavailable while the Pangea bots catch up.",
-  "@error502504Desc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "error404Title": "Translation error!",
-  "@error404Title": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "error404Desc": "Pangea Bot isn't sure how to translate that...",
-  "@error404Desc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "errorDisableIT": "Translation assistance is turned off.",
-  "errorDisableIGC": "Grammar assistance is turned off.",
-  "errorDisableLanguageAssistance": "Translation assistance and grammar assistance are turned off.",
-  "errorDisableITUserDesc": "Click here to update translation assistance settings",
-  "errorDisableIGCUserDesc": "Click here to update grammar assistance settings",
-  "errorDisableLanguageAssistanceUserDesc": "Click here to update translation assistance and grammar assistance settings",
-  "errorDisableITClassDesc": "Translation assistance is turned off for the space that this chat is in.",
-  "errorDisableIGCClassDesc": "Grammar assistance is turned off for the space that this chat is in.",
-  "errorDisableLanguageAssistanceClassDesc": "Translation assistance and grammar assistance are turned off for the space that this chat is in.",
-  "itIsDisabled": "Interactive Translation is disabled",
-  "igcIsDisabled": "Interactive Grammar Checking is disabled",
-  "goToLearningSettings": "Go to Learning Settings",
-  "error405Title": "Languages not set",
-  "error405Desc": "Please set your languages in Settings > Learning Settings",
-  "loginOrSignup": "Sign in with",
-  "@loginOrSignup": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "iAgreeToThe": "I agree to the ",
-  "@iAgreeToThe": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "termsAndConditions": "Terms and Conditions",
-  "@termsAndConditions": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "andCertifyIAmAtLeast13YearsOfAge": " and certify I am at least 13 years of age.",
-  "@andCertifyIAmAtLeast13YearsOfAge": {
+    "totalMessages": "Total messages sent",
+    "waTooltip": "L2 use without assistance",
+    "changeDateRange": "Change date range",
+    "numberOfStudents": "Number of Students",
+    "@numberOfStudents": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classDescription": "Description",
+    "@classDescription": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classDescriptionDesc": "Set a description",
+    "@classDescriptionDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "requestToEnroll": "Request to Enroll",
+    "@requestToEnroll": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "requestAnExchange": "Request an Exchange",
+    "@requestAnExchange": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "findLanguageExchange": "Find a class exchange partner",
+    "@findLanguageExchange": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classAnalyticsDesc": "Detailed information on student engagement and language use",
+    "@classAnalyticsDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "addStudents": "Add students",
+    "@addStudents": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "copyClassLink": "Copy invite link",
+    "@copyClassLink": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "copyClassLinkDesc": "Clicking this link will take students to the app, direct them to make an account and they will automatically join this space.",
+    "@copyClassLink": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "copyClassCode": "Copy invite code",
+    "inviteStudentByUserName": "Invite student by username",
+    "@inviteStudentByUserName": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classSettings": "Class Settings",
+    "@classSettings": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classSettingsDesc": "Edit class languages and proficiency level.",
+    "@classSettingsDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "selectClassRoomDominantLanguage": "What is the base language of your class?",
+    "@selectClassRoomDominantLanguage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "selectTargetLanguage": "What language are you teaching?",
+    "@selectTargetLanguage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "whatIsYourClassLanguageLevel": "What is the average language level of your class?",
+    "@whatIsYourClassLanguageLevel": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "studentPermissions": "Student Permissions",
+    "@studentPermissions": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "interactiveTranslator": "Translation assistance",
+    "@interactiveTranslator": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "oneToOneChatsWithinClass": "Private Chats within Space",
+    "@oneToOneChatsWithinClass": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "oneToOneChatsWithinClassDesc": "If you allow private chats, students can initiate and use private chats with other space participants. Otherwise, they can only participate in groups chats.",
+    "@oneToOneChatsWithinClassDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "createGroupChats": "Create Group Chats",
+    "@createGroupChats": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "createGroupChatsDesc": "Toggle this on to allow students to create group chats within the class/exchange space.",
+    "@createGroupChatsDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "shareVideo": "Share Video",
+    "@shareVideo": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "shareVideoDesc": "Toggle this on to allow students to share videos in chats.",
+    "@shareVideoDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "sharePhotos": "Share Photos",
+    "@sharePhotos": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "sharePhotosDesc": "Toggle this on to allow students to share photos in chats.",
+    "@sharePhotosDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "shareFiles": "Share Files",
+    "@shareFiles": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "shareFilesDesc": "Toggle this on to allow students to share files in chats.",
+    "@shareFilesDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "shareLocationDesc": "Toggle this on to allow students to share location in chats.",
+    "@shareLocationDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "selectLanguageLevel": "Select language level",
+    "@selectLanguageLevel": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "noIdenticalLanguages": "Please choose different base and target languages",
+    "@noIdenticalLanguages": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "iWantALanguagePartnerFrom": "Is from:",
+    "@iWantALanguagePartnerFrom": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "worldWide": "Worldwide",
+    "@worldWide": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "noResults": "No results! Try broadening your search.",
+    "@noResults": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "searchBy": "Search by country and languages",
+    "@searchBy": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "iWantAConversationPartner": "I want a conversation partner who",
+    "@iWantAConversationPartner": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "iWantALanguagePartnerWhoSpeaks": "Speaks:",
+    "@iWantALanguagePartnerWhoSpeaks": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "iWantALanguagePartnerWhoIsLearning": "Is learning:",
+    "@iWantALanguagePartnerWhoIsLearning": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "yourBirthdayPlease": "Pangea Chat serves schools and other learning communities, ages 13 and up, around the world.\n\nIn order to protect our young learners, we ask our users to verify their age before connecting to our community.\n\nBefore you can search Pangea Chat for classes, rooms, and new friends, you must verify you are 18 or older.",
+    "@yourBirthdayPlease": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "invalidDob": "Invalid Date of Birth",
+    "@invalidDob": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "enterYourDob": "Enter your Date of Birth",
+    "@enterYourDob": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "getStarted": "Get Started",
+    "@getStarted": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "mustBe13": "User should be 13 years old",
+    "@mustBe13": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "yourBirthdayPleaseShort": "Please provide your date of birth",
+    "@yourBirthdayPleaseShort": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "errorPleaseRefresh": "We're looking into it! Please reload and try again.",
+    "@errorPleaseRefresh": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "joinWithClassCode": "Join class or exchange",
+    "@joinWithClassCode": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "joinWithClassCodeDesc": "Connect to a class or exchange space with the 6-digit invite code provided by the space administrator.",
+    "@joinWithClassCodeDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "joinWithClassCodeHint": "Enter invite code",
+    "@joinWithClassCodeHint": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "unableToFindClass": "We are unable to find the class or exchange. Please double-check the information with the space administrator. If you are still experiencing an issue, please contact support@pangea.chat.",
+    "@unableToFindClass": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelPreA1": "True Beginner (Pre A1)",
+    "@languageLevelPreA1": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelA1": "Beginner (A1)",
+    "@languageLevelA1": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelA2": "Elementary (A2)",
+    "@languageLevelA2": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelB1": "Intermediate (B1)",
+    "@languageLevelB1": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelB2": "Upper Intermediate (B2)",
+    "@languageLevelB2": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelC1": "Advanced (C1)",
+    "@languageLevelC1": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languageLevelC2": "Mastery (C2)",
+    "@languageLevelC2": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "changeTheNameOfTheClass": "Change the name",
+    "@changeTheNameOfTheClass": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "changeTheNameOfTheChat": "Change the name of the chat",
+    "@changeTheNameOfTheChat": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "welcomeToYourNewClass": "Welcome! 🙂",
+    "@welcomeToYourNewClass": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "welcomeToClass": "Welcome! 🙂\n- Try joining a chat!\n- Have fun chatting!",
+    "@welcomeToClass": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "welcomeToPangea18Plus": "Welcome to Pangea Chat! 🙂\nWhat's next?\nCreate or join a class!\nOr search for a conversation partner!",
+    "@welcomeToPangea18Plus": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "welcomeToPangeaMinor": "Welcome to Pangea Chat! 🙂\nWhat's next?\nJoin a class!\nAsk your teacher for an invite code.",
+    "@welcomeToPangeaMinor": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "findALanguagePartner": "Find a conversation partner",
+    "@findALanguagePartner": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "setToPublicSettingsTitle": "Want to find a conversation partner?",
+    "@setToPublicSettingsTitle": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "setToPublicSettingsDesc": "Before you can search for a conversation parter, you must set your profile visibility to public.",
+    "@setToPublicSettingsDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "accountSettings": "Account settings",
+    "@accountSettings": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "unableToFindClassCode": "Unable to find code.",
+    "@unableToFindClassCode": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "askPangeaBot": "Ask Pangea Bot for a contextual definition.",
+    "sorryNoResults": "Sorry, no results.",
+    "@sorryNoResults": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "ignoreInThisText": "Ignore",
+    "@ignoreInThisText": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "helpMeTranslate": "Help me translate!",
+    "@helpMeTranslate": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "needsItShortMessage": "Try interactive translation!",
+    "needsIGCShortMessage": "Try interactive grammar assistance!",
+    "@needsItShortMessage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "needsItMessage": "This message has too many words in your base language.",
+    "@needsItMessage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "needsIgcMessage": "This message has a grammar error.",
+    "tokenTranslationTitle": "A word is in your base language.",
+    "@tokenTranslationTitle": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "spanTranslationDesc": "See possible translations below.",
+    "@spanTranslationDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "spanTranslationTitle": "Some words are in your base language.",
+    "@spanTranslationTitle": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "l1SpanAndGrammarTitle": "Outside target language",
+    "l1SpanAndGrammarDesc": "This could in your base language or it could be a grammar error.",
+    "otherTitle": "You have an error.",
+    "@otherTitle": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "otherDesc": "See possible corrections below.",
+    "@otherDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "countryInformation": "My country",
+    "@countryInformation": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "myLanguages": "My base and target language",
+    "@myLanguages": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "targetLanguage": "Target Language",
+    "@targetLanguage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "sourceLanguage": "Base language",
+    "@sourceLanguage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "languagesISpeak": "Languages I speak",
+    "@languagesISpeak": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "updateLanguage": "My languages",
+    "@updateLanguage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "whatLanguageYouWantToLearn": "What language do you want to learn?",
+    "@whatLanguageYouWantToLearn": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "whatIsYourBaseLanguage": "What is your base language?",
+    "@whatIsYourBaseLanguage": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "saveChanges": "Save changes",
+    "@saveChanges": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "publicProfileTitle": "Public Profile",
+    "@publicProfileTitle": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "publicProfileDesc": "Your profile must be public in order to search or be found as a conversation partner.",
+    "@publicProfileDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "error502504Title": "Wow, there are a lot of students online!",
+    "@error502504Title": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "error502504Desc": "Translation and grammar tools may be slow or unavailable while the Pangea bots catch up.",
+    "@error502504Desc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "error404Title": "Translation error!",
+    "@error404Title": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "error404Desc": "Pangea Bot isn't sure how to translate that...",
+    "@error404Desc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "errorDisableIT": "Translation assistance is turned off.",
+    "errorDisableIGC": "Grammar assistance is turned off.",
+    "errorDisableLanguageAssistance": "Translation assistance and grammar assistance are turned off.",
+    "errorDisableITUserDesc": "Click here to update translation assistance settings",
+    "errorDisableIGCUserDesc": "Click here to update grammar assistance settings",
+    "errorDisableLanguageAssistanceUserDesc": "Click here to update translation assistance and grammar assistance settings",
+    "errorDisableITClassDesc": "Translation assistance is turned off for the space that this chat is in.",
+    "errorDisableIGCClassDesc": "Grammar assistance is turned off for the space that this chat is in.",
+    "errorDisableLanguageAssistanceClassDesc": "Translation assistance and grammar assistance are turned off for the space that this chat is in.",
+    "itIsDisabled": "Interactive Translation is disabled",
+    "igcIsDisabled": "Interactive Grammar Checking is disabled",
+    "goToLearningSettings": "Go to Learning Settings",
+    "error405Title": "Languages not set",
+    "error405Desc": "Please set your languages in Settings > Learning Settings",
+    "loginOrSignup": "Sign in with",
+    "@loginOrSignup": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "iAgreeToThe": "I agree to the ",
+    "@iAgreeToThe": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "termsAndConditions": "Terms and Conditions",
+    "@termsAndConditions": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "andCertifyIAmAtLeast13YearsOfAge": " and certify I am at least 13 years of age.",
+    "@andCertifyIAmAtLeast13YearsOfAge": {
         "type": "text",
         "placeholders": {}
     },
@@ -3205,95 +3205,94 @@
         "type": "text",
         "placeholders": {}
     },
-  "findAClass": "Find a class (coming soon)",
-  "toggleIT": "Interactive Translation",
-  "@toggleIT": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "toggleIGC": "Interactive Grammar Checking",
-  "@toggleIGC": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "toggleToolSettingsDescription": "Here you can toggle your individual language tool settings. For chats within a space, the space settings will take precedence and may override these settings.",
-  "connectedToStaging": "You are connected to the staging server.",
-  "@connectedToStaging": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "learningSettings": "Learning Settings",
+    "findAClass": "Find a class (coming soon)",
+    "toggleIT": "Interactive Translation",
+    "@toggleIT": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "toggleIGC": "Interactive Grammar Checking",
+    "@toggleIGC": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "toggleToolSettingsDescription": "Here you can toggle your individual language tool settings. For chats within a space, the space settings will take precedence and may override these settings.",
+    "connectedToStaging": "You are connected to the staging server.",
+    "@connectedToStaging": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "learningSettings": "Learning Settings",
     "classNameRequired": "Please enter a space name",
     "@classNameRequired": {
         "type": "text",
         "placeholders": {}
     },
-  "sendVoiceNotes": "Send Voice Notes",
-  "@sendVoiceNotes": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "sendVoiceNotesDesc": "Toggle this on to allow students to send voice notes in chats.",
-  "@sendVoiceNotesDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "chatTopic": "Chat topic",
-  "@chatTopic": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "chatTopicDesc": "Set a chat topic",
-  "@chatTopicDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classDescription": "Space Description",
-  "@classDescription": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "inviteStudentByUserNameDesc": "If your student already has an account, you can search for them.",
-  "@inviteStudentByUserNameDesc": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "classRoster": "Participants",
-  "@classRoster": {
-    "type": "text",
-    "placeholders": {}
-  },
-  "almostPerfect": "That seems right! Here's what I would have said.",
-  "prettyGood": "Pretty good! Here's what I would have said.",
-  "letMeThink": "Hmm, let's see how you did!",
-  "clickMessageTitle": "Select messages for language help!",
-  "clickMessageBody": "Messages always show in your target language but you can select them to access definitions and translations!",
-  "understandingMessagesTitle": "Definitions and translations!",
-  "addToClass": "Add this chat to ",
-  "understandingMessagesBody": "Click underlined words for definitions. Translate with message options (upper right).",
-  "allDone": "All done!",
-  "vocab": "Vocabulary",
-
-  "low": "We have evidence the user does not understand these words.",
-  "medium": "These words have been used. It is unclear if the words are fully understood or not.",
-  "high": "We have evidence the user understands these words.",
-  "unknownProficiency": "These words have not been used in Pangea Chat.",
-  "changeView": "Switch views.",
-  "clearAll": "Clear all words?",
-  "generateVocabulary": "Generate vocabulary from title and description",
-  "generatePrompts": "Generate prompts",
-  "subscribe": "Subscribe",
-  "getAccess": "Unlock learning tools",
-  "subscriptionDesc": "Messaging is free! Subscribe to unlock interactive translation, grammar checking and learning analytics.",
-  "subscriptionManagement": "Subscription Management",
-  "currentSubscription": "Current Subscription",
-  "changeSubscription": "Change your subscription",
-  "cancelSubscription": "Cancel your subscription",
-  "selectYourPlan": "Select Your Plan",
-  "subsciptionPlatformTooltip": "Please login to your original device to manage your subscription plan",
-  "subscriptionManagementUnavailable": "Subscription management not available",
-  "paymentMethod": "Payment Method",
-  "paymentHistory": "Payment History",
+    "sendVoiceNotes": "Send Voice Notes",
+    "@sendVoiceNotes": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "sendVoiceNotesDesc": "Toggle this on to allow students to send voice notes in chats.",
+    "@sendVoiceNotesDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "chatTopic": "Chat topic",
+    "@chatTopic": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "chatTopicDesc": "Set a chat topic",
+    "@chatTopicDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classDescription": "Space Description",
+    "@classDescription": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "inviteStudentByUserNameDesc": "If your student already has an account, you can search for them.",
+    "@inviteStudentByUserNameDesc": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "classRoster": "Participants",
+    "@classRoster": {
+        "type": "text",
+        "placeholders": {}
+    },
+    "almostPerfect": "That seems right! Here's what I would have said.",
+    "prettyGood": "Pretty good! Here's what I would have said.",
+    "letMeThink": "Hmm, let's see how you did!",
+    "clickMessageTitle": "Select messages for language help!",
+    "clickMessageBody": "Messages always show in your target language but you can select them to access definitions and translations!",
+    "understandingMessagesTitle": "Definitions and translations!",
+    "addToClass": "Add this chat to ",
+    "understandingMessagesBody": "Click underlined words for definitions. Translate with message options (upper right).",
+    "allDone": "All done!",
+    "vocab": "Vocabulary",
+    "low": "We have evidence the user does not understand these words.",
+    "medium": "These words have been used. It is unclear if the words are fully understood or not.",
+    "high": "We have evidence the user understands these words.",
+    "unknownProficiency": "These words have not been used in Pangea Chat.",
+    "changeView": "Switch views.",
+    "clearAll": "Clear all words?",
+    "generateVocabulary": "Generate vocabulary from title and description",
+    "generatePrompts": "Generate prompts",
+    "subscribe": "Subscribe",
+    "getAccess": "Unlock learning tools",
+    "subscriptionDesc": "Messaging is free! Subscribe to unlock interactive translation, grammar checking and learning analytics.",
+    "subscriptionManagement": "Subscription Management",
+    "currentSubscription": "Current Subscription",
+    "changeSubscription": "Change your subscription",
+    "cancelSubscription": "Cancel your subscription",
+    "selectYourPlan": "Select Your Plan",
+    "subsciptionPlatformTooltip": "Please login to your original device to manage your subscription plan",
+    "subscriptionManagementUnavailable": "Subscription management not available",
+    "paymentMethod": "Payment Method",
+    "paymentHistory": "Payment History",
     "emptyChatDownloadWarning": "Cannot download empty chat",
     "appUpdateAvailable": "Update Available",
     "update": "Update",
@@ -3790,13 +3789,12 @@
     "zwCountryDisplayName": "Zimbabwe",
     "pay": "Pay",
     "allPrivateChats": "All private chats in space (including with Pangea Bot)",
-    "unknownPrivateChat": "Unknown private chat",  
+    "unknownPrivateChat": "Unknown private chat",
     "copyClassCodeDesc": "Students who are already in the app can 'Join class or exchange' via the main menu.",
     "addToClass": "Add exchange to class",
     "addToClassDesc": "Adding an exchange to a class will make the exchange appear within the class for students and give them access to all chats within the exchange.",
     "addToClassOrExchange": "Add chat to class or exchange",
-    "addToClassOrExchangeDesc": 
-        "Adding a chat to a class or exchange will make the chat appear within the class or exchange for students and give them access.",
+    "addToClassOrExchangeDesc": "Adding a chat to a class or exchange will make the chat appear within the class or exchange for students and give them access.",
     "invitedToClassOrExchange": "{user} has invited you to join a space: {classOrExchange}! Do you wish to accept?",
     "@invitedToClassOrExchange": {
         "placeholders": {
@@ -3931,23 +3929,23 @@
     "todosUnencrypted": "Please notice that todos are visible by everyone in the chat and are not end to end encrypted.",
     "noAddToSpacePermissions": "You can't add a chat to this space",
     "alreadyInSpace": "The chat is already in this space",
-  "yourGlobalUserIdIs": "Your global user-ID is: ",
-  "noUsersFoundWithQuery": "Unfortunately no user could be found with \"{query}\". Please check whether you made a typo.",
-  "@noUsersFoundWithQuery": {
-    "type": "text",
-    "placeholders": {
-        "query": {}
-    }
-  },
-  "searchChatsRooms": "Search for #chats, @users...",
-  "groupName": "Group name",
-  "createGroupAndInviteUsers": "Create a group and invite users",
-  "groupCanBeFoundViaSearch": "Group can be found via search",
-  "inNoSpaces": "You are not a member of any classes or exchanges",
-  "createClass": "Create class",
-  "createExchange": "Create exchange",
-  "viewArchive": "View Archive",
-  "trialExpiration": "Your free trial expires on {expiration}",
+    "yourGlobalUserIdIs": "Your global user-ID is: ",
+    "noUsersFoundWithQuery": "Unfortunately no user could be found with \"{query}\". Please check whether you made a typo.",
+    "@noUsersFoundWithQuery": {
+        "type": "text",
+        "placeholders": {
+            "query": {}
+        }
+    },
+    "searchChatsRooms": "Search for #chats, @users...",
+    "groupName": "Group name",
+    "createGroupAndInviteUsers": "Create a group and invite users",
+    "groupCanBeFoundViaSearch": "Group can be found via search",
+    "inNoSpaces": "You are not a member of any classes or exchanges",
+    "createClass": "Create class",
+    "createExchange": "Create exchange",
+    "viewArchive": "View Archive",
+    "trialExpiration": "Your free trial expires on {expiration}",
     "@trialExpiration": {
         "placeholders": {
             "expiration": {}
@@ -3955,8 +3953,8 @@
     },
     "freeTrialDesc": "New users recieve a one week free trial of Pangea Chat",
     "activateTrial": "Activate Trial",
-  "inNoSpaces": "You are not a member of any classes or exchanges",
-  "successfullySubscribed": "You have successfully subscribed!",
-  "clickToManageSubscription": "Click here to manage your subscription.",
-  "emptyInviteWarning": "Add this chat to a class or exchange to invite other users."
-}
+    "inNoSpaces": "You are not a member of any classes or exchanges",
+    "successfullySubscribed": "You have successfully subscribed!",
+    "clickToManageSubscription": "Click here to manage your subscription.",
+    "emptyInviteWarning": "Add this chat to a class or exchange to invite other users."
+}
\ No newline at end of file
diff --git a/lib/pangea/network/urls.dart b/lib/pangea/network/urls.dart
index c37919503..0b0d6ad59 100644
--- a/lib/pangea/network/urls.dart
+++ b/lib/pangea/network/urls.dart
@@ -13,7 +13,7 @@ class PApiUrls {
   static String choreoBaseApi = Environment.choreoApi;
 
   ///   ---------------------- Languages --------------------------------------
-  static String getLanguages = "/language/list";
+  static String getLanguages = "/languages";
 
   ///   ---------------------- Users --------------------------------------
   static String createUser = "/account/create";
@@ -25,20 +25,6 @@ class PApiUrls {
   ///   ---------------------- Conversation Partner -------------------------
   static String searchUserProfiles = "/account/search";
 
-  ///   ---------------------- Deprecated Class API -------------------------
-  static String classListBySpaceIds = "/class/listbyspaceids";
-  static String getClassByClassCode = "/class/class_by_code?class_code=";
-
-  ///   ---------------------- Exchange -----------------------------------
-  static String exchangeClassValidate = "/class/validate_exchange";
-  static String exchangeClass = "/class/class_exchange";
-  static String isExchange = "/class/get_exchange?exchange_pangea_id=";
-  static String exchangeParticipantsStore = "/class/exchange/participant";
-  static String exchangeInfoStore = "/class/exchange/create";
-  static String fetchExchangeInfo = "/class/exchange/data?exchange_pangea_id=";
-  static String exchangeAcceptRequest = "/class/exchange/accept";
-  static String makeAdminInExchange = "/class/exchange/admin/create";
-
   ///-------------------------------- Deprecated analytics --------------------
   static String classAnalytics = "${Environment.choreoApi}/class_analytics";
   static String messageService = "/message_service";
diff --git a/lib/pangea/repo/class_repo.dart b/lib/pangea/repo/class_repo.dart
deleted file mode 100644
index f6a92c924..000000000
--- a/lib/pangea/repo/class_repo.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-
-import 'package:http/http.dart';
-
-import 'package:fluffychat/pangea/models/class_email_invite_model.dart';
-import 'package:fluffychat/pangea/models/class_model.dart';
-import '../network/requests.dart';
-import '../network/urls.dart';
-
-class PClassRepo {
-  static classesBySpaceIds(String accessToken, List<String> spaceIds) async {
-    final Requests req =
-        Requests(baseUrl: PApiUrls.baseAPI, accessToken: accessToken);
-    final Response res = await req
-        .post(url: PApiUrls.classListBySpaceIds, body: {"class_ids": spaceIds});
-    final json = jsonDecode(res.body);
-    final List<ClassSettingsModel> pangeaClasses = json["results"]
-        .map((e) {
-          final ClassSettingsModel model = ClassSettingsModel.fromJson(e);
-          return model;
-        })
-        .toList()
-        .cast<ClassSettingsModel>();
-    return pangeaClasses;
-  }
-
-  //Question for Jordan - what happens if code is incorrect? statuscode 400?
-  // what about if user is already in the class?
-  //Question for Lala: In this widget, controller, repo framework, where are
-  // errors handled? How are they passed?
-  static Future<ClassSettingsModel?> getClassByCode(
-    String classCode,
-    String accessToken,
-  ) async {
-    final Requests req =
-        Requests(baseUrl: PApiUrls.baseAPI, accessToken: accessToken);
-    final Response res =
-        await req.get(url: PApiUrls.getClassByClassCode + classCode);
-
-    if (res.statusCode == 400) {
-      return null;
-    }
-    final json = jsonDecode(res.body);
-
-    final classSettings = ClassSettingsModel.fromJson(json);
-
-    return classSettings;
-  }
-
-  static searchClass(String text) async {}
-
-  static sendEmailToJoinClass(
-    List<ClassEmailInviteData> data,
-    String roomId,
-    String teacherName,
-  ) async {}
-
-  static inviteAction(BuildContext context, String id, String roomId) async {}
-
-  static reportUser({
-    String? classRoomNamedata,
-    String? classTeacherNamedata,
-    String? reportedUserdata,
-    String? classTeacherEmaildata,
-    String? offensivedata,
-    String? reasondata,
-  }) async {}
-}
diff --git a/lib/pangea/repo/language_repo.dart b/lib/pangea/repo/language_repo.dart
index b74b8a030..9ca12b25e 100644
--- a/lib/pangea/repo/language_repo.dart
+++ b/lib/pangea/repo/language_repo.dart
@@ -1,19 +1,18 @@
 import 'dart:convert';
 import 'dart:developer';
 
-import 'package:flutter/foundation.dart';
-
-import 'package:http/http.dart';
-
 import 'package:fluffychat/pangea/models/language_model.dart';
 import 'package:fluffychat/pangea/network/urls.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
+import 'package:flutter/foundation.dart';
+import 'package:http/http.dart';
+
 import '../config/environment.dart';
 import '../network/requests.dart';
 
 class LanguageRepo {
   static Future<List<LanguageModel>> fetchLanguages() async {
-    final Requests req = Requests(baseUrl: Environment.baseAPI);
+    final Requests req = Requests(baseUrl: Environment.choreoApi);
     final Response res = await req.get(url: PApiUrls.getLanguages);
 
     final decodedBody =