diff --git a/app/Livewire/Destination/New/Docker.php b/app/Livewire/Destination/New/Docker.php
index 842a44683..d68bf84d4 100644
--- a/app/Livewire/Destination/New/Docker.php
+++ b/app/Livewire/Destination/New/Docker.php
@@ -35,7 +35,7 @@ class Docker extends Component
     public function mount()
     {
         if (is_null($this->servers)) {
-            $this->servers = Server::ownedByCurrentTeam()->get();
+            $this->servers = Server::isReachable()->get();
         }
         if (request()->query('server_id')) {
             $this->server_id = request()->query('server_id');
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 2f0b5c8b2..f57d8c6fc 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -5,7 +5,7 @@
                 Coolify
             </a>
             <div
-                class="w-full bg-white rounded-lg shadow dark:border md:mt-0 sm:max-w-md xl:p-0 dark:bg-base dark:border-coolgray-200">
+                class="w-full bg-white rounded-lg shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base">
                 <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
                     <h1 class="text-xl font-bold leading-tight tracking-tight text-gray-900 md:text-2xl dark:text-white">
                         Create an account
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index bb8e8c1c3..998c16184 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -8,7 +8,7 @@
     <div class="subtitle">All your projects are here.</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($projects as $project)
-            <div class="gap-2 border border-transparent cursor-pointer box group" x-data
+            <div class="box group" x-data
                 x-on:click="goto('{{ $project->uuid }}')">
                 <a class="flex flex-col flex-1 mx-6 hover:no-underline"
                     href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php
index efe1d714b..1c7bc0bc8 100644
--- a/resources/views/livewire/settings/email.blade.php
+++ b/resources/views/livewire/settings/email.blade.php
@@ -2,16 +2,18 @@
     <div class="flex items-center gap-2">
         <h2>Transactional Email</h2>
     </div>
-    <div class="pb-4 ">Email settings for password resets, invitations, shared with Pro+ subscribers etc.</div>
-    <form wire:submit='submitFromFields' class="pb-4">
-        <div class="flex gap-2">
-            <x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" />
-            <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails."
-                label="From Address" />
-            <x-forms.button type="submit">
-                Save
-            </x-forms.button>
-        </div>
+    @if (isCloud())
+        <div class="pb-4 ">Email settings for password resets, invitations, shared with Pro+ subscribers etc.</div>
+    @else
+        <div class="pb-4 ">Email settings for password resets, invitations, etc.</div>
+    @endif
+    <form wire:submit='submitFromFields' class="flex flex-col gap-2 pb-4">
+        <x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" />
+        <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails."
+            label="From Address" />
+        <x-forms.button type="submit">
+            Save
+        </x-forms.button>
     </form>
     <div class="flex flex-col gap-4">
         <div class="p-4 border dark:border-coolgray-300">
diff --git a/resources/views/livewire/tags/index.blade.php b/resources/views/livewire/tags/index.blade.php
index e81866d32..11442c1f2 100644
--- a/resources/views/livewire/tags/index.blade.php
+++ b/resources/views/livewire/tags/index.blade.php
@@ -24,20 +24,25 @@
                         </div>
                         <div class="grid grid-cols-1 gap-2 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                             @foreach ($applications as $application)
-                                <a href="{{ $application->link() }}" class="flex flex-col box group">
-                                    <span
-                                        class="font-bold dark:text-white">{{ $application->project()->name }}/{{ $application->environment->name }}</span>
-                                    <span class="dark:text-white ">{{ $application->name }}</span>
-                                    <span class="description">{{ $application->description }}</span>
-                                </a>
+                                <div class="box group">
+                                    <a href="{{ $application->link() }}" class="flex flex-col ">
+                                        <div class="box-title">{{ $application->name }}</div>
+                                        <div class="box-description">
+                                            {{ $application->project()->name }}/{{ $application->environment->name }}
+                                        </div>
+                                        <div class="box-description">{{ $application->description }}</div>
+                                    </a>
+                                </div>
                             @endforeach
                             @foreach ($services as $service)
-                                <a href="{{ $service->link() }}" class="flex flex-col box group">
-                                    <span
-                                        class="font-bold dark:text-white">{{ $service->project()->name }}/{{ $service->environment->name }}</span>
-                                    <span class="dark:text-white ">{{ $service->name }}</span>
-                                    <span class="description">{{ $service->description }}</span>
-                                </a>
+                                <div class="box group">
+                                    <a href="{{ $service->link() }}" class="flex flex-col ">
+                                        <div class="box-title">{{ $service->name }}</div>
+                                        <div class="box-description">
+                                            {{ $service->project()->name }}/{{ $service->environment->name }}</div>
+                                        <div class="box-description">{{ $service->description }}</div>
+                                    </a>
+                                </div>
                             @endforeach
                         </div>
                         <div class="flex items-center gap-2">
@@ -51,22 +56,23 @@
                                 <h4 class="py-4">{{ $server_name }}</h4>
                                 <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
                                     @foreach ($deployments as $deployment)
-                                        <a href="{{ data_get($deployment, 'deployment_url') }}"
-                                            @class([
-                                                'gap-2 cursor-pointer box group border-l-2 border-dotted',
-                                                'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
-                                                'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
-                                            ])>
-                                            <div class="flex flex-col mx-6">
-                                                <div class="font-bold dark:text-white">
-                                                    {{ data_get($deployment, 'application_name') }}
+                                        <div @class([
+                                            'box-without-bg dark:bg-coolgray-100 bg-white gap-2 cursor-pointer group border-l-2 border-dotted',
+                                            'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
+                                            'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                                        ])>
+                                            <a href="{{ data_get($deployment, 'deployment_url') }}">
+                                                <div class="flex flex-col mx-6">
+                                                    <div class="box-title">
+                                                        {{ data_get($deployment, 'application_name') }}
+                                                    </div>
+                                                    <div class="box-description">
+                                                        {{ str(data_get($deployment, 'status'))->headline() }}
+                                                    </div>
                                                 </div>
-                                                <div class="description">
-                                                    {{ str(data_get($deployment, 'status'))->headline() }}
-                                                </div>
-                                            </div>
-                                            <div class="flex-1"></div>
-                                        </a>
+                                                <div class="flex-1"></div>
+                                            </a>
+                                        </div>
                                     @endforeach
                                 </div>
                             @empty
diff --git a/resources/views/livewire/team/storage/create.blade.php b/resources/views/livewire/team/storage/create.blade.php
index 1bfbee907..016a6a1b2 100644
--- a/resources/views/livewire/team/storage/create.blade.php
+++ b/resources/views/livewire/team/storage/create.blade.php
@@ -16,7 +16,7 @@
         </div>
 
         <x-forms.button type="submit">
-            Continue
+            Validate Connection & Continue
         </x-forms.button>
     </form>
 </div>