diff --git a/.gitignore b/.gitignore
index d7d899ab3e..330c0c29d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,6 @@ Secrets*.toml
 restate-data
 
 .windsurfrules
-.turbo
\ No newline at end of file
+.turbo
+
+CLAUDE.md 
\ No newline at end of file
diff --git a/apps/desktop/src/components/command-palette.tsx b/apps/desktop/src/components/command-palette.tsx
index 2896f24179..3eaf11bec0 100644
--- a/apps/desktop/src/components/command-palette.tsx
+++ b/apps/desktop/src/components/command-palette.tsx
@@ -23,6 +23,7 @@ import { useEffect, useRef, useState } from "react";
 import { useHypr } from "@/contexts/hypr";
 import { type SearchMatch } from "@/stores/search";
 import { commands as dbCommands } from "@hypr/plugin-db";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
 
 interface CommandPaletteProps {
   open: boolean;
@@ -281,10 +282,22 @@ export function CommandPalette({ open, onOpenChange }: CommandPaletteProps) {
         navigate({ to: "/app/new", search: { calendarEventId: match.item.id } });
         break;
       case "human":
-        navigate({ to: "/app/human/$id", params: { id: match.item.id } });
+        // Open finder window and navigate to contact view with person selected
+        windowsCommands.windowShow({ type: "finder" }).then(() => {
+          windowsCommands.windowNavigate(
+            { type: "finder" },
+            `/app/finder?view=contact&personId=${match.item.id}`,
+          );
+        });
         break;
       case "organization":
-        navigate({ to: "/app/organization/$id", params: { id: match.item.id } });
+        // Open finder window and navigate to contact view with organization selected
+        windowsCommands.windowShow({ type: "finder" }).then(() => {
+          windowsCommands.windowNavigate(
+            { type: "finder" },
+            `/app/finder?view=contact&orgId=${match.item.id}`,
+          );
+        });
         break;
     }
     onOpenChange(false);
diff --git a/apps/desktop/src/components/finder/index.ts b/apps/desktop/src/components/finder/index.ts
new file mode 100644
index 0000000000..fb30574fd5
--- /dev/null
+++ b/apps/desktop/src/components/finder/index.ts
@@ -0,0 +1,4 @@
+export { ViewSelector } from "./view-selector";
+export { CalendarView } from "./views/calendar-view";
+export { FolderView } from "./views/folder-view";
+export { TableView } from "./views/table-view";
diff --git a/apps/desktop/src/components/finder/view-selector.tsx b/apps/desktop/src/components/finder/view-selector.tsx
new file mode 100644
index 0000000000..e74881c2c9
--- /dev/null
+++ b/apps/desktop/src/components/finder/view-selector.tsx
@@ -0,0 +1,68 @@
+import { Button } from "@hypr/ui/components/ui/button";
+import { cn } from "@hypr/ui/lib/utils";
+import { Calendar, Folder, Table, Users } from "lucide-react";
+
+type ViewType = "folder" | "calendar" | "table" | "contact";
+
+interface ViewSelectorProps {
+  currentView: ViewType;
+  onViewChange: (view: ViewType) => void;
+}
+
+export function ViewSelector({ currentView, onViewChange }: ViewSelectorProps) {
+  return (
+    <div className="flex items-center gap-1 bg-neutral-100 rounded-md">
+      <Button
+        variant={currentView === "folder" ? "default" : "ghost"}
+        size="sm"
+        className={cn(
+          "h-8 transition-all",
+          currentView === "folder" ? "px-1.5 py-1 min-w-[70px]" : "w-8 px-0 py-0",
+        )}
+        onClick={() => onViewChange("folder")}
+      >
+        <Folder size={14} />
+        {currentView === "folder" && "Folder"}
+      </Button>
+
+      <Button
+        variant={currentView === "calendar" ? "default" : "ghost"}
+        size="sm"
+        className={cn(
+          "h-8 transition-all",
+          currentView === "calendar" ? "px-1.5 py-1 min-w-[95px]" : "w-8 px-0 py-0",
+        )}
+        onClick={() => onViewChange("calendar")}
+      >
+        <Calendar size={14} />
+        {currentView === "calendar" && "Calendar"}
+      </Button>
+
+      <Button
+        variant={currentView === "table" ? "default" : "ghost"}
+        size="sm"
+        className={cn(
+          "h-8 transition-all",
+          currentView === "table" ? "px-1.5 py-1 min-w-[70px]" : "w-8 px-0 py-0",
+        )}
+        onClick={() => onViewChange("table")}
+      >
+        <Table size={14} />
+        {currentView === "table" && "Table"}
+      </Button>
+
+      <Button
+        variant={currentView === "contact" ? "default" : "ghost"}
+        size="sm"
+        className={cn(
+          "h-8 transition-all",
+          currentView === "contact" ? "px-1.5 py-1 min-w-[90px]" : "w-8 px-0 py-0",
+        )}
+        onClick={() => onViewChange("contact")}
+      >
+        <Users size={14} />
+        {currentView === "contact" && "Contacts"}
+      </Button>
+    </div>
+  );
+}
diff --git a/apps/desktop/src/components/finder/views/calendar-view.tsx b/apps/desktop/src/components/finder/views/calendar-view.tsx
new file mode 100644
index 0000000000..28fea38722
--- /dev/null
+++ b/apps/desktop/src/components/finder/views/calendar-view.tsx
@@ -0,0 +1,101 @@
+import { Trans, useLingui } from "@lingui/react/macro";
+import { addMonths, subMonths } from "date-fns";
+import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
+import { useState } from "react";
+
+import WorkspaceCalendar from "@/components/workspace-calendar";
+import { Button } from "@hypr/ui/components/ui/button";
+import { cn } from "@hypr/ui/lib/utils";
+
+interface CalendarViewProps {
+  date: Date;
+  sessions: any[];
+  events: any[];
+  onNavigate: (params: { date: string }) => void;
+}
+
+export function CalendarView({ date, sessions, events, onNavigate }: CalendarViewProps) {
+  const { i18n } = useLingui();
+  const [currentDate, setCurrentDate] = useState(date);
+
+  // Embedded directly to handle navigation
+  const handlePreviousMonth = () => {
+    const prevMonth = subMonths(currentDate, 1);
+    setCurrentDate(prevMonth);
+    onNavigate({ date: prevMonth.toISOString() });
+  };
+
+  const handleNextMonth = () => {
+    const nextMonth = addMonths(currentDate, 1);
+    setCurrentDate(nextMonth);
+    onNavigate({ date: nextMonth.toISOString() });
+  };
+
+  const handleToday = () => {
+    const today = new Date();
+    setCurrentDate(today);
+    onNavigate({ date: today.toISOString() });
+  };
+
+  const weekDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+
+  return (
+    <div className="flex flex-col h-full">
+      <header className="flex w-full flex-col">
+        <div data-tauri-drag-region className="relative h-11 w-full flex items-center justify-center">
+          <h1 className="text-xl font-bold" data-tauri-drag-region>
+            {i18n.date(currentDate, { month: "long", year: "numeric" })}
+          </h1>
+
+          <div className="absolute right-2 flex h-fit rounded-md overflow-clip border border-neutral-200">
+            <Button
+              variant="outline"
+              className="p-0.5 rounded-none border-none"
+              onClick={handlePreviousMonth}
+            >
+              <ChevronLeftIcon size={16} />
+            </Button>
+
+            <Button
+              variant="outline"
+              className="text-sm px-1 py-0.5 rounded-none border-none"
+              onClick={handleToday}
+            >
+              <Trans>Today</Trans>
+            </Button>
+
+            <Button
+              variant="outline"
+              className="p-0.5 rounded-none border-none"
+              onClick={handleNextMonth}
+            >
+              <ChevronRightIcon size={16} />
+            </Button>
+          </div>
+        </div>
+
+        <div className="border-b border-neutral-200 grid grid-cols-7 h-8">
+          {weekDays.map((day, index) => (
+            <div
+              key={day}
+              className={cn(
+                "text-center font-light text-sm pb-2 pt-1",
+                index === weekDays.length - 1 && "border-r-0",
+              )}
+            >
+              {day}
+            </div>
+          ))}
+        </div>
+      </header>
+
+      <div className="flex-1 overflow-hidden">
+        <WorkspaceCalendar
+          month={currentDate}
+          sessions={sessions}
+          events={events}
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/desktop/src/components/finder/views/contact-view.tsx b/apps/desktop/src/components/finder/views/contact-view.tsx
new file mode 100644
index 0000000000..9031bac5f5
--- /dev/null
+++ b/apps/desktop/src/components/finder/views/contact-view.tsx
@@ -0,0 +1,888 @@
+import { commands as dbCommands } from "@hypr/plugin-db";
+import { type Human, type Organization } from "@hypr/plugin-db";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
+import { Button } from "@hypr/ui/components/ui/button";
+import { Input } from "@hypr/ui/components/ui/input";
+import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
+import { cn } from "@hypr/ui/lib/utils";
+import { getInitials } from "@hypr/utils";
+import { RiCornerDownLeftLine } from "@remixicon/react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { Building2, CircleMinus, FileText, Pencil, Plus, SearchIcon, User } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
+
+interface ContactViewProps {
+  userId: string;
+  initialPersonId?: string;
+  initialOrgId?: string;
+}
+
+export function ContactView({ userId, initialPersonId, initialOrgId }: ContactViewProps) {
+  const [selectedOrganization, setSelectedOrganization] = useState<string | null>(initialOrgId || null);
+  const [selectedPerson, setSelectedPerson] = useState<string | null>(initialPersonId || null);
+  const [editingPerson, setEditingPerson] = useState<string | null>(null);
+  const [editingOrg, setEditingOrg] = useState<string | null>(null);
+  const [showNewOrg, setShowNewOrg] = useState(false);
+  const queryClient = useQueryClient();
+
+  const { data: organizations = [] } = useQuery({
+    queryKey: ["organizations", userId],
+    queryFn: () => dbCommands.listOrganizations(null),
+  });
+
+  const { data: people = [] } = useQuery({
+    queryKey: ["organization-members", selectedOrganization],
+    queryFn: () =>
+      selectedOrganization ? dbCommands.listOrganizationMembers(selectedOrganization) : Promise.resolve([]),
+    enabled: !!selectedOrganization,
+  });
+
+  const { data: allPeople = [] } = useQuery({
+    queryKey: ["all-people", userId],
+    queryFn: async () => {
+      try {
+        const allHumans = await dbCommands.listHumans({ search: [100, ""] });
+        return allHumans;
+      } catch (error) {
+        console.error("Error fetching all people:", error);
+        return [];
+      }
+    },
+    enabled: !selectedOrganization,
+  });
+
+  const { data: personSessions = [] } = useQuery({
+    queryKey: ["person-sessions", selectedPerson, userId],
+    queryFn: async () => {
+      if (!selectedPerson) {
+        return [];
+      }
+
+      const sessions = await dbCommands.listSessions({
+        type: "search",
+        query: "",
+        user_id: userId,
+        limit: 100,
+      });
+
+      const sessionsWithPerson = [];
+      for (const session of sessions) {
+        try {
+          const participants = await dbCommands.sessionListParticipants(session.id);
+          if (participants.some(p => p.id === selectedPerson)) {
+            sessionsWithPerson.push(session);
+          }
+        } catch (error) {
+          console.error("Error fetching participants for session", session.id, error);
+        }
+      }
+
+      return sessionsWithPerson;
+    },
+    enabled: !!selectedPerson,
+  });
+
+  const displayPeople = selectedOrganization ? people : allPeople;
+
+  const selectedPersonData = displayPeople.find(p => p.id === selectedPerson);
+
+  // Handle initial person selection
+  useEffect(() => {
+    if (initialPersonId && allPeople.length > 0) {
+      const person = allPeople.find(p => p.id === initialPersonId);
+      if (person) {
+        setSelectedPerson(initialPersonId);
+        if (person.organization_id) {
+          setSelectedOrganization(person.organization_id);
+        }
+      }
+    }
+  }, [initialPersonId, allPeople]);
+
+  // Handle initial organization selection
+  useEffect(() => {
+    if (initialOrgId && organizations.length > 0) {
+      const org = organizations.find(o => o.id === initialOrgId);
+      if (org) {
+        setSelectedOrganization(initialOrgId);
+      }
+    }
+  }, [initialOrgId, organizations]);
+
+  const handleSessionClick = (sessionId: string) => {
+    const url = `/app/note/${sessionId}`;
+    windowsCommands.windowShow({ type: "main" }).then(() => {
+      windowsCommands.windowEmitNavigate({ type: "main" }, url);
+    });
+  };
+
+  const handleEditPerson = (personId: string) => {
+    setEditingPerson(personId);
+  };
+
+  const handleEditOrganization = (organizationId: string) => {
+    setEditingOrg(organizationId);
+  };
+
+  return (
+    <div className="flex h-full">
+      <div className="w-[200px] border-r border-neutral-200 flex flex-col">
+        <div className="px-3 py-2 border-b border-neutral-200 flex items-center justify-between">
+          <h3 className="text-xs font-medium text-neutral-600">Organizations</h3>
+          <button
+            onClick={() => setShowNewOrg(true)}
+            className="p-0.5 rounded hover:bg-neutral-100 transition-colors"
+          >
+            <Plus className="h-3 w-3 text-neutral-500" />
+          </button>
+        </div>
+        <div className="flex-1 overflow-y-auto">
+          <div className="p-2">
+            <button
+              onClick={() => setSelectedOrganization(null)}
+              className={cn(
+                "w-full text-left px-3 py-2 rounded-md text-sm flex items-center gap-2 hover:bg-neutral-100 transition-colors",
+                !selectedOrganization && "bg-neutral-100",
+              )}
+            >
+              <User className="h-4 w-4 text-neutral-500" />
+              All People
+            </button>
+            {showNewOrg && (
+              <NewOrganizationForm
+                onSave={(org) => {
+                  setShowNewOrg(false);
+                  setSelectedOrganization(org.id);
+                }}
+                onCancel={() => setShowNewOrg(false)}
+              />
+            )}
+            {organizations.map((org) => (
+              editingOrg === org.id
+                ? (
+                  <EditOrganizationForm
+                    key={org.id}
+                    organization={org}
+                    onSave={() => setEditingOrg(null)}
+                    onCancel={() => setEditingOrg(null)}
+                  />
+                )
+                : (
+                  <div
+                    key={org.id}
+                    className={cn(
+                      "group relative rounded-md transition-colors",
+                      selectedOrganization === org.id && "bg-neutral-100",
+                    )}
+                  >
+                    <button
+                      onClick={() => setSelectedOrganization(org.id)}
+                      className="w-full text-left px-3 py-2 text-sm flex items-center gap-2 hover:bg-neutral-100 transition-colors rounded-md"
+                    >
+                      <Building2 className="h-4 w-4 text-neutral-500" />
+                      {org.name}
+                    </button>
+                    <button
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        handleEditOrganization(org.id);
+                      }}
+                      className="absolute right-2 top-1/2 -translate-y-1/2 opacity-0 group-hover:opacity-100 p-1 rounded hover:bg-neutral-200 transition-all"
+                    >
+                      <Pencil className="h-3 w-3 text-neutral-500" />
+                    </button>
+                  </div>
+                )
+            ))}
+          </div>
+        </div>
+      </div>
+
+      <div className="w-[250px] border-r border-neutral-200 flex flex-col">
+        <div className="px-3 py-2 border-b border-neutral-200 flex items-center justify-between">
+          <h3 className="text-xs font-medium text-neutral-600">People</h3>
+          <button
+            onClick={() => {
+              const newPersonId = crypto.randomUUID();
+              dbCommands.upsertHuman({
+                id: newPersonId,
+                organization_id: selectedOrganization,
+                is_user: false,
+                full_name: null,
+                email: null,
+                job_title: null,
+                linkedin_username: null,
+              }).then(() => {
+                queryClient.invalidateQueries({ queryKey: ["all-people"] });
+                queryClient.invalidateQueries({ queryKey: ["organization-members"] });
+                setSelectedPerson(newPersonId);
+                setEditingPerson(newPersonId);
+              });
+            }}
+            className="p-0.5 rounded hover:bg-neutral-100 transition-colors"
+          >
+            <Plus className="h-3 w-3 text-neutral-500" />
+          </button>
+        </div>
+        <div className="flex-1 overflow-y-auto">
+          <div className="p-2">
+            {displayPeople.map((person) => (
+              <button
+                key={person.id}
+                onClick={() => setSelectedPerson(person.id)}
+                className={cn(
+                  "w-full text-left px-3 py-2 rounded-md text-sm hover:bg-neutral-100 transition-colors flex items-center gap-2",
+                  selectedPerson === person.id && "bg-neutral-100",
+                )}
+              >
+                <div className="flex-shrink-0 w-8 h-8 rounded-full bg-neutral-200 flex items-center justify-center">
+                  <span className="text-xs font-medium text-neutral-600">
+                    {getInitials(person.full_name || person.email)}
+                  </span>
+                </div>
+                <div className="flex-1 min-w-0">
+                  <div className="font-medium truncate">{person.full_name || person.email || "Unnamed"}</div>
+                  {person.email && person.full_name && (
+                    <div className="text-xs text-neutral-500 truncate">{person.email}</div>
+                  )}
+                </div>
+              </button>
+            ))}
+          </div>
+        </div>
+      </div>
+
+      <div className="flex-1 flex flex-col">
+        {selectedPersonData
+          ? (
+            editingPerson === selectedPersonData.id
+              ? (
+                <EditPersonForm
+                  person={selectedPersonData}
+                  organizations={organizations}
+                  onSave={() => setEditingPerson(null)}
+                  onCancel={() => setEditingPerson(null)}
+                />
+              )
+              : (
+                <>
+                  <div className="px-6 py-4 border-b border-neutral-200">
+                    <div className="flex items-start gap-4">
+                      <div className="w-12 h-12 rounded-full bg-neutral-200 flex items-center justify-center">
+                        <span className="text-lg font-medium text-neutral-600">
+                          {getInitials(selectedPersonData.full_name || selectedPersonData.email)}
+                        </span>
+                      </div>
+                      <div className="flex-1">
+                        <div className="flex items-start justify-between">
+                          <div>
+                            <h2 className="text-lg font-semibold">
+                              {selectedPersonData.full_name || "Unnamed Contact"}
+                            </h2>
+                            {selectedPersonData.job_title && (
+                              <p className="text-sm text-neutral-600">{selectedPersonData.job_title}</p>
+                            )}
+                            {selectedPersonData.email && (
+                              <p className="text-sm text-neutral-500">{selectedPersonData.email}</p>
+                            )}
+                            {selectedPersonData.organization_id && (
+                              <OrganizationInfo organizationId={selectedPersonData.organization_id} />
+                            )}
+                          </div>
+                          <button
+                            onClick={() => handleEditPerson(selectedPersonData.id)}
+                            className="p-2 rounded-md hover:bg-neutral-100 transition-colors"
+                          >
+                            <Pencil className="h-4 w-4 text-neutral-500" />
+                          </button>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <div className="flex-1 p-6">
+                    <h3 className="text-sm font-medium text-neutral-600 mb-4 pl-3">Related Notes</h3>
+                    <div className="h-full overflow-y-auto">
+                      <div className="space-y-2">
+                        {personSessions.length > 0
+                          ? (
+                            personSessions.map((session) => (
+                              <button
+                                key={session.id}
+                                onClick={() => handleSessionClick(session.id)}
+                                className="w-full text-left p-3 rounded-md border border-neutral-200 hover:bg-neutral-50 transition-colors"
+                              >
+                                <div className="flex items-center gap-2 mb-1">
+                                  <FileText className="h-4 w-4 text-neutral-500" />
+                                  <span className="font-medium text-sm">
+                                    {session.title || "Untitled Note"}
+                                  </span>
+                                </div>
+                                {session.created_at && (
+                                  <div className="text-xs text-neutral-500">
+                                    {new Date(session.created_at).toLocaleDateString()}
+                                  </div>
+                                )}
+                              </button>
+                            ))
+                          )
+                          : <p className="text-sm text-neutral-500 pl-3">No related notes found</p>}
+                      </div>
+                    </div>
+                  </div>
+                </>
+              )
+          )
+          : (
+            <div className="flex-1 flex items-center justify-center">
+              <p className="text-sm text-neutral-500">Select a person to view details</p>
+            </div>
+          )}
+      </div>
+    </div>
+  );
+}
+
+function OrganizationInfo({ organizationId }: { organizationId: string }) {
+  const { data: organization } = useQuery({
+    queryKey: ["organization", organizationId],
+    queryFn: () => dbCommands.getOrganization(organizationId),
+    enabled: !!organizationId,
+  });
+
+  if (!organization) {
+    return null;
+  }
+
+  return (
+    <p className="text-sm text-neutral-500">
+      {organization.name}
+    </p>
+  );
+}
+
+function EditPersonForm({
+  person,
+  organizations,
+  onSave,
+  onCancel,
+}: {
+  person: Human;
+  organizations: Organization[];
+  onSave: () => void;
+  onCancel: () => void;
+}) {
+  const queryClient = useQueryClient();
+  const [formData, setFormData] = useState({
+    full_name: person.full_name || "",
+    email: person.email || "",
+    job_title: person.job_title || "",
+    linkedin_username: person.linkedin_username || "",
+    organization_id: person.organization_id,
+  });
+
+  const updatePersonMutation = useMutation({
+    mutationFn: (data: Partial<Human>) =>
+      dbCommands.upsertHuman({
+        ...person,
+        ...data,
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["all-people"] });
+      queryClient.invalidateQueries({ queryKey: ["organization-members"] });
+      onSave();
+    },
+    onError: () => {
+      console.error("Failed to update contact");
+    },
+  });
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    updatePersonMutation.mutate(formData);
+  };
+
+  return (
+    <div className="flex-1 flex flex-col">
+      {/* Header */}
+      <div className="px-6 py-4 border-b border-gray-200">
+        <div className="flex items-center justify-between">
+          <h3 className="text-lg font-semibold">Edit Contact</h3>
+          <div className="flex gap-2">
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              onClick={onCancel}
+              className="hover:bg-gray-100 text-gray-700"
+            >
+              Cancel
+            </Button>
+            <Button
+              onClick={handleSubmit}
+              variant="ghost"
+              size="sm"
+              disabled={updatePersonMutation.isPending}
+              className="bg-gray-100 hover:bg-gray-200 text-gray-700"
+            >
+              Save
+            </Button>
+          </div>
+        </div>
+      </div>
+
+      {/* Content */}
+      <div className="flex-1 overflow-y-auto">
+        {/* Avatar Section */}
+        <div className="flex flex-col items-center py-6">
+          <div className="w-24 h-24 mb-3 bg-gray-200 rounded-full flex items-center justify-center">
+            <span className="text-xl font-semibold text-gray-600">
+              {getInitials(formData.full_name || "?")}
+            </span>
+          </div>
+        </div>
+
+        {/* Form Section */}
+        <div className="border-t border-gray-200">
+          {/* Name Field */}
+          <div className="flex items-center px-4 py-3 border-b border-gray-200">
+            <div className="w-28 text-sm text-gray-500">Name</div>
+            <div className="flex-1">
+              <Input
+                value={formData.full_name}
+                onChange={(e) => setFormData({ ...formData, full_name: e.target.value })}
+                placeholder="John Doe"
+                className="border-none p-0 h-7 text-base focus-visible:ring-0 focus-visible:ring-offset-0"
+              />
+            </div>
+          </div>
+
+          {/* Job Title Field */}
+          <div className="flex items-center px-4 py-3 border-b border-gray-200">
+            <div className="w-28 text-sm text-gray-500">Job Title</div>
+            <div className="flex-1">
+              <Input
+                value={formData.job_title}
+                onChange={(e) => setFormData({ ...formData, job_title: e.target.value })}
+                placeholder="Software Engineer"
+                className="border-none p-0 h-7 text-base focus-visible:ring-0 focus-visible:ring-offset-0"
+              />
+            </div>
+          </div>
+
+          {/* Company Field */}
+          <div className="flex items-center px-4 py-3 border-b border-gray-200">
+            <div className="w-28 text-sm text-gray-500">Company</div>
+            <div className="flex-1">
+              <ContactOrganizationSelector
+                value={formData.organization_id}
+                onChange={(orgId) => setFormData({ ...formData, organization_id: orgId })}
+              />
+            </div>
+          </div>
+
+          {/* Email Field */}
+          <div className="flex items-center px-4 py-3 border-b border-gray-200">
+            <div className="w-28 text-sm text-gray-500">Email</div>
+            <div className="flex-1">
+              <Input
+                type="email"
+                value={formData.email}
+                onChange={(e) => setFormData({ ...formData, email: e.target.value })}
+                placeholder="john@example.com"
+                className="border-none p-0 h-7 text-base focus-visible:ring-0 focus-visible:ring-offset-0"
+              />
+            </div>
+          </div>
+
+          {/* LinkedIn Field */}
+          <div className="flex items-center px-4 py-3 border-b border-gray-200">
+            <div className="w-28 text-sm text-gray-500">LinkedIn</div>
+            <div className="flex-1">
+              <Input
+                value={formData.linkedin_username}
+                onChange={(e) => setFormData({ ...formData, linkedin_username: e.target.value })}
+                placeholder="https://www.linkedin.com/in/johntopia/"
+                className="border-none p-0 h-7 text-base focus-visible:ring-0 focus-visible:ring-offset-0"
+              />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function ContactOrganizationSelector({
+  value,
+  onChange,
+}: {
+  value: string | null;
+  onChange: (orgId: string | null) => void;
+}) {
+  const [open, setOpen] = useState(false);
+
+  const { data: organization } = useQuery({
+    queryKey: ["org", value],
+    queryFn: () => (value ? dbCommands.getOrganization(value) : null),
+    enabled: !!value,
+  });
+
+  const handleRemoveOrganization = () => {
+    onChange(null);
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <div className="flex flex-row items-center cursor-pointer">
+          {organization
+            ? (
+              <div className="flex items-center">
+                <span className="text-base">{organization.name}</span>
+                <span className="ml-2 text-gray-400 group">
+                  <CircleMinus
+                    className="size-4 cursor-pointer text-gray-400 hover:text-red-600"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      handleRemoveOrganization();
+                    }}
+                  />
+                </span>
+              </div>
+            )
+            : <span className="text-gray-500 text-base">Select organization</span>}
+        </div>
+      </PopoverTrigger>
+
+      <PopoverContent className="shadow-lg p-3" align="start" side="bottom">
+        <OrganizationControl onChange={onChange} closePopover={() => setOpen(false)} />
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function OrganizationControl({
+  onChange,
+  closePopover,
+}: {
+  onChange: (orgId: string | null) => void;
+  closePopover: () => void;
+}) {
+  const queryClient = useQueryClient();
+  const [searchTerm, setSearchTerm] = useState("");
+
+  const addOrganizationMutation = useMutation({
+    mutationFn: async ({ name }: { name: string }) => {
+      const newOrg = await dbCommands.upsertOrganization({
+        id: crypto.randomUUID(),
+        name,
+        description: null,
+      });
+
+      onChange(newOrg.id);
+      return newOrg;
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: ["organizations"],
+      });
+      closePopover();
+    },
+  });
+
+  const { data: organizations = [] } = useQuery({
+    queryKey: ["organizations", searchTerm],
+    queryFn: () => {
+      if (!searchTerm) {
+        return dbCommands.listOrganizations(null);
+      }
+      return dbCommands.listOrganizations({ search: [5, searchTerm] });
+    },
+  });
+
+  const handleSubmit = (e: React.SyntheticEvent<HTMLFormElement>) => {
+    e.preventDefault();
+
+    const name = searchTerm.trim();
+    if (name === "") {
+      return;
+    }
+
+    addOrganizationMutation.mutate({ name });
+    setSearchTerm("");
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+
+      const name = searchTerm.trim();
+      if (name === "") {
+        return;
+      }
+
+      addOrganizationMutation.mutate({ name });
+      setSearchTerm("");
+    }
+  };
+
+  const selectOrganization = (orgId: string) => {
+    onChange(orgId);
+    closePopover();
+  };
+
+  return (
+    <div className="flex flex-col gap-3 max-w-[450px]">
+      <div className="text-sm font-medium text-gray-700">Organization</div>
+
+      <form onSubmit={handleSubmit}>
+        <div className="flex flex-col gap-2">
+          <div className="flex items-center w-full px-2 py-1.5 gap-2 rounded bg-gray-50 border border-gray-200">
+            <span className="text-gray-500 flex-shrink-0">
+              <SearchIcon className="size-4" />
+            </span>
+            <input
+              type="text"
+              value={searchTerm}
+              onChange={(e) => setSearchTerm(e.target.value)}
+              onKeyDown={handleKeyDown}
+              placeholder="Search or add company"
+              className="w-full bg-transparent text-sm focus:outline-none placeholder:text-gray-400 focus-visible:ring-0 focus-visible:ring-offset-0"
+            />
+          </div>
+
+          {searchTerm.trim() && (
+            <div className="flex flex-col w-full rounded border border-gray-200 overflow-hidden">
+              {organizations.map((org) => (
+                <button
+                  key={org.id}
+                  type="button"
+                  className="flex items-center px-3 py-2 text-sm text-left hover:bg-gray-100 transition-colors w-full"
+                  onClick={() => selectOrganization(org.id)}
+                >
+                  <span className="flex-shrink-0 size-5 flex items-center justify-center mr-2 bg-gray-100 rounded-full">
+                    <Building2 className="size-3" />
+                  </span>
+                  <span className="font-medium truncate">{org.name}</span>
+                </button>
+              ))}
+
+              {organizations.length === 0 && (
+                <button
+                  type="button"
+                  className="flex items-center px-3 py-2 text-sm text-left hover:bg-gray-100 transition-colors w-full"
+                  onClick={() => addOrganizationMutation.mutate({ name: searchTerm.trim() })}
+                >
+                  <span className="flex-shrink-0 size-5 flex items-center justify-center mr-2 bg-gray-200 rounded-full">
+                    <span className="text-xs">+</span>
+                  </span>
+                  <span className="flex items-center gap-1 font-medium text-gray-600">
+                    Create
+                    <span className="text-gray-900 truncate max-w-[140px]">
+                      &quot;{searchTerm.trim()}&quot;
+                    </span>
+                  </span>
+                </button>
+              )}
+            </div>
+          )}
+
+          {!searchTerm.trim() && organizations.length > 0 && (
+            <div className="flex flex-col w-full rounded border border-gray-200 overflow-hidden max-h-[40vh] overflow-y-auto custom-scrollbar">
+              {organizations.map((org) => (
+                <button
+                  key={org.id}
+                  type="button"
+                  className="flex items-center px-3 py-2 text-sm text-left hover:bg-gray-100 transition-colors w-full"
+                  onClick={() => selectOrganization(org.id)}
+                >
+                  <span className="flex-shrink-0 size-5 flex items-center justify-center mr-2 bg-gray-100 rounded-full">
+                    <Building2 className="size-3" />
+                  </span>
+                  <span className="font-medium truncate">{org.name}</span>
+                </button>
+              ))}
+            </div>
+          )}
+        </div>
+      </form>
+    </div>
+  );
+}
+
+function EditOrganizationForm({
+  organization,
+  onSave,
+  onCancel,
+}: {
+  organization: Organization;
+  onSave: () => void;
+  onCancel: () => void;
+}) {
+  const queryClient = useQueryClient();
+  const [name, setName] = useState(organization.name);
+  const formRef = useRef<HTMLDivElement>(null);
+
+  const updateOrgMutation = useMutation({
+    mutationFn: (data: Partial<Organization>) =>
+      dbCommands.upsertOrganization({
+        ...organization,
+        ...data,
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["organizations"] });
+      queryClient.invalidateQueries({ queryKey: ["organization", organization.id] });
+      onSave();
+    },
+    onError: () => {
+      console.error("Failed to update organization");
+    },
+  });
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (formRef.current && !formRef.current.contains(event.target as Node)) {
+        onCancel();
+      }
+    };
+
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, [onCancel]);
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    if (name.trim()) {
+      updateOrgMutation.mutate({ name: name.trim() });
+    }
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      if (name.trim()) {
+        updateOrgMutation.mutate({ name: name.trim() });
+      }
+    }
+    if (e.key === "Escape") {
+      onCancel();
+    }
+  };
+
+  return (
+    <div className="p-2" ref={formRef}>
+      <form onSubmit={handleSubmit}>
+        <div className="flex items-center w-full px-2 py-1.5 gap-2 rounded bg-neutral-50 border border-neutral-200">
+          <input
+            type="text"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            onKeyDown={handleKeyDown}
+            placeholder="Organization name"
+            className="w-full bg-transparent text-sm focus:outline-none placeholder:text-neutral-400"
+            autoFocus
+          />
+          {name.trim() && (
+            <button
+              type="submit"
+              className="text-neutral-500 hover:text-neutral-700 transition-colors flex-shrink-0"
+              aria-label="Save organization"
+            >
+              <RiCornerDownLeftLine className="size-4" />
+            </button>
+          )}
+        </div>
+      </form>
+    </div>
+  );
+}
+
+function NewOrganizationForm({
+  onSave,
+  onCancel,
+}: {
+  onSave: (org: Organization) => void;
+  onCancel: () => void;
+}) {
+  const queryClient = useQueryClient();
+  const [name, setName] = useState("");
+  const formRef = useRef<HTMLDivElement>(null);
+
+  const createOrgMutation = useMutation({
+    mutationFn: (name: string) =>
+      dbCommands.upsertOrganization({
+        id: crypto.randomUUID(),
+        name,
+        description: null,
+      }),
+    onSuccess: (org) => {
+      queryClient.invalidateQueries({ queryKey: ["organizations"] });
+      onSave(org);
+    },
+    onError: () => {
+      console.error("Failed to create organization");
+    },
+  });
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (formRef.current && !formRef.current.contains(event.target as Node)) {
+        onCancel();
+      }
+    };
+
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => {
+      document.removeEventListener("mousedown", handleClickOutside);
+    };
+  }, [onCancel]);
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault();
+    if (name.trim()) {
+      createOrgMutation.mutate(name.trim());
+    }
+  };
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      if (name.trim()) {
+        createOrgMutation.mutate(name.trim());
+      }
+    }
+    if (e.key === "Escape") {
+      onCancel();
+    }
+  };
+
+  return (
+    <div className="p-2" ref={formRef}>
+      <form onSubmit={handleSubmit}>
+        <div className="flex items-center w-full px-2 py-1.5 gap-2 rounded bg-neutral-50 border border-neutral-200">
+          <input
+            type="text"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            onKeyDown={handleKeyDown}
+            placeholder="Add organization"
+            className="w-full bg-transparent text-sm focus:outline-none placeholder:text-neutral-400"
+            autoFocus
+          />
+          {name.trim() && (
+            <button
+              type="submit"
+              className="text-neutral-500 hover:text-neutral-700 transition-colors flex-shrink-0"
+              aria-label="Add organization"
+            >
+              <RiCornerDownLeftLine className="size-4" />
+            </button>
+          )}
+        </div>
+      </form>
+    </div>
+  );
+}
diff --git a/apps/desktop/src/components/finder/views/folder-view.tsx b/apps/desktop/src/components/finder/views/folder-view.tsx
new file mode 100644
index 0000000000..d5637ca66f
--- /dev/null
+++ b/apps/desktop/src/components/finder/views/folder-view.tsx
@@ -0,0 +1,20 @@
+interface FolderViewProps {
+  date: Date;
+  onNavigate: (params: { date: string }) => void;
+}
+
+export function FolderView({ date, onNavigate }: FolderViewProps) {
+  return (
+    <div className="p-4">
+      <div className="flex flex-col items-center justify-center h-full">
+        <div className="text-center">
+          <h2 className="text-2xl font-semibold mb-2">Folder View</h2>
+          <p className="text-gray-500">
+            Here you'll be able to view and manage your notes in a folder structure.
+          </p>
+          <p className="text-gray-500 mt-4">Coming soon...</p>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/desktop/src/components/finder/views/index.ts b/apps/desktop/src/components/finder/views/index.ts
new file mode 100644
index 0000000000..850bebd45f
--- /dev/null
+++ b/apps/desktop/src/components/finder/views/index.ts
@@ -0,0 +1,4 @@
+export * from "./calendar-view";
+export * from "./contact-view";
+export * from "./folder-view";
+export * from "./table-view";
diff --git a/apps/desktop/src/components/finder/views/table-view.tsx b/apps/desktop/src/components/finder/views/table-view.tsx
new file mode 100644
index 0000000000..542b8680e7
--- /dev/null
+++ b/apps/desktop/src/components/finder/views/table-view.tsx
@@ -0,0 +1,323 @@
+import { format, isToday } from "date-fns";
+import { Archive, Calendar, ChevronDown, ChevronUp, FileText, Search } from "lucide-react";
+import { useMemo, useState } from "react";
+
+import { commands as dbCommands } from "@hypr/plugin-db";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
+import { Button } from "@hypr/ui/components/ui/button";
+import { Input } from "@hypr/ui/components/ui/input";
+import { Tabs, TabsList, TabsTrigger } from "@hypr/ui/components/ui/tabs";
+
+interface TableViewProps {
+  date: Date;
+  sessions: any[];
+  events: any[];
+  onNavigate: (params: { date: string }) => void;
+}
+
+type TableItemType = "session" | "event" | "all";
+
+interface TableItem {
+  id: string;
+  title: string;
+  date: Date;
+  type: "session" | "event";
+  original: any;
+  tags?: string[];
+  duration?: number;
+}
+
+type SortField = "title" | "date" | "type";
+type SortOrder = "asc" | "desc";
+
+export function TableView({ date, sessions, events, onNavigate }: TableViewProps) {
+  const [searchTerm, setSearchTerm] = useState("");
+  const [activeTab, setActiveTab] = useState<TableItemType>("all");
+  const [sortField, setSortField] = useState<SortField>("date");
+  const [sortOrder, setSortOrder] = useState<SortOrder>("desc");
+
+  const tableItems = useMemo(() => {
+    const items: TableItem[] = [];
+
+    sessions.forEach(session => {
+      items.push({
+        id: session.id,
+        title: session.title || "Untitled Session",
+        date: new Date(session.created_at),
+        type: "session",
+        original: session,
+        tags: session.tags || [],
+        duration: session.duration || 0,
+      });
+    });
+
+    events.forEach(event => {
+      const startDate = event.start_date ? new Date(event.start_date) : new Date();
+      const endDate = event.end_date ? new Date(event.end_date) : startDate;
+      const durationInMinutes = Math.round((endDate.getTime() - startDate.getTime()) / 60000);
+
+      items.push({
+        id: event.id,
+        title: event.name || "Untitled Event",
+        date: startDate,
+        type: "event",
+        original: event,
+        duration: durationInMinutes,
+      });
+    });
+
+    return items;
+  }, [sessions, events]);
+
+  const filteredItems = useMemo(() => {
+    return tableItems
+      .filter(item => {
+        if (searchTerm && !item.title.toLowerCase().includes(searchTerm.toLowerCase())) {
+          return false;
+        }
+
+        if (activeTab !== "all" && item.type !== activeTab) {
+          return false;
+        }
+
+        return true;
+      })
+      .sort((a, b) => {
+        let comparison = 0;
+
+        if (sortField === "title") {
+          comparison = a.title.localeCompare(b.title);
+        } else if (sortField === "date") {
+          comparison = a.date.getTime() - b.date.getTime();
+        } else if (sortField === "type") {
+          comparison = a.type.localeCompare(b.type);
+        }
+
+        return sortOrder === "asc" ? comparison : -comparison;
+      });
+  }, [tableItems, searchTerm, activeTab, sortField, sortOrder]);
+
+  const handleSortClick = (field: SortField) => {
+    if (sortField === field) {
+      setSortOrder(sortOrder === "asc" ? "desc" : "asc");
+    } else {
+      setSortField(field);
+      setSortOrder("desc");
+    }
+  };
+
+  const handleRowClick = async (item: TableItem) => {
+    if (item.type === "session") {
+      const url = `/app/note/${item.id}`;
+      windowsCommands.windowShow({ type: "main" }).then(() => {
+        windowsCommands.windowEmitNavigate({ type: "main" }, url);
+      });
+    } else if (item.type === "event") {
+      try {
+        const session = await dbCommands.getSession({ calendarEventId: item.id });
+
+        if (session) {
+          // Navigate to existing session
+          const url = `/app/note/${session.id}`;
+          windowsCommands.windowShow({ type: "main" }).then(() => {
+            windowsCommands.windowEmitNavigate({ type: "main" }, url);
+          });
+        } else {
+          // Create new note with event ID
+          const url = `/app/new?calendarEventId=${item.id}`;
+          windowsCommands.windowShow({ type: "main" }).then(() => {
+            windowsCommands.windowEmitNavigate({ type: "main" }, url);
+          });
+        }
+      } catch (error) {
+        // If session lookup fails, create new note
+        const url = `/app/new?calendarEventId=${item.id}`;
+        windowsCommands.windowShow({ type: "main" }).then(() => {
+          windowsCommands.windowEmitNavigate({ type: "main" }, url);
+        });
+      }
+    }
+  };
+
+  const formatDuration = (minutes: number): string => {
+    if (!minutes || minutes === 0) {
+      return "N/A";
+    }
+
+    if (minutes < 60) {
+      return `${minutes} min`;
+    } else {
+      const hours = Math.floor(minutes / 60);
+      const remainingMinutes = minutes % 60;
+      return remainingMinutes > 0 ? `${hours}h ${remainingMinutes}m` : `${hours}h`;
+    }
+  };
+
+  const formatDisplayDate = (dateObj: Date): string => {
+    if (isToday(dateObj)) {
+      return "Today, " + format(dateObj, "h:mm a");
+    }
+    return format(dateObj, "MMM d, yyyy, h:mm a");
+  };
+
+  return (
+    <div className="h-full flex flex-col overflow-hidden">
+      {/* Header with search and filters */}
+      <div className="p-4 pb-2 border-b border-neutral-100">
+        <div className="relative mb-3">
+          <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-400" />
+          <Input
+            placeholder="Search notes and events..."
+            className="pl-9 h-9"
+            value={searchTerm}
+            onChange={(e) => setSearchTerm(e.target.value)}
+          />
+        </div>
+
+        <Tabs
+          defaultValue="all"
+          value={activeTab}
+          onValueChange={(value) => setActiveTab(value as TableItemType)}
+          className="w-full"
+        >
+          <TabsList className="grid grid-cols-3 mb-2">
+            <TabsTrigger value="all">All</TabsTrigger>
+            <TabsTrigger value="session">Notes</TabsTrigger>
+            <TabsTrigger value="event">Events</TabsTrigger>
+          </TabsList>
+        </Tabs>
+      </div>
+
+      {/* Table content */}
+      <div className="flex-1 overflow-auto">
+        {filteredItems.length > 0
+          ? (
+            <table className="w-full border-collapse">
+              <thead className="sticky top-0 bg-white shadow-sm z-10">
+                <tr className="text-xs font-medium text-neutral-500 uppercase tracking-wider border-b border-neutral-200">
+                  <th
+                    className="px-4 py-2 text-left cursor-pointer"
+                    onClick={() => handleSortClick("type")}
+                  >
+                    <div className="flex items-center">
+                      Type
+                      {sortField === "type" && (
+                        sortOrder === "asc"
+                          ? <ChevronUp className="h-3 w-3 ml-1" />
+                          : <ChevronDown className="h-3 w-3 ml-1" />
+                      )}
+                      {sortField !== "type" && <ChevronDown className="h-3 w-3 ml-1 opacity-30" />}
+                    </div>
+                  </th>
+                  <th
+                    className="px-4 py-2 text-left cursor-pointer"
+                    onClick={() => handleSortClick("title")}
+                  >
+                    <div className="flex items-center">
+                      Title
+                      {sortField === "title" && (
+                        sortOrder === "asc"
+                          ? <ChevronUp className="h-3 w-3 ml-1" />
+                          : <ChevronDown className="h-3 w-3 ml-1" />
+                      )}
+                      {sortField !== "title" && <ChevronDown className="h-3 w-3 ml-1 opacity-30" />}
+                    </div>
+                  </th>
+                  <th
+                    className="px-4 py-2 text-left cursor-pointer"
+                    onClick={() => handleSortClick("date")}
+                  >
+                    <div className="flex items-center">
+                      Date
+                      {sortField === "date" && (
+                        sortOrder === "asc"
+                          ? <ChevronUp className="h-3 w-3 ml-1" />
+                          : <ChevronDown className="h-3 w-3 ml-1" />
+                      )}
+                      {sortField !== "date" && <ChevronDown className="h-3 w-3 ml-1 opacity-30" />}
+                    </div>
+                  </th>
+                  <th className="px-4 py-2 text-left">Duration</th>
+                  <th className="px-4 py-2 text-left">Tags</th>
+                </tr>
+              </thead>
+              <tbody className="bg-white">
+                {filteredItems.map((item) => (
+                  <tr
+                    key={`${item.type}-${item.id}`}
+                    className="border-b border-neutral-100 hover:bg-neutral-50 cursor-pointer"
+                    onClick={() => handleRowClick(item)}
+                  >
+                    <td className="px-4 py-3 whitespace-nowrap">
+                      <div className="flex items-center">
+                        <div className="p-1.5 rounded-md mr-2 bg-neutral-100">
+                          {item.type === "session"
+                            ? <FileText className="h-3.5 w-3.5 text-indigo-500" />
+                            : <Calendar className="h-3.5 w-3.5 text-blue-500" />}
+                        </div>
+                        <span className="text-xs text-neutral-500 font-medium">
+                          {item.type === "session" ? "Note" : "Event"}
+                        </span>
+                      </div>
+                    </td>
+                    <td className="px-4 py-3 max-w-sm">
+                      <div className="text-sm font-medium truncate">{item.title}</div>
+                    </td>
+                    <td className="px-4 py-3 whitespace-nowrap">
+                      <div className="text-xs text-neutral-500">
+                        {formatDisplayDate(item.date)}
+                      </div>
+                    </td>
+                    <td className="px-4 py-3 whitespace-nowrap text-xs text-neutral-500">
+                      {formatDuration(item.duration || 0)}
+                    </td>
+                    <td className="px-4 py-3">
+                      {item.tags && item.tags.length > 0
+                        ? (
+                          <div className="flex flex-wrap gap-1">
+                            {item.tags.slice(0, 2).map((tag: string, i: number) => (
+                              <span
+                                key={i}
+                                className="px-1.5 py-0.5 text-xs rounded-sm bg-neutral-100 text-neutral-700"
+                              >
+                                {tag}
+                              </span>
+                            ))}
+                            {item.tags.length > 2 && (
+                              <span className="text-xs text-neutral-500">
+                                +{item.tags.length - 2} more
+                              </span>
+                            )}
+                          </div>
+                        )
+                        : <span className="text-xs text-neutral-400">-</span>}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )
+          : (
+            <div className="flex flex-col items-center justify-center h-full text-neutral-400 pt-12">
+              <Archive className="h-12 w-12 mb-3 text-neutral-300" />
+              <p className="text-neutral-500 font-medium">No items found</p>
+              <p className="text-sm text-neutral-400 mt-1">
+                {searchTerm ? "Try a different search term" : "Create notes or events to see them here"}
+              </p>
+
+              {searchTerm && (
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => setSearchTerm("")}
+                  className="mt-4"
+                >
+                  Clear search
+                </Button>
+              )}
+            </div>
+          )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/desktop/src/components/left-sidebar/events-list.tsx b/apps/desktop/src/components/left-sidebar/events-list.tsx
index b578cce354..d1463c8c42 100644
--- a/apps/desktop/src/components/left-sidebar/events-list.tsx
+++ b/apps/desktop/src/components/left-sidebar/events-list.tsx
@@ -1,6 +1,6 @@
 import { Trans } from "@lingui/react/macro";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { LinkProps, useNavigate } from "@tanstack/react-router";
+import { useNavigate } from "@tanstack/react-router";
 import { clsx } from "clsx";
 import { format } from "date-fns";
 import { AppWindowMacIcon, ArrowUpRight, CalendarDaysIcon, RefreshCwIcon } from "lucide-react";
@@ -19,7 +19,6 @@ import { SplashLoader } from "@hypr/ui/components/ui/splash";
 import { cn } from "@hypr/ui/lib/utils";
 import { useSession } from "@hypr/utils/contexts";
 import { formatUpcomingTime } from "@hypr/utils/datetime";
-import { safeNavigate } from "@hypr/utils/navigation";
 
 type EventWithSession = Event & { session: Session | null };
 
@@ -128,14 +127,12 @@ function EventItem({
 
   const handleOpenCalendar = () => {
     const date = new Date(event.start_date);
+    const formattedDate = format(date, "yyyy-MM-dd");
+    const url = `/app/finder?view=calendar&date=${formattedDate}`;
 
-    const params = {
-      to: "/app/calendar",
-      search: { date: format(date, "yyyy-MM-dd") },
-    } as const satisfies LinkProps;
-
-    const url = `${params.to}?date=${params.search.date}`;
-    safeNavigate({ type: "calendar" }, url);
+    windowsCommands.windowShow({ type: "finder" }).then(() => {
+      windowsCommands.windowEmitNavigate({ type: "finder" }, url);
+    });
   };
 
   const isActive = activeSessionId
diff --git a/apps/desktop/src/components/left-sidebar/notes-list.tsx b/apps/desktop/src/components/left-sidebar/notes-list.tsx
index 9b8127de26..4388e13ad6 100644
--- a/apps/desktop/src/components/left-sidebar/notes-list.tsx
+++ b/apps/desktop/src/components/left-sidebar/notes-list.tsx
@@ -1,7 +1,7 @@
 import { Trans } from "@lingui/react/macro";
 import { useLingui } from "@lingui/react/macro";
 import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { type LinkProps, useMatch, useNavigate } from "@tanstack/react-router";
+import { useMatch, useNavigate } from "@tanstack/react-router";
 import { confirm } from "@tauri-apps/plugin-dialog";
 import { endOfMonth, startOfMonth, subMonths } from "date-fns";
 import { AppWindowMacIcon, ArrowUpRight, CalendarDaysIcon, TrashIcon } from "lucide-react";
@@ -24,7 +24,6 @@ import { SplashLoader } from "@hypr/ui/components/ui/splash";
 import { cn } from "@hypr/ui/lib/utils";
 import { useSession, useSessions } from "@hypr/utils/contexts";
 import { format, formatDate, formatRelative } from "@hypr/utils/datetime";
-import { safeNavigate } from "@hypr/utils/navigation";
 
 interface NotesListProps {
   filter: (session: Session) => boolean;
@@ -235,14 +234,13 @@ function NoteItem({
   };
 
   const handleOpenCalendar = () => {
-    const params = {
-      to: "/app/calendar",
-      search: { date: format(currentSession.created_at, "yyyy-MM-dd") },
-    } as const satisfies LinkProps;
+    const date = new Date(currentSession.created_at);
+    const formattedDate = format(date, "yyyy-MM-dd");
+    const url = `/app/finder?view=calendar&date=${formattedDate}`;
 
-    const url = `${params.to}?date=${params.search.date}`;
-
-    safeNavigate({ type: "calendar" }, url);
+    windowsCommands.windowShow({ type: "finder" }).then(() => {
+      windowsCommands.windowEmitNavigate({ type: "finder" }, url);
+    });
   };
 
   const buttonRef = useRef<HTMLButtonElement>(null);
diff --git a/apps/desktop/src/components/left-sidebar/search-list.tsx b/apps/desktop/src/components/left-sidebar/search-list.tsx
index 878ff3821d..51a87f3126 100644
--- a/apps/desktop/src/components/left-sidebar/search-list.tsx
+++ b/apps/desktop/src/components/left-sidebar/search-list.tsx
@@ -165,13 +165,6 @@ export function SessionMatch({ match: { item: session }, isSelected, query }: {
   const routeMatch = useMatch({ from: "/app/note/$id", shouldThrow: false });
   const isActive = routeMatch?.params.id === session.id;
 
-  // Auto-scroll disabled
-  // useEffect(() => {
-  //   if (isSelected && elementRef.current) {
-  //     elementRef.current.scrollIntoView({ block: "nearest" });
-  //   }
-  // }, [isSelected]);
-
   const handleClick = () => {
     navigate({
       to: "/app/note/$id",
@@ -209,13 +202,6 @@ function EventMatch({ match, isSelected, query }: {
   const event = match.item;
   const elementRef = useRef<HTMLButtonElement>(null);
 
-  // Auto-scroll disabled
-  // useEffect(() => {
-  //   if (isSelected && elementRef.current) {
-  //     elementRef.current.scrollIntoView({ block: "nearest" });
-  //   }
-  // }, [isSelected]);
-
   const handleClick = () => {
     navigate({ to: "/app/new", search: { calendarEventId: event.id } });
   };
@@ -259,13 +245,6 @@ function HumanMatch({ match: { item }, isSelected, query }: {
 
   const isActive = routeMatch?.params.id === item.id;
 
-  // Auto-scroll disabled
-  // useEffect(() => {
-  //   if (isSelected && elementRef.current) {
-  //     elementRef.current.scrollIntoView({ block: "nearest" });
-  //   }
-  // }, [isSelected]);
-
   const handleClick = () => {
     navigate({
       to: "/app/human/$id",
@@ -341,13 +320,6 @@ function OrganizationMatch({ match: { item: organization }, isSelected, query }:
 
   const isActive = routeMatch?.params.id === organization.id;
 
-  // Auto-scroll disabled
-  // useEffect(() => {
-  //   if (isSelected && elementRef.current) {
-  //     elementRef.current.scrollIntoView({ block: "nearest" });
-  //   }
-  // }, [isSelected]);
-
   const handleClick = () => {
     navigate({
       to: "/app/organization/$id",
diff --git a/apps/desktop/src/components/left-sidebar/top-area/calendar-button.tsx b/apps/desktop/src/components/left-sidebar/top-area/finder-button.tsx
similarity index 64%
rename from apps/desktop/src/components/left-sidebar/top-area/calendar-button.tsx
rename to apps/desktop/src/components/left-sidebar/top-area/finder-button.tsx
index e58967c264..3fd83f86e9 100644
--- a/apps/desktop/src/components/left-sidebar/top-area/calendar-button.tsx
+++ b/apps/desktop/src/components/left-sidebar/top-area/finder-button.tsx
@@ -1,13 +1,13 @@
 import { Trans } from "@lingui/react/macro";
-import { CalendarDaysIcon } from "lucide-react";
+import { Folder } from "lucide-react";
 
 import { commands as windowsCommands } from "@hypr/plugin-windows";
 import { Button } from "@hypr/ui/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@hypr/ui/components/ui/tooltip";
 
-export function CalendarButton() {
-  const handleClickCalendar = () => {
-    windowsCommands.windowShow({ type: "calendar" });
+export function FinderButton() {
+  const handleClickFinder = () => {
+    windowsCommands.windowShow({ type: "finder" });
   };
 
   return (
@@ -16,14 +16,14 @@ export function CalendarButton() {
         <Button
           variant="ghost"
           size="icon"
-          onClick={handleClickCalendar}
+          onClick={handleClickFinder}
           className="hover:bg-neutral-200"
         >
-          <CalendarDaysIcon className="size-4" />
+          <Folder size={16} />
         </Button>
       </TooltipTrigger>
       <TooltipContent>
-        <Trans>Open calendar view</Trans>
+        <Trans>Open finder view</Trans>
       </TooltipContent>
     </Tooltip>
   );
diff --git a/apps/desktop/src/components/left-sidebar/top-area/index.tsx b/apps/desktop/src/components/left-sidebar/top-area/index.tsx
index 5d65a53039..ebed4553f5 100644
--- a/apps/desktop/src/components/left-sidebar/top-area/index.tsx
+++ b/apps/desktop/src/components/left-sidebar/top-area/index.tsx
@@ -3,7 +3,7 @@ import { type as getOsType } from "@tauri-apps/plugin-os";
 
 import { LeftSidebarButton } from "@/components/toolbar/buttons/left-sidebar-button";
 import { cn } from "@hypr/ui/lib/utils";
-import { CalendarButton } from "./calendar-button";
+import { FinderButton } from "./finder-button";
 import { SettingsButton } from "./settings-button";
 
 export function TopArea() {
@@ -23,7 +23,7 @@ export function TopArea() {
     >
       <SettingsButton />
 
-      <CalendarButton />
+      <FinderButton />
 
       <LeftSidebarButton type="sidebar" />
     </div>
diff --git a/apps/desktop/src/components/toolbar/bars/calendar-toolbar.tsx b/apps/desktop/src/components/toolbar/bars/calendar-toolbar.tsx
deleted file mode 100644
index 1cb7b14f3e..0000000000
--- a/apps/desktop/src/components/toolbar/bars/calendar-toolbar.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Trans, useLingui } from "@lingui/react/macro";
-import { useNavigate } from "@tanstack/react-router";
-import { clsx } from "clsx";
-import { addMonths, subMonths } from "date-fns";
-import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
-
-import { Button } from "@hypr/ui/components/ui/button";
-
-interface CalendarToolbarProps {
-  date: Date;
-}
-
-export function CalendarToolbar({ date }: CalendarToolbarProps) {
-  const { i18n } = useLingui();
-  const navigate = useNavigate();
-  const today = new Date();
-
-  const handlePreviousMonth = () => {
-    const prevMonth = subMonths(date, 1);
-    navigate({
-      to: "/app/calendar",
-      search: { date: prevMonth.toISOString() },
-      replace: true,
-    });
-  };
-
-  const handleNextMonth = () => {
-    const nextMonth = addMonths(date, 1);
-    navigate({
-      to: "/app/calendar",
-      search: { date: nextMonth.toISOString() },
-      replace: true,
-    });
-  };
-
-  const handleToday = () => {
-    navigate({
-      to: "/app/calendar",
-      search: { date: today.toISOString() },
-      replace: true,
-    });
-  };
-
-  const weekDays = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-
-  return (
-    <header className="flex w-full flex-col">
-      <div data-tauri-drag-region className="relative h-11 w-full flex items-center justify-center">
-        <h1 className="text-xl font-bold" data-tauri-drag-region>
-          {i18n.date(date, { month: "long", year: "numeric" })}
-        </h1>
-
-        <div className="absolute right-2 flex h-fit rounded-md overflow-clip border border-neutral-200">
-          <Button
-            variant="outline"
-            className="p-0.5 rounded-none border-none"
-            onClick={handlePreviousMonth}
-          >
-            <ChevronLeftIcon size={16} />
-          </Button>
-
-          <Button
-            variant="outline"
-            className="text-sm px-1 py-0.5 rounded-none border-none"
-            onClick={handleToday}
-          >
-            <Trans>Today</Trans>
-          </Button>
-
-          <Button
-            variant="outline"
-            className="p-0.5 rounded-none border-none"
-            onClick={handleNextMonth}
-          >
-            <ChevronRightIcon size={16} />
-          </Button>
-        </div>
-      </div>
-
-      <div className="border-b border-neutral-200 grid grid-cols-7 h-8">
-        {weekDays.map((day, index) => (
-          <div
-            key={day}
-            className={clsx(
-              "text-center font-light text-sm pb-2 pt-1",
-              index === weekDays.length - 1 && "border-r-0",
-            )}
-          >
-            {day}
-          </div>
-        ))}
-      </div>
-    </header>
-  );
-}
diff --git a/apps/desktop/src/components/toolbar/bars/index.tsx b/apps/desktop/src/components/toolbar/bars/index.tsx
index 8cf9928083..a098a7b170 100644
--- a/apps/desktop/src/components/toolbar/bars/index.tsx
+++ b/apps/desktop/src/components/toolbar/bars/index.tsx
@@ -1,4 +1,3 @@
-export * from "./calendar-toolbar";
 export * from "./default-toolbar";
 export * from "./entity-toolbar";
 export * from "./main-toolbar";
diff --git a/apps/desktop/src/components/toolbar/index.tsx b/apps/desktop/src/components/toolbar/index.tsx
index 132c0a78f8..c573b429ce 100644
--- a/apps/desktop/src/components/toolbar/index.tsx
+++ b/apps/desktop/src/components/toolbar/index.tsx
@@ -2,13 +2,12 @@ import { useMatch } from "@tanstack/react-router";
 
 import { useEditMode } from "@/contexts/edit-mode-context";
 import { getCurrentWebviewWindowLabel } from "@hypr/plugin-windows";
-import { CalendarToolbar, DefaultToolbar, EntityToolbar, MainToolbar, NoteToolbar } from "./bars";
+import { DefaultToolbar, EntityToolbar, MainToolbar, NoteToolbar } from "./bars";
 
 export default function Toolbar() {
   const noteMatch = useMatch({ from: "/app/note/$id", shouldThrow: false });
   const organizationMatch = useMatch({ from: "/app/organization/$id", shouldThrow: false });
   const humanMatch = useMatch({ from: "/app/human/$id", shouldThrow: false });
-  const calendarMatch = useMatch({ from: "/app/calendar", shouldThrow: false });
   const plansMatch = useMatch({ from: "/app/plans", shouldThrow: false });
 
   const { isEditing, toggleEditMode } = useEditMode();
@@ -17,14 +16,8 @@ export default function Toolbar() {
   const isNote = !!noteMatch;
   const isOrg = !!organizationMatch;
   const isHuman = !!humanMatch;
-  const isCalendar = !!calendarMatch;
   const isPlans = !!plansMatch;
 
-  if (isCalendar) {
-    const date = calendarMatch?.search?.date ? new Date(calendarMatch.search.date as string) : new Date();
-    return <CalendarToolbar date={date} />;
-  }
-
   if (isPlans) {
     return <DefaultToolbar title="Plans" />;
   }
diff --git a/apps/desktop/src/components/workspace-calendar/event-card.tsx b/apps/desktop/src/components/workspace-calendar/event-card.tsx
index cbf7f55b8b..93015c9d04 100644
--- a/apps/desktop/src/components/workspace-calendar/event-card.tsx
+++ b/apps/desktop/src/components/workspace-calendar/event-card.tsx
@@ -1,16 +1,16 @@
 import { Trans } from "@lingui/react/macro";
 import { useQuery } from "@tanstack/react-query";
-import type { LinkProps } from "@tanstack/react-router";
+
 import { format } from "date-fns";
-import { ExternalLinkIcon, Pen } from "lucide-react";
+import { Calendar, FileText, Pen } from "lucide-react";
 import { useMemo, useState } from "react";
 
 import { useHypr } from "@/contexts";
+import { openURL } from "@/utils/shell";
 import type { Event } from "@hypr/plugin-db";
 import { commands as dbCommands } from "@hypr/plugin-db";
-import { Button } from "@hypr/ui/components/ui/button";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
 import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
-import { safeNavigate } from "@hypr/utils/navigation";
 
 export function EventCard({
   event,
@@ -65,25 +65,15 @@ export function EventCard({
     setOpen(false);
 
     if (session.data) {
-      const props = {
-        to: "/app/note/$id",
-        params: { id: session.data.id },
-      } as const satisfies LinkProps;
-
-      const url = props.to.replace("$id", props.params.id);
-
-      safeNavigate({ type: "main" }, url);
+      const url = `/app/note/${session.data.id}`;
+      windowsCommands.windowShow({ type: "main" }).then(() => {
+        windowsCommands.windowEmitNavigate({ type: "main" }, url);
+      });
     } else {
-      const props = {
-        to: "/app/new",
-        search: { calendarEventId: event.id },
-      } as const satisfies LinkProps;
-
-      const url = props.to.concat(
-        `?calendarEventId=${props.search.calendarEventId}`,
-      );
-
-      safeNavigate({ type: "main" }, url);
+      const url = `/app/new?calendarEventId=${event.id}`;
+      windowsCommands.windowShow({ type: "main" }).then(() => {
+        windowsCommands.windowEmitNavigate({ type: "main" }, url);
+      });
     }
   };
 
@@ -98,33 +88,23 @@ export function EventCard({
   return (
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
-        <div className="flex items-start space-x-1 px-0.5 py-0.5 cursor-pointer rounded hover:bg-neutral-200 transition-colors h-5">
-          <div className="w-1 h-3 mt-0.5 rounded-full flex-shrink-0 bg-neutral-400"></div>
+        <div className="flex items-center space-x-1 px-0.5 py-0.5 cursor-pointer rounded hover:bg-neutral-200 transition-colors h-5">
+          <Calendar className="w-2.5 h-2.5 text-neutral-500 flex-shrink-0" />
 
           <div className="flex-1 text-xs text-neutral-800 truncate">
             {event.name || "Untitled Event"}
           </div>
-
-          {showTime && (
-            <div className="text-xs text-neutral-500">
-              {format(getStartDate(), "h:mm a")} - {format(getEndDate(), "h:mm a")}
-            </div>
-          )}
         </div>
       </PopoverTrigger>
       <PopoverContent className="w-72 p-4 bg-white border-neutral-200 m-2 shadow-lg outline-none focus:outline-none focus:ring-0">
-        <div className="flex mb-2 items-center justify-between">
-          <div className="font-semibold text-lg text-neutral-800">
-            {event.name || "Untitled Event"}
-          </div>
-
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={() => window.open(event.google_event_url as string, "_blank")}
-          >
-            <ExternalLinkIcon size={14} />
-          </Button>
+        <div
+          className="font-semibold text-lg text-neutral-800 flex items-center gap-2 mb-2 cursor-pointer hover:text-orange-600 transition-all decoration-dotted underline hover:decoration-solid"
+          onClick={() =>
+            event.google_event_url && openURL(event.google_event_url as string).catch(error =>
+              console.error("Failed to open event URL:", error)
+            )}
+        >
+          {event.name || "Untitled Event"}
         </div>
 
         <p className="text-sm text-neutral-600 mb-2">
@@ -137,36 +117,33 @@ export function EventCard({
         </p>
 
         {participantsPreview && participantsPreview.length > 0 && (
-          <div className="text-xs text-neutral-600 mb-4 truncate">
+          <div className="text-xs text-neutral-600 mb-4">
             {participantsPreview.join(", ")}
           </div>
         )}
 
         {session.data
           ? (
-            <Button
-              className="w-full inline-flex gap-2"
-              size="md"
+            <div
+              className="flex items-center gap-2 px-2 py-1 bg-neutral-50 border border-neutral-200 rounded-md cursor-pointer hover:bg-neutral-100 transition-colors"
               onClick={handleClick}
             >
-              <Pen className="size-4" />
-              <Trans>Open Note</Trans>
-            </Button>
+              <FileText className="size-3 text-neutral-600 flex-shrink-0" />
+              <div className="text-xs font-medium text-neutral-800 truncate">
+                {session.data.title || "Untitled Note"}
+              </div>
+            </div>
           )
           : (
-            <Button
-              className="w-full inline-flex gap-2"
-              size="md"
-              disabled={session.isLoading}
+            <div
+              className="flex items-center gap-2 px-2 py-1 bg-neutral-50 border border-neutral-200 rounded-md cursor-pointer hover:bg-neutral-100 transition-colors"
               onClick={handleClick}
             >
-              {session.isLoading ? <Trans>Loading...</Trans> : (
-                <>
-                  <Pen className="size-4" />
-                  <Trans>Create Note</Trans>
-                </>
-              )}
-            </Button>
+              <Pen className="size-3 text-neutral-600 flex-shrink-0" />
+              <div className="text-xs font-medium text-neutral-800 truncate">
+                <Trans>Create Note</Trans>
+              </div>
+            </div>
           )}
       </PopoverContent>
     </Popover>
diff --git a/apps/desktop/src/components/workspace-calendar/index.tsx b/apps/desktop/src/components/workspace-calendar/index.tsx
index 827e7a824e..013f82aa5f 100644
--- a/apps/desktop/src/components/workspace-calendar/index.tsx
+++ b/apps/desktop/src/components/workspace-calendar/index.tsx
@@ -90,15 +90,27 @@ export default function WorkspaceCalendar({
     const daySessions = getSessionsForDay(date);
     const dayEvents = getEventsForDay(date);
 
+    // Filter out sessions that are linked to events to prevent duplicate display
+    // When a session is linked to an event, show only the event (not both)
+    const unlinkedSessions = daySessions.filter(session => {
+      // If session has calendar_event_id, check if that event exists in current events
+      if (session.calendar_event_id) {
+        // If the linked event exists in our events list, don't show the session separately
+        return !events.some(event => event.id === session.calendar_event_id);
+      }
+      // Session without calendar_event_id can be shown
+      return true;
+    });
+
     if (isFutureDate) {
-      return [...dayEvents, ...daySessions] as CalendarItem[];
+      return [...dayEvents, ...unlinkedSessions] as CalendarItem[];
     }
 
     if (isPastDate) {
-      return daySessions as CalendarItem[];
+      return unlinkedSessions as CalendarItem[];
     }
 
-    return [...dayEvents, ...daySessions] as CalendarItem[];
+    return [...dayEvents, ...unlinkedSessions] as CalendarItem[];
   };
 
   const getCalendarDays = () => {
diff --git a/apps/desktop/src/components/workspace-calendar/note-card.tsx b/apps/desktop/src/components/workspace-calendar/note-card.tsx
index 19dafa4612..4bc6ea817f 100644
--- a/apps/desktop/src/components/workspace-calendar/note-card.tsx
+++ b/apps/desktop/src/components/workspace-calendar/note-card.tsx
@@ -1,16 +1,14 @@
-import { Trans } from "@lingui/react/macro";
 import { useQuery } from "@tanstack/react-query";
-import type { LinkProps } from "@tanstack/react-router";
+
 import { format } from "date-fns";
-import { Pen } from "lucide-react";
+import { File, FileText } from "lucide-react";
 import { useMemo, useState } from "react";
 
 import { useHypr } from "@/contexts";
-import { type Session } from "@hypr/plugin-db";
+import type { Session } from "@hypr/plugin-db";
 import { commands as dbCommands } from "@hypr/plugin-db";
-import { Button } from "@hypr/ui/components/ui/button";
+import { commands as windowsCommands } from "@hypr/plugin-windows";
 import { Popover, PopoverContent, PopoverTrigger } from "@hypr/ui/components/ui/popover";
-import { safeNavigate } from "@hypr/utils/navigation";
 
 export function NoteCard({
   session,
@@ -22,6 +20,17 @@ export function NoteCard({
   const { userId } = useHypr();
   const [open, setOpen] = useState(false);
 
+  const linkedEvent = useQuery({
+    queryKey: ["session-linked-event", session.calendar_event_id],
+    queryFn: async () => {
+      if (!session.calendar_event_id) {
+        return null;
+      }
+      return await dbCommands.getEvent(session.calendar_event_id);
+    },
+    enabled: !!session.calendar_event_id,
+  });
+
   const participants = useQuery({
     queryKey: ["participants", session.id],
     queryFn: async () => {
@@ -55,73 +64,83 @@ export function NoteCard({
   const handleClick = (id: string) => {
     setOpen(false);
 
-    const props = {
-      to: "/app/note/$id",
-      params: { id },
-    } as const satisfies LinkProps;
-
-    const url = props.to.replace("$id", props.params.id);
-
-    safeNavigate({ type: "main" }, url);
+    const url = `/app/note/${id}`;
+    windowsCommands.windowShow({ type: "main" }).then(() => {
+      windowsCommands.windowEmitNavigate({ type: "main" }, url);
+    });
   };
 
   const getStartDate = () => {
-    return session.calendar_event_id
-      ? new Date(session.created_at)
-      : new Date();
+    if (session.record_start) {
+      return new Date(session.record_start);
+    }
+    return new Date(session.created_at);
   };
 
   const getEndDate = () => {
-    return session.calendar_event_id
-      ? new Date(session.created_at)
-      : new Date();
+    if (session.record_start && session.record_end) {
+      return new Date(session.record_end);
+    }
+    return getStartDate();
   };
 
+  const isRecordedSession = session.record_start && session.record_end;
+  const shouldShowRange = isRecordedSession;
+
   return (
     <Popover open={open} onOpenChange={setOpen}>
       <PopoverTrigger asChild>
-        <div className="flex items-start space-x-1 px-0.5 py-0.5 cursor-pointer rounded hover:bg-neutral-200 transition-colors h-5">
-          <div className="w-1 h-3 mt-0.5 rounded-full flex-shrink-0 bg-neutral-600"></div>
+        <div className="flex items-center space-x-1 px-0.5 py-0.5 cursor-pointer rounded hover:bg-neutral-200 transition-colors h-5">
+          {isRecordedSession
+            ? <FileText className="w-2.5 h-2.5 text-neutral-500 flex-shrink-0" />
+            : <File className="w-2.5 h-2.5 text-neutral-500 flex-shrink-0" />}
 
           <div className="flex-1 text-xs text-neutral-800 truncate">
-            {session.title || "Untitled"}
+            {linkedEvent.data?.name || session.title || "Untitled"}
           </div>
-
-          {showTime && (
-            <div className="text-xs text-neutral-500">
-              {format(getStartDate(), "h:mm a")} - {format(getEndDate(), "h:mm a")}
-            </div>
-          )}
         </div>
       </PopoverTrigger>
       <PopoverContent className="w-72 p-4 bg-white border-neutral-200 m-2 shadow-lg outline-none focus:outline-none focus:ring-0">
-        <div className="font-semibold text-lg mb-2 text-neutral-800">
-          {session.title || "Untitled"}
-        </div>
+        <h3 className="font-semibold text-lg mb-2">
+          {linkedEvent.data?.name || session.title || "Untitled"}
+        </h3>
 
         <p className="text-sm mb-2 text-neutral-600">
-          {format(getStartDate(), "MMM d, h:mm a")}
-          {" - "}
-          {format(getStartDate(), "yyyy-MM-dd")
-              !== format(getEndDate(), "yyyy-MM-dd")
-            ? format(getEndDate(), "MMM d, h:mm a")
-            : format(getEndDate(), "h:mm a")}
+          {shouldShowRange
+            ? (
+              <>
+                {format(getStartDate(), "MMM d, h:mm a")}
+                {" - "}
+                {format(getStartDate(), "yyyy-MM-dd")
+                    !== format(getEndDate(), "yyyy-MM-dd")
+                  ? format(getEndDate(), "MMM d, h:mm a")
+                  : format(getEndDate(), "h:mm a")}
+              </>
+            )
+            : (
+              <>
+                Created: {format(getStartDate(), "MMM d, h:mm a")}
+              </>
+            )}
         </p>
 
         {participantsPreview && participantsPreview.length > 0 && (
-          <div className="text-xs text-neutral-600 mb-4 truncate">
+          <div className="text-xs text-neutral-600 mb-4">
             {participantsPreview.join(", ")}
           </div>
         )}
 
-        <Button
-          className="w-full inline-flex gap-2"
-          size="md"
+        <div
+          className="flex items-center gap-2 px-2 py-1 bg-neutral-50 border border-neutral-200 rounded-md cursor-pointer hover:bg-neutral-100 transition-colors"
           onClick={() => handleClick(session.id)}
         >
-          <Pen className="size-4" />
-          <Trans>Open Note</Trans>
-        </Button>
+          {isRecordedSession
+            ? <FileText className="size-3 text-neutral-600 flex-shrink-0" />
+            : <File className="size-3 text-neutral-600 flex-shrink-0" />}
+          <div className="text-xs font-medium text-neutral-800 truncate">
+            {linkedEvent.data?.name || session.title || "Untitled"}
+          </div>
+        </div>
       </PopoverContent>
     </Popover>
   );
diff --git a/apps/desktop/src/locales/en/messages.po b/apps/desktop/src/locales/en/messages.po
index 20523a2348..6ca5479c0b 100644
--- a/apps/desktop/src/locales/en/messages.po
+++ b/apps/desktop/src/locales/en/messages.po
@@ -368,7 +368,7 @@ msgid "Apple"
 msgstr "Apple"
 
 #: src/components/toolbar/buttons/delete-note-button.tsx:43
-#: src/components/left-sidebar/notes-list.tsx:268
+#: src/components/left-sidebar/notes-list.tsx:266
 msgid "Are you sure you want to delete this note?"
 msgstr "Are you sure you want to delete this note?"
 
@@ -528,7 +528,7 @@ msgstr "Create agenda"
 msgid "Create new note"
 msgstr "Create new note"
 
-#: src/components/workspace-calendar/event-card.tsx:166
+#: src/components/workspace-calendar/event-card.tsx:144
 msgid "Create Note"
 msgstr "Create Note"
 
@@ -558,7 +558,7 @@ msgstr "Custom Vocabulary"
 
 #: src/components/settings/views/template.tsx:215
 #: src/components/settings/views/team.tsx:165
-#: src/components/left-sidebar/notes-list.tsx:335
+#: src/components/left-sidebar/notes-list.tsx:333
 msgid "Delete"
 msgstr "Delete"
 
@@ -724,7 +724,7 @@ msgstr "Help us improve Hyprnote by sharing anonymous usage data"
 msgid "Help us tailor your Hyprnote experience"
 msgstr "Help us tailor your Hyprnote experience"
 
-#: src/components/left-sidebar/events-list.tsx:305
+#: src/components/left-sidebar/events-list.tsx:302
 #~ msgid "Hide Event"
 #~ msgstr "Hide Event"
 
@@ -805,7 +805,6 @@ msgstr "Loading events..."
 msgid "Loading templates..."
 msgstr "Loading templates..."
 
-#: src/components/workspace-calendar/event-card.tsx:163
 #: src/components/settings/components/calendar/calendar-selector.tsx:95
 msgid "Loading..."
 msgstr "Loading..."
@@ -867,8 +866,8 @@ msgstr "My Templates"
 msgid "New note"
 msgstr "New note"
 
-#: src/components/left-sidebar/notes-list.tsx:312
-#: src/components/left-sidebar/events-list.tsx:181
+#: src/components/left-sidebar/notes-list.tsx:310
+#: src/components/left-sidebar/events-list.tsx:178
 msgid "New window"
 msgstr "New window"
 
@@ -912,7 +911,7 @@ msgstr "No Template (Default)"
 msgid "No templates yet"
 msgstr "No templates yet"
 
-#: src/components/left-sidebar/events-list.tsx:95
+#: src/components/left-sidebar/events-list.tsx:94
 msgid "No upcoming events"
 msgstr "No upcoming events"
 
@@ -941,23 +940,23 @@ msgstr "Official Templates"
 #~ msgstr "Ooh! Suggestion!"
 
 #: src/components/left-sidebar/top-area/calendar-button.tsx:26
-msgid "Open calendar view"
-msgstr "Open calendar view"
+#~ msgid "Open calendar view"
+#~ msgstr "Open calendar view"
 
 #: src/components/left-sidebar/top-area/finder-button.tsx:26
-#~ msgid "Open finder view"
-#~ msgstr "Open finder view"
+msgid "Open finder view"
+msgstr "Open finder view"
 
 #: src/components/toolbar/buttons/new-window-button.tsx:35
-#: src/components/left-sidebar/search-list.tsx:319
-#: src/components/left-sidebar/search-list.tsx:396
+#: src/components/left-sidebar/search-list.tsx:298
+#: src/components/left-sidebar/search-list.tsx:368
 msgid "Open in new window"
 msgstr "Open in new window"
 
 #: src/components/workspace-calendar/note-card.tsx:123
 #: src/components/workspace-calendar/event-card.tsx:153
-msgid "Open Note"
-msgstr "Open Note"
+#~ msgid "Open Note"
+#~ msgstr "Open Note"
 
 #: src/components/settings/views/integrations.tsx:255
 msgid "Optional base folder path within your Obsidian vault."
@@ -1206,7 +1205,7 @@ msgstr "This is a short description of your company."
 msgid "This is the name of the company you work for."
 msgstr "This is the name of the company you work for."
 
-#: src/components/toolbar/bars/calendar-toolbar.tsx:67
+#: src/components/finder/views/calendar-view.tsx:64
 msgid "Today"
 msgstr "Today"
 
@@ -1250,7 +1249,7 @@ msgstr "Untitled"
 msgid "Untitled Template"
 msgstr "Untitled Template"
 
-#: src/components/left-sidebar/events-list.tsx:62
+#: src/components/left-sidebar/events-list.tsx:61
 msgid "Upcoming"
 msgstr "Upcoming"
 
@@ -1282,11 +1281,11 @@ msgstr "username"
 msgid "Vault Name"
 msgstr "Vault Name"
 
-#: src/components/left-sidebar/notes-list.tsx:323
+#: src/components/left-sidebar/notes-list.tsx:321
 msgid "View calendar"
 msgstr "View calendar"
 
-#: src/components/left-sidebar/events-list.tsx:193
+#: src/components/left-sidebar/events-list.tsx:190
 #: src/components/editor-area/note-header/chips/event-chip.tsx:246
 msgid "View in calendar"
 msgstr "View in calendar"
diff --git a/apps/desktop/src/locales/ko/messages.po b/apps/desktop/src/locales/ko/messages.po
index 234668df1c..af8640fb57 100644
--- a/apps/desktop/src/locales/ko/messages.po
+++ b/apps/desktop/src/locales/ko/messages.po
@@ -368,7 +368,7 @@ msgid "Apple"
 msgstr ""
 
 #: src/components/toolbar/buttons/delete-note-button.tsx:43
-#: src/components/left-sidebar/notes-list.tsx:268
+#: src/components/left-sidebar/notes-list.tsx:266
 msgid "Are you sure you want to delete this note?"
 msgstr ""
 
@@ -528,7 +528,7 @@ msgstr ""
 msgid "Create new note"
 msgstr ""
 
-#: src/components/workspace-calendar/event-card.tsx:166
+#: src/components/workspace-calendar/event-card.tsx:144
 msgid "Create Note"
 msgstr ""
 
@@ -558,7 +558,7 @@ msgstr ""
 
 #: src/components/settings/views/template.tsx:215
 #: src/components/settings/views/team.tsx:165
-#: src/components/left-sidebar/notes-list.tsx:335
+#: src/components/left-sidebar/notes-list.tsx:333
 msgid "Delete"
 msgstr ""
 
@@ -724,7 +724,7 @@ msgstr ""
 msgid "Help us tailor your Hyprnote experience"
 msgstr ""
 
-#: src/components/left-sidebar/events-list.tsx:305
+#: src/components/left-sidebar/events-list.tsx:302
 #~ msgid "Hide Event"
 #~ msgstr ""
 
@@ -805,7 +805,6 @@ msgstr ""
 msgid "Loading templates..."
 msgstr ""
 
-#: src/components/workspace-calendar/event-card.tsx:163
 #: src/components/settings/components/calendar/calendar-selector.tsx:95
 msgid "Loading..."
 msgstr ""
@@ -867,8 +866,8 @@ msgstr ""
 msgid "New note"
 msgstr ""
 
-#: src/components/left-sidebar/notes-list.tsx:312
-#: src/components/left-sidebar/events-list.tsx:181
+#: src/components/left-sidebar/notes-list.tsx:310
+#: src/components/left-sidebar/events-list.tsx:178
 msgid "New window"
 msgstr ""
 
@@ -912,7 +911,7 @@ msgstr ""
 msgid "No templates yet"
 msgstr ""
 
-#: src/components/left-sidebar/events-list.tsx:95
+#: src/components/left-sidebar/events-list.tsx:94
 msgid "No upcoming events"
 msgstr ""
 
@@ -941,23 +940,23 @@ msgstr ""
 #~ msgstr ""
 
 #: src/components/left-sidebar/top-area/calendar-button.tsx:26
-msgid "Open calendar view"
-msgstr ""
+#~ msgid "Open calendar view"
+#~ msgstr ""
 
 #: src/components/left-sidebar/top-area/finder-button.tsx:26
-#~ msgid "Open finder view"
-#~ msgstr ""
+msgid "Open finder view"
+msgstr ""
 
 #: src/components/toolbar/buttons/new-window-button.tsx:35
-#: src/components/left-sidebar/search-list.tsx:319
-#: src/components/left-sidebar/search-list.tsx:396
+#: src/components/left-sidebar/search-list.tsx:298
+#: src/components/left-sidebar/search-list.tsx:368
 msgid "Open in new window"
 msgstr ""
 
 #: src/components/workspace-calendar/note-card.tsx:123
 #: src/components/workspace-calendar/event-card.tsx:153
-msgid "Open Note"
-msgstr ""
+#~ msgid "Open Note"
+#~ msgstr ""
 
 #: src/components/settings/views/integrations.tsx:255
 msgid "Optional base folder path within your Obsidian vault."
@@ -1206,7 +1205,7 @@ msgstr ""
 msgid "This is the name of the company you work for."
 msgstr ""
 
-#: src/components/toolbar/bars/calendar-toolbar.tsx:67
+#: src/components/finder/views/calendar-view.tsx:64
 msgid "Today"
 msgstr ""
 
@@ -1250,7 +1249,7 @@ msgstr ""
 msgid "Untitled Template"
 msgstr ""
 
-#: src/components/left-sidebar/events-list.tsx:62
+#: src/components/left-sidebar/events-list.tsx:61
 msgid "Upcoming"
 msgstr ""
 
@@ -1282,11 +1281,11 @@ msgstr ""
 msgid "Vault Name"
 msgstr ""
 
-#: src/components/left-sidebar/notes-list.tsx:323
+#: src/components/left-sidebar/notes-list.tsx:321
 msgid "View calendar"
 msgstr ""
 
-#: src/components/left-sidebar/events-list.tsx:193
+#: src/components/left-sidebar/events-list.tsx:190
 #: src/components/editor-area/note-header/chips/event-chip.tsx:246
 msgid "View in calendar"
 msgstr ""
diff --git a/apps/desktop/src/routeTree.gen.ts b/apps/desktop/src/routeTree.gen.ts
index ee1e7a603e..2389b77444 100644
--- a/apps/desktop/src/routeTree.gen.ts
+++ b/apps/desktop/src/routeTree.gen.ts
@@ -15,8 +15,8 @@ import { Route as AppIndexRouteImport } from './routes/app.index'
 import { Route as AppSettingsRouteImport } from './routes/app.settings'
 import { Route as AppPlansRouteImport } from './routes/app.plans'
 import { Route as AppNewRouteImport } from './routes/app.new'
+import { Route as AppFinderRouteImport } from './routes/app.finder'
 import { Route as AppControlRouteImport } from './routes/app.control'
-import { Route as AppCalendarRouteImport } from './routes/app.calendar'
 import { Route as AppOrganizationIdRouteImport } from './routes/app.organization.$id'
 import { Route as AppNoteIdRouteImport } from './routes/app.note.$id'
 import { Route as AppHumanIdRouteImport } from './routes/app.human.$id'
@@ -52,16 +52,16 @@ const AppNewRoute = AppNewRouteImport.update({
   path: '/new',
   getParentRoute: () => AppRoute,
 } as any)
+const AppFinderRoute = AppFinderRouteImport.update({
+  id: '/finder',
+  path: '/finder',
+  getParentRoute: () => AppRoute,
+} as any)
 const AppControlRoute = AppControlRouteImport.update({
   id: '/control',
   path: '/control',
   getParentRoute: () => AppRoute,
 } as any)
-const AppCalendarRoute = AppCalendarRouteImport.update({
-  id: '/calendar',
-  path: '/calendar',
-  getParentRoute: () => AppRoute,
-} as any)
 const AppOrganizationIdRoute = AppOrganizationIdRouteImport.update({
   id: '/organization/$id',
   path: '/organization/$id',
@@ -86,8 +86,8 @@ const AppNoteEventIdRoute = AppNoteEventIdRouteImport.update({
 export interface FileRoutesByFullPath {
   '/app': typeof AppRouteWithChildren
   '/video': typeof VideoRoute
-  '/app/calendar': typeof AppCalendarRoute
   '/app/control': typeof AppControlRoute
+  '/app/finder': typeof AppFinderRoute
   '/app/new': typeof AppNewRoute
   '/app/plans': typeof AppPlansRoute
   '/app/settings': typeof AppSettingsRoute
@@ -99,8 +99,8 @@ export interface FileRoutesByFullPath {
 }
 export interface FileRoutesByTo {
   '/video': typeof VideoRoute
-  '/app/calendar': typeof AppCalendarRoute
   '/app/control': typeof AppControlRoute
+  '/app/finder': typeof AppFinderRoute
   '/app/new': typeof AppNewRoute
   '/app/plans': typeof AppPlansRoute
   '/app/settings': typeof AppSettingsRoute
@@ -114,8 +114,8 @@ export interface FileRoutesById {
   __root__: typeof rootRouteImport
   '/app': typeof AppRouteWithChildren
   '/video': typeof VideoRoute
-  '/app/calendar': typeof AppCalendarRoute
   '/app/control': typeof AppControlRoute
+  '/app/finder': typeof AppFinderRoute
   '/app/new': typeof AppNewRoute
   '/app/plans': typeof AppPlansRoute
   '/app/settings': typeof AppSettingsRoute
@@ -130,8 +130,8 @@ export interface FileRouteTypes {
   fullPaths:
     | '/app'
     | '/video'
-    | '/app/calendar'
     | '/app/control'
+    | '/app/finder'
     | '/app/new'
     | '/app/plans'
     | '/app/settings'
@@ -143,8 +143,8 @@ export interface FileRouteTypes {
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/video'
-    | '/app/calendar'
     | '/app/control'
+    | '/app/finder'
     | '/app/new'
     | '/app/plans'
     | '/app/settings'
@@ -157,8 +157,8 @@ export interface FileRouteTypes {
     | '__root__'
     | '/app'
     | '/video'
-    | '/app/calendar'
     | '/app/control'
+    | '/app/finder'
     | '/app/new'
     | '/app/plans'
     | '/app/settings'
@@ -218,6 +218,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AppNewRouteImport
       parentRoute: typeof AppRoute
     }
+    '/app/finder': {
+      id: '/app/finder'
+      path: '/finder'
+      fullPath: '/app/finder'
+      preLoaderRoute: typeof AppFinderRouteImport
+      parentRoute: typeof AppRoute
+    }
     '/app/control': {
       id: '/app/control'
       path: '/control'
@@ -225,13 +232,6 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AppControlRouteImport
       parentRoute: typeof AppRoute
     }
-    '/app/calendar': {
-      id: '/app/calendar'
-      path: '/calendar'
-      fullPath: '/app/calendar'
-      preLoaderRoute: typeof AppCalendarRouteImport
-      parentRoute: typeof AppRoute
-    }
     '/app/organization/$id': {
       id: '/app/organization/$id'
       path: '/organization/$id'
@@ -264,8 +264,8 @@ declare module '@tanstack/react-router' {
 }
 
 interface AppRouteChildren {
-  AppCalendarRoute: typeof AppCalendarRoute
   AppControlRoute: typeof AppControlRoute
+  AppFinderRoute: typeof AppFinderRoute
   AppNewRoute: typeof AppNewRoute
   AppPlansRoute: typeof AppPlansRoute
   AppSettingsRoute: typeof AppSettingsRoute
@@ -277,8 +277,8 @@ interface AppRouteChildren {
 }
 
 const AppRouteChildren: AppRouteChildren = {
-  AppCalendarRoute: AppCalendarRoute,
   AppControlRoute: AppControlRoute,
+  AppFinderRoute: AppFinderRoute,
   AppNewRoute: AppNewRoute,
   AppPlansRoute: AppPlansRoute,
   AppSettingsRoute: AppSettingsRoute,
diff --git a/apps/desktop/src/routes/app.calendar.tsx b/apps/desktop/src/routes/app.calendar.tsx
deleted file mode 100644
index 6c5897a999..0000000000
--- a/apps/desktop/src/routes/app.calendar.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { createFileRoute } from "@tanstack/react-router";
-import { zodValidator } from "@tanstack/zod-adapter";
-import { endOfMonth, startOfMonth } from "date-fns";
-import { z } from "zod";
-
-import WorkspaceCalendar from "@/components/workspace-calendar";
-import { commands as dbCommands } from "@hypr/plugin-db";
-
-const schema = z.object({
-  date: z.string().optional(),
-  sessionId: z.string().optional(),
-});
-
-export const Route = createFileRoute("/app/calendar")({
-  component: Component,
-  validateSearch: zodValidator(schema),
-  loaderDeps: ({ search }) => ({ search }),
-  loader: async ({ context: { queryClient, userId }, deps: { search } }) => {
-    const eventPromise = search.sessionId
-      ? queryClient.fetchQuery({
-        queryKey: ["event-session", search.sessionId],
-        queryFn: () => dbCommands.sessionGetEvent(search.sessionId!),
-      })
-      : Promise.resolve(null);
-
-    const event = await eventPromise;
-
-    const date = event?.start_date
-      ? new Date(event.start_date)
-      : search.date
-      ? new Date(search.date)
-      : new Date();
-
-    const [start, end] = [startOfMonth(date), endOfMonth(date)].map((v) => v.toISOString());
-
-    const sessionsPromise = queryClient.fetchQuery({
-      queryKey: ["sessions", start, end],
-      queryFn: () =>
-        dbCommands.listSessions({
-          type: "dateRange",
-          user_id: userId,
-          start,
-          end,
-          limit: 100,
-        }),
-    });
-
-    const eventsPromise = queryClient.fetchQuery({
-      queryKey: ["events", start, end],
-      queryFn: () =>
-        dbCommands.listEvents({
-          type: "dateRange",
-          user_id: userId,
-          start,
-          end,
-          limit: 100,
-        }),
-    });
-
-    const [sessions, events] = await Promise.all([sessionsPromise, eventsPromise]);
-    return { sessions, events, date };
-  },
-});
-
-function Component() {
-  const { sessions, events, date } = Route.useLoaderData();
-
-  return <WorkspaceCalendar month={date} sessions={sessions} events={events} />;
-}
diff --git a/apps/desktop/src/routes/app.finder.tsx b/apps/desktop/src/routes/app.finder.tsx
new file mode 100644
index 0000000000..a209fac416
--- /dev/null
+++ b/apps/desktop/src/routes/app.finder.tsx
@@ -0,0 +1,234 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { zodValidator } from "@tanstack/zod-adapter";
+import { endOfMonth, startOfMonth } from "date-fns";
+import { z } from "zod";
+
+import { ViewSelector } from "@/components/finder/view-selector";
+import { CalendarView, ContactView, FolderView, TableView } from "@/components/finder/views";
+import { commands as dbCommands } from "@hypr/plugin-db";
+import { cn } from "@hypr/ui/lib/utils";
+
+const schema = z.object({
+  view: z.enum(["folder", "calendar", "table", "contact"]).default("calendar"),
+  date: z.string().optional(),
+  sessionId: z.string().optional(),
+  personId: z.string().optional(),
+  orgId: z.string().optional(),
+});
+
+export const Route = createFileRoute("/app/finder")({
+  component: FinderView,
+  validateSearch: zodValidator(schema),
+  loaderDeps: ({ search }) => ({ search }),
+  loader: async ({ context: { queryClient, userId }, deps: { search } }) => {
+    const currentDate = search.date ? new Date(search.date) : new Date();
+
+    const baseData = {
+      view: search.view,
+      date: currentDate,
+    };
+
+    if (search.view === "calendar") {
+      const eventPromise = search.sessionId
+        ? queryClient.fetchQuery({
+          queryKey: ["event-session", search.sessionId],
+          queryFn: () => dbCommands.sessionGetEvent(search.sessionId!),
+        })
+        : Promise.resolve(null);
+
+      const event = await eventPromise;
+
+      const date = event?.start_date
+        ? new Date(event.start_date)
+        : search.date
+        ? new Date(search.date)
+        : new Date();
+
+      const [start, end] = [startOfMonth(date), endOfMonth(date)].map((v) => v.toISOString());
+
+      const sessionsPromise = queryClient.fetchQuery({
+        queryKey: ["sessions", start, end],
+        queryFn: () =>
+          dbCommands.listSessions({
+            type: "dateRange",
+            user_id: userId,
+            start,
+            end,
+            limit: 100,
+          }),
+      });
+
+      const eventsPromise = queryClient.fetchQuery({
+        queryKey: ["calendar-events", start, end],
+        queryFn: () =>
+          dbCommands.listEvents({
+            type: "dateRange",
+            user_id: userId,
+            start,
+            end,
+            limit: 100,
+          }),
+      });
+
+      const [sessions, rawEvents] = await Promise.all([
+        sessionsPromise,
+        eventsPromise,
+      ]);
+
+      // Deduplicate events by tracking_id to handle any sync issues
+      // Keep the most recent event (by database id) for each tracking_id
+      const eventsByTrackingId = new Map<string, typeof rawEvents[0]>();
+      rawEvents.forEach(event => {
+        const existing = eventsByTrackingId.get(event.tracking_id);
+        if (!existing || event.id > existing.id) {
+          eventsByTrackingId.set(event.tracking_id, event);
+        }
+      });
+      const events = Array.from(eventsByTrackingId.values());
+
+      return {
+        ...baseData,
+        date,
+        sessions,
+        events,
+      };
+    }
+
+    if (search.view === "table") {
+      const currentDate = search.date ? new Date(search.date) : new Date();
+      const [start, end] = [startOfMonth(currentDate), endOfMonth(currentDate)].map((v) => v.toISOString());
+
+      const sessionsPromise = queryClient.fetchQuery({
+        queryKey: ["sessions-table", start, end],
+        queryFn: () =>
+          dbCommands.listSessions({
+            type: "dateRange",
+            user_id: userId,
+            start,
+            end,
+            limit: 100,
+          }),
+      });
+
+      const eventsPromise = queryClient.fetchQuery({
+        queryKey: ["events-table", start, end],
+        queryFn: () =>
+          dbCommands.listEvents({
+            type: "dateRange",
+            user_id: userId,
+            start,
+            end,
+            limit: 100,
+          }),
+      });
+
+      const [sessions, rawEvents] = await Promise.all([
+        sessionsPromise,
+        eventsPromise,
+      ]);
+
+      // Deduplicate events by tracking_id to handle any sync issues
+      // Keep the most recent event (by database id) for each tracking_id
+      const eventsByTrackingId = new Map<string, typeof rawEvents[0]>();
+      rawEvents.forEach(event => {
+        const existing = eventsByTrackingId.get(event.tracking_id);
+        if (!existing || event.id > existing.id) {
+          eventsByTrackingId.set(event.tracking_id, event);
+        }
+      });
+      const events = Array.from(eventsByTrackingId.values());
+
+      return {
+        ...baseData,
+        sessions,
+        events,
+      };
+    }
+
+    if (search.view === "folder") {
+      return baseData;
+    }
+
+    if (search.view === "contact") {
+      return baseData;
+    }
+
+    return baseData;
+  },
+});
+
+export type ViewType = "folder" | "calendar" | "table" | "contact";
+
+interface LoaderData {
+  view: ViewType;
+  date: Date;
+  sessions?: any[];
+  events?: any[];
+}
+
+function FinderView() {
+  const { view, date, sessions, events } = Route.useLoaderData() as LoaderData;
+  const navigate = Route.useNavigate();
+  const { userId } = Route.useRouteContext();
+  const searchParams = Route.useSearch();
+
+  const handleViewChange = (newView: ViewType) => {
+    navigate({
+      search: (prev) => ({
+        ...prev,
+        view: newView,
+      }),
+      replace: true,
+    });
+  };
+
+  const handleNavigate = (params: { date: string }) => {
+    navigate({
+      search: (prev) => ({
+        ...prev,
+        ...params,
+      }),
+      replace: true,
+    });
+  };
+
+  return (
+    <div className="flex flex-col h-full">
+      <div className="border-b border-neutral-200 px-4 py-1 flex items-center justify-center" data-tauri-drag-region>
+        <ViewSelector currentView={view} onViewChange={handleViewChange} />
+      </div>
+
+      <div className={cn("flex-1 overflow-hidden", view !== "calendar" && view !== "contact" && "p-4")}>
+        {view === "folder" && (
+          <FolderView
+            date={date}
+            onNavigate={handleNavigate}
+          />
+        )}
+        {view === "calendar" && sessions && events && (
+          <CalendarView
+            date={date}
+            sessions={sessions}
+            events={events}
+            onNavigate={handleNavigate}
+          />
+        )}
+        {view === "table" && sessions && events && (
+          <TableView
+            date={date}
+            sessions={sessions}
+            events={events}
+            onNavigate={handleNavigate}
+          />
+        )}
+        {view === "contact" && (
+          <ContactView
+            userId={userId}
+            initialPersonId={searchParams.personId}
+            initialOrgId={searchParams.orgId}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 177f16dea6..bd29bb6c60 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -1,6 +1,5 @@
 export * from "./ai";
 export * from "./datetime";
 export * from "./fetch";
-export * from "./navigation";
 export * from "./organization";
 export * from "./string";
diff --git a/packages/utils/src/navigation.ts b/packages/utils/src/navigation.ts
deleted file mode 100644
index cc871ffd74..0000000000
--- a/packages/utils/src/navigation.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { commands as windowsCommands } from "@hypr/plugin-windows";
-import type { HyprWindow } from "@hypr/plugin-windows";
-
-/**
- * Safely navigate to a URL in a specific window type
- * This ensures the window is visible before attempting navigation
- * to prevent potential crashes in the URL scheme handler
- */
-export const safeNavigate = async (
-  window: HyprWindow,
-  url: string,
-  maxAttempts = 50,
-): Promise<void> => {
-  // First ensure the window is shown
-  await windowsCommands.windowShow(window);
-
-  // Then check visibility before navigating
-  let attempts = 0;
-
-  const checkAndNavigate = async (): Promise<void> => {
-    try {
-      const isVisible = await windowsCommands.windowIsVisible(window);
-
-      if (isVisible) {
-        await windowsCommands.windowEmitNavigate(window, url);
-        return;
-      } else if (attempts < maxAttempts) {
-        attempts++;
-        // If not visible yet, check again after a short delay
-        setTimeout(checkAndNavigate, 100);
-      } else {
-        console.error("Max attempts reached waiting for window visibility");
-      }
-    } catch (err) {
-      console.error("Error during safe navigation:", err);
-    }
-  };
-
-  // Start checking after a short initial delay
-  setTimeout(checkAndNavigate, 200);
-};
diff --git a/plugins/apple-calendar/src/sync.rs b/plugins/apple-calendar/src/sync.rs
index 9f7499e2be..79f79e909f 100644
--- a/plugins/apple-calendar/src/sync.rs
+++ b/plugins/apple-calendar/src/sync.rs
@@ -124,6 +124,9 @@ async fn _sync_events(
 ) -> Result<EventSyncState, crate::Error> {
     let mut state = EventSyncState::default();
 
+    // Track system events that have been handled to prevent duplicates
+    let mut handled_system_event_ids = std::collections::HashSet::<String>::new();
+
     // Collect all system events for rescheduled event detection
     let all_system_events: Vec<&hypr_calendar_interface::Event> =
         system_events_per_selected_calendar
@@ -158,6 +161,9 @@ async fn _sync_events(
                         google_event_url: db_event.google_event_url.clone(),
                     };
                     state.to_update.push(updated_event);
+
+                    // Mark this system event as handled
+                    handled_system_event_ids.insert(matching_event.id.clone());
                     continue;
                 }
 
@@ -179,6 +185,9 @@ async fn _sync_events(
                         google_event_url: db_event.google_event_url.clone(),
                     };
                     state.to_update.push(updated_event);
+
+                    // Mark this rescheduled system event as handled to prevent duplicate creation
+                    handled_system_event_ids.insert(rescheduled_event.id.clone());
                     continue;
                 }
 
diff --git a/plugins/windows/js/bindings.gen.ts b/plugins/windows/js/bindings.gen.ts
index da93ff0acc..9373783a0f 100644
--- a/plugins/windows/js/bindings.gen.ts
+++ b/plugins/windows/js/bindings.gen.ts
@@ -70,7 +70,7 @@ windowDestroyed: "plugin:windows:window-destroyed"
 
 /** user-defined types **/
 
-export type HyprWindow = { type: "main" } | { type: "note"; value: string } | { type: "human"; value: string } | { type: "organization"; value: string } | { type: "calendar" } | { type: "settings" } | { type: "video"; value: string } | { type: "plans" } | { type: "control" }
+export type HyprWindow = { type: "main" } | { type: "note"; value: string } | { type: "human"; value: string } | { type: "organization"; value: string } | { type: "finder" } | { type: "settings" } | { type: "video"; value: string } | { type: "plans" } | { type: "control" }
 export type KnownPosition = "left-half" | "right-half" | "center"
 export type MainWindowState = { left_sidebar_expanded: boolean | null; right_panel_expanded: boolean | null }
 export type Navigate = { path: string }
diff --git a/plugins/windows/src/ext.rs b/plugins/windows/src/ext.rs
index 126c9969da..14532fae2a 100644
--- a/plugins/windows/src/ext.rs
+++ b/plugins/windows/src/ext.rs
@@ -18,8 +18,8 @@ pub enum HyprWindow {
     Human(String),
     #[serde(rename = "organization")]
     Organization(String),
-    #[serde(rename = "calendar")]
-    Calendar,
+    #[serde(rename = "finder")]
+    Finder,
     #[serde(rename = "settings")]
     Settings,
     #[serde(rename = "video")]
@@ -37,7 +37,7 @@ impl std::fmt::Display for HyprWindow {
             Self::Note(id) => write!(f, "note-{}", id),
             Self::Human(id) => write!(f, "human-{}", id),
             Self::Organization(id) => write!(f, "organization-{}", id),
-            Self::Calendar => write!(f, "calendar"),
+            Self::Finder => write!(f, "finder"),
             Self::Settings => write!(f, "settings"),
             Self::Video(id) => write!(f, "video-{}", id),
             Self::Plans => write!(f, "plans"),
@@ -52,7 +52,7 @@ impl std::str::FromStr for HyprWindow {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "main" => return Ok(Self::Main),
-            "calendar" => return Ok(Self::Calendar),
+            "finder" => return Ok(Self::Finder),
             "settings" => return Ok(Self::Settings),
             _ => {}
         }
@@ -143,7 +143,7 @@ impl HyprWindow {
             Self::Note(_) => "Note".into(),
             Self::Human(_) => "Human".into(),
             Self::Organization(_) => "Organization".into(),
-            Self::Calendar => "Calendar".into(),
+            Self::Finder => "Finder".into(),
             Self::Settings => "Settings".into(),
             Self::Video(_) => "Video".into(),
             Self::Plans => "Plans".into(),
@@ -316,10 +316,10 @@ impl HyprWindow {
                 .min_inner_size(480.0, 360.0)
                 .center()
                 .build()?,
-            Self::Calendar => self
-                .window_builder(app, "/app/calendar")
-                .inner_size(640.0, 532.0)
-                .min_inner_size(640.0, 532.0)
+            Self::Finder => self
+                .window_builder(app, "/app/finder")
+                .inner_size(900.0, 650.0)
+                .min_inner_size(800.0, 600.0)
                 .build()?,
             Self::Settings => self
                 .window_builder(app, "/app/settings")