diff --git a/App.tsx b/App.tsx
index 3bbc33e5..f1ae6821 100644
--- a/App.tsx
+++ b/App.tsx
@@ -12,6 +12,9 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import TrackPlayer, { IOSCategory, IOSCategoryOptions } from 'react-native-track-player';
 import { CAPABILITIES } from './player/constants';
 import { createWorkletRuntime } from 'react-native-reanimated';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { NavigationContainer } from '@react-navigation/native';
+import { JellifyDarkTheme, JellifyLightTheme } from './components/theme';
 
 export const backgroundRuntime = createWorkletRuntime('background');
 
@@ -49,20 +52,25 @@ export default function App(): React.JSX.Element {
   });
 
   return (
-    <PersistQueryClientProvider 
-      client={queryClient} 
-      persistOptions={{ 
-        persister: clientPersister,
-    }}>
-      <GestureHandlerRootView>
-        <TamaguiProvider config={jellifyConfig}>
-          <Theme name={isDarkMode ? 'dark' : 'light'}>
-            { playerIsReady && (
-              <Jellify />
-            )}
-          </Theme>
-        </TamaguiProvider>
-      </GestureHandlerRootView>
-    </PersistQueryClientProvider>
+    <SafeAreaProvider>
+      <NavigationContainer theme={isDarkMode ? JellifyDarkTheme : JellifyLightTheme}>
+
+      <PersistQueryClientProvider 
+        client={queryClient} 
+        persistOptions={{ 
+          persister: clientPersister,
+      }}>
+        <GestureHandlerRootView>
+          <TamaguiProvider config={jellifyConfig}>
+            <Theme name={isDarkMode ? 'dark' : 'light'}>
+              { playerIsReady && (
+                <Jellify />
+              )}
+            </Theme>
+          </TamaguiProvider>
+        </GestureHandlerRootView>
+      </PersistQueryClientProvider>
+      </NavigationContainer>
+    </SafeAreaProvider>
   );
 }
\ No newline at end of file
diff --git a/api/mutations/functions/playlists.ts b/api/mutations/functions/playlists.ts
index b40c67fd..318881f1 100644
--- a/api/mutations/functions/playlists.ts
+++ b/api/mutations/functions/playlists.ts
@@ -47,7 +47,9 @@ export async function createPlaylist(name: string) {
             userId: Client.user!.id,
             mediaType: MediaType.Audio,
             createPlaylistDto: {
-                Name: name
+                Name: name,
+                IsPublic: false,
+                MediaType: MediaType.Audio
             }
         });
 }
diff --git a/components/jellify.tsx b/components/jellify.tsx
index 16813759..4f33e0ab 100644
--- a/components/jellify.tsx
+++ b/components/jellify.tsx
@@ -1,17 +1,13 @@
 import _ from "lodash";
 import React from "react";
-import { NavigationContainer } from "@react-navigation/native";
 import Navigation from "./navigation";
 import Login from "./Login/component";
 import { JellyfinAuthenticationProvider } from "./Login/provider";
-import { SafeAreaProvider } from "react-native-safe-area-context";
-import { JellifyDarkTheme, JellifyLightTheme } from "./theme";
 import { PlayerProvider } from "../player/provider";
 import { useColorScheme } from "react-native";
 import { PortalProvider } from "@tamagui/portal";
 import { JellifyProvider, useJellifyContext } from "./provider";
 import { ToastProvider } from "@tamagui/toast";
-import SafeToastViewport from "./Global/components/toast-area-view-port";
 
 export default function Jellify(): React.JSX.Element {
 
@@ -32,9 +28,7 @@ function App(): React.JSX.Element {
   const { loggedIn } = useJellifyContext();
   
   return (
-    <NavigationContainer theme={isDarkMode ? JellifyDarkTheme : JellifyLightTheme}>
-      <SafeAreaProvider>
-        { loggedIn ? (
+        loggedIn ? (
           <PlayerProvider>
             <Navigation />
           </PlayerProvider>
@@ -42,9 +36,6 @@ function App(): React.JSX.Element {
            <JellyfinAuthenticationProvider>
             <Login /> 
           </JellyfinAuthenticationProvider>
-        )}
-        <SafeToastViewport />
-      </SafeAreaProvider>
-    </NavigationContainer>
+        )
   )
 }
\ No newline at end of file