diff --git a/amnet-native/App.tsx b/amnet-native/App.tsx
index df1e7b6..0d48c5a 100644
--- a/amnet-native/App.tsx
+++ b/amnet-native/App.tsx
@@ -16,7 +16,7 @@ import {
     MD3LightTheme,
     MD3Theme,
     PaperProvider,
-    Paragraph
+    Text
 } from 'react-native-paper';
 
 import linking from "./Linking";
@@ -72,6 +72,7 @@ const {LightTheme, DarkTheme} = adaptNavigationTheme({
 });
 
 const {RealmProvider} = RealmContext;
+
 const Tab = createBottomTabNavigator();
 const Stack = createNativeStackNavigator();
 
@@ -79,17 +80,11 @@ function AppContent() {
     return (<Tab.Navigator tabBar={p => <AMUITabBar {...p}/>} screenOptions={{headerShown: false}}>
         <Tab.Screen name="servers"
                     component={ServerManagerStack}
-                    options={{
-                        title: 'Servers',
-                        tabBarIcon: ({color, size}) => (<Server color={color} size={size}/>)
-                    }}/>
+                    options={{tabBarIcon: ({color, size}) => (<Server color={color} size={size}/>)}}/>
 
         <Tab.Screen name="cards"
                     component={CardManagerStack}
-                    options={{
-                        title: "Cards",
-                        tabBarIcon: ({color, size}) => (<WalletCards color={color} size={size}/>)
-                    }}/>
+                    options={{tabBarIcon: ({color, size}) => (<WalletCards color={color} size={size}/>)}}/>
     </Tab.Navigator>)
 }
 
@@ -103,7 +98,7 @@ export default function AppRoot() {
         return (
             <View style={{flex: 1, justifyContent: "center", alignItems: "center", gap: 10}}>
                 <ActivityIndicator animating/>
-                <Paragraph>Starting...</Paragraph>
+                <Text variant="bodyMedium">Starting...</Text>
             </View>
         )
     }
diff --git a/amnet-native/app/CardManagerStack.tsx b/amnet-native/app/CardManagerStack.tsx
index fc99b45..4fec4ac 100644
--- a/amnet-native/app/CardManagerStack.tsx
+++ b/amnet-native/app/CardManagerStack.tsx
@@ -15,7 +15,13 @@ export default function CardManagerStack({navigation}) {
             headerLargeTitle: true,
             headerBlurEffect: "regular",
             headerStyle: {
-                backgroundColor: theme.colors.background,
+                backgroundColor: theme.colors.background
+            },
+            headerTitleStyle: {
+                fontWeight: "bold"
+            },
+            headerLargeTitleStyle: {
+                fontWeight: "bold"
             }
         }}>
             <Stack.Screen name="card-listing"
diff --git a/amnet-native/app/ServerManagerStack.tsx b/amnet-native/app/ServerManagerStack.tsx
index abc81e2..d7d6db7 100644
--- a/amnet-native/app/ServerManagerStack.tsx
+++ b/amnet-native/app/ServerManagerStack.tsx
@@ -18,16 +18,19 @@ export default function ServerManagerStack({navigation}) {
                 headerBlurEffect: "regular",
                 headerStyle: {
                     backgroundColor: theme.colors.background
+                },
+                headerTitleStyle: {
+                    fontWeight: "bold"
+                },
+                headerLargeTitleStyle: {
+                    fontWeight: "bold"
                 }
             }}>
                 <Stack.Screen name="server-listing"
                               component={ServerManager}
                               options={{
                                   title: "Servers",
-                                  headerRight: () =>  Platform.OS === 'android' ? null : <TouchableOpacity
-                                      onPress={() => navigation.navigate('add-server')}>
-                                      <Plus/>
-                                  </TouchableOpacity>
+                                  headerRight: () =>  Platform.OS === 'android' ? null : <TouchableOpacity onPress={() => navigation.navigate('add-server')}><Plus/></TouchableOpacity>
                               }}/>
 
                 <Stack.Screen name="server" options={{title: "Server", headerTransparent: true}} component={ServerCardIn}/>
diff --git a/amnet-native/tsconfig.json b/amnet-native/tsconfig.json
index 0e6371f..6f5da7e 100644
--- a/amnet-native/tsconfig.json
+++ b/amnet-native/tsconfig.json
@@ -1,4 +1,7 @@
 {
-  "compilerOptions": {},
+  "compilerOptions": {
+    "strictNullChecks": true,
+    "moduleResolution": "bundler"
+  },
   "extends": "expo/tsconfig.base"
 }