diff --git a/app/(auth)/(tabs)/_layout.tsx b/app/(auth)/(tabs)/_layout.tsx
index fe268291..35da3645 100644
--- a/app/(auth)/(tabs)/_layout.tsx
+++ b/app/(auth)/(tabs)/_layout.tsx
@@ -5,18 +5,29 @@ import * as NavigationBar from "expo-navigation-bar";
 import React, { useEffect } from "react";
 import { Platform, StyleSheet } from "react-native";
 
+import { withLayoutContext } from "expo-router";
+
 import {
   createNativeBottomTabNavigator,
-  BottomSheetNavigationOptions,
+  NativeBottomTabNavigationEventMap,
+  NativeBottomTabNavigationOptions,
 } from "react-native-bottom-tabs/react-navigation";
 
-import { withLayoutContext } from "expo-router";
-
 const { Navigator } = createNativeBottomTabNavigator();
 
-export const Tabs = withLayoutContext<any, typeof Navigator, any, any>(
-  Navigator
-);
+import { BottomTabNavigationOptions } from "@react-navigation/bottom-tabs";
+
+import type {
+  ParamListBase,
+  TabNavigationState,
+} from "@react-navigation/native";
+
+export const NativeTabs = withLayoutContext<
+  BottomTabNavigationOptions,
+  typeof Navigator,
+  TabNavigationState<ParamListBase>,
+  NativeBottomTabNavigationEventMap
+>(Navigator);
 
 export default function TabLayout() {
   useEffect(() => {
@@ -27,34 +38,29 @@ export default function TabLayout() {
   }, []);
 
   return (
-    <Tabs
-      sidebarAdaptable
-      options={{
-        headerShown: false,
-      }}
-    >
-      <Tabs.Screen redirect name="index" />
-      <Tabs.Screen
+    <NativeTabs sidebarAdaptable>
+      <NativeTabs.Screen redirect name="index" />
+      <NativeTabs.Screen
         name="(home)"
         options={{
           title: "Home",
           tabBarIcon: () => ({ sfSymbol: "house" }),
         }}
       />
-      <Tabs.Screen
+      <NativeTabs.Screen
         name="(search)"
         options={{
           title: "Search",
           tabBarIcon: () => ({ sfSymbol: "magnifyingglass" }),
         }}
       />
-      <Tabs.Screen
+      <NativeTabs.Screen
         name="(libraries)"
         options={{
           title: "Library",
           tabBarIcon: () => ({ sfSymbol: "server.rack" }),
         }}
       />
-    </Tabs>
+    </NativeTabs>
   );
 }
diff --git a/app/_layout.tsx b/app/_layout.tsx
index 9c32fc76..e37db593 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -334,6 +334,8 @@ function Layout() {
                           options={{
                             headerShown: false,
                             title: "",
+                            header: () => null,
+                            
                           }}
                         />
                         <Stack.Screen