diff --git a/app/Http/Livewire/Destination/Form.php b/app/Http/Livewire/Destination/Form.php
new file mode 100644
index 000000000..437df49c6
--- /dev/null
+++ b/app/Http/Livewire/Destination/Form.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Livewire\Destination;
+
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Livewire\Component;
+
+class Form extends Component
+{
+    public $destination_uuid;
+    public $destination;
+
+    protected $rules = [
+        'destination.name' => 'required',
+        'destination.network' => 'required',
+        'destination.server.ip' => 'required',
+    ];
+    public function mount()
+    {
+        $standalone = StandaloneDocker::where('uuid', $this->destination_uuid)->first();
+        $swarm = SwarmDocker::where('uuid', $this->destination_uuid)->first();
+        if (!$standalone && !$swarm) {
+            abort(404);
+        }
+        $this->destination = $standalone ? $standalone->load(['server']) : $swarm->load(['server']);
+    }
+    public function submit()
+    {
+        $this->validate();
+        $this->destination->save();
+    }
+    public function delete()
+    {
+        instantRemoteProcess(['docker network rm -f ' . $this->destination->network], $this->destination->server);
+        $this->destination->delete();
+        return redirect()->route('dashboard');
+    }
+}
diff --git a/app/Http/Livewire/Destination/New/StandaloneDocker.php b/app/Http/Livewire/Destination/New/StandaloneDocker.php
index 7b1c1089b..bb555bf4b 100644
--- a/app/Http/Livewire/Destination/New/StandaloneDocker.php
+++ b/app/Http/Livewire/Destination/New/StandaloneDocker.php
@@ -5,6 +5,7 @@ namespace App\Http\Livewire\Destination\New;
 use App\Models\Server;
 use App\Models\StandaloneDocker as ModelsStandaloneDocker;
 use Livewire\Component;
+use Visus\Cuid2\Cuid2;
 
 class StandaloneDocker extends Component
 {
@@ -12,7 +13,7 @@ class StandaloneDocker extends Component
     public string $network;
 
     public $servers;
-    public int|null $server_id = null;
+    public int $server_id;
 
     protected $rules = [
         'name' => 'required|string',
@@ -21,13 +22,11 @@ class StandaloneDocker extends Component
     ];
     public function mount()
     {
-        $this->name = generateRandomName();
         $this->servers = Server::where('team_id', session('currentTeam')->id)->get();
+        $this->network = new Cuid2(7);
+        $this->name = generateRandomName();
     }
-    public function setServerId($server_id)
-    {
-        $this->server_id = $server_id;
-    }
+
     public function submit()
     {
         $this->validate();
diff --git a/resources/css/app.css b/resources/css/app.css
index 93d5c4896..d500237ff 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -8,9 +8,13 @@ body {
 a, a:visited {
     @apply text-neutral-300 hover:text-purple-500;
 }
-input, select, textarea {
-    @apply border-none p-2 bg-neutral-800 text-white disabled:text-neutral-600;
+input, textarea {
+    @apply border-none p-2 bg-neutral-800 text-white disabled:text-neutral-600 read-only:text-neutral-600 read-only:select-none
 }
+select {
+    @apply border-none p-2 bg-neutral-800 text-white disabled:text-neutral-600  read-only:select-none
+}
+
 button {
     @apply border-none px-2 p-1 cursor-pointer;
 }
diff --git a/resources/views/components/inputs/button.blade.php b/resources/views/components/inputs/button.blade.php
index 74388b531..23e0e0f11 100644
--- a/resources/views/components/inputs/button.blade.php
+++ b/resources/views/components/inputs/button.blade.php
@@ -1,7 +1,7 @@
 @props([
     'isWarning' => null,
-    'defaultClass' => 'text-white bg-neutral-800 hover:bg-violet-600',
-    'defaultWarningClass' => 'text-white bg-red-500 hover:bg-red-600',
+    'defaultClass' => 'text-white bg-neutral-800 hover:bg-violet-600 w-28',
+    'defaultWarningClass' => 'text-white bg-red-500 hover:bg-red-600 w-28',
     'loadingClass' => 'text-black bg-green-500',
     'confirm' => null,
     'confirmAction' => null,
diff --git a/resources/views/components/inputs/input.blade.php b/resources/views/components/inputs/input.blade.php
index a09af0496..eba849e9d 100644
--- a/resources/views/components/inputs/input.blade.php
+++ b/resources/views/components/inputs/input.blade.php
@@ -2,7 +2,6 @@
     'id' => null,
     'type' => 'text',
     'required' => false,
-    'readonly' => false,
     'label' => null,
     'instantSave' => false,
     'disabled' => false,
diff --git a/resources/views/components/inputs/select.blade.php b/resources/views/components/inputs/select.blade.php
new file mode 100644
index 000000000..722039a77
--- /dev/null
+++ b/resources/views/components/inputs/select.blade.php
@@ -0,0 +1,25 @@
+@props([
+    'id' => null,
+    'label' => null,
+    'required' => false,
+])
+
+<span @class(['flex flex-col'])>
+    <label for={{ $id }}>
+        @if ($label)
+            {{ $label }}
+        @else
+            {{ $id }}
+        @endif
+        @if ($required)
+            *
+        @endif
+    </label>
+    <select {{ $attributes }} wire:model.defer={{ $id }}>
+        {{ $slot }}
+    </select>
+
+    @error($id)
+        <div class="text-red-500">{{ $message }}</div>
+    @enderror
+</span>
diff --git a/resources/views/destination/show.blade.php b/resources/views/destination/show.blade.php
index 51379c451..34bea294e 100644
--- a/resources/views/destination/show.blade.php
+++ b/resources/views/destination/show.blade.php
@@ -1,11 +1,4 @@
 <x-layout>
     <h1>Destination</h1>
-    <p>Name: {{ data_get($destination, 'name') }}</p>
-    <p>Server:{{ data_get($destination, 'server.ip') }}:{{ data_get($destination, 'server.port') }} </p>
-    @if ($destination->getMorphClass() === 'App\Models\StandaloneDocker')
-        <p>Network: {{ data_get($destination, 'network') }}</p>
-    @endif
-    @if ($destination->getMorphClass() === 'App\Models\SwarmDocker')
-        <p>Uuid: {{ data_get($destination, 'uuid') }}</p>
-    @endif
+    <livewire:destination.form :destination_uuid="$destination_uuid" />
 </x-layout>
diff --git a/resources/views/livewire/check-update.blade.php b/resources/views/livewire/check-update.blade.php
index 577b4e931..7e8c93f23 100644
--- a/resources/views/livewire/check-update.blade.php
+++ b/resources/views/livewire/check-update.blade.php
@@ -1,5 +1,6 @@
 <div>
-    <x-inputs.button wire:click='checkUpdate' type="submit">Check for updates</x-inputs.button>
+    <x-inputs.button class="w-32 text-white bg-neutral-800 hover:bg-violet-600" wire:click='checkUpdate' type="submit">
+        Check for updates</x-inputs.button>
     @if ($updateAvailable)
         Update available
     @endif
diff --git a/resources/views/livewire/destination/form.blade.php b/resources/views/livewire/destination/form.blade.php
new file mode 100644
index 000000000..e74656eef
--- /dev/null
+++ b/resources/views/livewire/destination/form.blade.php
@@ -0,0 +1,18 @@
+<div>
+    <form class="flex flex-col gap-4" wire:submit.prevent='submit'>
+        <x-inputs.input id="destination.name" label="Name" />
+        <x-inputs.input id="destination.server.ip" label="Server IP" readonly />
+        @if ($destination->getMorphClass() === 'App\Models\StandaloneDocker')
+            <x-inputs.input id="destination.network" label="Docker Network" readonly />
+        @endif
+        <div>
+            <x-inputs.button>
+                Submit
+            </x-inputs.button>
+            <x-inputs.button confirm='Are you sure you would like to delete this private key?'
+                confirmAction="delete('{{ $destination->id }}')">
+                Delete
+            </x-inputs.button>
+        </div>
+    </form>
+</div>
diff --git a/resources/views/livewire/destination/new/standalone-docker.blade.php b/resources/views/livewire/destination/new/standalone-docker.blade.php
index 2c8cee3c4..023d7d4ba 100644
--- a/resources/views/livewire/destination/new/standalone-docker.blade.php
+++ b/resources/views/livewire/destination/new/standalone-docker.blade.php
@@ -1,21 +1,14 @@
 <div>
-    <form class="flex flex-col" wire:submit.prevent='submit'>
+    <form class="flex items-end gap-4" wire:submit.prevent='submit'>
         <x-inputs.input id="name" label="Name" required />
         <x-inputs.input id="network" label="Network" required />
-        <x-inputs.input id="server_id" label="Server ID" required />
-        @foreach ($servers as $key)
-            @if ($server_id == $key->id)
-                <x-inputs.button class="bg-green-500" wire:click.prevent="setServerId('{{ $key->id }}')">
-                    {{ $key->name }}
-                </x-inputs.button>
-            @else
-                <x-inputs.button wire:click.prevent="setServerId('{{ $key->id }}')">{{ $key->name }}
-                </x-inputs.button>
-            @endif
-        @endforeach
-        <x-inputs.button class="mt-4" type="submit">
+        <x-inputs.select id="server_id" label="Select a server" required>
+            @foreach ($servers as $server)
+                <option value="{{ $server->id }}">{{ $server->name }}</option>
+            @endforeach
+        </x-inputs.select>
+        <x-inputs.button type="submit">
             Submit
         </x-inputs.button>
     </form>
-
 </div>
diff --git a/resources/views/livewire/project/application/destination.blade.php b/resources/views/livewire/project/application/destination.blade.php
index a141c6c4b..feabe4862 100644
--- a/resources/views/livewire/project/application/destination.blade.php
+++ b/resources/views/livewire/project/application/destination.blade.php
@@ -1,5 +1,7 @@
 <div>
-    <p>IP: {{ $destination->server->ip }}</p>
-    <p>Description: {{ $destination->server->description }}</p>
+    <p>Server Name: {{ data_get($destination, 'server.name') }}</p>
+    @if (data_get($destination, 'server.description'))
+        <p>Description: {{ data_get($destination, 'server.description') }}</p>
+    @endif
     <p>Docker Network: {{ $destination->network }}</p>
 </div>
diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 36186c3fd..635134564 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -15,18 +15,16 @@
                 @endif
             </div>
             <div class="flex flex-col w-96">
-
                 <x-inputs.input id="application.base_directory" label="Base Directory" />
                 @if ($application->settings->is_static)
                     <x-inputs.input id="application.publish_directory" label="Publish Directory" required />
                 @else
                     <x-inputs.input id="application.publish_directory" label="Publish Directory" />
                 @endif
-
             </div>
             <div class="flex flex-col w-96">
                 @if ($application->settings->is_static)
-                    <x-inputs.input id="application.ports_exposes" label="Ports Exposes" disabled />
+                    <x-inputs.input id="application.ports_exposes" label="Ports Exposes" readonly />
                 @else
                     <x-inputs.input id="application.ports_exposes" label="Ports Exposes" required />
                 @endif
@@ -34,7 +32,7 @@
                 <x-inputs.input id="application.ports_mappings" label="Ports Mappings" />
             </div>
         </div>
-        <x-inputs.button class="flex mx-auto mt-4" type="submit">
+        <x-inputs.button class="mx-auto mt-4 text-white bg-neutral-800 hover:bg-violet-600" type="submit">
             Submit
         </x-inputs.button>
     </form>
diff --git a/resources/views/livewire/project/application/storages.blade.php b/resources/views/livewire/project/application/storages.blade.php
index 0f7a5bc9c..75d49bc78 100644
--- a/resources/views/livewire/project/application/storages.blade.php
+++ b/resources/views/livewire/project/application/storages.blade.php
@@ -5,6 +5,6 @@
         <p>HostPath:{{ data_get($storage, 'host_path') }}</p>
         <p>ContainerId:{{ data_get($storage, 'container_id') }}</p>
     @empty
-        <p>No storage found.</p>
+        <p>There are no storages added for this application.</p>
     @endforelse
 </div>
diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index ae36b76de..bd9cb6bcd 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -61,7 +61,7 @@
             @if ($is_static)
                 <x-inputs.input id="publish_directory" label="Publish Directory" />
             @else
-                <x-inputs.input type="number" id="port" label="Port" :disabled="$is_static" />
+                <x-inputs.input type="number" id="port" label="Port" :readonly="$is_static" />
             @endif
             <x-inputs.button type="submit">
                 Submit
diff --git a/routes/web.php b/routes/web.php
index e47acfaf1..a22dc59b2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -93,7 +93,7 @@ Route::middleware(['auth'])->group(function () {
 Route::middleware(['auth'])->group(function () {
     Route::get('/destination/new', function () {
         $query_params = request()->query();
-        $server_id = null;
+        $server_id = 1;
         if (isset($query_params['server_id'])) {
             $server_id = $query_params['server_id'];
         }
@@ -109,7 +109,7 @@ Route::middleware(['auth'])->group(function () {
         }
         $destination = $standalone_dockers ? $standalone_dockers : $swarm_dockers;
         return view('destination.show', [
-            'destination' => $destination,
+            'destination_uuid' => $destination->uuid,
         ]);
     })->name('destination.show');
 });