diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php
index 8c75f887e..1c01345bb 100644
--- a/app/Http/Livewire/Server/Form.php
+++ b/app/Http/Livewire/Server/Form.php
@@ -54,6 +54,11 @@ public function checkServer()
         } catch (\Exception $e) {
         }
     }
+    public function delete()
+    {
+        $this->server->delete();
+        redirect()->route('dashboard');
+    }
     public function submit()
     {
         $this->validate();
diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php
index f003beb5f..e5fdafa98 100644
--- a/app/Http/Livewire/Server/New/ByIp.php
+++ b/app/Http/Livewire/Server/New/ByIp.php
@@ -45,6 +45,10 @@ public function addPrivateKey()
     }
     public function submit()
     {
+        if (!$this->private_key_id) {
+            $this->addError('private_key_id', 'The private key field is required.');
+            return;
+        }
         $server = Server::create([
             'name' => $this->name,
             'description' => $this->description,
diff --git a/app/View/Components/FormInput.php b/app/View/Components/FormInput.php
index a96dc3b6c..efe511b6a 100644
--- a/app/View/Components/FormInput.php
+++ b/app/View/Components/FormInput.php
@@ -19,6 +19,7 @@ public function __construct(
         public string|null $type = 'text',
         public bool $instantSave = false,
         public bool $disabled = false,
+        public bool $hidden = false
     ) {
     }
 
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 77af63b9a..cd593ebd5 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -22,6 +22,9 @@
                 Submit
             </button>
             <button wire:click.prevent='checkServer'>Check Server</button>
+            <button class="bg-red-500" @confirm.window="$wire.delete()"
+                x-on:click="toggleConfirmModal('Are you sure you would like to delete this application?')">
+                Delete</button>
             {{-- <button wire:click.prevent='installDocker'>Install Docker</button> --}}
         </div>
     </form>
diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php
index a12ad1523..6f16bece7 100644
--- a/resources/views/livewire/server/new/by-ip.blade.php
+++ b/resources/views/livewire/server/new/by-ip.blade.php
@@ -5,22 +5,29 @@
         <x-form-input id="ip" label="IP Address" required />
         <x-form-input id="user" label="User" />
         <x-form-input type="number" id="port" label="Port" />
+        <x-form-input id="private_key_id" label="Private Key" required hidden />
         <button class="mt-4" type="submit">
             Submit
         </button>
     </form>
-    <h1>Select a private key</h1>
-    @foreach ($private_keys as $key)
-        <button @if ($private_key_id == $key->id) class="bg-green-500" @endif
-            wire:click="setPrivateKey('{{ $key->id }}')">{{ $key->name }}</button>
-    @endforeach
-    <h2>Add a new One</h2>
-    <form wire:submit.prevent='addPrivateKey'>
-        <x-form-input id="new_private_key_name" label="Name" required />
-        <x-form-input id="new_private_key_description" label="Longer Description" />
-        <x-form-input type="textarea" id="new_private_key_value" label="Private Key" required />
-        <button type="submit">
-            Submit
-        </button>
-    </form>
+    <div class="flex gap-4">
+        <div>
+            <h1>Select a private key</h1>
+            @foreach ($private_keys as $key)
+                <button @if ($private_key_id == $key->id) class="bg-green-500" @endif
+                    wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}</button>
+            @endforeach
+        </div>
+        <div>
+            <h2>Add a new One</h2>
+            <form class="flex flex-col gap-2" wire:submit.prevent='addPrivateKey'>
+                <x-form-input id="new_private_key_name" label="Name" required />
+                <x-form-input id="new_private_key_description" label="Longer Description" />
+                <x-form-input type="textarea" id="new_private_key_value" label="Private Key" required />
+                <button type="submit">
+                    Submit
+                </button>
+            </form>
+        </div>
+    </div>
 </div>