diff --git a/src/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js
index 5edb3b8..c211ea0 100644
--- a/src/navigation/MainTabNavigator.js
+++ b/src/navigation/MainTabNavigator.js
@@ -28,8 +28,8 @@ import {AmicaleWebsiteScreen} from "../screens/Websites/AmicaleWebsiteScreen";
 import {ElusEtudiantsWebsiteScreen} from "../screens/Websites/ElusEtudiantsWebsiteScreen";
 import {WiketudWebsiteScreen} from "../screens/Websites/WiketudWebsiteScreen";
 import {TutorInsaWebsiteScreen} from "../screens/Websites/TutorInsaWebsiteScreen";
-import {ENTWebsiteScreen} from "../screens/Websites/ENTWebsiteScreen.js";
-import {BlueMindWebsiteScreen} from "../screens/Websites/BlueMindWebsiteScreen.js";
+import {ENTWebsiteScreen} from "../screens/Websites/ENTWebsiteScreen";
+import {BlueMindWebsiteScreen} from "../screens/Websites/BlueMindWebsiteScreen";
 import LoginScreen from "../screens/Amicale/LoginScreen";
 import ProfileScreen from "../screens/Amicale/ProfileScreen";
 import ClubListScreen from "../screens/Amicale/Clubs/ClubListScreen";
@@ -91,7 +91,7 @@ function ServicesStackComponent() {
             headerMode={"screen"}
             screenOptions={defaultScreenOptions}
         >
-            {createScreenCollapsibleStack("index", ServicesStack, WebsitesHomeScreen, "SERVICES")}
+            {createScreenCollapsibleStack("index", ServicesStack, WebsitesHomeScreen, i18n.t('screens.services'))}
 
             {createScreenCollapsibleStack("proximo", ServicesStack, ProximoMainScreen, "Proximo")}
             {createScreenCollapsibleStack(
@@ -111,11 +111,9 @@ function ServicesStackComponent() {
                 }}
             />
 
-
-            {/*{createScreenCollapsibleStack("index", PlanningStack, InsaHomeScreen, "INSA HOME")}*/}
-            {getWebsiteStack("available-rooms", PlanningStack, AvailableRoomScreen, i18n.t('screens.availableRooms'))}
-            {getWebsiteStack("bib", PlanningStack, BibScreen, i18n.t('screens.bib'))}
-            {createScreenCollapsibleStack("self-menu", PlanningStack, SelfMenuScreen, i18n.t('screens.menuSelf'))}
+            {getWebsiteStack("available-rooms", ServicesStack, AvailableRoomScreen, i18n.t('screens.availableRooms'))}
+            {getWebsiteStack("bib", ServicesStack, BibScreen, i18n.t('screens.bib'))}
+            {createScreenCollapsibleStack("self-menu", ServicesStack, SelfMenuScreen, i18n.t('screens.menuSelf'))}
 
             {getWebsiteStack("amicale-website", ServicesStack, AmicaleWebsiteScreen, "Amicale")}
             {getWebsiteStack("elus-etudiants", ServicesStack, ElusEtudiantsWebsiteScreen, "Élus Étudiants")}
@@ -158,14 +156,14 @@ function PlanningStackComponent() {
             headerMode={"screen"}
             screenOptions={defaultScreenOptions}
         >
-            <ServicesStack.Screen
+            <PlanningStack.Screen
                 name="planning"
                 component={PlanningScreen}
                 options={{
                     title: i18n.t('screens.planning'),
                 }}
             />
-            <ServicesStack.Screen
+            <PlanningStack.Screen
                 name="planning-information"
                 component={PlanningDisplayScreen}
                 options={{
@@ -239,7 +237,7 @@ function HomeStackComponent(initialRoute: string | null, defaultData: { [key: st
                     ...modalTransition,
                 }}
             />
-            {createScreenCollapsibleStack("self-menu", PlanningStack, SelfMenuScreen, i18n.t('screens.menuSelf'), true, {...modalTransition})}
+            {createScreenCollapsibleStack("self-menu", HomeStack, SelfMenuScreen, i18n.t('screens.menuSelf'), true, {...modalTransition})}
 
             <HomeStack.Screen
                 name="login"
@@ -346,7 +344,7 @@ export default class TabNavigator extends React.Component<Props> {
                     name="services"
                     option
                     component={ServicesStackComponent}
-                    options={{title: "SERVICES"}}
+                    options={{title: i18n.t('screens.services')}}
                 />
 
                 <Tab.Screen
@@ -357,7 +355,7 @@ export default class TabNavigator extends React.Component<Props> {
                 <Tab.Screen
                     name="planning"
                     component={PlanningStackComponent}
-                    options={{title: "EVENTS"}}
+                    options={{title: i18n.t('screens.planning')}}
                 />
 
                 <Tab.Screen
diff --git a/src/screens/Websites/BlueMindWebsiteScreen.js.js b/src/screens/Websites/BlueMindWebsiteScreen.js
similarity index 100%
rename from src/screens/Websites/BlueMindWebsiteScreen.js.js
rename to src/screens/Websites/BlueMindWebsiteScreen.js
diff --git a/src/screens/Websites/ENTWebsiteScreen.js.js b/src/screens/Websites/ENTWebsiteScreen.js
similarity index 100%
rename from src/screens/Websites/ENTWebsiteScreen.js.js
rename to src/screens/Websites/ENTWebsiteScreen.js
diff --git a/translations/en.json b/translations/en.json
index 124899c..c6603be 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -1,13 +1,14 @@
 {
   "screens": {
     "home": "Home",
-    "planning": "Planning",
+    "planning": "Events",
     "planningDisplayScreen": "Event details",
     "clubDisplayScreen": "Club details",
     "feedDisplayScreen": "Details",
     "clubsAbout": "Clubs",
     "amicaleAbout": "The Amicale",
     "proxiwash": "Proxiwash",
+    "services": "Services",
     "proximo": "Proximo",
     "proximoArticles": "Articles",
     "menuSelf": "RU Menu",
diff --git a/translations/fr.json b/translations/fr.json
index c10a0ee..ce4db33 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -1,13 +1,14 @@
 {
   "screens": {
     "home": "Accueil",
-    "planning": "Planning",
+    "planning": "Événements",
     "planningDisplayScreen": "Détails",
     "clubDisplayScreen": "Détails",
     "feedDisplayScreen": "Détails",
     "clubsAbout": "Les Clubs",
     "amicaleAbout": "L' Amicale",
     "proxiwash": "Proxiwash",
+    "services": "Services",
     "proximo": "Proximo",
     "proximoArticles": "Articles",
     "menuSelf": "Menu du RU",