diff --git a/ArtisanConnect/app/(tabs)/_layout.jsx b/ArtisanConnect/app/(tabs)/_layout.jsx
new file mode 100644
index 0000000..35b9a42
--- /dev/null
+++ b/ArtisanConnect/app/(tabs)/_layout.jsx
@@ -0,0 +1,62 @@
+import { Tabs } from "expo-router";
+import { Ionicons } from "@expo/vector-icons";
+export default function TabLayout() {
+  return (
+    <Tabs
+      screenOptions={{
+        tabBarActiveTintColor: "rgb(var(--color-primary-500))",
+      }}
+    >
+      <Tabs.Screen
+        name="index"
+        options={{
+          title: "Home",
+          tabBarLabel: "Home",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="home-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="notices"
+        options={{
+          title: "Ogłoszenia",
+          tabBarLabel: "Ogłoszenia",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="list-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="notice/create"
+        options={{
+          title: "Dodaj",
+          tabBarLabel: "Dodaj",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="add-circle-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="wishlist"
+        options={{
+          title: "Ulubione",
+          tabBarLabel: "Ulubione",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="heart-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="account"
+        options={{
+          title: "Konto",
+          tabBarLabel: "Konto",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="person-outline" size={size} color={color} />
+          ),
+        }}
+      />
+    </Tabs>
+  );
+}
diff --git a/ArtisanConnect/app/(tabs)/account.jsx b/ArtisanConnect/app/(tabs)/account.jsx
new file mode 100644
index 0000000..7d3093d
--- /dev/null
+++ b/ArtisanConnect/app/(tabs)/account.jsx
@@ -0,0 +1,4 @@
+import { Text } from "@/components/ui/text";
+export default function User() {
+  return <Text>Użytkownik</Text>;
+}
diff --git a/ArtisanConnect/app/index.jsx b/ArtisanConnect/app/(tabs)/index.jsx
similarity index 100%
rename from ArtisanConnect/app/index.jsx
rename to ArtisanConnect/app/(tabs)/index.jsx
diff --git a/ArtisanConnect/app/(tabs)/notice/create.jsx b/ArtisanConnect/app/(tabs)/notice/create.jsx
new file mode 100644
index 0000000..9eddf21
--- /dev/null
+++ b/ArtisanConnect/app/(tabs)/notice/create.jsx
@@ -0,0 +1,4 @@
+import { Text } from "@/components/ui/text";
+export default function CreateNotice() {
+  return <Text>Tworzenie ogłoszenia</Text>;
+}
diff --git a/ArtisanConnect/app/notices.jsx b/ArtisanConnect/app/(tabs)/notices.jsx
similarity index 100%
rename from ArtisanConnect/app/notices.jsx
rename to ArtisanConnect/app/(tabs)/notices.jsx
diff --git a/ArtisanConnect/app/wishlist.jsx b/ArtisanConnect/app/(tabs)/wishlist.jsx
similarity index 100%
rename from ArtisanConnect/app/wishlist.jsx
rename to ArtisanConnect/app/(tabs)/wishlist.jsx
diff --git a/ArtisanConnect/app/_layout.jsx b/ArtisanConnect/app/_layout.jsx
index 95a93d8..7454eda 100644
--- a/ArtisanConnect/app/_layout.jsx
+++ b/ArtisanConnect/app/_layout.jsx
@@ -8,12 +8,15 @@ export default function RootLayout() {
   return (
     <QueryClientProvider client={queryClient}>
       <GluestackUIProvider>
-        <Stack>
-          <Stack.Screen name="index" options={{ title: "Home" }} />
-          <Stack.Screen name="notices" options={{ title: "Ogłoszenia" }} />
-          <Stack.Screen name="wishlist" options={{ title: "Ulubione" }} />
+        <Stack
+          screenOptions={{
+            headerTintColor: "#1c1c1e",
+            headerBackTitleVisible: false,
+            headerBackTitle: "Wróć",
+          }}
+        >
+          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         </Stack>
-        {/* <Tabs/> */}
       </GluestackUIProvider>
     </QueryClientProvider>
   );
diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index e9d7980..35cee37 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -33,7 +33,11 @@ export default function NoticeDetails() {
 
   return (
     <Card className="p-0 rounded-lg  m-3 flex-1">
-      <Stack.Screen options={{ title: notice.title }} />
+      <Stack.Screen
+        options={{
+          title: notice.title,
+        }}
+      />
       <Image
         source={{
           uri: "https://gluestack.github.io/public-blog-video-assets/saree.png",