diff --git a/resources/views/components/forms/button.blade.php b/resources/views/components/forms/button.blade.php
index f91a53b77..460e5ac26 100644
--- a/resources/views/components/forms/button.blade.php
+++ b/resources/views/components/forms/button.blade.php
@@ -9,7 +9,7 @@
     >
 
     {{ $slot }}
-    @if ($attributes->whereStartsWith('wire:click')->first() && $attributes->get('type') === 'submit')
+    @if ($attributes->whereStartsWith('wire:click')->first())
         <x-loading wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}" wire:loading.delay />
     @endif
 </button>
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index e4ac66c17..b1b9a5d40 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -47,7 +47,7 @@ class="relative w-auto h-auto">
         @endif
     @endif
     <template x-teleport="body">
-        <div x-show="modalOpen" class="fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen"
+        <div x-show="modalOpen" class="fixed top-0 lg:top-10 left-0 z-[99] flex items-start justify-center w-screen h-screen"
             x-cloak>
             <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
                 x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index ee81edd63..9da3816a7 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -96,7 +96,7 @@ class="{{ request()->is('destination*') ? 'menu-item-active menu-item' : 'menu-i
                     <li>
                         <a title="Notifications"
                             class="{{ request()->is('notifications*') ? 'menu-item-active menu-item' : 'menu-item' }}"
-                            href="{{ route('notification.email') }}">
+                            href="{{ route('notifications.email') }}">
                             <svg class="icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
                                 <path fill="none" stroke="currentColor" stroke-linecap="round"
                                     stroke-linejoin="round" stroke-width="2"
diff --git a/resources/views/components/notification/navbar.blade.php b/resources/views/components/notification/navbar.blade.php
index e5f42fd12..24b4fecfd 100644
--- a/resources/views/components/notification/navbar.blade.php
+++ b/resources/views/components/notification/navbar.blade.php
@@ -2,16 +2,16 @@
     <h1>Notifications</h1>
     <div class="subtitle">Get notified about your infrastructure.</div>
     <nav class="navbar-main">
-        <a class="{{ request()->routeIs('notification.email') ? 'dark:text-white' : '' }}"
-            href="{{ route('notification.email') }}">
+        <a class="{{ request()->routeIs('notifications.email') ? 'dark:text-white' : '' }}"
+            href="{{ route('notifications.email') }}">
             <button>Email</button>
         </a>
-        <a class="{{ request()->routeIs('notification.telegram') ? 'dark:text-white' : '' }}"
-            href="{{ route('notification.telegram') }}">
+        <a class="{{ request()->routeIs('notifications.telegram') ? 'dark:text-white' : '' }}"
+            href="{{ route('notifications.telegram') }}">
             <button>Telegram</button>
         </a>
-        <a class="{{ request()->routeIs('notification.discord') ? 'dark:text-white' : '' }}"
-            href="{{ route('notification.discord') }}">
+        <a class="{{ request()->routeIs('notifications.discord') ? 'dark:text-white' : '' }}"
+            href="{{ route('notifications.discord') }}">
             <button>Discord</button>
         </a>
     </nav>
diff --git a/resources/views/livewire/layout-popups.blade.php b/resources/views/livewire/layout-popups.blade.php
index 69de58da2..d710b4407 100644
--- a/resources/views/livewire/layout-popups.blade.php
+++ b/resources/views/livewire/layout-popups.blade.php
@@ -57,7 +57,7 @@ class="text-white underline">/subscription</a> to update your subscription or re
                     highly recommended to enable at least
                     one
                     notification channel to receive important alerts.<br>Visit <a
-                        href="{{ route('notification.email') }}" class="text-white underline">/notification</a> to
+                        href="{{ route('notifications.email') }}" class="text-white underline">/notification</a> to
                     enable notifications.</span>
         </x-slot:description>
         <x-slot:button-text @click="disableNotification()">
diff --git a/resources/views/livewire/project/add-empty.blade.php b/resources/views/livewire/project/add-empty.blade.php
index 6560a0a10..c9cf5ac4e 100644
--- a/resources/views/livewire/project/add-empty.blade.php
+++ b/resources/views/livewire/project/add-empty.blade.php
@@ -1,5 +1,5 @@
-<form class="flex flex-col gap-2 rounded" wire:submit='submit'>
-    <x-forms.input placeholder="Your Cool Project" id="name" label="Name" required />
+<form class="flex flex-col w-full gap-2 rounded" wire:submit='submit'>
+    <x-forms.input autofocus placeholder="Your Cool Project" id="name" label="Name" required />
     <x-forms.input placeholder="This is my cool project everyone knows about" id="description" label="Description" />
     <div class="subtitle">New project will have a default production environment.</div>
     <x-forms.button type="submit" @click="slideOverOpen=false">
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index 9b5a2e8b5..f7c6e91ba 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -9,6 +9,9 @@
             <button @click="slideOverOpen=true" class="button">+
                 Add</button>
         </x-slide-over>
+        <x-modal-input buttonTitle="+ Add" title="New Project">
+            <livewire:project.add-empty />
+        </x-modal-input>
     </div>
     <div class="subtitle">All your projects are here.</div>
     <div class="grid gap-2 lg:grid-cols-2">
diff --git a/routes/web.php b/routes/web.php
index 735f6138d..78527c8ce 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -128,9 +128,9 @@
         Route::get('/{tag_name}', TagsShow::class)->name('tags.show');
     });
     Route::prefix('notifications')->group(function () {
-        Route::get('/email', NotificationEmail::class)->name('notification.email');
-        Route::get('/telegram', NotificationTelegram::class)->name('notification.telegram');
-        Route::get('/discord', NotificationDiscord::class)->name('notification.discord');
+        Route::get('/email', NotificationEmail::class)->name('notifications.email');
+        Route::get('/telegram', NotificationTelegram::class)->name('notifications.telegram');
+        Route::get('/discord', NotificationDiscord::class)->name('notifications.discord');
     });
     Route::prefix('team')->group(function () {
         Route::get('/', TeamIndex::class)->name('team.index');