diff --git a/ApiCore-Frontend/src/app/(app)/apiaries/page.tsx b/ApiCore-Frontend/src/app/(app)/apiaries/page.tsx
index c59ccbf..6ba3fed 100644
--- a/ApiCore-Frontend/src/app/(app)/apiaries/page.tsx
+++ b/ApiCore-Frontend/src/app/(app)/apiaries/page.tsx
@@ -48,7 +48,7 @@ export default function ApiariesPage() {
           onValueChange={(value) => setStatus(value === "ALL" ? "" : ((value ?? "") as ApiaryStatus))}
         >
           <SelectTrigger className="w-40">
-            <SelectValue placeholder="Status" />
+            <SelectValue placeholder="Status">{status || "Alle Status"}</SelectValue>
           </SelectTrigger>
           <SelectContent>
             <SelectItem value="ALL">Alle Status</SelectItem>
diff --git a/ApiCore-Frontend/src/app/(app)/colonies/page.tsx b/ApiCore-Frontend/src/app/(app)/colonies/page.tsx
index 2f779c2..4c5693e 100644
--- a/ApiCore-Frontend/src/app/(app)/colonies/page.tsx
+++ b/ApiCore-Frontend/src/app/(app)/colonies/page.tsx
@@ -69,7 +69,7 @@ export default function ColoniesPage() {
         onValueChange={(value) => setStatus(value === "ALL" ? "" : ((value ?? "") as ColonyStatus))}
       >
         <SelectTrigger className="w-40">
-          <SelectValue placeholder="Status" />
+          <SelectValue placeholder="Status">{status || "Alle Status"}</SelectValue>
         </SelectTrigger>
         <SelectContent>
           <SelectItem value="ALL">Alle Status</SelectItem>
diff --git a/ApiCore-Frontend/src/app/(app)/honey-batches/page.tsx b/ApiCore-Frontend/src/app/(app)/honey-batches/page.tsx
index 15ebda7..42b9893 100644
--- a/ApiCore-Frontend/src/app/(app)/honey-batches/page.tsx
+++ b/ApiCore-Frontend/src/app/(app)/honey-batches/page.tsx
@@ -70,7 +70,7 @@ export default function HoneyBatchesPage() {
         }
       >
         <SelectTrigger className="w-40">
-          <SelectValue placeholder="Status" />
+          <SelectValue placeholder="Status">{status || "Alle Status"}</SelectValue>
         </SelectTrigger>
         <SelectContent>
           <SelectItem value="ALL">Alle Status</SelectItem>
diff --git a/ApiCore-Frontend/src/app/(app)/layout.tsx b/ApiCore-Frontend/src/app/(app)/layout.tsx
index 0c7241e..faeb296 100644
--- a/ApiCore-Frontend/src/app/(app)/layout.tsx
+++ b/ApiCore-Frontend/src/app/(app)/layout.tsx
@@ -2,61 +2,18 @@
 
 import { ReactNode, useEffect } from "react";
 import Link from "next/link";
-import { usePathname, useRouter } from "next/navigation";
-import { Hexagon, MoreHorizontal } from "lucide-react";
+import { useRouter } from "next/navigation";
+import { Hexagon } from "lucide-react";
 import { useAuth } from "@/lib/auth/auth-context";
 import { NotificationBell } from "@/components/notification-bell";
 import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
+import { Sidebar } from "./sidebar";
 import { BottomNav } from "./bottom-nav";
 import { QuickAddMenu } from "./quick-add-menu";
-
-const NAV_LINK_CLASS =
-  "shrink-0 rounded-md px-2.5 py-1.5 text-sm font-medium text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground aria-[current=page]:bg-primary/10 aria-[current=page]:text-primary";
-
-const PRIMARY_LINKS = [
-  { label: "Dashboard", href: "/dashboard" },
-  { label: "Bienenstände", href: "/apiaries" },
-  { label: "Völker", href: "/colonies" },
-  { label: "Königinnen", href: "/queens" },
-  { label: "Aufgaben", href: "/tasks" },
-  { label: "Kalender", href: "/calendar" },
-  { label: "Honigchargen", href: "/honey-batches" },
-  { label: "Lager", href: "/storage" },
-  { label: "Suche", href: "/search" },
-];
-
-const MORE_LINKS = [
-  { label: "Produkte", href: "/products" },
-  { label: "Abfüllungen", href: "/bottling/new" },
-  { label: "Inventar", href: "/equipment" },
-];
-
-const ADMIN_LINKS = [
-  { label: "Benutzer", href: "/settings/users" },
-  { label: "Audit-Log", href: "/settings/audit-log" },
-];
-
-function NavLink({ href, label, pathname }: { href: string; label: string; pathname: string }) {
-  return (
-    <Link
-      href={href}
-      aria-current={pathname.startsWith(href) ? "page" : undefined}
-      className={NAV_LINK_CLASS}
-    >
-      {label}
-    </Link>
-  );
-}
+import { PageTransition } from "./page-transition";
 
 export default function AppLayout({ children }: { children: ReactNode }) {
   const router = useRouter();
-  const pathname = usePathname();
   const { user, isLoading, logout } = useAuth();
 
   useEffect(() => {
@@ -70,58 +27,37 @@ export default function AppLayout({ children }: { children: ReactNode }) {
   }
 
   return (
-    <div className="flex min-h-screen flex-col">
-      <header className="flex items-center justify-between gap-3 border-b bg-card px-4 py-2.5">
-        <nav className="flex min-w-0 items-center gap-3 max-sm:gap-2">
-          <Link href="/dashboard" className="flex shrink-0 items-center gap-1.5 font-heading font-semibold">
+    <div className="flex min-h-screen">
+      <Sidebar user={user} />
+      <div className="flex min-w-0 flex-1 flex-col">
+        <header className="flex items-center justify-between gap-3 border-b bg-card px-4 py-2.5 sm:justify-end sm:px-6">
+          <Link
+            href="/dashboard"
+            className="flex items-center gap-1.5 font-heading font-semibold sm:hidden"
+          >
             <Hexagon className="size-5 fill-primary/15 text-primary" strokeWidth={2.25} />
             ApiCore
           </Link>
-          <div className="hidden min-w-0 items-center gap-1 overflow-x-auto whitespace-nowrap sm:flex">
-            {PRIMARY_LINKS.map((item) => (
-              <NavLink key={item.href} {...item} pathname={pathname} />
-            ))}
-            <DropdownMenu>
-              <DropdownMenuTrigger
-                render={<Button variant="ghost" size="sm" className="gap-1 text-muted-foreground" />}
-              >
-                <MoreHorizontal className="size-4" />
-                Mehr
-              </DropdownMenuTrigger>
-              <DropdownMenuContent align="start">
-                {MORE_LINKS.map((item) => (
-                  <DropdownMenuItem key={item.href} render={<Link href={item.href} />}>
-                    {item.label}
-                  </DropdownMenuItem>
-                ))}
-                {user.role === "ADMIN"
-                  ? ADMIN_LINKS.map((item) => (
-                      <DropdownMenuItem key={item.href} render={<Link href={item.href} />}>
-                        {item.label}
-                      </DropdownMenuItem>
-                    ))
-                  : null}
-              </DropdownMenuContent>
-            </DropdownMenu>
+          <div className="flex shrink-0 items-center gap-2 text-sm">
+            <NotificationBell />
+            <span className="hidden max-w-40 truncate text-muted-foreground md:inline">
+              {user.email}
+            </span>
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => {
+                void logout().then(() => router.push("/login"));
+              }}
+            >
+              Abmelden
+            </Button>
           </div>
-        </nav>
-        <div className="flex shrink-0 items-center gap-2 text-sm">
-          <NotificationBell />
-          <span className="hidden max-w-40 truncate text-muted-foreground md:inline">
-            {user.email}
-          </span>
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => {
-              void logout().then(() => router.push("/login"));
-            }}
-          >
-            Abmelden
-          </Button>
+        </header>
+        <div className="flex-1 overflow-y-auto pb-16 sm:pb-0">
+          <PageTransition>{children}</PageTransition>
         </div>
-      </header>
-      <div className="flex-1 pb-16 sm:pb-0">{children}</div>
+      </div>
       <BottomNav />
       <QuickAddMenu />
     </div>
diff --git a/ApiCore-Frontend/src/app/(app)/page-transition.tsx b/ApiCore-Frontend/src/app/(app)/page-transition.tsx
new file mode 100644
index 0000000..351fdfd
--- /dev/null
+++ b/ApiCore-Frontend/src/app/(app)/page-transition.tsx
@@ -0,0 +1,13 @@
+"use client";
+
+import { ReactNode } from "react";
+import { usePathname } from "next/navigation";
+
+export function PageTransition({ children }: { children: ReactNode }) {
+  const pathname = usePathname();
+  return (
+    <div key={pathname} className="motion-safe:animate-page-in">
+      {children}
+    </div>
+  );
+}
diff --git a/ApiCore-Frontend/src/app/(app)/queens/page.tsx b/ApiCore-Frontend/src/app/(app)/queens/page.tsx
index 87582b2..6ef29d8 100644
--- a/ApiCore-Frontend/src/app/(app)/queens/page.tsx
+++ b/ApiCore-Frontend/src/app/(app)/queens/page.tsx
@@ -56,7 +56,7 @@ export default function QueensPage() {
         onValueChange={(value) => setStatus(value === "ALL" ? "" : ((value ?? "") as QueenStatus))}
       >
         <SelectTrigger className="w-40">
-          <SelectValue placeholder="Status" />
+          <SelectValue placeholder="Status">{status || "Alle Status"}</SelectValue>
         </SelectTrigger>
         <SelectContent>
           <SelectItem value="ALL">Alle Status</SelectItem>
diff --git a/ApiCore-Frontend/src/app/(app)/sidebar.tsx b/ApiCore-Frontend/src/app/(app)/sidebar.tsx
new file mode 100644
index 0000000..e63c763
--- /dev/null
+++ b/ApiCore-Frontend/src/app/(app)/sidebar.tsx
@@ -0,0 +1,134 @@
+"use client";
+
+import Link from "next/link";
+import { usePathname } from "next/navigation";
+import {
+  CalendarDays,
+  Crown,
+  Droplet,
+  FileClock,
+  Hexagon,
+  History,
+  LayoutDashboard,
+  Layers,
+  ListTodo,
+  type LucideIcon,
+  MapPin,
+  Package,
+  Search,
+  ShoppingBag,
+  Users,
+  Warehouse,
+  Wrench,
+} from "lucide-react";
+import { cn } from "@/lib/utils";
+import type { AuthUser } from "@/lib/auth/auth-context";
+
+interface NavItem {
+  label: string;
+  href: string;
+  icon: LucideIcon;
+}
+
+interface NavGroup {
+  label: string | null;
+  items: NavItem[];
+}
+
+const NAV_GROUPS: NavGroup[] = [
+  {
+    label: null,
+    items: [
+      { label: "Dashboard", href: "/dashboard", icon: LayoutDashboard },
+      { label: "Suche", href: "/search", icon: Search },
+    ],
+  },
+  {
+    label: "Betrieb",
+    items: [
+      { label: "Bienenstände", href: "/apiaries", icon: MapPin },
+      { label: "Völker", href: "/colonies", icon: Layers },
+      { label: "Königinnen", href: "/queens", icon: Crown },
+    ],
+  },
+  {
+    label: "Arbeit",
+    items: [
+      { label: "Aufgaben", href: "/tasks", icon: ListTodo },
+      { label: "Kalender", href: "/calendar", icon: CalendarDays },
+    ],
+  },
+  {
+    label: "Ernte & Lager",
+    items: [
+      { label: "Honigchargen", href: "/honey-batches", icon: Droplet },
+      { label: "Abfüllungen", href: "/bottling/new", icon: Package },
+      { label: "Produkte", href: "/products", icon: ShoppingBag },
+      { label: "Lager", href: "/storage", icon: Warehouse },
+      { label: "Inventar", href: "/equipment", icon: Wrench },
+    ],
+  },
+];
+
+const ADMIN_GROUP: NavGroup = {
+  label: "Verwaltung",
+  items: [
+    { label: "Benutzer", href: "/settings/users", icon: Users },
+    { label: "Audit-Log", href: "/settings/audit-log", icon: History },
+  ],
+};
+
+function SidebarLink({ item, pathname }: { item: NavItem; pathname: string }) {
+  const Icon = item.icon;
+  const isActive = pathname.startsWith(item.href);
+  return (
+    <Link
+      href={item.href}
+      aria-current={isActive ? "page" : undefined}
+      className={cn(
+        "flex items-center gap-2.5 rounded-lg px-3 py-2 text-sm font-medium transition-colors duration-150",
+        isActive
+          ? "bg-primary/10 text-primary"
+          : "text-muted-foreground hover:bg-accent hover:text-accent-foreground",
+      )}
+    >
+      <Icon className="size-4.5 shrink-0" />
+      <span className="truncate">{item.label}</span>
+    </Link>
+  );
+}
+
+export function Sidebar({ user }: { user: AuthUser }) {
+  const pathname = usePathname();
+  const groups = user.role === "ADMIN" ? [...NAV_GROUPS, ADMIN_GROUP] : NAV_GROUPS;
+
+  return (
+    <aside className="hidden w-60 shrink-0 flex-col gap-1 overflow-y-auto border-r bg-card px-3 py-4 sm:flex">
+      <Link
+        href="/dashboard"
+        className="mb-4 flex items-center gap-2 px-2 font-heading text-lg font-semibold"
+      >
+        <Hexagon className="size-5.5 fill-primary/15 text-primary" strokeWidth={2.25} />
+        ApiCore
+      </Link>
+      <nav className="flex flex-1 flex-col gap-4">
+        {groups.map((group, index) => (
+          <div key={group.label ?? `group-${index}`} className="flex flex-col gap-0.5">
+            {group.label ? (
+              <p className="px-3 pb-1 text-xs font-medium tracking-wide text-muted-foreground uppercase">
+                {group.label}
+              </p>
+            ) : null}
+            {group.items.map((item) => (
+              <SidebarLink key={item.href} item={item} pathname={pathname} />
+            ))}
+          </div>
+        ))}
+      </nav>
+      <div className="flex items-center gap-1.5 rounded-lg px-2 py-1.5 text-xs text-muted-foreground">
+        <FileClock className="size-3.5 shrink-0" />
+        <span className="truncate">v1.x</span>
+      </div>
+    </aside>
+  );
+}
diff --git a/ApiCore-Frontend/src/app/(app)/tasks/page.tsx b/ApiCore-Frontend/src/app/(app)/tasks/page.tsx
index fbb5f4b..1be583a 100644
--- a/ApiCore-Frontend/src/app/(app)/tasks/page.tsx
+++ b/ApiCore-Frontend/src/app/(app)/tasks/page.tsx
@@ -69,7 +69,7 @@ export default function TasksPage() {
           onValueChange={(value) => setStatus(value === "ALL" ? "" : ((value ?? "") as TaskStatus))}
         >
           <SelectTrigger className="w-40">
-            <SelectValue placeholder="Status" />
+            <SelectValue placeholder="Status">{status || "Alle Status"}</SelectValue>
           </SelectTrigger>
           <SelectContent>
             <SelectItem value="ALL">Alle Status</SelectItem>
@@ -87,7 +87,7 @@ export default function TasksPage() {
           }
         >
           <SelectTrigger className="w-40">
-            <SelectValue placeholder="Priorität" />
+            <SelectValue placeholder="Priorität">{priority || "Alle Prioritäten"}</SelectValue>
           </SelectTrigger>
           <SelectContent>
             <SelectItem value="ALL">Alle Prioritäten</SelectItem>
diff --git a/ApiCore-Frontend/src/app/globals.css b/ApiCore-Frontend/src/app/globals.css
index 7df2050..82e3e0d 100644
--- a/ApiCore-Frontend/src/app/globals.css
+++ b/ApiCore-Frontend/src/app/globals.css
@@ -50,6 +50,18 @@
   --radius-2xl: calc(var(--radius) * 1.8);
   --radius-3xl: calc(var(--radius) * 2.2);
   --radius-4xl: calc(var(--radius) * 2.6);
+  --animate-page-in: page-in 260ms ease-out;
+}
+
+@keyframes page-in {
+  from {
+    opacity: 0;
+    transform: translateY(6px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
 }
 
 :root {