diff --git a/front/components/navigators/TabRowNavigator.tsx b/front/components/navigators/TabRowNavigator.tsx
index 21abbe8..9d1b189 100644
--- a/front/components/navigators/TabRowNavigator.tsx
+++ b/front/components/navigators/TabRowNavigator.tsx
@@ -24,6 +24,10 @@ import {
 } from "@react-navigation/native";
 import IconButton from "../IconButton";
 
+const TabRowNavigatorInitialComponentName = "TabIndex";
+
+export {TabRowNavigatorInitialComponentName};
+
 // Props accepted by the view
 type TabNavigationConfig = {
 	tabBarStyle: StyleProp<ViewStyle>;
@@ -82,6 +86,27 @@ function TabNavigator({
 	const [isPanelView, setIsPanelView] = React.useState(false);
 	const isMobileView = screenSize == "small";
 
+	React.useEffect(() => {
+		if (state.index === 0) {
+			if (isMobileView) {
+				setIsPanelView(true);
+			} else {
+				navigation.reset(
+					{
+						...state,
+						index: 1,
+					}
+				);
+			}
+		}
+	}, [state.index]);
+
+	React.useEffect(() => {
+		navigation.setOptions({
+			headerShown: !isMobileView || isPanelView,
+		});
+	}, [isMobileView, isPanelView]);
+
 	return (
 		<NavigationContent>
 			<Row height={"900px"}>
@@ -95,12 +120,15 @@ function TabNavigator({
 								borderRightWidth: 1,
 								borderRightColor: "lightgray",
 								overflow: "scroll",
-								width: isMobileView ? "100%" : undefined,
+								width: isMobileView ? "100%" : "clamp(200px, 20%, 300px)",
 							},
 							tabBarStyle,
 						]}
 					>
-						{state.routes.map((route) => {
+						{state.routes.map((route, idx) => {
+							if (idx === 0) {
+								return null;
+							}
 							const isSelected = route.key === state.routes[state.index]?.key;
 							const { options } = descriptors[route.key];
 
@@ -128,12 +156,12 @@ function TabNavigator({
 											setIsPanelView(false);
 										}
 									}}
-									bgColor={isSelected ? "primary.300" : undefined}
+									bgColor={isSelected && (!isMobileView || !isPanelView) ? "primary.300" : undefined}
 									style={{
 										justifyContent: "flex-start",
 										padding: "10px",
 										height: "50px",
-										width: "250px",
+										width: "100%",
 									}}
 									leftIcon={
 										options.iconProvider && options.iconName ? (
@@ -141,7 +169,7 @@ function TabNavigator({
 												as={options.iconProvider}
 												name={options.iconName}
 												size="xl"
-												color="black"
+												borderRadius="full"
 											/>
 										) : undefined
 									}
@@ -176,6 +204,7 @@ function TabNavigator({
 										name="arrow-back"
 										size="xl"
 										color="black"
+										borderRadius="full"
 									/>
 								}
 							/>
@@ -193,4 +222,4 @@ export default createNavigatorFactory<
 	TabNavigationOptions,
 	TabNavigationEventMap,
 	typeof TabNavigator
->(TabNavigator);
+>(TabNavigator);
\ No newline at end of file
diff --git a/front/views/SettingsView.tsx b/front/views/SettingsView.tsx
index d35bd0a..26c7b19 100644
--- a/front/views/SettingsView.tsx
+++ b/front/views/SettingsView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { View } from 'react-native';
-import { Center, Button, Text, Switch, Slider, Select, Heading } from "native-base";
+import { Center, Button, Text, Switch, Slider, Select, Heading, Box } from "native-base";
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { unsetAccessToken } from '../state/UserSlice';
 import { useDispatch } from "react-redux";
@@ -258,7 +258,10 @@ const TabRow = createTabRowNavigator();
 
 const SetttingsNavigator = () => {
     return (
-        <TabRow.Navigator initialRouteName='Main'>
+        <TabRow.Navigator initialRouteName='InternalDefault'>
+            {/* I'm doing this to be able to land on the summary of settings when clicking on settings and directly to the
+            wanted settings page if needed so I need to do special work with the 0 index */}
+            <TabRow.Screen name='InternalDefault' component={Box} />
             <TabRow.Screen name='Main' component={MainView} options={{ title: "Profil", iconProvider: FontAwesome, iconName: "user" }} />
             <TabRow.Screen name='Preferences' component={PreferencesView} />
             <TabRow.Screen name='Notifications' component={NotificationsView} />