diff --git a/app/Models/ProjectProposal.php b/app/Models/ProjectProposal.php
index f21a9e0..4c11e95 100644
--- a/app/Models/ProjectProposal.php
+++ b/app/Models/ProjectProposal.php
@@ -35,6 +35,8 @@ class ProjectProposal extends Model implements HasMedia
     protected $casts = [
         'id' => 'integer',
         'einundzwanzig_pleb_id' => 'integer',
+        'accepted' => 'boolean',
+        'sats_paid' => 'integer',
     ];
 
     protected static function booted() {}
diff --git a/resources/views/components/project-card.blade.php b/resources/views/components/project-card.blade.php
index 6d47ff8..ad3807e 100644
--- a/resources/views/components/project-card.blade.php
+++ b/resources/views/components/project-card.blade.php
@@ -113,11 +113,7 @@
             </div>
             <div class="py-2">
                 @if($project->sats_paid)
-                    <div
-                        class="text-sm inline-flex font-medium bg-green-500/20 text-green-700 rounded-full text-center px-2.5 py-1">
-                        Wurde mit {{ number_format($project->sats_paid, 0, ',', '.') }} Sats
-                        unterstützt
-                    </div>
+                    <flux:badge color="green">Wurde mit {{ number_format($project->sats_paid, 0, ',', '.') }} Sats unterstützt</flux:badge>
                 @endif
             </div>
         </div>
diff --git a/resources/views/livewire/association/election/admin.blade.php b/resources/views/livewire/association/election/admin.blade.php
index f04fa26..3d7c2c8 100644
--- a/resources/views/livewire/association/election/admin.blade.php
+++ b/resources/views/livewire/association/election/admin.blade.php
@@ -47,25 +47,6 @@ new class extends Component {
         $this->loadBoardVotes();
     }
 
-    public function handleNostrLoggedOut(): void
-    {
-        $this->currentPubkey = null;
-        $this->currentPleb = null;
-    }
-
-    public function handleNostrLoggedIn($pubkey): void
-    {
-        $this->currentPubkey = $pubkey;
-        $allowedPubkeys = [
-            '0adf67475ccc5ca456fd3022e46f5d526eb0af6284bf85494c0dd7847f3e5033',
-            '430169631f2f0682c60cebb4f902d68f0c71c498fd1711fd982f052cf1fd4279',
-        ];
-        if (in_array($this->currentPubkey, $allowedPubkeys, true)) {
-            $this->isAllowed = true;
-        }
-        dd($this->isAllowed);
-    }
-
     public function handleNewVote(): void
     {
         $this->loadEvents();
diff --git a/resources/views/livewire/association/election/index.blade.php b/resources/views/livewire/association/election/index.blade.php
index 0894008..56a65f4 100644
--- a/resources/views/livewire/association/election/index.blade.php
+++ b/resources/views/livewire/association/election/index.blade.php
@@ -37,28 +37,6 @@ new class extends Component {
         }
     }
 
-    public function handleNostrLoggedOut(): void
-    {
-        $this->isAllowed = false;
-        $this->currentPubkey = null;
-        $this->currentPleb = null;
-    }
-
-    public function handleNostrLoggedIn($pubkey): void
-    {
-        NostrAuth::login($pubkey);
-        $this->currentPubkey = $pubkey;
-        $this->currentPleb = \App\Models\EinundzwanzigPleb::query()
-            ->where('pubkey', $pubkey)->first();
-        $logPubkeys = [
-            '0adf67475ccc5ca456fd3022e46f5d526eb0af6284bf85494c0dd7847f3e5033',
-            '430169631f2f0682c60cebb4f902d68f0c71c498fd1711fd982f052cf1fd4279',
-        ];
-        if (in_array($this->currentPubkey, $logPubkeys, true)) {
-            $this->isAllowed = true;
-        }
-    }
-
     public function saveElection($index): void
     {
         $election = $this->elections[$index];
diff --git a/resources/views/livewire/association/election/show.blade.php b/resources/views/livewire/association/election/show.blade.php
index 423515e..f296b5d 100644
--- a/resources/views/livewire/association/election/show.blade.php
+++ b/resources/views/livewire/association/election/show.blade.php
@@ -210,28 +210,6 @@ new class extends Component {
             ->toArray();
     }
 
-    public function handleNostrLoggedIn($pubkey): void
-    {
-        NostrAuth::login($pubkey);
-        $this->currentPubkey = $pubkey;
-        $this->currentPleb = EinundzwanzigPleb::query()->where('pubkey', $pubkey)->first();
-        $logPubkeys = [
-            '0adf67475ccc5ca456fd3022e46f5d526eb0af6284bf85494c0dd7847f3e5033',
-            '430169631f2f0682c60cebb4f902d68f0c71c498fd1711fd982f052cf1fd4279',
-        ];
-        if (in_array($this->currentPubkey, $logPubkeys, true)) {
-            $this->showLog = true;
-            $this->isAllowed = true;
-        }
-    }
-
-    public function handleNostrLoggedOut(): void
-    {
-        $this->isAllowed = false;
-        $this->currentPubkey = null;
-        $this->currentPleb = null;
-    }
-
     public function handleNewVote(): void
     {
         $this->loadEvents();
diff --git a/resources/views/livewire/association/members/admin.blade.php b/resources/views/livewire/association/members/admin.blade.php
index 3e00b98..47fa04a 100644
--- a/resources/views/livewire/association/members/admin.blade.php
+++ b/resources/views/livewire/association/members/admin.blade.php
@@ -1,16 +1,41 @@
 <?php
 
+use App\Enums\AssociationStatus;
 use App\Models\EinundzwanzigPleb;
 use App\Support\NostrAuth;
+use Flux\Flux;
+use Livewire\Attributes\Computed;
 use Livewire\Component;
 
-new class extends Component {
+new class extends Component
+{
     public bool $isAllowed = false;
 
     public ?string $currentPubkey = null;
 
     public ?EinundzwanzigPleb $currentPleb = null;
 
+    public string $sortBy = 'association_status';
+
+    public string $sortDirection = 'desc';
+
+    public ?int $selectedPlebId = null;
+
+    public ?int $confirmAcceptId = null;
+
+    public ?int $confirmDeleteId = null;
+
+    public string $search = '';
+
+    public bool $showPaidOnly = false;
+
+    public $plebs = [];
+
+    public function updatedSearch(): void
+    {
+        $this->plebs = $this->loadPlebs();
+    }
+
     protected $listeners = [
         'nostrLoggedOut' => 'handleNostrLoggedOut',
         'nostrLoggedIn' => 'handleNostrLoggedIn',
@@ -34,43 +59,247 @@ new class extends Component {
                 $this->isAllowed = true;
             }
         }
+
+        $this->plebs = $this->loadPlebs();
     }
 
-    public function handleNostrLoggedOut(): void
+    private function loadPlebs()
     {
-        $this->isAllowed = false;
-        $this->currentPubkey = null;
+        $query = EinundzwanzigPleb::query()
+            ->with([
+                'profile',
+                'paymentEvents' => fn ($query) => $query
+                    ->where('year', date('Y'))
+                    ->where('paid', true),
+            ]);
+
+        if ($this->search) {
+            $query->where(function ($query) {
+                $query->whereHas('profile', function ($query) {
+                    $query->where('name', 'ilike', '%'.$this->search.'%');
+                })->orWhere('npub', 'like', '%'.$this->search.'%');
+            });
+        }
+
+        if ($this->showPaidOnly) {
+            $query->whereHas('paymentEvents', fn ($query) => $query
+                ->where('year', date('Y'))
+                ->where('paid', true)
+            );
+        }
+
+        return $query->tap(fn ($query) => $this->sortBy ? $query->orderBy($this->sortBy, $this->sortDirection) : $query)
+            ->get();
     }
 
-    public function handleNostrLoggedIn($pubkey): void
+    public function sort(string $column): void
     {
-        NostrAuth::login($pubkey);
-        $this->currentPubkey = $pubkey;
-        $this->currentPleb = \App\Models\EinundzwanzigPleb::query()
-            ->where('pubkey', $pubkey)->first();
-        $allowedPubkeys = [
-            '0adf67475ccc5ca456fd3022e46f5d526eb0af6284bf85494c0dd7847f3e5033',
-            '430169631f2f0682c60cebb4f902d68f0c71c498fd1711fd982f052cf1fd4279',
-            '7acf30cf60b85c62b8f654556cc21e4016df8f5604b3b6892794f88bb80d7a1d',
-            'f240be2b684f85cc81566f2081386af81d7427ea86250c8bde6b7a8500c761ba',
-            '19e358b8011f5f4fc653c565c6d4c2f33f32661f4f90982c9eedc292a8774ec3',
-            'acbcec475a1a4f9481939ecfbd1c3d111f5b5a474a39ae039bbc720fdd305bec',
-        ];
-        if (in_array($this->currentPubkey, $allowedPubkeys, true)) {
-            $this->isAllowed = true;
+        if ($this->sortBy === $column) {
+            $this->sortDirection = $this->sortDirection === 'asc' ? 'desc' : 'asc';
+        } else {
+            $this->sortBy = $column;
+            $this->sortDirection = 'asc';
+        }
+
+        $this->plebs = $this->loadPlebs();
+    }
+
+    public function togglePaidFilter(): void
+    {
+        $this->showPaidOnly = !$this->showPaidOnly;
+        $this->plebs = $this->loadPlebs();
+    }
+
+    public function openPaymentModal(int $plebId): void
+    {
+        $this->selectedPlebId = $plebId;
+        Flux::modal('payment-details')->show();
+    }
+
+    public function accept($rowId): void
+    {
+        $this->confirmAcceptId = $rowId;
+        Flux::modal('confirm-accept-pleb')->show();
+    }
+
+    public function delete($rowId): void
+    {
+        $this->confirmDeleteId = $rowId;
+        Flux::modal('confirm-delete-pleb')->show();
+    }
+
+    public function acceptPleb(): void
+    {
+        if ($this->confirmAcceptId) {
+            $pleb = EinundzwanzigPleb::query()->findOrFail($this->confirmAcceptId);
+            $for = $pleb->application_for;
+            $text = $pleb->application_text;
+            $pleb->association_status = AssociationStatus::from($for);
+            $pleb->application_for = null;
+            $pleb->archived_application_text = $text;
+            $pleb->application_text = null;
+            $pleb->save();
+
+            $this->confirmAcceptId = null;
+            Flux::modal('confirm-accept-pleb')->close();
         }
     }
 
+    public function deletePleb(): void
+    {
+        if ($this->confirmDeleteId) {
+            $pleb = EinundzwanzigPleb::query()->findOrFail($this->confirmDeleteId);
+            $pleb->application_for = null;
+            $pleb->application_text = null;
+            $pleb->save();
+
+            $this->confirmDeleteId = null;
+            Flux::modal('confirm-delete-pleb')->close();
+        }
+    }
+
+    public function closePaymentModal(): void
+    {
+        $this->selectedPlebId = null;
+        Flux::modal('payment-details')->close();
+    }
+
+    #[Computed]
+    public function selectedPleb(): ?EinundzwanzigPleb
+    {
+        return EinundzwanzigPleb::with(['paymentEvents'])->find($this->selectedPlebId);
+    }
 };
 ?>
 
 <div>
     @if($isAllowed)
-        <div class="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
-            <livewire:einundzwanzig-pleb-table/>
+        <div class="mb-4 flex gap-2">
+            <flux:input
+                    wire:model.live.debounce.300ms="search"
+                placeholder="Suche nach Name oder Npub..."
+                icon="magnifying-glass"
+                class="flex-1"
+            />
+            <flux:button
+                wire:click="togglePaidFilter"
+                :variant="$showPaidOnly ? 'primary' : 'ghost'"
+                icon="check"
+            >
+                {{ $showPaidOnly ? 'Alle anzeigen' : 'Nur Bezahlt' }}
+            </flux:button>
         </div>
+
+        <flux:table>
+            <flux:table.columns>
+                <flux:table.column>Avatar</flux:table.column>
+                <flux:table.column
+                    sortable
+                    :sorted="$sortBy === 'name'"
+                    :direction="$sortDirection"
+                    wire:click="sort('name')"
+                >
+                    Name
+                </flux:table.column>
+                <flux:table.column
+                    sortable
+                    :sorted="$sortBy === 'association_status'"
+                    :direction="$sortDirection"
+                    wire:click="sort('association_status')"
+                >
+                    Aktueller Status
+                </flux:table.column>
+                <flux:table.column>Beitrag {{ date('Y') }}</flux:table.column>
+                <flux:table.column>Aktionen</flux:table.column>
+            </flux:table.columns>
+
+            <flux:table.rows>
+                @foreach ($this->plebs as $pleb)
+                    <flux:table.row :key="$pleb->id">
+                        <flux:table.cell>
+                            <flux:avatar
+                                size="xl"
+                                :src="$pleb->profile?->picture ?? asset('einundzwanzig-alpha.jpg')"
+                                :name="$pleb->profile?->name ?? ''"
+                                rounded
+                            />
+                        </flux:table.cell>
+
+                        <flux:table.cell>
+                            <div class="flex flex-col">
+                                <flux:heading size="sm">
+                                    {{ $pleb->profile?->name ?: $pleb->profile?->display_name ?? '' }}
+                                </flux:heading>
+                                <a
+                                    target="_blank"
+                                    href="https://nostrudel.ninja/u/{{ $pleb->npub }}"
+                                    class="text-xs text-zinc-500 hover:text-zinc-700 dark:text-zinc-400 dark:hover:text-zinc-200"
+                                >
+                                    Nostr Profile
+                                </a>
+                            </div>
+                        </flux:table.cell>
+
+                        <flux:table.cell>
+                            <flux:badge
+                                size="sm"
+                                :color="match($pleb->association_status) {
+                                        AssociationStatus::DEFAULT => 'zinc',
+                                        AssociationStatus::PASSIVE => 'yellow',
+                                        AssociationStatus::ACTIVE => 'green',
+                                        AssociationStatus::HONORARY => 'blue',
+                                        default => 'red',
+                                    }"
+                                inset="top bottom"
+                            >
+                                {{ $pleb->association_status->label() }}
+                            </flux:badge>
+                        </flux:table.cell>
+
+                        <flux:table.cell>
+                            @if($pleb->paymentEvents->count() > 0 && $pleb->paymentEvents->first()->paid)
+                                <flux:button
+                                    wire:click="openPaymentModal({{ $pleb->id }})"
+                                    variant="ghost"
+                                    size="sm"
+                                    icon="banknotes"
+                                >
+                                        <span class="text-green-500">
+                                            {{ number_format($pleb->paymentEvents->first()->amount, 0, ',', '.') }}
+                                        </span>
+                                </flux:button>
+                            @else
+                                <flux:text class="text-zinc-500">keine Zahlung vorhanden</flux:text>
+                            @endif
+                        </flux:table.cell>
+
+                        <flux:table.cell align="end">
+                            <div class="flex gap-2">
+                                <flux:button
+                                    wire:click="delete({{ $pleb->id }})"
+                                    variant="ghost"
+                                    size="sm"
+                                    icon="trash"
+                                    inset="top bottom"
+                                ></flux:button>
+
+                                @if($pleb->application_for)
+                                    <flux:button
+                                        wire:click="accept({{ $pleb->id }})"
+                                        variant="ghost"
+                                        size="sm"
+                                        icon="check"
+                                        inset="top bottom"
+                                    ></flux:button>
+                                @endif
+                            </div>
+                        </flux:table.cell>
+                    </flux:table.row>
+                @endforeach
+            </flux:table.rows>
+        </flux:table>
     @else
-        <div class="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
+        <div class="px-4 sm:px-6 lg:px-8 py-8 w-full mx-auto">
             <flux:callout variant="warning" icon="exclamation-circle">
                 <flux:heading>Mitglieder können nicht bearbeitet werden</flux:heading>
                 <p>
@@ -80,13 +309,68 @@ new class extends Component {
                     @if(!NostrAuth::check())
                         Bitte melde dich zunächst mit Nostr an.
                     @else
-                        Dein Benutzer-Account ist nicht für diese Funktion autorisiert. Bitte kontaktiere den Vorstand, wenn du Zugriff benötigst.
+                        Dein Benutzer-Account ist nicht für diese Funktion autorisiert. Bitte kontaktiere den Vorstand,
+                        wenn du Zugriff benötigst.
                     @endif
                 </p>
             </flux:callout>
         </div>
     @endif
 
+    <!-- Payment Details Modal -->
+    <flux:modal name="payment-details" class="max-w-full">
+        @if($this->selectedPleb)
+            <div class="space-y-6">
+                <div>
+                    <flux:heading size="lg">Zahlungsdetails</flux:heading>
+                    <flux:subheading class="mt-2">
+                        {{ $this->selectedPleb->profile?->name ?: $this->selectedPleb->profile?->display_name ?? 'Unbekannt' }}
+                    </flux:subheading>
+                </div>
+
+                @if($this->selectedPleb->application_text)
+                    <flux:callout icon="information-circle" variant="info">
+                        {{ $this->selectedPleb->application_text }}
+                    </flux:callout>
+                @endif
+
+                <section>
+                    <flux:heading size="md" class="mb-4">Bisherige Zahlungen</flux:heading>
+
+                    @if($this->selectedPleb->paymentEvents->count() > 0)
+                        <flux:table>
+                            <flux:table.columns>
+                                <flux:table.column>Satoshis</flux:table.column>
+                                <flux:table.column>Jahr</flux:table.column>
+                                <flux:table.column>Event-ID</flux:table.column>
+                            </flux:table.columns>
+
+                            <flux:table.rows>
+                                @foreach($this->selectedPleb->paymentEvents as $payment)
+                                    <flux:table.row :key="$payment->id">
+                                        <flux:table.cell variant="strong">{{ $payment->amount }}</flux:table.cell>
+                                        <flux:table.cell>{{ $payment->year }}</flux:table.cell>
+                                        <flux:table.cell class="text-xs">{{ $payment->event_id }}</flux:table.cell>
+                                    </flux:table.row>
+                                @endforeach
+                            </flux:table.rows>
+                        </flux:table>
+                    @else
+                        <flux:callout variant="info" icon="information-circle">
+                            Keine Zahlungen gefunden
+                        </flux:callout>
+                    @endif
+                </section>
+
+                <div class="flex gap-2">
+                    <flux:spacer/>
+                    <flux:button wire:click="closePaymentModal" variant="primary">Schließen</flux:button>
+                </div>
+            </div>
+        @endif
+    </flux:modal>
+
+    <!-- Accept Confirmation Modal -->
     <flux:modal name="confirm-accept-pleb" class="min-w-88">
         <div class="space-y-6">
             <div>
@@ -105,6 +389,7 @@ new class extends Component {
         </div>
     </flux:modal>
 
+    <!-- Delete Confirmation Modal -->
     <flux:modal name="confirm-delete-pleb" class="min-w-88">
         <div class="space-y-6">
             <div>
diff --git a/resources/views/livewire/association/profile.blade.php b/resources/views/livewire/association/profile.blade.php
index e832be2..46ee296 100644
--- a/resources/views/livewire/association/profile.blade.php
+++ b/resources/views/livewire/association/profile.blade.php
@@ -73,44 +73,6 @@ new class extends Component {
         }
     }
 
-    public function handleNostrLoggedIn($pubkey): void
-    {
-        NostrAuth::login($pubkey);
-
-        $this->currentPubkey = $pubkey;
-        $this->currentPleb = EinundzwanzigPleb::query()
-            ->with([
-                'paymentEvents' => fn($query) => $query->where('year', date('Y')),
-            ])
-            ->where('pubkey', $pubkey)->first();
-        $this->email = $this->currentPleb->email;
-        $this->no = $this->currentPleb->no_email;
-        $this->showEmail = !$this->no;
-        if ($this->currentPleb->association_status === AssociationStatus::ACTIVE) {
-            $this->amountToPay = config('app.env') === 'production' ? 21000 : 1;
-        }
-        if ($this->currentPleb->paymentEvents->count() < 1) {
-            $this->createPaymentEvent();
-            $this->currentPleb->load('paymentEvents');
-        }
-        $this->loadEvents();
-        $this->listenForPayment();
-    }
-
-    public function handleNostrLoggedOut(): void
-    {
-        NostrAuth::logout();
-
-        $this->currentPubkey = null;
-        $this->currentPleb = null;
-        $this->yearsPaid = [];
-        $this->events = [];
-        $this->payments = [];
-        $this->qrCode = null;
-        $this->amountToPay = config('app.env') === 'production' ? 21000 : 1;
-        $this->currentYearIsPaid = false;
-    }
-
     public function updatedNo(): void
     {
         $this->showEmail = !$this->no;
@@ -562,7 +524,7 @@ new class extends Component {
                                             Pay {{ $amountToPay }} Sats
                                         </flux:button>
                                     @else
-                                        <flux:button disabled class="text-xl px-8 py-3">
+                                        <flux:button disabled variant="primary" color="green" class="text-xl px-8 py-3">
                                             <i class="fa-sharp-duotone fa-solid fa-check-circle mr-2"></i>
                                             Aktuelles Jahr bezahlt
                                         </flux:button>
diff --git a/resources/views/livewire/association/project-support/form/create.blade.php b/resources/views/livewire/association/project-support/form/create.blade.php
index 041b280..5a3e3b9 100644
--- a/resources/views/livewire/association/project-support/form/create.blade.php
+++ b/resources/views/livewire/association/project-support/form/create.blade.php
@@ -2,21 +2,28 @@
 
 use App\Models\ProjectProposal;
 use App\Support\NostrAuth;
-use Livewire\Component;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
+use Livewire\Component;
 
 new
 #[Layout('layouts.app')]
 #[Title('Projektförderung anlegen')]
-class extends Component {
+class extends Component
+{
     public array $form = [
         'name' => '',
         'description' => '',
+        'support_in_sats' => '',
+        'website' => '',
+        'accepted' => false,
+        'sats_paid' => 0,
     ];
 
     public bool $isAllowed = false;
 
+    public bool $isAdmin = false;
+
     public function mount(): void
     {
         if (NostrAuth::check()) {
@@ -26,6 +33,10 @@ class extends Component {
             if ($currentPleb && $currentPleb->association_status->value > 1 && $currentPleb->paymentEvents()->where('year', date('Y'))->where('paid', true)->exists()) {
                 $this->isAllowed = true;
             }
+
+            if ($currentPleb && in_array($currentPleb->npub, config('einundzwanzig.config.current_board'), true)) {
+                $this->isAdmin = true;
+            }
         }
     }
 
@@ -34,19 +45,24 @@ class extends Component {
         $this->validate([
             'form.name' => 'required|string|max:255',
             'form.description' => 'required|string',
+            'form.support_in_sats' => 'required|integer|min:0',
+            'form.website' => 'required|url|max:255',
         ]);
 
         ProjectProposal::query()->create([
             'name' => $this->form['name'],
             'description' => $this->form['description'],
-            'support_in_sats' => 0,
+            'support_in_sats' => (int) $this->form['support_in_sats'],
+            'website' => $this->form['website'],
+            'accepted' => $this->form['accepted'],
+            'sats_paid' => $this->form['sats_paid'],
             'einundzwanzig_pleb_id' => \App\Models\EinundzwanzigPleb::query()->where('pubkey', NostrAuth::pubkey())->first()->id,
         ]);
 
         $this->redirectRoute('association.projectSupport');
     }
 };
- ?>
+?>
 <div>
         @if($isAllowed)
             <div class="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
@@ -59,47 +75,62 @@ class extends Component {
                     </div>
                 </div>
 
-                <div class="md:flex">
-                    <!-- Left column -->
-                    <div class="w-full md:w-60 mb-4 md:mb-0">
-                        <div
-                            class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
-                            <h2 class="text-lg font-semibold text-gray-800 dark:text-gray-100 mb-4">
-                                Formular
-                            </h2>
-                            <div class="space-y-4">
-                                <div>
+                <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+                    <!-- Form card -->
+                    <div class="lg:col-span-2">
+                        <flux:card>
+                            <flux:fieldset>
+                                <flux:legend>Formular</flux:legend>
+                                <div class="space-y-4">
                                     <flux:field>
                                         <flux:label>Name</flux:label>
                                         <flux:input wire:model="form.name" placeholder="Projektname" />
                                         <flux:error name="form.name" />
                                     </flux:field>
-                                </div>
-                                <div>
                                     <flux:field>
-                                        <flux:label>Beschreibung</flux:label>
-                                        <flux:textarea wire:model="form.description" rows="6" placeholder="Projektbeschreibung..." />
-                                        <flux:error name="form.description" />
+                                        <flux:label>Website</flux:label>
+                                        <flux:input wire:model="form.website" type="url" placeholder="https://example.com" />
+                                        <flux:error name="form.website" />
                                     </flux:field>
+                                    <flux:field>
+                                        <flux:label>Unterstützung (Sats)</flux:label>
+                                        <flux:input wire:model="form.support_in_sats" type="number" placeholder="100000" />
+                                        <flux:error name="form.support_in_sats" />
+                                    </flux:field>
+                                    <flux:editor wire:model="form.description" label="Beschreibung" description="Projektbeschreibung..." />
+                                    <flux:error name="form.description" />
+
+                                    @if($isAdmin)
+                                        <flux:separator />
+                                        <flux:heading level="3" class="text-sm font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">Admin Felder</flux:heading>
+                                        <div class="space-y-3 mt-3">
+                                            <flux:field>
+                                                <flux:label>Akzeptiert</flux:label>
+                                                <flux:switch wire:model="form.accepted" />
+                                            </flux:field>
+                                            <flux:field>
+                                                <flux:label>Sats bezahlt</flux:label>
+                                                <flux:input type="number" wire:model="form.sats_paid" />
+                                            </flux:field>
+                                        </div>
+                                    @endif
+
+                                    <flux:button wire:click="save" wire:loading.attr="disabled" variant="primary" class="w-full mt-4">
+                                        Speichern
+                                    </flux:button>
                                 </div>
-                                <flux:button wire:click="save" wire:loading.attr="disabled" variant="primary" class="w-full">
-                                    Speichern
-                                </flux:button>
-                            </div>
-                        </div>
+                            </flux:fieldset>
+                        </flux:card>
                     </div>
 
-                    <!-- Right column -->
-                    <div class="flex-1 md:ml-8">
-                        <div
-                            class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
-                            <h2 class="text-lg font-semibold text-gray-800 dark:text-gray-100 mb-4">
-                                Information
-                            </h2>
-                            <p class="text-sm text-gray-800 dark:text-gray-100">
+                    <!-- Information card -->
+                    <div>
+                        <flux:card>
+                            <flux:heading level="2">Information</flux:heading>
+                            <p class="text-sm text-gray-800 dark:text-gray-100 mt-4">
                                 Fülle das Formular aus, um eine neue Projektförderung anzulegen.
                             </p>
-                        </div>
+                        </flux:card>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/livewire/association/project-support/form/edit.blade.php b/resources/views/livewire/association/project-support/form/edit.blade.php
index 24a7119..0034bd3 100644
--- a/resources/views/livewire/association/project-support/form/edit.blade.php
+++ b/resources/views/livewire/association/project-support/form/edit.blade.php
@@ -9,16 +9,23 @@ use Livewire\Component;
 new
 #[Layout('layouts.app')]
 #[Title('Projektförderung bearbeiten')]
-class extends Component {
+class extends Component
+{
     public ProjectProposal $project;
 
     public array $form = [
         'name' => '',
         'description' => '',
+        'support_in_sats' => '',
+        'website' => '',
+        'accepted' => false,
+        'sats_paid' => 0,
     ];
 
     public bool $isAllowed = false;
 
+    public bool $isAdmin = false;
+
     public function mount($projectProposal): void
     {
         $this->project = ProjectProposal::query()->where('slug', $projectProposal)->firstOrFail();
@@ -38,8 +45,16 @@ class extends Component {
                 $this->form = [
                     'name' => $this->project->name,
                     'description' => $this->project->description,
+                    'support_in_sats' => (string) $this->project->support_in_sats,
+                    'website' => $this->project->website ?? '',
+                    'accepted' => (bool) $this->project->accepted,
+                    'sats_paid' => $this->project->sats_paid,
                 ];
             }
+
+            if ($currentPleb && in_array($currentPleb->npub, config('einundzwanzig.config.current_board'), true)) {
+                $this->isAdmin = true;
+            }
         }
     }
 
@@ -48,11 +63,17 @@ class extends Component {
         $this->validate([
             'form.name' => 'required|string|max:255',
             'form.description' => 'required|string',
+            'form.support_in_sats' => 'required|integer|min:0',
+            'form.website' => 'required|url|max:255',
         ]);
 
         $this->project->update([
             'name' => $this->form['name'],
             'description' => $this->form['description'],
+            'support_in_sats' => (int) $this->form['support_in_sats'],
+            'website' => $this->form['website'],
+            'accepted' => $this->isAdmin ? (bool) $this->form['accepted'] : $this->project->accepted,
+            'sats_paid' => $this->isAdmin ? $this->form['sats_paid'] : $this->project->sats_paid,
         ]);
 
         $this->redirectRoute('association.projectSupport.item', $this->project);
@@ -72,47 +93,70 @@ class extends Component {
                 </div>
             </div>
 
-            <div class="md:flex">
-                <!-- Left column -->
-                <div class="w-full md:w-60 mb-4 md:mb-0">
-                    <div
-                        class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
-                        <h2 class="text-lg font-semibold text-gray-800 dark:text-gray-100 mb-4">
-                            Formular
-                        </h2>
-                        <div class="space-y-4">
-                            <div>
-                                <flux:field>
-                                    <flux:label>Name</flux:label>
-                                    <flux:input wire:model="form.name" placeholder="Projektname" />
-                                    <flux:error name="form.name" />
-                                </flux:field>
-                            </div>
-                            <div>
-                                <flux:field>
-                                    <flux:label>Beschreibung</flux:label>
-                                    <flux:textarea wire:model="form.description" rows="6" placeholder="Projektbeschreibung..." />
+            <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
+                <!-- Left column - Form -->
+                <div class="lg:col-span-2">
+                    <flux:card>
+                        <flux:fieldset>
+                            <flux:legend>Formular</flux:legend>
+                            <div class="space-y-4">
+                                <div>
+                                    <flux:field>
+                                        <flux:label>Name</flux:label>
+                                        <flux:input wire:model="form.name" placeholder="Projektname" />
+                                        <flux:error name="form.name" />
+                                    </flux:field>
+                                </div>
+                                <div>
+                                    <flux:field>
+                                        <flux:label>Website</flux:label>
+                                        <flux:input wire:model="form.website" type="url" placeholder="https://example.com" />
+                                        <flux:error name="form.website" />
+                                    </flux:field>
+                                </div>
+                                <div>
+                                    <flux:field>
+                                        <flux:label>Unterstützung (Sats)</flux:label>
+                                        <flux:input wire:model="form.support_in_sats" type="number" placeholder="100000" />
+                                        <flux:error name="form.support_in_sats" />
+                                    </flux:field>
+                                </div>
+                                <div>
+                                    <flux:editor wire:model="form.description" label="Beschreibung" description="Projektbeschreibung..." />
                                     <flux:error name="form.description" />
-                                </flux:field>
+                                </div>
+
+                                @if($isAdmin)
+                                    <flux:separator />
+                                    <flux:heading level="3" class="text-sm font-semibold uppercase tracking-wide text-gray-500 dark:text-gray-400">Admin Felder</flux:heading>
+                                    <div class="space-y-3 mt-3">
+                                        <flux:field>
+                                            <flux:label>Akzeptiert</flux:label>
+                                            <flux:switch wire:model="form.accepted" />
+                                        </flux:field>
+                                        <flux:field>
+                                            <flux:label>Sats bezahlt</flux:label>
+                                            <flux:input type="number" wire:model="form.sats_paid" />
+                                        </flux:field>
+                                    </div>
+                                @endif
+
+                                <flux:button wire:click="update" wire:loading.attr="disabled" variant="primary" class="w-full mt-4">
+                                    Speichern
+                                </flux:button>
                             </div>
-                            <flux:button wire:click="update" wire:loading.attr="disabled" variant="primary" class="w-full">
-                                Speichern
-                            </flux:button>
-                        </div>
-                    </div>
+                        </flux:fieldset>
+                    </flux:card>
                 </div>
 
-                <!-- Right column -->
-                <div class="flex-1 md:ml-8">
-                    <div
-                        class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
-                        <h2 class="text-lg font-semibold text-gray-800 dark:text-gray-100 mb-4">
-                            Information
-                        </h2>
-                        <p class="text-sm text-gray-800 dark:text-gray-100">
+                <!-- Right column - Information -->
+                <div>
+                    <flux:card>
+                        <flux:heading level="2">Information</flux:heading>
+                        <p class="text-sm text-gray-800 dark:text-gray-100 mt-4">
                             Bearbeite die Projektförderung und speichere deine Änderungen.
                         </p>
-                    </div>
+                    </flux:card>
                 </div>
             </div>
         </div>
diff --git a/resources/views/livewire/association/project-support/index.blade.php b/resources/views/livewire/association/project-support/index.blade.php
index 8297e94..8f42584 100644
--- a/resources/views/livewire/association/project-support/index.blade.php
+++ b/resources/views/livewire/association/project-support/index.blade.php
@@ -64,21 +64,6 @@ new class extends Component {
             ->get();
     }
 
-    public function handleNostrLoggedIn($pubkey): void
-    {
-        NostrAuth::login($pubkey);
-        $this->currentPubkey = $pubkey;
-        $this->currentPleb = EinundzwanzigPleb::query()->where('pubkey', $pubkey)->first();
-        $this->isAllowed = true;
-    }
-
-    public function handleNostrLoggedOut(): void
-    {
-        $this->isAllowed = false;
-        $this->currentPubkey = null;
-        $this->currentPleb = null;
-    }
-
     public function confirmDeleteProject($id): void
     {
         $this->projectToDelete = ProjectProposal::query()->findOrFail($id);
diff --git a/resources/views/livewire/association/project-support/show.blade.php b/resources/views/livewire/association/project-support/show.blade.php
index 6f52500..f860639 100644
--- a/resources/views/livewire/association/project-support/show.blade.php
+++ b/resources/views/livewire/association/project-support/show.blade.php
@@ -21,7 +21,6 @@ new class extends Component {
         $this->projectProposal = \App\Models\ProjectProposal::query()->where('slug', $projectProposal)->firstOrFail();
         if (NostrAuth::check()) {
             $this->currentPubkey = NostrAuth::pubkey();
-            $this->handleNostrLoggedIn($this->currentPubkey);
             $this->isAllowed = true;
         }
     }
@@ -45,17 +44,6 @@ new class extends Component {
             ->get();
     }
 
-    public function handleNostrLoggedIn($pubkey): void
-    {
-        $this->currentPubkey = $pubkey;
-        $this->currentPleb = \App\Models\EinundzwanzigPleb::query()->where('pubkey', $pubkey)->first();
-        $this->isAllowed = true;
-        $this->ownVoteExists = Vote::query()
-            ->where('project_proposal_id', $this->projectProposal->id)
-            ->where('einundzwanzig_pleb_id', $this->currentPleb->id)
-            ->exists();
-    }
-
     public function handleApprove(): void
     {
         Vote::query()->updateOrCreate([
@@ -95,7 +83,9 @@ new class extends Component {
                         <h1 class="text-2xl md:text-3xl text-gray-800 dark:text-gray-100 font-bold mb-2">
                             {{ $projectProposal->name }}
                         </h1>
-                        {!! $projectProposal->description !!}
+                        <x-markdown>
+                            {!! $projectProposal->description !!}
+                        </x-markdown>
                     </header>
 
                     <div class="space-y-3 sm:flex sm:items-center sm:justify-between sm:space-y-0 mb-6">