diff --git a/.github/workflows/pr-target-check.yml b/.github/workflows/pr-target-check.yml
new file mode 100644
index 0000000..87fa547
--- /dev/null
+++ b/.github/workflows/pr-target-check.yml
@@ -0,0 +1,37 @@
+name: PR Target Check
+on:
+  pull_request_target:
+    branches:
+      - main
+jobs:
+  warn-wrong-target:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - name: Comment and close PR targeting main
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: `👋 Hey @${context.payload.pull_request.user.login}! Thanks for your contribution.
+
+It looks like this PR targets the \`main\` branch. We only accept PRs targeting the \`dev\` branch — please reopen your PR against \`dev\` instead.
+
+Steps to fix:
+1. Close this PR
+2. Change the base branch to \`dev\`
+3. Reopen the PR
+
+Thanks! 🚀`
+            });
+            await github.rest.pulls.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+              state: 'closed'
+            });
+
diff --git a/app/marketplace/page.tsx b/app/marketplace/page.tsx
index 8c9cf14..c727b8d 100644
--- a/app/marketplace/page.tsx
+++ b/app/marketplace/page.tsx
@@ -1,11 +1,13 @@
 "use client";
 
-import { useRef, useCallback, useMemo } from "react";
-import { useInfiniteQuery } from "@tanstack/react-query";
+import { useCallback, useMemo, useRef, useState } from "react";
+import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
 import { fetchInvoices, type Invoice } from "@/lib/api";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
+import { MarketplaceFilterBar } from "@/components/marketplace";
+import { Loader2 } from "lucide-react";
 
 function InvoiceRow({ invoice }: { invoice: Invoice }) {
   return (
@@ -80,12 +82,14 @@ export default function MarketplacePage() {
     hasNextPage,
     isFetchingNextPage,
     isLoading,
+    isFetching,
   } = useInfiniteQuery({
     queryKey: ["invoices"],
     queryFn: ({ pageParam }) => fetchInvoices(pageParam as string | undefined),
     initialPageParam: undefined as string | undefined,
     getNextPageParam: (lastPage) =>
       lastPage.has_more ? lastPage.next_cursor ?? undefined : undefined,
+    staleTime: 60 * 1000,
   });
 
   const sentinelRef = useRef<HTMLDivElement>(null);
@@ -115,11 +119,38 @@ export default function MarketplacePage() {
     [observer]
   );
 
-  const invoices = useMemo(
+  const allInvoices = useMemo(
     () => data?.pages.flatMap((p) => p.invoices) ?? [],
     [data]
   );
 
+  const [status, setStatus] = useState<"open" | "funded" | "settled" | "all">("all");
+  const [search, setSearch] = useState("");
+  const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const [debouncedSearch, setDebouncedSearch] = useState("");
+
+  const handleSearchChange = useCallback((value: string) => {
+    setSearch(value);
+    if (debounceRef.current) clearTimeout(debounceRef.current);
+    debounceRef.current = setTimeout(() => setDebouncedSearch(value), 300);
+  }, []);
+
+  const handleClear = useCallback(() => {
+    setStatus("all");
+    setSearch("");
+    setDebouncedSearch("");
+  }, []);
+
+  const filtered = useMemo(() => {
+    return allInvoices.filter((inv) => {
+      const matchesStatus = status === "all" || inv.status === status;
+      const matchesSearch =
+        debouncedSearch === "" ||
+        inv.title.toLowerCase().includes(debouncedSearch.toLowerCase());
+      return matchesStatus && matchesSearch;
+    });
+  }, [allInvoices, status, debouncedSearch]);
+
   if (isLoading) {
     return (
       <main className="container mx-auto px-4 py-8">
@@ -136,16 +167,38 @@ export default function MarketplacePage() {
   return (
     <main className="container mx-auto px-4 py-8">
       <h1 className="text-2xl font-bold mb-6">Invoice Marketplace</h1>
-      <div className="space-y-4">
-        {invoices.map((invoice) => (
-          <InvoiceRow key={invoice.id} invoice={invoice} />
-        ))}
+
+      <MarketplaceFilterBar
+        status={status}
+        search={search}
+        onStatusChange={setStatus}
+        onSearchChange={handleSearchChange}
+        onClear={handleClear}
+      />
+
+      {isFetching && !isLoading && (
+        <div className="flex items-center gap-2 text-sm text-muted-foreground my-4">
+          <Loader2 className="size-3 animate-spin" />
+          Refreshing…
+        </div>
+      )}
+
+      <div className="space-y-4 mt-4">
+        {filtered.length === 0 ? (
+          <p className="py-12 text-center text-muted-foreground">
+            No invoices match your filters.
+          </p>
+        ) : (
+          filtered.map((invoice) => (
+            <InvoiceRow key={invoice.id} invoice={invoice} />
+          ))
+        )}
         {isFetchingNextPage &&
           Array.from({ length: 3 }).map((_, i) => (
             <SkeletonRow key={`skeleton-${i}`} />
           ))}
         {hasNextPage && <div ref={sentinelRefCallback} className="h-4" />}
-        {!hasNextPage && invoices.length > 0 && (
+        {!hasNextPage && filtered.length > 0 && (
           <p className="text-center text-sm text-muted-foreground py-4">
             No more invoices
           </p>
diff --git a/components/invoices/InvoiceDetail.tsx b/components/invoices/InvoiceDetail.tsx
index 8968ffb..1c2c144 100644
--- a/components/invoices/InvoiceDetail.tsx
+++ b/components/invoices/InvoiceDetail.tsx
@@ -6,6 +6,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Separator } from "@/components/ui/separator";
+import { CountdownTimer, isExpired } from "@/components/marketplace";
 
 function InvoiceDetailSkeleton() {
   return (
@@ -96,6 +97,8 @@ export function InvoiceDetail({ invoiceId }: InvoiceDetailProps) {
   }
 
   const progress = Math.min((invoice.raised / invoice.amount) * 100, 100);
+  const published = invoice.status === "open";
+  const expired = isExpired(invoice.due_date);
 
   return (
     <div className="space-y-6">
@@ -108,6 +111,7 @@ export function InvoiceDetail({ invoiceId }: InvoiceDetailProps) {
             </Badge>
           </div>
           <p className="text-sm text-muted-foreground">Seller: {invoice.seller}</p>
+          <CountdownTimer deadline={invoice.due_date} published={published} />
         </CardHeader>
       </Card>
 
diff --git a/components/marketplace/countdown-timer.tsx b/components/marketplace/countdown-timer.tsx
new file mode 100644
index 0000000..62fd90e
--- /dev/null
+++ b/components/marketplace/countdown-timer.tsx
@@ -0,0 +1,53 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { differenceInSeconds } from "date-fns";
+import { Badge } from "@/components/ui/badge";
+
+interface CountdownTimerProps {
+  deadline: string | null;
+  published: boolean;
+}
+
+function formatCountdown(totalSeconds: number): string {
+  const days = Math.floor(totalSeconds / 86400);
+  const hours = Math.floor((totalSeconds % 86400) / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+
+  return `${String(days).padStart(2, "0")}:${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
+}
+
+export function CountdownTimer({ deadline, published }: CountdownTimerProps) {
+  const [now, setNow] = useState(() => Date.now());
+
+  useEffect(() => {
+    if (!deadline || !published) return;
+
+    const id = setInterval(() => setNow(Date.now()), 60_000);
+    return () => clearInterval(id);
+  }, [deadline, published]);
+
+  if (!published || !deadline) return null;
+
+  const deadlineMs = new Date(deadline).getTime();
+  const remaining = differenceInSeconds(deadlineMs, now);
+
+  if (remaining <= 0) {
+    return (
+      <Badge variant="destructive" className="text-xs">
+        Expired
+      </Badge>
+    );
+  }
+
+  return (
+    <span className="font-mono text-sm tabular-nums text-muted-foreground">
+      {formatCountdown(remaining)}
+    </span>
+  );
+}
+
+export function isExpired(deadline: string | null): boolean {
+  if (!deadline) return false;
+  return new Date(deadline).getTime() <= Date.now();
+}
diff --git a/components/marketplace/filter-bar.tsx b/components/marketplace/filter-bar.tsx
new file mode 100644
index 0000000..5cba1c8
--- /dev/null
+++ b/components/marketplace/filter-bar.tsx
@@ -0,0 +1,68 @@
+"use client";
+
+import { Search, X } from "lucide-react";
+import { Input } from "@/components/ui/input";
+import { Button } from "@/components/ui/button";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+
+type InvoiceStatus = "open" | "funded" | "settled";
+
+interface MarketplaceFilterBarProps {
+  status: InvoiceStatus | "all";
+  search: string;
+  onStatusChange: (value: InvoiceStatus | "all") => void;
+  onSearchChange: (value: string) => void;
+  onClear: () => void;
+}
+
+export function MarketplaceFilterBar({
+  status,
+  search,
+  onStatusChange,
+  onSearchChange,
+  onClear,
+}: MarketplaceFilterBarProps) {
+  const hasFilters = status !== "all" || search.length > 0;
+
+  return (
+    <div className="flex flex-col gap-3 sm:flex-row sm:items-center">
+      <Select
+        value={status}
+        onValueChange={(v) => onStatusChange(v as InvoiceStatus | "all")}
+      >
+        <SelectTrigger className="w-full sm:w-[160px]">
+          <SelectValue placeholder="All statuses" />
+        </SelectTrigger>
+        <SelectContent>
+          <SelectItem value="all">All</SelectItem>
+          <SelectItem value="open">Open</SelectItem>
+          <SelectItem value="funded">Funded</SelectItem>
+          <SelectItem value="settled">Settled</SelectItem>
+        </SelectContent>
+      </Select>
+
+      <div className="relative flex-1">
+        <Search className="absolute left-3 top-1/2 size-4 -translate-y-1/2 text-muted-foreground" />
+        <Input
+          placeholder="Search by title…"
+          value={search}
+          onChange={(e) => onSearchChange(e.target.value)}
+          className="pl-9"
+        />
+      </div>
+
+      {hasFilters && (
+        <Button variant="ghost" size="sm" onClick={onClear}>
+          <X className="size-4" />
+          Clear filters
+        </Button>
+      )}
+    </div>
+  );
+}
diff --git a/components/marketplace/index.ts b/components/marketplace/index.ts
index cb0ff5c..eda6b4b 100644
--- a/components/marketplace/index.ts
+++ b/components/marketplace/index.ts
@@ -1 +1,3 @@
-export {};
+export { MarketplaceFilterBar } from "./filter-bar";
+export { InvoiceCard } from "./invoice-card";
+export { CountdownTimer, isExpired } from "./countdown-timer";
diff --git a/components/marketplace/invoice-card.tsx b/components/marketplace/invoice-card.tsx
new file mode 100644
index 0000000..b2850e8
--- /dev/null
+++ b/components/marketplace/invoice-card.tsx
@@ -0,0 +1,53 @@
+import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { CountdownTimer, isExpired } from "./countdown-timer";
+import type { Invoice } from "@/lib/api";
+
+const statusVariant: Record<string, "default" | "secondary" | "outline" | "destructive"> = {
+  open: "default",
+  funded: "secondary",
+  settled: "outline",
+};
+
+interface InvoiceCardProps {
+  invoice: Invoice;
+  onInvest?: (invoiceId: string) => void;
+}
+
+export function InvoiceCard({ invoice, onInvest }: InvoiceCardProps) {
+  const published = invoice.status === "open";
+  const expired = isExpired(invoice.due_date);
+
+  return (
+    <Card className="flex flex-col">
+      <CardHeader className="pb-3">
+        <div className="flex items-start justify-between gap-2">
+          <CardTitle className="line-clamp-1 text-base">
+            {invoice.title}
+          </CardTitle>
+          <Badge variant={statusVariant[invoice.status]}>
+            {invoice.status}
+          </Badge>
+        </div>
+      </CardHeader>
+
+      <CardContent className="flex flex-1 flex-col gap-3">
+        <div className="flex items-center justify-between">
+          <span className="text-lg font-semibold">
+            {invoice.amount.toLocaleString()} XLM
+          </span>
+          <CountdownTimer deadline={invoice.due_date} published={published} />
+        </div>
+
+        <Button
+          className="mt-auto w-full"
+          disabled={!published || expired}
+          onClick={() => onInvest?.(invoice.id)}
+        >
+          {expired ? "Expired" : "Invest"}
+        </Button>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/components/providers.tsx b/components/providers.tsx
index 3ddbe84..7709e76 100644
--- a/components/providers.tsx
+++ b/components/providers.tsx
@@ -2,6 +2,7 @@
 
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useState } from "react";
+import { Toaster } from "@/components/ui/sonner";
 
 export function Providers({ children }: { children: React.ReactNode }) {
   const [queryClient] = useState(
@@ -13,5 +14,10 @@ export function Providers({ children }: { children: React.ReactNode }) {
       })
   );
 
-  return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;
+  return (
+    <QueryClientProvider client={queryClient}>
+      {children}
+      <Toaster position="top-right" />
+    </QueryClientProvider>
+  );
 }
diff --git a/components/ui/select.tsx b/components/ui/select.tsx
new file mode 100644
index 0000000..c0dc712
--- /dev/null
+++ b/components/ui/select.tsx
@@ -0,0 +1,190 @@
+"use client"
+
+import * as React from "react"
+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react"
+import { Select as SelectPrimitive } from "radix-ui"
+
+import { cn } from "@/lib/utils"
+
+function Select({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Root>) {
+  return <SelectPrimitive.Root data-slot="select" {...props} />
+}
+
+function SelectGroup({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Group>) {
+  return <SelectPrimitive.Group data-slot="select-group" {...props} />
+}
+
+function SelectValue({
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Value>) {
+  return <SelectPrimitive.Value data-slot="select-value" {...props} />
+}
+
+function SelectTrigger({
+  className,
+  size = "default",
+  children,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
+  size?: "sm" | "default"
+}) {
+  return (
+    <SelectPrimitive.Trigger
+      data-slot="select-trigger"
+      data-size={size}
+      className={cn(
+        "flex w-fit items-center justify-between gap-2 rounded-md border border-input bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 data-[placeholder]:text-muted-foreground data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <SelectPrimitive.Icon asChild>
+        <ChevronDownIcon className="size-4 opacity-50" />
+      </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
+  )
+}
+
+function SelectContent({
+  className,
+  children,
+  position = "item-aligned",
+  align = "center",
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Content>) {
+  return (
+    <SelectPrimitive.Portal>
+      <SelectPrimitive.Content
+        data-slot="select-content"
+        className={cn(
+          "relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border bg-popover text-popover-foreground shadow-md data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
+          position === "popper" &&
+            "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+          className
+        )}
+        position={position}
+        align={align}
+        {...props}
+      >
+        <SelectScrollUpButton />
+        <SelectPrimitive.Viewport
+          className={cn(
+            "p-1",
+            position === "popper" &&
+              "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"
+          )}
+        >
+          {children}
+        </SelectPrimitive.Viewport>
+        <SelectScrollDownButton />
+      </SelectPrimitive.Content>
+    </SelectPrimitive.Portal>
+  )
+}
+
+function SelectLabel({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Label>) {
+  return (
+    <SelectPrimitive.Label
+      data-slot="select-label"
+      className={cn("px-2 py-1.5 text-xs text-muted-foreground", className)}
+      {...props}
+    />
+  )
+}
+
+function SelectItem({
+  className,
+  children,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Item>) {
+  return (
+    <SelectPrimitive.Item
+      data-slot="select-item"
+      className={cn(
+        "relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 [&_svg:not([class*='text-'])]:text-muted-foreground *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        className
+      )}
+      {...props}
+    >
+      <span
+        data-slot="select-item-indicator"
+        className="absolute right-2 flex size-3.5 items-center justify-center"
+      >
+        <SelectPrimitive.ItemIndicator>
+          <CheckIcon className="size-4" />
+        </SelectPrimitive.ItemIndicator>
+      </span>
+      <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+    </SelectPrimitive.Item>
+  )
+}
+
+function SelectSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
+  return (
+    <SelectPrimitive.Separator
+      data-slot="select-separator"
+      className={cn("pointer-events-none -mx-1 my-1 h-px bg-border", className)}
+      {...props}
+    />
+  )
+}
+
+function SelectScrollUpButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
+  return (
+    <SelectPrimitive.ScrollUpButton
+      data-slot="select-scroll-up-button"
+      className={cn(
+        "flex cursor-default items-center justify-center py-1",
+        className
+      )}
+      {...props}
+    >
+      <ChevronUpIcon className="size-4" />
+    </SelectPrimitive.ScrollUpButton>
+  )
+}
+
+function SelectScrollDownButton({
+  className,
+  ...props
+}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
+  return (
+    <SelectPrimitive.ScrollDownButton
+      data-slot="select-scroll-down-button"
+      className={cn(
+        "flex cursor-default items-center justify-center py-1",
+        className
+      )}
+      {...props}
+    >
+      <ChevronDownIcon className="size-4" />
+    </SelectPrimitive.ScrollDownButton>
+  )
+}
+
+export {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+}
diff --git a/hooks/useInvestments.ts b/hooks/useInvestments.ts
index 915c72a..b6b1342 100644
--- a/hooks/useInvestments.ts
+++ b/hooks/useInvestments.ts
@@ -4,6 +4,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { investInInvoice } from "@/lib/api";
 import type { InvoiceDetail } from "@/lib/api";
 import { toast } from "sonner";
+import { INVOICES_QUERY_KEY } from "./useInvoices";
 
 interface InvestMutationVars {
   invoiceId: string;
@@ -42,6 +43,7 @@ export function useInvestMutation() {
 
     onSettled: (_data, _error, { invoiceId }) => {
       queryClient.invalidateQueries({ queryKey: ["invoice", invoiceId] });
+      queryClient.invalidateQueries({ queryKey: INVOICES_QUERY_KEY });
     },
   });
 }
diff --git a/hooks/useInvoices.ts b/hooks/useInvoices.ts
index ba773e6..cbd67ec 100644
--- a/hooks/useInvoices.ts
+++ b/hooks/useInvoices.ts
@@ -3,12 +3,16 @@
 import { useInfiniteQuery } from "@tanstack/react-query";
 import { fetchInvoices, type InvoicesResponse } from "@/lib/api";
 
+export const INVOICES_QUERY_KEY = ["invoices"] as const;
+export const STALE_TIME = 60 * 1000;
+
 export function useInvoices() {
   return useInfiniteQuery<InvoicesResponse>({
-    queryKey: ["invoices"],
+    queryKey: INVOICES_QUERY_KEY,
     queryFn: ({ pageParam }) => fetchInvoices(pageParam as string | undefined),
     initialPageParam: undefined as string | undefined,
     getNextPageParam: (lastPage) =>
       lastPage.has_more ? lastPage.next_cursor ?? undefined : undefined,
+    staleTime: STALE_TIME,
   });
 }