diff --git a/app/(auth)/(tabs)/_layout.tsx b/app/(auth)/(tabs)/_layout.tsx
index 4dfc2d4b..155158d9 100644
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -17,13 +17,15 @@ export default function TabLayout() {
 
   return (
     <Tabs
+      initialRouteName="home"
       screenOptions={{
         tabBarActiveTintColor: Colors.tabIconSelected,
         headerShown: false,
       }}
     >
+      <Tabs.Screen redirect name="index" />
       <Tabs.Screen
-        name="index"
+        name="home"
         options={{
           headerShown: false,
           title: "Home",
diff --git a/app/(auth)/(tabs)/index/_layout.tsx b/app/(auth)/(tabs)/home/_layout.tsx
similarity index 100%
rename from app/(auth)/(tabs)/index/_layout.tsx
rename to app/(auth)/(tabs)/home/_layout.tsx
diff --git a/app/(auth)/(tabs)/index/index.tsx b/app/(auth)/(tabs)/home/index.tsx
similarity index 100%
rename from app/(auth)/(tabs)/index/index.tsx
rename to app/(auth)/(tabs)/home/index.tsx
diff --git a/app/(auth)/(tabs)/index.tsx b/app/(auth)/(tabs)/index.tsx
new file mode 100644
index 00000000..a89bbdc9
--- /dev/null
+++ b/app/(auth)/(tabs)/index.tsx
@@ -0,0 +1,5 @@
+const Index = () => {
+  return null;
+};
+
+export default Index;
diff --git a/app/(auth)/(tabs)/search/_layout.tsx b/app/(auth)/(tabs)/search/_layout.tsx
index 3270a520..7aee1250 100644
--- a/app/(auth)/(tabs)/search/_layout.tsx
+++ b/app/(auth)/(tabs)/search/_layout.tsx
@@ -4,7 +4,7 @@ export default function SearchLayout() {
   return (
     <Stack>
       <Stack.Screen
-        name="search"
+        name="index"
         options={{
           headerShown: true,
           headerLargeTitle: true,
diff --git a/app/(auth)/(tabs)/search/search.tsx b/app/(auth)/(tabs)/search/index.tsx
similarity index 52%
rename from app/(auth)/(tabs)/search/search.tsx
rename to app/(auth)/(tabs)/search/index.tsx
index b5d55be9..fc7ee3cf 100644
--- a/app/(auth)/(tabs)/search/search.tsx
+++ b/app/(auth)/(tabs)/search/index.tsx
@@ -8,10 +8,11 @@ import Poster from "@/components/Poster";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getUserItemData } from "@/utils/jellyfin/user-library/getUserItemData";
+import { Ionicons } from "@expo/vector-icons";
 import { BaseItemDto } from "@jellyfin/sdk/lib/generated-client/models";
 import { getSearchApi } from "@jellyfin/sdk/lib/utils/api";
 import { useQuery } from "@tanstack/react-query";
-import { router, useNavigation } from "expo-router";
+import { router, Stack, useNavigation } from "expo-router";
 import { useAtom } from "jotai";
 import React, { useLayoutEffect, useState } from "react";
 import { Platform, ScrollView, TouchableOpacity, View } from "react-native";
@@ -30,6 +31,7 @@ export default function search() {
           placeholder: "Search...",
           onChangeText: (e: any) => setSearch(e.nativeEvent.text),
           hideWhenScrolling: false,
+          autoFocus: true,
         },
       });
   }, [navigation]);
@@ -79,92 +81,94 @@ export default function search() {
   });
 
   return (
-    <ScrollView
-      keyboardDismissMode="on-drag"
-      contentInsetAdjustmentBehavior="automatic"
-    >
-      <View className="flex flex-col pt-2 pb-20">
-        {Platform.OS === "android" && (
-          <View className="mb-4 px-4">
-            <Input
-              autoCorrect={false}
-              returnKeyType="done"
-              keyboardType="web-search"
-              placeholder="Search here..."
-              value={search}
-              onChangeText={(text) => setSearch(text)}
-            />
-          </View>
-        )}
-        <Text className="font-bold text-2xl px-4 mb-2">Movies</Text>
-        <SearchItemWrapper
-          ids={movies?.map((m) => m.Id!)}
-          renderItem={(data) => (
-            <HorizontalScroll<BaseItemDto>
-              data={data}
-              renderItem={(item) => (
-                <TouchableOpacity
-                  key={item.Id}
-                  className="flex flex-col w-32"
-                  onPress={() => router.push(`/items/${item.Id}/page`)}
-                >
-                  <MoviePoster item={item} key={item.Id} />
-                  <Text className="mt-2">{item.Name}</Text>
-                  <Text className="opacity-50 text-xs">
-                    {item.ProductionYear}
-                  </Text>
-                </TouchableOpacity>
-              )}
-            />
+    <>
+      <ScrollView
+        keyboardDismissMode="on-drag"
+        contentInsetAdjustmentBehavior="automatic"
+      >
+        <View className="flex flex-col pt-2 pb-20">
+          {Platform.OS === "android" && (
+            <View className="mb-4 px-4">
+              <Input
+                autoCorrect={false}
+                returnKeyType="done"
+                keyboardType="web-search"
+                placeholder="Search here..."
+                value={search}
+                onChangeText={(text) => setSearch(text)}
+              />
+            </View>
           )}
-        />
-        <Text className="font-bold text-2xl px-4 my-2">Series</Text>
-        <SearchItemWrapper
-          ids={series?.map((m) => m.Id!)}
-          renderItem={(data) => (
-            <HorizontalScroll<BaseItemDto>
-              data={data}
-              renderItem={(item) => (
-                <TouchableOpacity
-                  key={item.Id}
-                  onPress={() => router.push(`/series/${item.Id}/page`)}
-                  className="flex flex-col w-32"
-                >
-                  <Poster
-                    item={item}
+          <Text className="font-bold text-2xl px-4 mb-2">Movies</Text>
+          <SearchItemWrapper
+            ids={movies?.map((m) => m.Id!)}
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
                     key={item.Id}
-                    url={getPrimaryImageUrl({ api, item })}
-                  />
-                  <Text className="mt-2">{item.Name}</Text>
-                  <Text className="opacity-50 text-xs">
-                    {item.ProductionYear}
-                  </Text>
-                </TouchableOpacity>
-              )}
-            />
-          )}
-        />
-        <Text className="font-bold text-2xl px-4 my-2">Episodes</Text>
-        <SearchItemWrapper
-          ids={episodes?.map((m) => m.Id!)}
-          renderItem={(data) => (
-            <HorizontalScroll<BaseItemDto>
-              data={data}
-              renderItem={(item) => (
-                <TouchableOpacity
-                  key={item.Id}
-                  onPress={() => router.push(`/items/${item.Id}/page`)}
-                  className="flex flex-col w-48"
-                >
-                  <ContinueWatchingPoster item={item} />
-                  <ItemCardText item={item} />
-                </TouchableOpacity>
-              )}
-            />
-          )}
-        />
-      </View>
-    </ScrollView>
+                    className="flex flex-col w-32"
+                    onPress={() => router.push(`/items/${item.Id}/page`)}
+                  >
+                    <MoviePoster item={item} key={item.Id} />
+                    <Text className="mt-2">{item.Name}</Text>
+                    <Text className="opacity-50 text-xs">
+                      {item.ProductionYear}
+                    </Text>
+                  </TouchableOpacity>
+                )}
+              />
+            )}
+          />
+          <Text className="font-bold text-2xl px-4 my-2">Series</Text>
+          <SearchItemWrapper
+            ids={series?.map((m) => m.Id!)}
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
+                    key={item.Id}
+                    onPress={() => router.push(`/series/${item.Id}/page`)}
+                    className="flex flex-col w-32"
+                  >
+                    <Poster
+                      item={item}
+                      key={item.Id}
+                      url={getPrimaryImageUrl({ api, item })}
+                    />
+                    <Text className="mt-2">{item.Name}</Text>
+                    <Text className="opacity-50 text-xs">
+                      {item.ProductionYear}
+                    </Text>
+                  </TouchableOpacity>
+                )}
+              />
+            )}
+          />
+          <Text className="font-bold text-2xl px-4 my-2">Episodes</Text>
+          <SearchItemWrapper
+            ids={episodes?.map((m) => m.Id!)}
+            renderItem={(data) => (
+              <HorizontalScroll<BaseItemDto>
+                data={data}
+                renderItem={(item) => (
+                  <TouchableOpacity
+                    key={item.Id}
+                    onPress={() => router.push(`/items/${item.Id}/page`)}
+                    className="flex flex-col w-48"
+                  >
+                    <ContinueWatchingPoster item={item} />
+                    <ItemCardText item={item} />
+                  </TouchableOpacity>
+                )}
+              />
+            )}
+          />
+        </View>
+      </ScrollView>
+    </>
   );
 }
 
diff --git a/app/_layout.tsx b/app/_layout.tsx
index dddfe8d8..54340338 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -20,7 +20,7 @@ import { useSettings } from "@/utils/atoms/settings";
 SplashScreen.preventAutoHideAsync();
 
 export const unstable_settings = {
-  initialRouteName: "(auth)/(tabs)/",
+  initialRouteName: "/index",
 };
 
 export default function RootLayout() {
@@ -80,12 +80,12 @@ function Layout() {
           <JellyfinProvider>
             <StatusBar style="light" backgroundColor="#000" />
             <ThemeProvider value={DarkTheme}>
-              <Stack>
+              <Stack initialRouteName="/home">
                 <Stack.Screen
                   name="(auth)/(tabs)"
                   options={{
                     headerShown: false,
-                    title: "Home",
+                    title: "",
                   }}
                 />
                 <Stack.Screen