diff --git a/app/Filament/Pages/Auth/Register.php b/app/Filament/Pages/Auth/Register.php
index dd631da..4f04dc3 100644
--- a/app/Filament/Pages/Auth/Register.php
+++ b/app/Filament/Pages/Auth/Register.php
@@ -16,6 +16,8 @@ use Filament\Schemas\Components\Wizard;
 use Filament\Schemas\Components\Wizard\Step;
 use Filament\Schemas\Schema;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\HtmlString;
 use Ysfkaya\FilamentPhoneInput\Forms\PhoneInput;
 
 class Register extends BaseRegister
@@ -117,6 +119,12 @@ class Register extends BaseRegister
                                         ->label('Telefon')
                                         ->defaultCountry('AT'),
                                 ])->columnSpan(4),
+                            Fieldset::make('Mit diesen Daten auch einen')
+                                ->visible(fn (Get $get): bool => $get('register-modus') == 'new')
+                                ->schema([
+                                    Checkbox::make('gutachter_anlegen')->inline(),
+                                    Checkbox::make('auftraggeber_anlegen')->inline(),
+                                ])->columnSpan(4),
 
                         ]),
                     Wizard\Step::make('AGB')
@@ -132,11 +140,24 @@ class Register extends BaseRegister
 
                             View::make('pages.agb'),
                         ]),
-                ]),
+                ])->submitAction(new HtmlString(Blade::render(<<<'BLADE'
+                    <x-filament::button
+                        type="submit"
+                        size="sm"
+                        wire:submit="register"
+                    >
+                        Register
+                    </x-filament::button>
+                    BLADE))),
 
             ]);
     }
 
+    protected function getFormActions(): array
+    {
+        return [];
+    }
+
     public function handleRegistration(array $data): Model
     {
         if (isset($data['kontos'])) {
diff --git a/resources/views/layouts/dark-toggle.blade.php b/resources/views/layouts/dark-toggle.blade.php
index d340f19..75e4ca5 100644
--- a/resources/views/layouts/dark-toggle.blade.php
+++ b/resources/views/layouts/dark-toggle.blade.php
@@ -1,4 +1,4 @@
 <div class="pl-4">
     <x-filament::icon-button icon="heroicon-o-sun" class="hidden dark:block" x-on:click=toggle_theme(); />
-    <x-filament::icon-button icon="heroicon-m-moon" class="block dark:hidden" x-on:click=toggle_theme(); />
+    <x-filament::icon-button icon="heroicon-o-moon" class="block dark:hidden" x-on:click=toggle_theme(); />
 </div>
diff --git a/resources/views/layouts/nav.blade.php b/resources/views/layouts/nav.blade.php
index abd38c4..c403b16 100644
--- a/resources/views/layouts/nav.blade.php
+++ b/resources/views/layouts/nav.blade.php
@@ -25,21 +25,21 @@
         <x-filament::link href="/nutzwerte" color="white" icon="heroicon-o-building-office-2">
             Nutzwerte
         </x-filament::link>
-        <x-filament::link href="/programm" color="white" icon="heroicon-o-calculator">
+        {{-- <x-filament::link href="/programm" color="white" icon="heroicon-o-calculator">
             Programm
-        </x-filament::link>
+        </x-filament::link> --}}
         <x-filament::link href="/impressum" color="white" icon="heroicon-o-calendar-date-range">
             Impressum
         </x-filament::link>
-        <x-filament::button href="/app" tag="a" size="sm">
+
+        <x-filament::button href="/app" tag="a" size="sm" color="gray">
             Anmelden
         </x-filament::button>
+        <x-filament::button href="/app/register" tag="a" size="sm">
+            Registrieren
+        </x-filament::button>
 
         @include('layouts.dark-toggle')
-
-        {{-- <x-filament::button href="/app/register" tag="a" size="sm" color="gray">
-            Registrieren
-        </x-filament::button> --}}
     </dev>
     <!-- Mobile Menu Button -->
     <button x-on:click="mobileMenuIsOpen = !mobileMenuIsOpen" x-bind:aria-expanded="mobileMenuIsOpen"