diff --git a/FastNotes/app/login.tsx b/FastNotes/app/login.tsx
index b8c419d..833eb41 100644
--- a/FastNotes/app/login.tsx
+++ b/FastNotes/app/login.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { Link, Stack } from 'expo-router'
-import { Pressable, Text, TextInput, View } from 'react-native'
+import { Keyboard, KeyboardAvoidingView, Platform, Pressable, ScrollView, Text, TextInput, View } from 'react-native'
 import { supabase } from '@/libs/supabase'
 import { useAppTheme } from '@/src/theme/AppThemeProvider'
 import { loginScreenStyles as styles } from '@/src/styles/app-styles'
@@ -36,55 +36,69 @@ export default function LoginScreen() {
   return (
     <>
       <Stack.Screen options={{ title: 'Login' }} />
-      <View style={[styles.container, { backgroundColor: palette.background }]}>
-        <Text style={[styles.title, { color: palette.text }]}>Login</Text>
-
-        <Text style={[styles.label, { color: palette.text }]}>E-mail</Text>
-        <TextInput
-            autoCapitalize="none"
-            autoComplete="email"
-            keyboardType="email-address"
-            onChangeText={setEmail}
-            placeholder="name@email.com"
-            placeholderTextColor={palette.mutedText}
-            style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
-            value={email}
-        />
-
-        <Text style={[styles.label, { color: palette.text }]}>Password</Text>
-        <TextInput
-            autoCapitalize="none"
-            autoComplete="password"
-            onChangeText={setPassword}
-            placeholder="Password"
-            placeholderTextColor={palette.mutedText}
-            secureTextEntry
-            style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
-            value={password}
-        />
-
-        {errorMessage ? (
-          <Text style={styles.errorText}>{errorMessage}</Text>
-        ) : null}
-
-        <Pressable
-          disabled={isSubmitting}
-          onPress={onLogin}
-            style={({ pressed }) => [
-                styles.loginButton,
-                pressed && !isSubmitting ? styles.loginButtonPressed : null,
-                isSubmitting ? styles.loginButtonDisabled : null,
-          ]}
+      <KeyboardAvoidingView
+        style={[styles.keyboardAvoider, { backgroundColor: palette.background }]}
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+      >
+        <ScrollView
+          style={styles.scrollView}
+          contentContainerStyle={styles.scrollContent}
+          keyboardShouldPersistTaps="handled"
+          keyboardDismissMode={Platform.OS === 'ios' ? 'interactive' : 'on-drag'}
         >
-          <Text style={styles.loginButtonText}>
-            {isSubmitting ? 'Logging in...' : 'Log in'}
-          </Text>
-        </Pressable>
+          <Pressable style={styles.dismissArea} onPress={Keyboard.dismiss}>
+            <View style={styles.form}>
+              <Text style={[styles.title, { color: palette.text }]}>Login</Text>
 
-        <Link href="/signup" style={styles.link}>
-          <Text style={[styles.linkText, { color: colorScheme === "dark" ? "#8ab4ff" : "#0b57d0" }]}>Create a new account</Text>
-        </Link>
-      </View>
+              <Text style={[styles.label, { color: palette.text }]}>E-mail</Text>
+              <TextInput
+                  autoCapitalize="none"
+                  autoComplete="email"
+                  keyboardType="email-address"
+                  onChangeText={setEmail}
+                  placeholder="name@email.com"
+                  placeholderTextColor={palette.mutedText}
+                  style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
+                  value={email}
+              />
+
+              <Text style={[styles.label, { color: palette.text }]}>Password</Text>
+              <TextInput
+                  autoCapitalize="none"
+                  autoComplete="password"
+                  onChangeText={setPassword}
+                  placeholder="Password"
+                  placeholderTextColor={palette.mutedText}
+                  secureTextEntry
+                  style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
+                  value={password}
+              />
+
+              {errorMessage ? (
+                <Text style={styles.errorText}>{errorMessage}</Text>
+              ) : null}
+
+              <Pressable
+                disabled={isSubmitting}
+                onPress={onLogin}
+                  style={({ pressed }) => [
+                      styles.loginButton,
+                      pressed && !isSubmitting ? styles.loginButtonPressed : null,
+                      isSubmitting ? styles.loginButtonDisabled : null,
+                ]}
+              >
+                <Text style={styles.loginButtonText}>
+                  {isSubmitting ? 'Logging in...' : 'Log in'}
+                </Text>
+              </Pressable>
+
+              <Link href="/signup" style={styles.link}>
+                <Text style={[styles.linkText, { color: colorScheme === "dark" ? "#8ab4ff" : "#0b57d0" }]}>Create a new account</Text>
+              </Link>
+            </View>
+          </Pressable>
+        </ScrollView>
+      </KeyboardAvoidingView>
     </>
   )
 }
diff --git a/FastNotes/app/newNote.tsx b/FastNotes/app/newNote.tsx
index a995bff..99c48e6 100644
--- a/FastNotes/app/newNote.tsx
+++ b/FastNotes/app/newNote.tsx
@@ -88,7 +88,7 @@ export default function NewNoteScreen() {
                 return
             }
 
-            router.replace("/index")
+            router.replace("/")
         }
     }
 
diff --git a/FastNotes/app/signup.tsx b/FastNotes/app/signup.tsx
index e243dbc..afcf518 100644
--- a/FastNotes/app/signup.tsx
+++ b/FastNotes/app/signup.tsx
@@ -1,7 +1,7 @@
 import { supabase } from "@/libs/supabase"
-import { Link, Stack } from "expo-router"
+import { Link, Stack, router } from "expo-router"
 import { useState } from "react"
-import { Pressable, Text, TextInput, View } from 'react-native'
+import { Keyboard, KeyboardAvoidingView, Platform, Pressable, ScrollView, Text, TextInput, View } from 'react-native'
 import { useAppTheme } from "@/src/theme/AppThemeProvider"
 import { signupScreenStyles as styles } from "@/src/styles/app-styles"
 
@@ -59,60 +59,80 @@ export default function SignupScreen(){
     return (
     <>
     <Stack.Screen options={{title: "Signup"}}/>
-    <View style={[styles.container, { backgroundColor: palette.background }]}>
-        <Text style={[styles.title, { color: palette.text }]}>Sign up</Text>
-
-        <Text style={[styles.label, { color: palette.text }]}>E-mail</Text>
-        <TextInput
-            autoCapitalize="none"
-            autoComplete="email"
-            keyboardType="email-address"
-            onChangeText={setEmail}
-            placeholder="name@email.com"
-            placeholderTextColor={palette.mutedText}
-            style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
-            value={email}
-        />
-
-        <Text style={[styles.label, { color: palette.text }]} >Password</Text>
-        <TextInput 
-            autoCapitalize="none"
-            autoComplete="password"
-            onChangeText={setPassword}
-            placeholder="Password"
-            placeholderTextColor={palette.mutedText}
-            secureTextEntry
-            style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
-            value={password}
-        />
-
-        {errorMessage ? (
-          <Text style={styles.errorText}>{errorMessage}</Text>
-        ) : null}
-
-        {successMessage ? (
-          <Text style={styles.successText}>{successMessage}</Text>
-        ) : null}
-
-        <Pressable
-          disabled={isSubmitting}
-          onPress={onSignup}
-          style={({ pressed }) => [
-            styles.actionButton,
-            pressed && !isSubmitting ? styles.actionButtonPressed : null,
-            isSubmitting ? styles.actionButtonDisabled : null,
-          ]}
+    <KeyboardAvoidingView
+        style={[styles.keyboardAvoider, { backgroundColor: palette.background }]}
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+    >
+        <ScrollView
+            style={styles.scrollView}
+            contentContainerStyle={styles.scrollContent}
+            keyboardShouldPersistTaps="handled"
+            keyboardDismissMode={Platform.OS === "ios" ? "interactive" : "on-drag"}
         >
-          <Text style={styles.actionButtonText}>
-            {isSubmitting ? 'Creating account...' : 'Sign up'}
-          </Text>
-        </Pressable>
+            <Pressable style={styles.dismissArea} onPress={Keyboard.dismiss}>
+                <View style={styles.form}>
+                    <Pressable
+                        onPress={() => router.replace("/login")}
+                        style={styles.backButton}
+                    >
+                        <Text style={[styles.backButtonText, { color: palette.text }]}>Back to login</Text>
+                    </Pressable>
 
-        <Link href="/login" style={styles.link}>
-          <Text style={[styles.linkText, { color: colorScheme === "dark" ? "#8ab4ff" : "#0b57d0" }]}>Already have an account? Log in</Text>
-        </Link>
+                    <Text style={[styles.title, { color: palette.text }]}>Sign up</Text>
 
-    </View>
+                    <Text style={[styles.label, { color: palette.text }]}>E-mail</Text>
+                    <TextInput
+                        autoCapitalize="none"
+                        autoComplete="email"
+                        keyboardType="email-address"
+                        onChangeText={setEmail}
+                        placeholder="name@email.com"
+                        placeholderTextColor={palette.mutedText}
+                        style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
+                        value={email}
+                    />
+
+                    <Text style={[styles.label, { color: palette.text }]} >Password</Text>
+                    <TextInput 
+                        autoCapitalize="none"
+                        autoComplete="password"
+                        onChangeText={setPassword}
+                        placeholder="Password"
+                        placeholderTextColor={palette.mutedText}
+                        secureTextEntry
+                        style={[styles.input, { color: palette.text, backgroundColor: palette.input, borderColor: palette.border }]}
+                        value={password}
+                    />
+
+                    {errorMessage ? (
+                      <Text style={styles.errorText}>{errorMessage}</Text>
+                    ) : null}
+
+                    {successMessage ? (
+                      <Text style={styles.successText}>{successMessage}</Text>
+                    ) : null}
+
+                    <Pressable
+                      disabled={isSubmitting}
+                      onPress={onSignup}
+                      style={({ pressed }) => [
+                        styles.actionButton,
+                        pressed && !isSubmitting ? styles.actionButtonPressed : null,
+                        isSubmitting ? styles.actionButtonDisabled : null,
+                      ]}
+                    >
+                      <Text style={styles.actionButtonText}>
+                        {isSubmitting ? 'Creating account...' : 'Sign up'}
+                      </Text>
+                    </Pressable>
+
+                    <Link href="/login" style={styles.link}>
+                      <Text style={[styles.linkText, { color: colorScheme === "dark" ? "#8ab4ff" : "#0b57d0" }]}>Already have an account? Log in</Text>
+                    </Link>
+                </View>
+            </Pressable>
+        </ScrollView>
+    </KeyboardAvoidingView>
     </>
     )
 }
diff --git a/FastNotes/providers/auth-provider.tsx b/FastNotes/providers/auth-provider.tsx
index 3abc1a0..cccf199 100644
--- a/FastNotes/providers/auth-provider.tsx
+++ b/FastNotes/providers/auth-provider.tsx
@@ -10,12 +10,37 @@ const buildClaims = (user?: { id: string; email?: string | null } | null) =>
       }
     : null
 
+const isInvalidRefreshTokenError = (error: { message?: string; status?: number } | null) => {
+  if (!error) {
+    return false
+  }
+
+  const message = error.message?.toLowerCase() ?? ''
+
+  return error.status === 401 && (
+    message.includes('invalid refresh token') ||
+    message.includes('refresh token not found')
+  )
+}
+
 export default function AuthProvider({ children }: PropsWithChildren) {
   const [claims, setClaims] = useState<Record<string, any> | undefined | null>()
   const [profile, setProfile] = useState<any>()
   const [isLoading, setIsLoading] = useState<boolean>(true)
 
   useEffect(() => {
+    const clearInvalidSession = async () => {
+      const { error } = await supabase.auth.signOut({ scope: 'local' })
+
+      if (error) {
+        console.error('Error clearing invalid local session:', error)
+      }
+
+      setClaims(null)
+      setProfile(null)
+      setIsLoading(false)
+    }
+
     const hydrateSession = async () => {
       const {
         data: { session },
@@ -23,6 +48,12 @@ export default function AuthProvider({ children }: PropsWithChildren) {
       } = await supabase.auth.getSession()
 
       if (error) {
+        if (isInvalidRefreshTokenError(error)) {
+          console.warn('Clearing expired auth session:', error.message)
+          await clearInvalidSession()
+          return
+        }
+
         console.error('Error hydrating session:', error)
       }
 
diff --git a/FastNotes/src/styles/app-styles.ts b/FastNotes/src/styles/app-styles.ts
index 429271c..bd1a42a 100644
--- a/FastNotes/src/styles/app-styles.ts
+++ b/FastNotes/src/styles/app-styles.ts
@@ -72,10 +72,23 @@ export const themedTextStyles = StyleSheet.create({
 })
 
 export const loginScreenStyles = StyleSheet.create({
-    container: {
+    keyboardAvoider: {
+        flex: 1,
+    },
+    scrollView: {
+        flex: 1,
+    },
+    scrollContent: {
+        flexGrow: 1,
+        justifyContent: "center",
+        paddingHorizontal: 24,
+        paddingVertical: 32,
+    },
+    dismissArea: {
         flex: 1,
         justifyContent: "center",
-        padding: 24,
+    },
+    form: {
         gap: 12,
     },
     title: {
@@ -125,12 +138,33 @@ export const loginScreenStyles = StyleSheet.create({
 })
 
 export const signupScreenStyles = StyleSheet.create({
-    container: {
+    keyboardAvoider: {
+        flex: 1,
+    },
+    scrollView: {
+        flex: 1,
+    },
+    scrollContent: {
+        flexGrow: 1,
+        justifyContent: "center",
+        paddingHorizontal: 24,
+        paddingVertical: 32,
+    },
+    dismissArea: {
         flex: 1,
         justifyContent: "center",
-        padding: 24,
+    },
+    form: {
         gap: 12,
     },
+    backButton: {
+        alignSelf: "flex-start",
+        paddingVertical: 8,
+    },
+    backButtonText: {
+        fontSize: 16,
+        fontWeight: "600",
+    },
     title: {
         fontSize: 28,
         fontWeight: "700",