diff --git a/app/Actions/Server/InstallLogDrain.php b/app/Actions/Server/StartLogDrain.php
similarity index 96%
rename from app/Actions/Server/InstallLogDrain.php
rename to app/Actions/Server/StartLogDrain.php
index 43376efe5..0e8036cd9 100644
--- a/app/Actions/Server/InstallLogDrain.php
+++ b/app/Actions/Server/StartLogDrain.php
@@ -5,7 +5,7 @@ namespace App\Actions\Server;
 use App\Models\Server;
 use Lorisleiva\Actions\Concerns\AsAction;
 
-class InstallLogDrain
+class StartLogDrain
 {
     use AsAction;
 
@@ -13,12 +13,16 @@ class InstallLogDrain
     {
         if ($server->settings->is_logdrain_newrelic_enabled) {
             $type = 'newrelic';
+            StopLogDrain::run($server);
         } elseif ($server->settings->is_logdrain_highlight_enabled) {
             $type = 'highlight';
+            StopLogDrain::run($server);
         } elseif ($server->settings->is_logdrain_axiom_enabled) {
             $type = 'axiom';
+            StopLogDrain::run($server);
         } elseif ($server->settings->is_logdrain_custom_enabled) {
             $type = 'custom';
+            StopLogDrain::run($server);
         } else {
             $type = 'none';
         }
@@ -151,6 +155,8 @@ services:
       - ./parsers.conf:/parsers.conf
     ports:
       - 127.0.0.1:24224:24224
+    labels:
+      - coolify.managed=true
     restart: unless-stopped
 ');
             $readme = base64_encode('# New Relic Log Drain
@@ -202,15 +208,11 @@ Files:
                 throw new \Exception('Unknown log drain type.');
             }
             $restart_command = [
-                "echo 'Stopping old Fluent Bit'",
-                "cd $config_path && docker compose down --remove-orphans || true",
                 "echo 'Starting Fluent Bit'",
-                "cd $config_path && docker compose up -d --remove-orphans",
+                "cd $config_path && docker compose up -d",
             ];
             $command = array_merge($command, $add_envs_command, $restart_command);
 
-            StopLogDrain::run($server);
-
             return instant_remote_process($command, $server);
         } catch (\Throwable $e) {
             return handleError($e);
diff --git a/app/Actions/Server/StopLogDrain.php b/app/Actions/Server/StopLogDrain.php
index a5bce94a5..96c2466de 100644
--- a/app/Actions/Server/StopLogDrain.php
+++ b/app/Actions/Server/StopLogDrain.php
@@ -12,7 +12,7 @@ class StopLogDrain
     public function handle(Server $server)
     {
         try {
-            return instant_remote_process(['docker rm -f coolify-log-drain || true'], $server);
+            return instant_remote_process(['docker rm -f coolify-log-drain'], $server, false);
         } catch (\Throwable $e) {
             return handleError($e);
         }
diff --git a/app/Jobs/PushServerUpdateJob.php b/app/Jobs/PushServerUpdateJob.php
index c1db7001d..74ab8fa40 100644
--- a/app/Jobs/PushServerUpdateJob.php
+++ b/app/Jobs/PushServerUpdateJob.php
@@ -6,7 +6,7 @@ use App\Actions\Database\StartDatabaseProxy;
 use App\Actions\Database\StopDatabaseProxy;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
-use App\Actions\Server\InstallLogDrain;
+use App\Actions\Server\StartLogDrain;
 use App\Actions\Shared\ComplexStatusCheck;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
@@ -362,7 +362,7 @@ class PushServerUpdateJob implements ShouldBeEncrypted, ShouldQueue
     private function checkLogDrainContainer()
     {
         if ($this->server->isLogDrainEnabled() && $this->foundLogDrainContainer === false) {
-            InstallLogDrain::dispatch($this->server);
+            StartLogDrain::dispatch($this->server);
         }
     }
 }
diff --git a/app/Jobs/ServerCheckJob.php b/app/Jobs/ServerCheckJob.php
index 727149181..553796e87 100644
--- a/app/Jobs/ServerCheckJob.php
+++ b/app/Jobs/ServerCheckJob.php
@@ -5,7 +5,7 @@ namespace App\Jobs;
 use App\Actions\Docker\GetContainersStatus;
 use App\Actions\Proxy\CheckProxy;
 use App\Actions\Proxy\StartProxy;
-use App\Actions\Server\InstallLogDrain;
+use App\Actions\Server\StartLogDrain;
 use App\Models\Server;
 use App\Notifications\Container\ContainerRestarted;
 use Illuminate\Bus\Queueable;
@@ -109,10 +109,10 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
         if ($foundLogDrainContainer) {
             $status = data_get($foundLogDrainContainer, 'State.Status');
             if ($status !== 'running') {
-                InstallLogDrain::dispatch($this->server);
+                StartLogDrain::dispatch($this->server);
             }
         } else {
-            InstallLogDrain::dispatch($this->server);
+            StartLogDrain::dispatch($this->server);
         }
     }
 }
diff --git a/app/Jobs/ServerStorageCheckJob.php b/app/Jobs/ServerStorageCheckJob.php
index c646f77eb..32737cc47 100644
--- a/app/Jobs/ServerStorageCheckJob.php
+++ b/app/Jobs/ServerStorageCheckJob.php
@@ -38,7 +38,6 @@ class ServerStorageCheckJob implements ShouldBeEncrypted, ShouldQueue
 
             if (is_null($this->percentage)) {
                 $this->percentage = $this->server->storageCheck();
-                loggy('Server storage check percentage: '.$this->percentage);
             }
             if (! $this->percentage) {
                 return 'No percentage could be retrieved.';
diff --git a/app/Livewire/Server/Advanced.php b/app/Livewire/Server/Advanced.php
index 4d2d777d4..87b42cf3c 100644
--- a/app/Livewire/Server/Advanced.php
+++ b/app/Livewire/Server/Advanced.php
@@ -4,45 +4,82 @@ namespace App\Livewire\Server;
 
 use App\Jobs\DockerCleanupJob;
 use App\Models\Server;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class Advanced extends Component
 {
     public Server $server;
 
-    protected $rules = [
-        'server.settings.concurrent_builds' => 'required|integer|min:1',
-        'server.settings.dynamic_timeout' => 'required|integer|min:1',
-        'server.settings.force_docker_cleanup' => 'required|boolean',
-        'server.settings.docker_cleanup_frequency' => 'required_if:server.settings.force_docker_cleanup,true|string',
-        'server.settings.docker_cleanup_threshold' => 'required_if:server.settings.force_docker_cleanup,false|integer|min:1|max:100',
-        'server.settings.server_disk_usage_notification_threshold' => 'required|integer|min:50|max:100',
-        'server.settings.delete_unused_volumes' => 'boolean',
-        'server.settings.delete_unused_networks' => 'boolean',
-    ];
+    public array $parameters = [];
 
-    protected $validationAttributes = [
+    #[Rule(['integer', 'min:1'])]
+    public int $concurrentBuilds = 1;
 
-        'server.settings.concurrent_builds' => 'Concurrent Builds',
-        'server.settings.dynamic_timeout' => 'Dynamic Timeout',
-        'server.settings.force_docker_cleanup' => 'Force Docker Cleanup',
-        'server.settings.docker_cleanup_frequency' => 'Docker Cleanup Frequency',
-        'server.settings.docker_cleanup_threshold' => 'Docker Cleanup Threshold',
-        'server.settings.server_disk_usage_notification_threshold' => 'Server Disk Usage Notification Threshold',
-        'server.settings.delete_unused_volumes' => 'Delete Unused Volumes',
-        'server.settings.delete_unused_networks' => 'Delete Unused Networks',
-    ];
+    #[Rule(['integer', 'min:1'])]
+    public int $dynamicTimeout = 1;
+
+    #[Rule('boolean')]
+    public bool $forceDockerCleanup = false;
+
+    #[Rule('string')]
+    public string $dockerCleanupFrequency = '*/10 * * * *';
+
+    #[Rule(['integer', 'min:1', 'max:99'])]
+    public int $dockerCleanupThreshold = 10;
+
+    #[Rule(['integer', 'min:1', 'max:99'])]
+    public int $serverDiskUsageNotificationThreshold = 50;
+
+    #[Rule('boolean')]
+    public bool $deleteUnusedVolumes = false;
+
+    #[Rule('boolean')]
+    public bool $deleteUnusedNetworks = false;
+
+    public function mount(string $server_uuid)
+    {
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+            $this->parameters = get_route_parameters();
+            $this->syncData();
+        } catch (\Throwable $e) {
+            return redirect()->route('server.show');
+        }
+    }
+
+    public function syncData(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->validate();
+            $this->server->settings->concurrent_builds = $this->concurrentBuilds;
+            $this->server->settings->dynamic_timeout = $this->dynamicTimeout;
+            $this->server->settings->force_docker_cleanup = $this->forceDockerCleanup;
+            $this->server->settings->docker_cleanup_frequency = $this->dockerCleanupFrequency;
+            $this->server->settings->docker_cleanup_threshold = $this->dockerCleanupThreshold;
+            $this->server->settings->server_disk_usage_notification_threshold = $this->serverDiskUsageNotificationThreshold;
+            $this->server->settings->delete_unused_volumes = $this->deleteUnusedVolumes;
+            $this->server->settings->delete_unused_networks = $this->deleteUnusedNetworks;
+            $this->server->settings->save();
+        } else {
+            $this->concurrentBuilds = $this->server->settings->concurrent_builds;
+            $this->dynamicTimeout = $this->server->settings->dynamic_timeout;
+            $this->forceDockerCleanup = $this->server->settings->force_docker_cleanup;
+            $this->dockerCleanupFrequency = $this->server->settings->docker_cleanup_frequency;
+            $this->dockerCleanupThreshold = $this->server->settings->docker_cleanup_threshold;
+            $this->serverDiskUsageNotificationThreshold = $this->server->settings->server_disk_usage_notification_threshold;
+            $this->deleteUnusedVolumes = $this->server->settings->delete_unused_volumes;
+            $this->deleteUnusedNetworks = $this->server->settings->delete_unused_networks;
+        }
+    }
 
     public function instantSave()
     {
         try {
-            $this->validate();
-            $this->server->settings->save();
+            $this->syncData(true);
             $this->dispatch('success', 'Server updated.');
-            $this->dispatch('refreshServerShow');
+            // $this->dispatch('refreshServerShow');
         } catch (\Throwable $e) {
-            $this->server->settings->refresh();
-
             return handleError($e, $this);
         }
     }
@@ -60,12 +97,11 @@ class Advanced extends Component
     public function submit()
     {
         try {
-            $frequency = $this->server->settings->docker_cleanup_frequency;
-            if (empty($frequency) || ! validate_cron_expression($frequency)) {
-                $this->server->settings->docker_cleanup_frequency = '*/10 * * * *';
-                throw new \Exception('Invalid Cron / Human expression for Docker Cleanup Frequency. Resetting to default 10 minutes.');
+            if (! validate_cron_expression($this->dockerCleanupFrequency)) {
+                $this->dockerCleanupFrequency = $this->server->settings->getOriginal('docker_cleanup_frequency');
+                throw new \Exception('Invalid Cron / Human expression for Docker Cleanup Frequency.');
             }
-            $this->server->settings->save();
+            $this->syncData(true);
             $this->dispatch('success', 'Server updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
diff --git a/app/Livewire/Server/Charts.php b/app/Livewire/Server/Charts.php
index 20f8dd9ed..d879de65d 100644
--- a/app/Livewire/Server/Charts.php
+++ b/app/Livewire/Server/Charts.php
@@ -19,6 +19,15 @@ class Charts extends Component
 
     public bool $poll = true;
 
+    public function mount(string $server_uuid)
+    {
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function pollData()
     {
         if ($this->poll || $this->interval <= 10) {
diff --git a/app/Livewire/Server/CloudflareTunnels.php b/app/Livewire/Server/CloudflareTunnels.php
index 82bc789db..f16962bca 100644
--- a/app/Livewire/Server/CloudflareTunnels.php
+++ b/app/Livewire/Server/CloudflareTunnels.php
@@ -3,27 +3,33 @@
 namespace App\Livewire\Server;
 
 use App\Models\Server;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class CloudflareTunnels extends Component
 {
     public Server $server;
 
-    protected $rules = [
-        'server.settings.is_cloudflare_tunnel' => 'required|boolean',
-    ];
+    #[Rule(['required', 'boolean'])]
+    public bool $isCloudflareTunnelsEnabled;
 
-    protected $validationAttributes = [
-        'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
-    ];
+    public function mount(string $server_uuid)
+    {
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+            $this->isCloudflareTunnelsEnabled = $this->server->settings->is_cloudflare_tunnel;
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
 
     public function instantSave()
     {
         try {
             $this->validate();
+            $this->server->settings->is_cloudflare_tunnel = $this->isCloudflareTunnelsEnabled;
             $this->server->settings->save();
             $this->dispatch('success', 'Server updated.');
-            $this->dispatch('refreshServerShow');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -31,6 +37,7 @@ class CloudflareTunnels extends Component
 
     public function manualCloudflareConfig()
     {
+        $this->isCloudflareTunnelsEnabled = true;
         $this->server->settings->is_cloudflare_tunnel = true;
         $this->server->settings->save();
         $this->server->refresh();
diff --git a/app/Livewire/Server/Delete.php b/app/Livewire/Server/Delete.php
index cc2b335e1..b9e3944b5 100644
--- a/app/Livewire/Server/Delete.php
+++ b/app/Livewire/Server/Delete.php
@@ -4,6 +4,7 @@ namespace App\Livewire\Server;
 
 use App\Actions\Server\DeleteServer;
 use App\Models\InstanceSettings;
+use App\Models\Server;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
@@ -13,7 +14,16 @@ class Delete extends Component
 {
     use AuthorizesRequests;
 
-    public $server;
+    public Server $server;
+
+    public function mount(string $server_uuid)
+    {
+        try {
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
 
     public function delete($password)
     {
diff --git a/app/Livewire/Server/Destination/Show.php b/app/Livewire/Server/Destination/Show.php
index 986e16cbf..71c051a74 100644
--- a/app/Livewire/Server/Destination/Show.php
+++ b/app/Livewire/Server/Destination/Show.php
@@ -3,27 +3,87 @@
 namespace App\Livewire\Server\Destination;
 
 use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 
 class Show extends Component
 {
-    public ?Server $server = null;
+    public Server $server;
 
-    public $parameters = [];
+    public Collection $networks;
 
-    public function mount()
+    public function mount(string $server_uuid)
     {
-        $this->parameters = get_route_parameters();
         try {
-            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
-            if (is_null($this->server)) {
-                return redirect()->route('server.index');
-            }
+            $this->networks = collect();
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+            loggy($this->server);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
+    private function createNetworkAndAttachToProxy()
+    {
+        $connectProxyToDockerNetworks = connectProxyToNetworks($this->server);
+        instant_remote_process($connectProxyToDockerNetworks, $this->server, false);
+    }
+
+    public function add($name)
+    {
+        if ($this->server->isSwarm()) {
+            $found = $this->server->swarmDockers()->where('network', $name)->first();
+            if ($found) {
+                $this->dispatch('error', 'Network already added to this server.');
+
+                return;
+            } else {
+                SwarmDocker::create([
+                    'name' => $this->server->name.'-'.$name,
+                    'network' => $this->name,
+                    'server_id' => $this->server->id,
+                ]);
+            }
+        } else {
+            $found = $this->server->standaloneDockers()->where('network', $name)->first();
+            if ($found) {
+                $this->dispatch('error', 'Network already added to this server.');
+
+                return;
+            } else {
+                StandaloneDocker::create([
+                    'name' => $this->server->name.'-'.$name,
+                    'network' => $name,
+                    'server_id' => $this->server->id,
+                ]);
+            }
+            $this->createNetworkAndAttachToProxy();
+        }
+    }
+
+    public function scan()
+    {
+        if ($this->server->isSwarm()) {
+            $alreadyAddedNetworks = $this->server->swarmDockers;
+        } else {
+            $alreadyAddedNetworks = $this->server->standaloneDockers;
+        }
+        $networks = instant_remote_process(['docker network ls --format "{{json .}}"'], $this->server, false);
+        $this->networks = format_docker_command_output_to_json($networks)->filter(function ($network) {
+            return $network['Name'] !== 'bridge' && $network['Name'] !== 'host' && $network['Name'] !== 'none';
+        })->filter(function ($network) use ($alreadyAddedNetworks) {
+            return ! $alreadyAddedNetworks->contains('network', $network['Name']);
+        });
+        if ($this->networks->count() === 0) {
+            $this->dispatch('success', 'No new destinations found on this server.');
+
+            return;
+        }
+        $this->dispatch('success', 'Scan done.');
+    }
+
     public function render()
     {
         return view('livewire.server.destination.show');
diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index bfe2853c0..697c7b76f 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -111,7 +111,7 @@ class Form extends Component
     {
         if ($field === 'server.settings.docker_cleanup_frequency') {
             $frequency = $this->server->settings->docker_cleanup_frequency;
-            if (empty($frequency) || ! validate_cron_expression($frequency)) {
+            if (! validate_cron_expression($frequency)) {
                 $this->dispatch('error', 'Invalid Cron / Human expression for Docker Cleanup Frequency. Resetting to default 10 minutes.');
                 $this->server->settings->docker_cleanup_frequency = '*/10 * * * *';
             }
diff --git a/app/Livewire/Server/LogDrains.php b/app/Livewire/Server/LogDrains.php
index 6e09eecdd..2bc24eff8 100644
--- a/app/Livewire/Server/LogDrains.php
+++ b/app/Livewire/Server/LogDrains.php
@@ -2,84 +2,96 @@
 
 namespace App\Livewire\Server;
 
-use App\Actions\Server\InstallLogDrain;
+use App\Actions\Server\StartLogDrain;
 use App\Actions\Server\StopLogDrain;
 use App\Models\Server;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class LogDrains extends Component
 {
     public Server $server;
 
-    public $parameters = [];
+    #[Rule(['boolean'])]
+    public bool $isLogDrainNewRelicEnabled = false;
 
-    protected $rules = [
-        'server.settings.is_logdrain_newrelic_enabled' => 'required|boolean',
-        'server.settings.logdrain_newrelic_license_key' => 'required|string',
-        'server.settings.logdrain_newrelic_base_uri' => 'required|string',
-        'server.settings.is_logdrain_highlight_enabled' => 'required|boolean',
-        'server.settings.logdrain_highlight_project_id' => 'required|string',
-        'server.settings.is_logdrain_axiom_enabled' => 'required|boolean',
-        'server.settings.logdrain_axiom_dataset_name' => 'required|string',
-        'server.settings.logdrain_axiom_api_key' => 'required|string',
-        'server.settings.is_logdrain_custom_enabled' => 'required|boolean',
-        'server.settings.logdrain_custom_config' => 'required|string',
-        'server.settings.logdrain_custom_config_parser' => 'nullable',
-    ];
+    #[Rule(['boolean'])]
+    public bool $isLogDrainCustomEnabled = false;
 
-    protected $validationAttributes = [
-        'server.settings.is_logdrain_newrelic_enabled' => 'New Relic log drain',
-        'server.settings.logdrain_newrelic_license_key' => 'New Relic license key',
-        'server.settings.logdrain_newrelic_base_uri' => 'New Relic base URI',
-        'server.settings.is_logdrain_highlight_enabled' => 'Highlight log drain',
-        'server.settings.logdrain_highlight_project_id' => 'Highlight project ID',
-        'server.settings.is_logdrain_axiom_enabled' => 'Axiom log drain',
-        'server.settings.logdrain_axiom_dataset_name' => 'Axiom dataset name',
-        'server.settings.logdrain_axiom_api_key' => 'Axiom API key',
-        'server.settings.is_logdrain_custom_enabled' => 'Custom log drain',
-        'server.settings.logdrain_custom_config' => 'Custom log drain configuration',
-        'server.settings.logdrain_custom_config_parser' => 'Custom log drain configuration parser',
-    ];
+    #[Rule(['boolean'])]
+    public bool $isLogDrainAxiomEnabled = false;
 
-    public function mount()
+    #[Rule(['string', 'nullable'])]
+    public ?string $logDrainNewRelicLicenseKey = null;
+
+    #[Rule(['url', 'nullable'])]
+    public ?string $logDrainNewRelicBaseUri = null;
+
+    #[Rule(['string', 'nullable'])]
+    public ?string $logDrainAxiomDatasetName = null;
+
+    #[Rule(['string', 'nullable'])]
+    public ?string $logDrainAxiomApiKey = null;
+
+    #[Rule(['string', 'nullable'])]
+    public ?string $logDrainCustomConfig = null;
+
+    #[Rule(['string', 'nullable'])]
+    public ?string $logDrainCustomConfigParser = null;
+
+    public function mount(string $server_uuid)
     {
-        $this->parameters = get_route_parameters();
         try {
-            $server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
-            if (is_null($server)) {
-                return redirect()->route('server.index');
-            }
-            $this->server = $server;
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+            $this->syncData();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
-    public function configureLogDrain()
+    public function syncData(bool $toModel = false)
+    {
+
+        if ($toModel) {
+            $this->validate();
+            $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
+            $this->server->settings->is_logdrain_axiom_enabled = $this->isLogDrainAxiomEnabled;
+            $this->server->settings->is_logdrain_custom_enabled = $this->isLogDrainCustomEnabled;
+
+            $this->server->settings->logdrain_newrelic_license_key = $this->logDrainNewRelicLicenseKey;
+            $this->server->settings->logdrain_newrelic_base_uri = $this->logDrainNewRelicBaseUri;
+            $this->server->settings->logdrain_axiom_dataset_name = $this->logDrainAxiomDatasetName;
+            $this->server->settings->logdrain_axiom_api_key = $this->logDrainAxiomApiKey;
+            $this->server->settings->logdrain_custom_config = $this->logDrainCustomConfig;
+            $this->server->settings->logdrain_custom_config_parser = $this->logDrainCustomConfigParser;
+
+            $this->server->settings->save();
+        } else {
+            $this->isLogDrainNewRelicEnabled = $this->server->settings->is_logdrain_newrelic_enabled;
+            $this->isLogDrainAxiomEnabled = $this->server->settings->is_logdrain_axiom_enabled;
+            $this->isLogDrainCustomEnabled = $this->server->settings->is_logdrain_custom_enabled;
+
+            $this->logDrainNewRelicLicenseKey = $this->server->settings->logdrain_newrelic_license_key;
+            $this->logDrainNewRelicBaseUri = $this->server->settings->logdrain_newrelic_base_uri;
+            $this->logDrainAxiomDatasetName = $this->server->settings->logdrain_axiom_dataset_name;
+            $this->logDrainAxiomApiKey = $this->server->settings->logdrain_axiom_api_key;
+            $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
+            $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
+        }
+
+    }
+
+    public function instantSave()
     {
         try {
-            InstallLogDrain::run($this->server);
-            if (! $this->server->isLogDrainEnabled()) {
-                $this->dispatch('serverRefresh');
+            $this->syncData(true);
+            if ($this->server->isLogDrainEnabled()) {
+                StartLogDrain::run($this->server);
+                $this->dispatch('success', 'Log drain service started.');
+            } else {
+                StopLogDrain::run($this->server);
                 $this->dispatch('success', 'Log drain service stopped.');
-
-                return;
             }
-            $this->dispatch('serverRefresh');
-            $this->dispatch('success', 'Log drain service started.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSave(string $type)
-    {
-        try {
-            $ok = $this->submit($type);
-            if (! $ok) {
-                return;
-            }
-            $this->configureLogDrain();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
@@ -88,79 +100,10 @@ class LogDrains extends Component
     public function submit(string $type)
     {
         try {
-            $this->resetErrorBag();
-            if ($type === 'newrelic') {
-                $this->validate([
-                    'server.settings.is_logdrain_newrelic_enabled' => 'required|boolean',
-                    'server.settings.logdrain_newrelic_license_key' => 'required|string',
-                    'server.settings.logdrain_newrelic_base_uri' => 'required|string',
-                ]);
-                $this->server->settings->update([
-                    'is_logdrain_highlight_enabled' => false,
-                    'is_logdrain_axiom_enabled' => false,
-                    'is_logdrain_custom_enabled' => false,
-                ]);
-            } elseif ($type === 'highlight') {
-                $this->validate([
-                    'server.settings.is_logdrain_highlight_enabled' => 'required|boolean',
-                    'server.settings.logdrain_highlight_project_id' => 'required|string',
-                ]);
-                $this->server->settings->update([
-                    'is_logdrain_newrelic_enabled' => false,
-                    'is_logdrain_axiom_enabled' => false,
-                    'is_logdrain_custom_enabled' => false,
-                ]);
-            } elseif ($type === 'axiom') {
-                $this->validate([
-                    'server.settings.is_logdrain_axiom_enabled' => 'required|boolean',
-                    'server.settings.logdrain_axiom_dataset_name' => 'required|string',
-                    'server.settings.logdrain_axiom_api_key' => 'required|string',
-                ]);
-                $this->server->settings->update([
-                    'is_logdrain_newrelic_enabled' => false,
-                    'is_logdrain_highlight_enabled' => false,
-                    'is_logdrain_custom_enabled' => false,
-                ]);
-            } elseif ($type === 'custom') {
-                $this->validate([
-                    'server.settings.is_logdrain_custom_enabled' => 'required|boolean',
-                    'server.settings.logdrain_custom_config' => 'required|string',
-                    'server.settings.logdrain_custom_config_parser' => 'nullable',
-                ]);
-                $this->server->settings->update([
-                    'is_logdrain_newrelic_enabled' => false,
-                    'is_logdrain_highlight_enabled' => false,
-                    'is_logdrain_axiom_enabled' => false,
-                ]);
-            }
-            if (! $this->server->isLogDrainEnabled()) {
-                StopLogDrain::dispatch($this->server);
-            }
-            $this->server->settings->save();
+            $this->syncData(true);
             $this->dispatch('success', 'Settings saved.');
-
-            return true;
         } catch (\Throwable $e) {
-            if ($type === 'newrelic') {
-                $this->server->settings->update([
-                    'is_logdrain_newrelic_enabled' => false,
-                ]);
-            } elseif ($type === 'highlight') {
-                $this->server->settings->update([
-                    'is_logdrain_highlight_enabled' => false,
-                ]);
-            } elseif ($type === 'axiom') {
-                $this->server->settings->update([
-                    'is_logdrain_axiom_enabled' => false,
-                ]);
-            } elseif ($type === 'custom') {
-                $this->server->settings->update([
-                    'is_logdrain_custom_enabled' => false,
-                ]);
-            }
-            handleError($e, $this);
-
-            return false;
+            return handleError($e, $this);
         }
     }
 
diff --git a/app/Livewire/Server/PrivateKey/Show.php b/app/Livewire/Server/PrivateKey/Show.php
index 0ad820428..64aa1884b 100644
--- a/app/Livewire/Server/PrivateKey/Show.php
+++ b/app/Livewire/Server/PrivateKey/Show.php
@@ -8,26 +8,63 @@ use Livewire\Component;
 
 class Show extends Component
 {
-    public ?Server $server = null;
+    public Server $server;
 
     public $privateKeys = [];
 
     public $parameters = [];
 
-    public function mount()
+    public function mount(string $server_uuid)
     {
-        $this->parameters = get_route_parameters();
         try {
-            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first();
-            if (is_null($this->server)) {
-                return redirect()->route('server.index');
-            }
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
             $this->privateKeys = PrivateKey::ownedByCurrentTeam()->get()->where('is_git_related', false);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
+    public function setPrivateKey($privateKeyId)
+    {
+        $ownedPrivateKey = PrivateKey::ownedByCurrentTeam()->find($privateKeyId);
+        if (is_null($ownedPrivateKey)) {
+            $this->dispatch('error', 'You are not allowed to use this private key.');
+
+            return;
+        }
+
+        $originalPrivateKeyId = $this->server->getOriginal('private_key_id');
+        try {
+            $this->server->update(['private_key_id' => $privateKeyId]);
+            ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection(justCheckingNewKey: true);
+            if ($uptime) {
+                $this->dispatch('success', 'Private key updated successfully.');
+            } else {
+                throw new \Exception($error);
+            }
+        } catch (\Exception $e) {
+            $this->server->update(['private_key_id' => $originalPrivateKeyId]);
+            $this->server->validateConnection();
+            $this->dispatch('error', $e->getMessage());
+        }
+    }
+
+    public function checkConnection()
+    {
+        try {
+            ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
+            if ($uptime) {
+                $this->dispatch('success', 'Server is reachable.');
+            } else {
+                $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
+
+                return;
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function render()
     {
         return view('livewire.server.private-key.show');
diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php
index 85c5f95f8..afc7682a4 100644
--- a/app/Livewire/Server/Show.php
+++ b/app/Livewire/Server/Show.php
@@ -3,38 +3,203 @@
 namespace App\Livewire\Server;
 
 use App\Models\Server;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 class Show extends Component
 {
-    use AuthorizesRequests;
-
     public Server $server;
 
-    public array $parameters;
+    #[Rule(['required'])]
+    public string $name;
 
-    protected $listeners = ['refreshServerShow'];
+    #[Rule(['nullable'])]
+    public ?string $description;
 
-    public function mount()
+    #[Rule(['required'])]
+    public string $ip;
+
+    #[Rule(['required'])]
+    public string $user;
+
+    #[Rule(['required'])]
+    public string $port;
+
+    #[Rule(['nullable'])]
+    public ?string $validationLogs = null;
+
+    #[Rule(['nullable', 'url'])]
+    public ?string $wildcardDomain;
+
+    #[Rule(['required'])]
+    public bool $isReachable;
+
+    #[Rule(['required'])]
+    public bool $isUsable;
+
+    #[Rule(['required'])]
+    public bool $isSwarmManager;
+
+    #[Rule(['required'])]
+    public bool $isSwarmWorker;
+
+    #[Rule(['required'])]
+    public bool $isBuildServer;
+
+    #[Rule(['required'])]
+    public bool $isMetricsEnabled;
+
+    #[Rule(['required'])]
+    public string $sentinelToken;
+
+    #[Rule(['nullable'])]
+    public ?string $sentinelUpdatedAt;
+
+    #[Rule(['required', 'integer', 'min:1'])]
+    public int $sentinelMetricsRefreshRateSeconds;
+
+    #[Rule(['required', 'integer', 'min:1'])]
+    public int $sentinelMetricsHistoryDays;
+
+    #[Rule(['required', 'integer', 'min:10'])]
+    public int $sentinelPushIntervalSeconds;
+
+    #[Rule(['nullable', 'url'])]
+    public ?string $sentinelCustomUrl;
+
+    #[Rule(['required'])]
+    public bool $isSentinelEnabled;
+
+    #[Rule(['required'])]
+    public bool $isSentinelDebugEnabled;
+
+    #[Rule(['required'])]
+    public string $serverTimezone;
+
+    public array $timezones;
+
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+
+        return [
+            "echo-private:team.{$teamId},CloudflareTunnelConfigured" => '$refresh',
+            'refreshServerShow' => '$refresh',
+        ];
+    }
+
+    public function mount(string $server_uuid)
     {
         try {
-            $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->firstOrFail();
-            $this->parameters = get_route_parameters();
+            $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail();
+            $this->timezones = collect(timezone_identifiers_list())->sort()->values()->toArray();
+            $this->syncData();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
-    public function refreshServerShow()
+    public function syncData(bool $toModel = false)
     {
-        $this->server->refresh();
-        $this->dispatch('$refresh');
+        if ($toModel) {
+            $this->validate();
+            $this->server->name = $this->name;
+            $this->server->description = $this->description;
+            $this->server->ip = $this->ip;
+            $this->server->user = $this->user;
+            $this->server->port = $this->port;
+            $this->server->validation_logs = $this->validationLogs;
+            $this->server->save();
+
+            $this->server->settings->is_swarm_manager = $this->isSwarmManager;
+            $this->server->settings->is_swarm_worker = $this->isSwarmWorker;
+            $this->server->settings->is_build_server = $this->isBuildServer;
+            $this->server->settings->is_metrics_enabled = $this->isMetricsEnabled;
+            $this->server->settings->sentinel_token = $this->sentinelToken;
+            $this->server->settings->sentinel_metrics_refresh_rate_seconds = $this->sentinelMetricsRefreshRateSeconds;
+            $this->server->settings->sentinel_metrics_history_days = $this->sentinelMetricsHistoryDays;
+            $this->server->settings->sentinel_push_interval_seconds = $this->sentinelPushIntervalSeconds;
+            $this->server->settings->sentinel_custom_url = $this->sentinelCustomUrl;
+            $this->server->settings->is_sentinel_enabled = $this->isSentinelEnabled;
+            $this->server->settings->is_sentinel_debug_enabled = $this->isSentinelDebugEnabled;
+            $this->server->settings->server_timezone = $this->serverTimezone;
+            $this->server->settings->save();
+        } else {
+            $this->name = $this->server->name;
+            $this->description = $this->server->description;
+            $this->ip = $this->server->ip;
+            $this->user = $this->server->user;
+            $this->port = $this->server->port;
+            $this->wildcardDomain = $this->server->settings->wildcard_domain;
+            $this->isReachable = $this->server->settings->is_reachable;
+            $this->isUsable = $this->server->settings->is_usable;
+            $this->isSwarmManager = $this->server->settings->is_swarm_manager;
+            $this->isSwarmWorker = $this->server->settings->is_swarm_worker;
+            $this->isBuildServer = $this->server->settings->is_build_server;
+            $this->isMetricsEnabled = $this->server->settings->is_metrics_enabled;
+            $this->sentinelToken = $this->server->settings->sentinel_token;
+            $this->sentinelMetricsRefreshRateSeconds = $this->server->settings->sentinel_metrics_refresh_rate_seconds;
+            $this->sentinelMetricsHistoryDays = $this->server->settings->sentinel_metrics_history_days;
+            $this->sentinelPushIntervalSeconds = $this->server->settings->sentinel_push_interval_seconds;
+            $this->sentinelCustomUrl = $this->server->settings->sentinel_custom_url;
+            $this->isSentinelEnabled = $this->server->settings->is_sentinel_enabled;
+            $this->isSentinelDebugEnabled = $this->server->settings->is_sentinel_debug_enabled;
+            $this->sentinelUpdatedAt = $this->server->settings->updated_at;
+            $this->serverTimezone = $this->server->settings->server_timezone;
+        }
+    }
+
+    public function validateServer($install = true)
+    {
+        try {
+            $this->validationLogs = $this->server->validation_logs = null;
+            $this->server->save();
+            $this->dispatch('init', $install);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function checkLocalhostConnection()
+    {
+        $this->syncData(true);
+        ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
+        if ($uptime) {
+            $this->dispatch('success', 'Server is reachable.');
+            $this->server->settings->is_reachable = $this->isReachable = true;
+            $this->server->settings->is_usable = $this->isUsable = true;
+            $this->server->settings->save();
+            $this->dispatch('proxyStatusUpdated');
+        } else {
+            $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help. <br><br>Error: '.$error);
+
+            return;
+        }
+    }
+
+    public function regenerateSentinelToken()
+    {
+        try {
+            $this->server->settings->generateSentinelToken();
+            $this->dispatch('success', 'Token regenerated & Sentinel restarted.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function instantSave()
+    {
+        $this->submit();
     }
 
     public function submit()
     {
-        $this->dispatch('serverRefresh', false);
+        try {
+            $this->syncData(true);
+            $this->dispatch('success', 'Server updated');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
 
     public function render()
diff --git a/app/Livewire/Server/ShowPrivateKey.php b/app/Livewire/Server/ShowPrivateKey.php
deleted file mode 100644
index eaa71c70b..000000000
--- a/app/Livewire/Server/ShowPrivateKey.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Livewire\Server;
-
-use App\Models\PrivateKey;
-use App\Models\Server;
-use Livewire\Component;
-
-class ShowPrivateKey extends Component
-{
-    public Server $server;
-
-    public $privateKeys;
-
-    public $parameters;
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-
-    public function setPrivateKey($privateKeyId)
-    {
-        $ownedPrivateKey = PrivateKey::ownedByCurrentTeam()->find($privateKeyId);
-        if (is_null($ownedPrivateKey)) {
-            $this->dispatch('error', 'You are not allowed to use this private key.');
-
-            return;
-        }
-
-        $originalPrivateKeyId = $this->server->getOriginal('private_key_id');
-        try {
-            $this->server->update(['private_key_id' => $privateKeyId]);
-            ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection(justCheckingNewKey: true);
-            if ($uptime) {
-                $this->dispatch('success', 'Private key updated successfully.');
-            } else {
-                throw new \Exception($error);
-            }
-        } catch (\Exception $e) {
-            $this->server->update(['private_key_id' => $originalPrivateKeyId]);
-            $this->server->validateConnection();
-            $this->dispatch('error', $e->getMessage());
-        } finally {
-            $this->dispatch('refreshServerShow');
-            $this->server->refresh();
-        }
-    }
-
-    public function checkConnection()
-    {
-        try {
-            ['uptime' => $uptime, 'error' => $error] = $this->server->validateConnection();
-            if ($uptime) {
-                $this->dispatch('success', 'Server is reachable.');
-            } else {
-                $this->dispatch('error', 'Server is not reachable.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.<br><br>Error: '.$error);
-
-                return;
-            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->dispatch('refreshServerShow');
-            $this->server->refresh();
-        }
-    }
-}
diff --git a/app/Models/Server.php b/app/Models/Server.php
index f1792c5e5..bd09f1b85 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -63,7 +63,11 @@ class Server extends BaseModel
                 $payload['ip'] = str($server->ip)->trim();
             }
             $server->forceFill($payload);
-
+        });
+        static::saved(function ($server) {
+            if ($server->privateKey->isDirty()) {
+                refresh_server_connection($server->privateKey);
+            }
         });
         static::created(function ($server) {
             ServerSetting::create([
@@ -1027,7 +1031,6 @@ $schema://$host {
         $this->refresh();
         $unreachableNotificationSent = (bool) $this->unreachable_notification_sent;
         $isReachable = (bool) $this->settings->is_reachable;
-        loggy('Server setting is_reachable changed to '.$isReachable.' for server '.$this->id.'. Unreachable notification sent: '.$unreachableNotificationSent);
         // If the server is reachable, send the reachable notification if it was sent before
         if ($isReachable === true) {
             if ($unreachableNotificationSent === true) {
diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php
index 7a8e7b8ed..bca16536e 100644
--- a/app/Models/ServerSetting.php
+++ b/app/Models/ServerSetting.php
@@ -117,7 +117,6 @@ class ServerSetting extends Model
             $domain = 'http://'.$settings->public_ipv6.':8000';
         }
         $this->sentinel_custom_url = $domain;
-        loggy('Sentinel URL: '.$domain);
         if ($save) {
             $this->save();
         }
diff --git a/app/View/Components/Server/Sidebar.php b/app/View/Components/Server/Sidebar.php
deleted file mode 100644
index f968b6d0c..000000000
--- a/app/View/Components/Server/Sidebar.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\View\Components\Server;
-
-use App\Models\Server;
-use Closure;
-use Illuminate\Contracts\View\View;
-use Illuminate\View\Component;
-
-class Sidebar extends Component
-{
-    /**
-     * Create a new component instance.
-     */
-    public function __construct(public Server $server, public $parameters)
-    {
-        //
-    }
-
-    /**
-     * Get the view / contents that represent the component.
-     */
-    public function render(): View|Closure|string
-    {
-        return view('components.server.sidebar');
-    }
-}
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index f92cd5a73..89462215c 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -127,7 +127,6 @@ function refreshSession(?Team $team = null): void
 }
 function handleError(?Throwable $error = null, ?Livewire\Component $livewire = null, ?string $customErrorMessage = null)
 {
-    loggy($error);
     if ($error instanceof TooManyRequestsException) {
         if (isset($livewire)) {
             return $livewire->dispatch('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
@@ -370,6 +369,9 @@ function translate_cron_expression($expression_to_validate): string
 }
 function validate_cron_expression($expression_to_validate): bool
 {
+    if (empty($expression_to_validate)) {
+        return false;
+    }
     $isValid = false;
     $expression = new CronExpression($expression_to_validate);
     $isValid = $expression->isValid();
diff --git a/resources/views/components/forms/checkbox.blade.php b/resources/views/components/forms/checkbox.blade.php
index fed6ad77f..f5eb5778a 100644
--- a/resources/views/components/forms/checkbox.blade.php
+++ b/resources/views/components/forms/checkbox.blade.php
@@ -14,10 +14,7 @@
     'w-full' => $fullWidth,
 ])>
     @if (!$hideLabel)
-        <label  @class([
-            "flex gap-4 px-0 min-w-fit label",
-            'opacity-40' => $disabled,
-        ])>
+        <label @class(['flex gap-4 px-0 min-w-fit label', 'opacity-40' => $disabled])>
             <span class="flex gap-2">
                 @if ($label)
                     {!! $label !!}
@@ -34,4 +31,5 @@
     <input @disabled($disabled) type="checkbox" {{ $attributes->merge(['class' => $defaultClass]) }}
         @if ($instantSave) wire:loading.attr="disabled" wire:click='{{ $instantSave === 'instantSave' || $instantSave == '1' ? 'instantSave' : $instantSave }}'
        wire:model={{ $id }} @else wire:model={{ $value ?? $id }} @endif />
+
 </div>
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 3ebefb396..b4818984c 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -1,6 +1,7 @@
 @props([
     'title' => 'Are you sure?',
     'isErrorButton' => false,
+    'isHighlightedButton' => false,
     'buttonTitle' => 'Confirm Action',
     'buttonFullWidth' => false,
     'customButton' => null,
@@ -143,6 +144,16 @@
                         {{ $buttonTitle }}
                     </x-forms.button>
                 @endif
+            @elseif($isHighlightedButton)
+                @if ($buttonFullWidth)
+                    <x-forms.button @click="modalOpen=true" class="flex gap-2 w-full" isHighlighted wire:target>
+                        {{ $buttonTitle }}
+                    </x-forms.button>
+                @else
+                    <x-forms.button @click="modalOpen=true" class="flex gap-2" isHighlighted wire:target>
+                        {{ $buttonTitle }}
+                    </x-forms.button>
+                @endif
             @else
                 @if ($buttonFullWidth)
                     <x-forms.button @click="modalOpen=true" class="flex gap-2 w-full" wire:target>
diff --git a/resources/views/components/modal-input.blade.php b/resources/views/components/modal-input.blade.php
index e8c63d929..f396f399d 100644
--- a/resources/views/components/modal-input.blade.php
+++ b/resources/views/components/modal-input.blade.php
@@ -2,6 +2,7 @@
     'title' => 'Are you sure?',
     'buttonTitle' => 'Open Modal',
     'isErrorButton' => false,
+    'isHighlightedButton' => false,
     'disabled' => false,
     'action' => 'delete',
     'content' => null,
@@ -18,6 +19,8 @@
             <x-forms.button isError disabled>{{ $buttonTitle }}</x-forms.button>
         @elseif ($isErrorButton)
             <x-forms.button isError @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+        @elseif ($isHighlightedButton)
+            <x-forms.button isHighlighted @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
         @else
             <x-forms.button @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
         @endif
diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php
index ff28cdbdf..518831c83 100644
--- a/resources/views/components/server/navbar.blade.php
+++ b/resources/views/components/server/navbar.blade.php
@@ -20,7 +20,7 @@
         <nav class="flex items-center gap-6 overflow-x-scroll sm:overflow-x-hidden scrollbar min-h-10 whitespace-nowrap">
             <a class="{{ request()->routeIs('server.show') ? 'dark:text-white' : '' }}"
                 href="{{ route('server.show', [
-                    'server_uuid' => data_get($parameters, 'server_uuid'),
+                    'server_uuid' => data_get($server, 'uuid'),
                 ]) }}">
                 <button>Configuration</button>
             </a>
@@ -28,20 +28,20 @@
             @if (!$server->isSwarmWorker() && !$server->settings->is_build_server)
                 <a class="{{ request()->routeIs('server.proxy') ? 'dark:text-white' : '' }}"
                     href="{{ route('server.proxy', [
-                        'server_uuid' => data_get($parameters, 'server_uuid'),
+                        'server_uuid' => data_get($server, 'uuid'),
                     ]) }}">
                     <button>Proxy</button>
                 </a>
             @endif
             <a class="{{ request()->routeIs('server.resources') ? 'dark:text-white' : '' }}"
                 href="{{ route('server.resources', [
-                    'server_uuid' => data_get($parameters, 'server_uuid'),
+                    'server_uuid' => data_get($server, 'uuid'),
                 ]) }}">
                 <button>Resources</button>
             </a>
             <a class="{{ request()->routeIs('server.command') ? 'dark:text-white' : '' }}"
                 href="{{ route('server.command', [
-                    'server_uuid' => data_get($parameters, 'server_uuid'),
+                    'server_uuid' => data_get($server, 'uuid'),
                 ]) }}">
                 <button>Terminal</button>
             </a>
diff --git a/resources/views/components/server/sidebar-proxy.blade.php b/resources/views/components/server/sidebar-proxy.blade.php
new file mode 100644
index 000000000..9f47fde7f
--- /dev/null
+++ b/resources/views/components/server/sidebar-proxy.blade.php
@@ -0,0 +1,16 @@
+@if ($server->proxySet())
+    <div class="flex flex-col items-start gap-2 min-w-fit">
+        <a class="{{ request()->routeIs('server.proxy') ? 'menu-item menu-item-active' : 'menu-item' }}"
+            href="{{ route('server.proxy', $parameters) }}">
+            <button>Configuration</button>
+        </a>
+        <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'menu-item menu-item-active' : 'menu-item' }}"
+            href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
+            <button>Dynamic Configurations</button>
+        </a>
+        <a class="{{ request()->routeIs('server.proxy.logs') ? 'menu-item menu-item-active' : 'menu-item' }}"
+            href="{{ route('server.proxy.logs', $parameters) }}">
+            <button>Logs</button>
+        </a>
+    </div>
+@endif
diff --git a/resources/views/components/server/sidebar.blade.php b/resources/views/components/server/sidebar.blade.php
index 9f47fde7f..bd5249c86 100644
--- a/resources/views/components/server/sidebar.blade.php
+++ b/resources/views/components/server/sidebar.blade.php
@@ -1,16 +1,29 @@
-@if ($server->proxySet())
-    <div class="flex flex-col items-start gap-2 min-w-fit">
-        <a class="{{ request()->routeIs('server.proxy') ? 'menu-item menu-item-active' : 'menu-item' }}"
-            href="{{ route('server.proxy', $parameters) }}">
-            <button>Configuration</button>
+<div class="flex flex-col items-start gap-2 min-w-fit">
+    <a class="menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}"
+        href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}" wire:navigate>General</a>
+    @if ($server->isFunctional())
+        <a class="menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}"
+            href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}" wire:navigate>Advanced
         </a>
-        <a class="{{ request()->routeIs('server.proxy.dynamic-confs') ? 'menu-item menu-item-active' : 'menu-item' }}"
-            href="{{ route('server.proxy.dynamic-confs', $parameters) }}">
-            <button>Dynamic Configurations</button>
+    @endif
+    <a class="menu-item {{ $activeMenu === 'private-key' ? 'menu-item-active' : '' }}"
+        href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}" wire:navigate>Private Key
+    </a>
+    @if ($server->isFunctional())
+        <a class="menu-item {{ $activeMenu === 'cloudflare-tunnels' ? 'menu-item-active' : '' }}"
+            href="{{ route('server.cloudflare-tunnels', ['server_uuid' => $server->uuid]) }}" wire:navigate>Cloudflare
+            Tunnels</a>
+        <a class="menu-item {{ $activeMenu === 'destinations' ? 'menu-item-active' : '' }}"
+            href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}" wire:navigate>Destinations
         </a>
-        <a class="{{ request()->routeIs('server.proxy.logs') ? 'menu-item menu-item-active' : 'menu-item' }}"
-            href="{{ route('server.proxy.logs', $parameters) }}">
-            <button>Logs</button>
-        </a>
-    </div>
-@endif
+        <a class="menu-item {{ $activeMenu === 'log-drains' ? 'menu-item-active' : '' }}"
+            href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}" wire:navigate>Log
+            Drains</a>
+        <a class="menu-item {{ $activeMenu === 'metrics' ? 'menu-item-active' : '' }}"
+            href="{{ route('server.charts', ['server_uuid' => $server->uuid]) }}">Metrics</a>
+    @endif
+    @if (!$server->isLocalhost())
+        <a class="menu-item {{ $activeMenu === 'danger' ? 'menu-item-active' : '' }}"
+            href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}" wire:navigate>Danger</a>
+    @endif
+</div>
diff --git a/resources/views/livewire/server/advanced.blade.php b/resources/views/livewire/server/advanced.blade.php
index 29b6cd34c..2440f49d0 100644
--- a/resources/views/livewire/server/advanced.blade.php
+++ b/resources/views/livewire/server/advanced.blade.php
@@ -1,47 +1,50 @@
-<form wire:submit='submit'>
-    <div>
-        <div class="flex items-center gap-2">
-            <h2>Advanced</h2>
-            <x-forms.button type="submit">Save</x-forms.button>
-            <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
-                submitAction="manualCleanup" :actions="[
-                    'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
-                    'Permanently deletes all unused images',
-                    'Clears build cache',
-                    'Removes old versions of the Coolify helper image',
-                    'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
-                    'Optionally permanently deletes all unused networks (if enabled in advanced options).',
-                ]" :confirmWithText="false" :confirmWithPassword="false"
-                step2ButtonText="Trigger Docker Cleanup" />
-        </div>
-        <div>Advanced configuration for your server.</div>
-    </div>
+<div>
+    <x-server.navbar :server="$server" />
+    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="advanced" />
+        <form wire:submit='submit' class="w-full">
+            <div>
+                <div class="flex items-center gap-2">
+                    <h2>Advanced</h2>
+                    <x-forms.button type="submit">Save</x-forms.button>
+                    <x-modal-confirmation title="Confirm Docker Cleanup?" buttonTitle="Trigger Manual Cleanup"
+                        isHighlightedButton submitAction="manualCleanup" :actions="[
+                            'Permanently deletes all stopped containers managed by Coolify (as containers are non-persistent, no data will be lost)',
+                            'Permanently deletes all unused images',
+                            'Clears build cache',
+                            'Removes old versions of the Coolify helper image',
+                            'Optionally permanently deletes all unused volumes (if enabled in advanced options).',
+                            'Optionally permanently deletes all unused networks (if enabled in advanced options).',
+                        ]" :confirmWithText="false"
+                        :confirmWithPassword="false" step2ButtonText="Trigger Docker Cleanup" />
+                </div>
+                <div>Advanced configuration for your server.</div>
+            </div>
 
-    <div class="flex flex-col gap-4">
-        <div class="flex flex-col">
-            <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
-                <x-forms.input id="server.settings.server_disk_usage_notification_threshold"
-                    label="Server disk usage notification threshold (%)" required
-                    helper="If the server disk usage exceeds this threshold, Coolify will send a notification to the team members." />
-            </div>
-        </div>
-        <div class="flex flex-col gap-2">
-            <div class="flex items-center gap-2">
-                <h3>Docker Cleanup</h3>
-            </div>
-            <div class="flex flex-wrap items-center gap-4">
-                @if ($server->settings->force_docker_cleanup)
-                    <x-forms.input placeholder="*/10 * * * *" id="server.settings.docker_cleanup_frequency"
-                        label="Docker cleanup frequency" required
-                        helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
-                @else
-                    <x-forms.input id="server.settings.docker_cleanup_threshold" label="Docker cleanup threshold (%)"
-                        required
-                        helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
-                @endif
-                <div class="w-96">
-                    <x-forms.checkbox
-                        helper="Enabling Force Docker Cleanup or manually triggering a cleanup will perform the following actions:
+            <div class="flex flex-col gap-4">
+                <div class="flex flex-col">
+                    <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
+                        <x-forms.input id="serverDiskUsageNotificationThreshold"
+                            label="Server disk usage notification threshold (%)" required
+                            helper="If the server disk usage exceeds this threshold, Coolify will send a notification to the team members." />
+                    </div>
+                </div>
+                <div class="flex flex-col gap-2">
+                    <div class="flex items-center gap-2">
+                        <h3>Docker Cleanup</h3>
+                    </div>
+                    <div class="flex flex-wrap items-center gap-4">
+                        @if ($forceDockerCleanup)
+                            <x-forms.input placeholder="*/10 * * * *" id="dockerCleanupFrequency"
+                                label="Docker cleanup frequency" required
+                                helper="Cron expression for Docker Cleanup.<br>You can use every_minute, hourly, daily, weekly, monthly, yearly.<br><br>Default is every night at midnight." />
+                        @else
+                            <x-forms.input id="dockerCleanupThreshold" label="Docker cleanup threshold (%)" required
+                                helper="The Docker cleanup tasks will run when the disk usage exceeds this threshold." />
+                        @endif
+                        <div class="w-96">
+                            <x-forms.checkbox
+                                helper="Enabling Force Docker Cleanup or manually triggering a cleanup will perform the following actions:
                         <ul class='list-disc pl-4 mt-2'>
                             <li>Removes stopped containers manged by Coolify (as containers are none persistent, no data will be lost).</li>
                             <li>Deletes unused images.</li>
@@ -50,43 +53,45 @@
                             <li>Optionally delete unused volumes (if enabled in advanced options).</li>
                             <li>Optionally remove unused networks (if enabled in advanced options).</li>
                         </ul>"
-                        instantSave id="server.settings.force_docker_cleanup" label="Force Docker Cleanup" />
-                </div>
+                                instantSave id="forceDockerCleanup" label="Force Docker Cleanup" />
+                        </div>
 
-            </div>
-            <p class="text-sm text-gray-600 dark:text-gray-400 mb-2">
-                <span class="dark:text-warning font-bold">Warning: Enable these
-                    options only if you fully understand their implications and
-                    consequences!</span><br>Improper use will result in data loss and could cause
-                functional issues.
-            </p>
-            <div class="w-96">
-                <x-forms.checkbox instantSave id="server.settings.delete_unused_volumes" label="Delete Unused Volumes"
-                    helper="This option will remove all unused Docker volumes during cleanup.<br><br><strong>Warning: Data form stopped containers will be lost!</strong><br><br>Consequences include:<br>
+                    </div>
+                    <p class="text-sm text-gray-600 dark:text-gray-400 mb-2">
+                        <span class="dark:text-warning font-bold">Warning: Enable these
+                            options only if you fully understand their implications and
+                            consequences!</span><br>Improper use will result in data loss and could cause
+                        functional issues.
+                    </p>
+                    <div class="w-96">
+                        <x-forms.checkbox instantSave id="deleteUnusedVolumes" label="Delete Unused Volumes"
+                            helper="This option will remove all unused Docker volumes during cleanup.<br><br><strong>Warning: Data form stopped containers will be lost!</strong><br><br>Consequences include:<br>
             <ul class='list-disc pl-4 mt-2'>
                 <li>Volumes not attached to running containers will be deleted and data will be permanently lost (stopped containers are affected).</li>
                 <li>Data from stopped containers volumes will be permanently lost.</li>
                 <li>No way to recover deleted volume data.</li>
             </ul>" />
-                <x-forms.checkbox instantSave id="server.settings.delete_unused_networks" label="Delete Unused Networks"
-                    helper="This option will remove all unused Docker networks during cleanup.<br><br><strong>Warning: Functionality may be lost and containers may not be able to communicate with each other!</strong><br><br>Consequences include:<br>
+                        <x-forms.checkbox instantSave id="deleteUnusedNetworks" label="Delete Unused Networks"
+                            helper="This option will remove all unused Docker networks during cleanup.<br><br><strong>Warning: Functionality may be lost and containers may not be able to communicate with each other!</strong><br><br>Consequences include:<br>
             <ul class='list-disc pl-4 mt-2'>
                 <li>Networks not attached to running containers will be permanently deleted (stopped containers are affected).</li>
                 <li>Custom networks for stopped containers will be permanently deleted.</li>
                 <li>Functionality may be lost and containers may not be able to communicate with each other.</li>
             </ul>" />
-            </div>
-        </div>
+                    </div>
+                </div>
 
-        <div class="flex flex-col">
-            <h3>Builds</h3>
-            <div>Customize the build process.</div>
-            <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
-                <x-forms.input id="server.settings.concurrent_builds" label="Number of concurrent builds" required
-                    helper="You can specify the number of simultaneous build processes/deployments that should run concurrently." />
-                <x-forms.input id="server.settings.dynamic_timeout" label="Deployment timeout (seconds)" required
-                    helper="You can define the maximum duration for a deployment to run before timing it out." />
+                <div class="flex flex-col">
+                    <h3>Builds</h3>
+                    <div>Customize the build process.</div>
+                    <div class="flex flex-wrap gap-2 sm:flex-nowrap pt-4">
+                        <x-forms.input id="concurrentBuilds" label="Number of concurrent builds" required
+                            helper="You can specify the number of simultaneous build processes/deployments that should run concurrently." />
+                        <x-forms.input id="dynamicTimeout" label="Deployment timeout (seconds)" required
+                            helper="You can define the maximum duration for a deployment to run before timing it out." />
+                    </div>
+                </div>
             </div>
-        </div>
+        </form>
     </div>
-</form>
+</div>
diff --git a/resources/views/livewire/server/charts.blade.php b/resources/views/livewire/server/charts.blade.php
index b0447fd78..64a5b5fbb 100644
--- a/resources/views/livewire/server/charts.blade.php
+++ b/resources/views/livewire/server/charts.blade.php
@@ -1,240 +1,253 @@
-<div @if ($poll) wire:poll.5000ms='pollData' @endif x-init="$wire.loadData()">
-    <x-forms.select label="Interval" wire:change="setInterval" id="interval">
-        <option value="5">5 minutes (live)</option>
-        <option value="10">10 minutes (live)</option>
-        <option value="30">30 minutes</option>
-        <option value="60">1 hour</option>
-        <option value="720">12 hours</option>
-        <option value="10080">1 week</option>
-        <option value="43200">30 days</option>
-    </x-forms.select>
-    <h4 class="pt-4">CPU (%)</h4>
-    <div wire:ignore id="{!! $chartId !!}-cpu"></div>
+<div>
+    <x-slot:title>
+        {{ data_get_str($server, 'name')->limit(10) }} > Server Destinations | Coolify
+    </x-slot>
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="metrics" />
+        <div class="w-full">
+            <h2>Metrics</h2>
+            <div class="pb-4">Basic metrics for your container.</div>
+            <div @if ($poll) wire:poll.5000ms='pollData' @endif x-init="$wire.loadData()">
+                <x-forms.select label="Interval" wire:change="setInterval" id="interval">
+                    <option value="5">5 minutes (live)</option>
+                    <option value="10">10 minutes (live)</option>
+                    <option value="30">30 minutes</option>
+                    <option value="60">1 hour</option>
+                    <option value="720">12 hours</option>
+                    <option value="10080">1 week</option>
+                    <option value="43200">30 days</option>
+                </x-forms.select>
+                <h4 class="pt-4">CPU (%)</h4>
+                <div wire:ignore id="{!! $chartId !!}-cpu"></div>
 
-    <script>
-        checkTheme();
-        const optionsServerCpu = {
-            stroke: {
-                curve: 'straight',
-            },
-            chart: {
-                height: '150px',
-                id: '{!! $chartId !!}-cpu',
-                type: 'area',
-                toolbar: {
-                    show: true,
-                    tools: {
-                        download: false,
-                        selection: false,
-                        zoom: true,
-                        zoomin: false,
-                        zoomout: false,
-                        pan: false,
-                        reset: true
-                    },
-                },
-                animations: {
-                    enabled: false,
-                },
-            },
-            fill: {
-                type: 'gradient',
-            },
-            dataLabels: {
-                enabled: false,
-                offsetY: -10,
-                style: {
-                    colors: ['#FCD452'],
-                },
-                background: {
-                    enabled: false,
-                }
-            },
-            grid: {
-                show: true,
-                borderColor: '',
-            },
-            colors: [baseColor],
-            xaxis: {
-                type: 'datetime',
-            },
-            series: [{
-                name: 'CPU %',
-                data: []
-            }],
-            noData: {
-                text: 'Loading...',
-                style: {
-                    color: textColor,
-                }
-            },
-            tooltip: {
-                enabled: true,
-                marker: {
-                    show: false,
-                }
-            },
-            legend: {
-                show: false
-            }
-        }
-        const serverCpuChart = new ApexCharts(document.getElementById(`{!! $chartId !!}-cpu`),
-            optionsServerCpu);
-        serverCpuChart.render();
-        document.addEventListener('livewire:init', () => {
-            Livewire.on('refreshChartData-{!! $chartId !!}-cpu', (chartData) => {
-                checkTheme();
-                serverCpuChart.updateOptions({
-                    series: [{
-                        data: chartData[0].seriesData,
-                    }],
-                    colors: [baseColor],
-                    xaxis: {
-                        type: 'datetime',
-                        labels: {
-                            show: true,
-                            style: {
-                                colors: textColor,
-                            }
-                        }
-                    },
-                    yaxis: {
-                        show: true,
-                        labels: {
-                            show: true,
-                            style: {
-                                colors: textColor,
-                            }
-                        }
-                    },
-                    noData: {
-                        text: 'Loading...',
-                        style: {
-                            color: textColor,
-                        }
-                    }
-                });
-            });
-        });
-    </script>
-
-    <div>
-        <h4>Memory (%)</h4>
-        <div wire:ignore id="{!! $chartId !!}-memory"></div>
-
-        <script>
-            checkTheme();
-            const optionsServerMemory = {
-                stroke: {
-                    curve: 'straight',
-                },
-                chart: {
-                    height: '150px',
-                    id: '{!! $chartId !!}-memory',
-                    type: 'area',
-                    toolbar: {
-                        show: true,
-                        tools: {
-                            download: false,
-                            selection: false,
-                            zoom: true,
-                            zoomin: false,
-                            zoomout: false,
-                            pan: false,
-                            reset: true
-                        },
-                    },
-                    animations: {
-                        enabled: false,
-                    },
-                },
-                fill: {
-                    type: 'gradient',
-                },
-                dataLabels: {
-                    enabled: false,
-                    offsetY: -10,
-                    style: {
-                        colors: ['#FCD452'],
-                    },
-                    background: {
-                        enabled: false,
-                    }
-                },
-                grid: {
-                    show: true,
-                    borderColor: '',
-                },
-                colors: [baseColor],
-                xaxis: {
-                    type: 'datetime',
-                    labels: {
-                        show: true,
-                        style: {
-                            colors: textColor,
-                        }
-                    }
-                },
-                series: [{
-                    name: "Memory (%)",
-                    data: []
-                }],
-                noData: {
-                    text: 'Loading...',
-                    style: {
-                        color: textColor,
-                    }
-                },
-                tooltip: {
-                    enabled: true,
-                    marker: {
-                        show: false,
-                    }
-                },
-                legend: {
-                    show: false
-                }
-            }
-            const serverMemoryChart = new ApexCharts(document.getElementById(`{!! $chartId !!}-memory`),
-                optionsServerMemory);
-            serverMemoryChart.render();
-            document.addEventListener('livewire:init', () => {
-                Livewire.on('refreshChartData-{!! $chartId !!}-memory', (chartData) => {
+                <script>
                     checkTheme();
-                    serverMemoryChart.updateOptions({
-                        series: [{
-                            data: chartData[0].seriesData,
-                        }],
+                    const optionsServerCpu = {
+                        stroke: {
+                            curve: 'straight',
+                        },
+                        chart: {
+                            height: '150px',
+                            id: '{!! $chartId !!}-cpu',
+                            type: 'area',
+                            toolbar: {
+                                show: true,
+                                tools: {
+                                    download: false,
+                                    selection: false,
+                                    zoom: true,
+                                    zoomin: false,
+                                    zoomout: false,
+                                    pan: false,
+                                    reset: true
+                                },
+                            },
+                            animations: {
+                                enabled: false,
+                            },
+                        },
+                        fill: {
+                            type: 'gradient',
+                        },
+                        dataLabels: {
+                            enabled: false,
+                            offsetY: -10,
+                            style: {
+                                colors: ['#FCD452'],
+                            },
+                            background: {
+                                enabled: false,
+                            }
+                        },
+                        grid: {
+                            show: true,
+                            borderColor: '',
+                        },
                         colors: [baseColor],
                         xaxis: {
                             type: 'datetime',
-                            labels: {
-                                show: true,
-                                style: {
-                                    colors: textColor,
-                                }
-                            }
-                        },
-                        yaxis: {
-                            min: 0,
-                            show: true,
-                            labels: {
-                                show: true,
-                                style: {
-                                    colors: textColor,
-                                }
-                            }
                         },
+                        series: [{
+                            name: 'CPU %',
+                            data: []
+                        }],
                         noData: {
                             text: 'Loading...',
                             style: {
                                 color: textColor,
                             }
+                        },
+                        tooltip: {
+                            enabled: true,
+                            marker: {
+                                show: false,
+                            }
+                        },
+                        legend: {
+                            show: false
                         }
+                    }
+                    const serverCpuChart = new ApexCharts(document.getElementById(`{!! $chartId !!}-cpu`),
+                        optionsServerCpu);
+                    serverCpuChart.render();
+                    document.addEventListener('livewire:init', () => {
+                        Livewire.on('refreshChartData-{!! $chartId !!}-cpu', (chartData) => {
+                            checkTheme();
+                            serverCpuChart.updateOptions({
+                                series: [{
+                                    data: chartData[0].seriesData,
+                                }],
+                                colors: [baseColor],
+                                xaxis: {
+                                    type: 'datetime',
+                                    labels: {
+                                        show: true,
+                                        style: {
+                                            colors: textColor,
+                                        }
+                                    }
+                                },
+                                yaxis: {
+                                    show: true,
+                                    labels: {
+                                        show: true,
+                                        style: {
+                                            colors: textColor,
+                                        }
+                                    }
+                                },
+                                noData: {
+                                    text: 'Loading...',
+                                    style: {
+                                        color: textColor,
+                                    }
+                                }
+                            });
+                        });
                     });
-                });
-            });
-        </script>
+                </script>
 
+                <div>
+                    <h4>Memory (%)</h4>
+                    <div wire:ignore id="{!! $chartId !!}-memory"></div>
+
+                    <script>
+                        checkTheme();
+                        const optionsServerMemory = {
+                            stroke: {
+                                curve: 'straight',
+                            },
+                            chart: {
+                                height: '150px',
+                                id: '{!! $chartId !!}-memory',
+                                type: 'area',
+                                toolbar: {
+                                    show: true,
+                                    tools: {
+                                        download: false,
+                                        selection: false,
+                                        zoom: true,
+                                        zoomin: false,
+                                        zoomout: false,
+                                        pan: false,
+                                        reset: true
+                                    },
+                                },
+                                animations: {
+                                    enabled: false,
+                                },
+                            },
+                            fill: {
+                                type: 'gradient',
+                            },
+                            dataLabels: {
+                                enabled: false,
+                                offsetY: -10,
+                                style: {
+                                    colors: ['#FCD452'],
+                                },
+                                background: {
+                                    enabled: false,
+                                }
+                            },
+                            grid: {
+                                show: true,
+                                borderColor: '',
+                            },
+                            colors: [baseColor],
+                            xaxis: {
+                                type: 'datetime',
+                                labels: {
+                                    show: true,
+                                    style: {
+                                        colors: textColor,
+                                    }
+                                }
+                            },
+                            series: [{
+                                name: "Memory (%)",
+                                data: []
+                            }],
+                            noData: {
+                                text: 'Loading...',
+                                style: {
+                                    color: textColor,
+                                }
+                            },
+                            tooltip: {
+                                enabled: true,
+                                marker: {
+                                    show: false,
+                                }
+                            },
+                            legend: {
+                                show: false
+                            }
+                        }
+                        const serverMemoryChart = new ApexCharts(document.getElementById(`{!! $chartId !!}-memory`),
+                            optionsServerMemory);
+                        serverMemoryChart.render();
+                        document.addEventListener('livewire:init', () => {
+                            Livewire.on('refreshChartData-{!! $chartId !!}-memory', (chartData) => {
+                                checkTheme();
+                                serverMemoryChart.updateOptions({
+                                    series: [{
+                                        data: chartData[0].seriesData,
+                                    }],
+                                    colors: [baseColor],
+                                    xaxis: {
+                                        type: 'datetime',
+                                        labels: {
+                                            show: true,
+                                            style: {
+                                                colors: textColor,
+                                            }
+                                        }
+                                    },
+                                    yaxis: {
+                                        min: 0,
+                                        show: true,
+                                        labels: {
+                                            show: true,
+                                            style: {
+                                                colors: textColor,
+                                            }
+                                        }
+                                    },
+                                    noData: {
+                                        text: 'Loading...',
+                                        style: {
+                                            color: textColor,
+                                        }
+                                    }
+                                });
+                            });
+                        });
+                    </script>
+
+                </div>
+            </div>
+        </div>
     </div>
 </div>
diff --git a/resources/views/livewire/server/cloudflare-tunnels.blade.php b/resources/views/livewire/server/cloudflare-tunnels.blade.php
index acca66d60..4cb7fc2ec 100644
--- a/resources/views/livewire/server/cloudflare-tunnels.blade.php
+++ b/resources/views/livewire/server/cloudflare-tunnels.blade.php
@@ -1,42 +1,54 @@
 <div>
-    <div class="flex gap-1 items-center">
-        <h2>Cloudflare Tunnels</h2>
-        <x-helper class="inline-flex"
-            helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br> You then can close your server's SSH port in the firewall of your hosting provider.<br><span class='dark:text-warning'>If you choose manual configuration, Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
-    </div>
-    <div class="flex flex-col gap-2 pt-6">
-        @if ($server->settings->is_cloudflare_tunnel)
-            <div class="w-64">
-                <x-forms.checkbox instantSave id="server.settings.is_cloudflare_tunnel"
-                    label="Enabled" />
-            </div>
-        @elseif (!$server->isFunctional())
-            <div
-                class="p-4 mb-4 w-full text-sm text-yellow-800 bg-yellow-100 rounded dark:bg-yellow-900 dark:text-yellow-300">
-                To <span class="font-semibold">automatically</span> configure Cloudflare Tunnels, please
-                validate your server first.</span> Then you will need a Cloudflare token and an SSH
-                domain configured.
-                <br />
-                To <span class="font-semibold">manually</span> configure Cloudflare Tunnels, please
-                click <span wire:click="manualCloudflareConfig"
-                    class="underline cursor-pointer">here</span>, then you should validate the server.
-                <br /><br />
-                For more information, please read our <a
-                    href="https://coolify.io/docs/knowledge-base/cloudflare/tunnels/" target="_blank"
-                    class="font-medium underline hover:text-yellow-600 dark:hover:text-yellow-200">documentation</a>.
-            </div>
-        @endif
-        @if (!$server->settings->is_cloudflare_tunnel && $server->isFunctional())
-            <x-modal-input buttonTitle="Automated Configuration" title="Cloudflare Tunnels"
-                class="w-full" :closeOutside="false">
-                <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
-            </x-modal-input>
-        @endif
-        @if ($server->isFunctional() && !$server->settings->is_cloudflare_tunnel)
-            <div wire:click="manualCloudflareConfig" class="w-full underline cursor-pointer">
-                I have configured Cloudflare Tunnels manually
-            </div>
-        @endif
+    <x-slot:title>
+        {{ data_get_str($server, 'name')->limit(10) }} > Cloudflare Tunnels | Coolify
+    </x-slot>
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="cloudflare-tunnels" />
+        <div class="w-full">
+            <div class="flex flex-col">
+                <div class="flex gap-1 items-center">
+                    <h2>Cloudflare Tunnels</h2>
+                    <x-helper class="inline-flex"
+                        helper="If you are using Cloudflare Tunnels, enable this. It will proxy all SSH requests to your server through Cloudflare.<br> You then can close your server's SSH port in the firewall of your hosting provider.<br><span class='dark:text-warning'>If you choose manual configuration, Coolify does not install or set up Cloudflare (cloudflared) on your server.</span>" />
+                </div>
+                <div>Secure your servers with Cloudflare Tunnels</div>
 
+            </div>
+            <div class="flex flex-col gap-2 pt-6">
+                @if ($isCloudflareTunnelsEnabled)
+                    <div class="w-64">
+                        <x-forms.checkbox instantSave id="isCloudflareTunnelsEnabled" label="Enabled" />
+                    </div>
+                @elseif (!$server->isFunctional())
+                    <div
+                        class="p-4 mb-4 w-full text-sm text-yellow-800 bg-yellow-100 rounded dark:bg-yellow-900 dark:text-yellow-300">
+                        To <span class="font-semibold">automatically</span> configure Cloudflare Tunnels, please
+                        validate your server first.</span> Then you will need a Cloudflare token and an SSH
+                        domain configured.
+                        <br />
+                        To <span class="font-semibold">manually</span> configure Cloudflare Tunnels, please
+                        click <span wire:click="manualCloudflareConfig" class="underline cursor-pointer">here</span>,
+                        then you should validate the server.
+                        <br /><br />
+                        For more information, please read our <a
+                            href="https://coolify.io/docs/knowledge-base/cloudflare/tunnels/" target="_blank"
+                            class="font-medium underline hover:text-yellow-600 dark:hover:text-yellow-200">documentation</a>.
+                    </div>
+                @endif
+                @if (!$isCloudflareTunnelsEnabled && $server->isFunctional())
+                    <h4>Configuration</h4>
+                    <div class="flex gap-2">
+                        <x-modal-input buttonTitle="Automated" title="Cloudflare Tunnels" :closeOutside="false"
+                            isHighlightedButton>
+                            <livewire:server.configure-cloudflare-tunnels :server_id="$server->id" />
+                        </x-modal-input>
+                        <x-forms.button wire:click="manualCloudflareConfig" class="w-20">
+                            Manual
+                        </x-forms.button>
+                    </div>
+                @endif
+            </div>
+        </div>
     </div>
 </div>
diff --git a/resources/views/livewire/server/delete.blade.php b/resources/views/livewire/server/delete.blade.php
index 978943158..1b56b35c9 100644
--- a/resources/views/livewire/server/delete.blade.php
+++ b/resources/views/livewire/server/delete.blade.php
@@ -1,22 +1,31 @@
 <div>
-    @if ($server->id !== 0)
-        <h2>Danger Zone</h2>
-        <div class="">Woah. I hope you know what are you doing.</div>
-        <h4 class="pt-4">Delete Server</h4>
-        <div class="pb-4">This will remove this server from Coolify. Beware! There is no coming
-            back!
+    <x-slot:title>
+        {{ data_get_str($server, 'name')->limit(10) }} > Delete Server | Coolify
+    </x-slot>
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="danger" />
+        <div class="w-full">
+            @if ($server->id !== 0)
+                <h2>Danger Zone</h2>
+                <div class="">Woah. I hope you know what are you doing.</div>
+                <h4 class="pt-4">Delete Server</h4>
+                <div class="pb-4">This will remove this server from Coolify. Beware! There is no coming
+                    back!
+                </div>
+                @if ($server->definedResources()->count() > 0)
+                    <div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
+                    <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
+                        submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
+                        confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
+                        shortConfirmationLabel="Server Name" step3ButtonText="Permanently Delete" />
+                @else
+                    <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
+                        submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
+                        confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
+                        shortConfirmationLabel="Server Name" step3ButtonText="Permanently Delete" />
+                @endif
+            @endif
         </div>
-        @if ($server->definedResources()->count() > 0)
-            <div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
-            <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete" submitAction="delete"
-                :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
-                confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                shortConfirmationLabel="Server Name" step3ButtonText="Permanently Delete" />
-        @else
-            <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
-                submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
-                confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                shortConfirmationLabel="Server Name" step3ButtonText="Permanently Delete" />
-        @endif
-    @endif
+    </div>
 </div>
diff --git a/resources/views/livewire/server/destination/show.blade.php b/resources/views/livewire/server/destination/show.blade.php
index fb9ab4fbb..9dba9c0d6 100644
--- a/resources/views/livewire/server/destination/show.blade.php
+++ b/resources/views/livewire/server/destination/show.blade.php
@@ -2,6 +2,48 @@
     <x-slot:title>
         {{ data_get_str($server, 'name')->limit(10) }} > Server Destinations | Coolify
     </x-slot>
-    {{-- <x-server.navbar :server="$server" :parameters="$parameters" /> --}}
-    <livewire:destination.show :server="$server" />
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="destinations" />
+        <div class="w-full">
+            @if ($server->isFunctional())
+                <div class="flex items-end gap-2">
+                    <h2>Destinations</h2>
+                    <x-modal-input buttonTitle="+ Add" title="New Destination">
+                        <livewire:destination.new.docker :server_id="$server->id" />
+                    </x-modal-input>
+                    <x-forms.button isHighlighted wire:click='scan'>Scan for Destinations</x-forms.button>
+                </div>
+                <div>Destinations are used to segregate resources by network.</div>
+                <h4 class="pt-4 pb-2">Available Destinations</h4>
+                <div class="flex gap-2">
+                    @foreach ($server->standaloneDockers as $docker)
+                        <a href="{{ route('destination.show', ['destination_uuid' => data_get($docker, 'uuid')]) }}">
+                            <x-forms.button>{{ data_get($docker, 'network') }} </x-forms.button>
+                        </a>
+                    @endforeach
+                    @foreach ($server->swarmDockers as $docker)
+                        <a href="{{ route('destination.show', ['destination_uuid' => data_get($docker, 'uuid')]) }}">
+                            <x-forms.button>{{ data_get($docker, 'network') }} </x-forms.button>
+                        </a>
+                    @endforeach
+                </div>
+                @if ($networks->count() > 0)
+                    <div class="pt-2">
+                        <h3 class="pb-4">Found Destinations</h3>
+                        <div class="flex flex-wrap gap-2 ">
+                            @foreach ($networks as $network)
+                                <div class="min-w-fit">
+                                    <x-forms.button wire:click="add('{{ data_get($network, 'Name') }}')">Add
+                                        {{ data_get($network, 'Name') }}</x-forms.button>
+                                </div>
+                            @endforeach
+                        </div>
+                    </div>
+                @endif
+            @else
+                <div>Server is not validated. Validate first.</div>
+            @endif
+        </div>
+    </div>
 </div>
diff --git a/resources/views/livewire/server/log-drains.blade.php b/resources/views/livewire/server/log-drains.blade.php
index ac905e8bb..2ababba93 100644
--- a/resources/views/livewire/server/log-drains.blade.php
+++ b/resources/views/livewire/server/log-drains.blade.php
@@ -1,120 +1,118 @@
 <div>
     <x-slot:title>
-        {{ data_get_str($server, 'name')->limit(10) }} > Server LogDrains | Coolify
+        {{ data_get_str($server, 'name')->limit(10) }} > Server Log Drains | Coolify
     </x-slot>
-    {{-- <x-server.navbar :server="$server" :parameters="$parameters" /> --}}
-    @if ($server->isFunctional())
-        <h2>Log Drains</h2>
-        <div class="pb-4">Sends service logs to 3rd party tools.</div>
-        <div class="flex flex-col gap-4 pt-4">
-            <div class="p-4 border dark:border-coolgray-300">
-                <form wire:submit='submit("newrelic")' class="flex flex-col">
-                    <h3>New Relic</h3>
-                    <div class="w-32">
-                        <x-forms.checkbox instantSave='instantSave("newrelic")'
-                            id="server.settings.is_logdrain_newrelic_enabled" label="Enabled" />
-                    </div>
-                    <div class="flex flex-col gap-4">
-                        <div class="flex flex-col w-full gap-2 xl:flex-row">
-                            @if ($server->isLogDrainEnabled())
-                                <x-forms.input disabled type="password" required
-                                    id="server.settings.logdrain_newrelic_license_key" label="License Key" />
-                                <x-forms.input disabled required id="server.settings.logdrain_newrelic_base_uri"
-                                    placeholder="https://log-api.eu.newrelic.com/log/v1"
-                                    helper="For EU use: https://log-api.eu.newrelic.com/log/v1<br>For US use: https://log-api.newrelic.com/log/v1"
-                                    label="Endpoint" />
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="log-drains" />
+        <div class="w-full">
+            @if ($server->isFunctional())
+                <div class="flex gap-2 items-center">
+                    <h2>Log Drains</h2>
+                    <x-loading wire:target="instantSave" wire:loading.delay />
+                </div>
+                <div class="">Sends service logs to 3rd party tools.</div>
+                <div class="flex flex-col gap-4 pt-4">
+                    <div class="p-4 border dark:border-coolgray-300">
+                        <form wire:submit='submit("newrelic")' class="flex flex-col">
+                            <h3>New Relic</h3>
+                            <div class="w-32">
+                                @if ($isLogDrainAxiomEnabled || $isLogDrainCustomEnabled)
+                                    <x-forms.checkbox disabled id="isLogDrainNewRelicEnabled" label="Enabled" />
+                                @else
+                                    <x-forms.checkbox instantSave id="isLogDrainNewRelicEnabled" label="Enabled" />
+                                @endif
+                            </div>
+                            <div class="flex flex-col gap-4">
+                                <div class="flex flex-col w-full gap-2 xl:flex-row">
+                                    @if ($server->isLogDrainEnabled())
+                                        <x-forms.input disabled type="password" required id="logDrainNewRelicLicenseKey"
+                                            label="License Key" />
+                                        <x-forms.input disabled required id="logDrainNewRelicBaseUri"
+                                            placeholder="https://log-api.eu.newrelic.com/log/v1"
+                                            helper="For EU use: https://log-api.eu.newrelic.com/log/v1<br>For US use: https://log-api.newrelic.com/log/v1"
+                                            label="Endpoint" />
+                                    @else
+                                        <x-forms.input type="password" required id="logDrainNewRelicLicenseKey"
+                                            label="License Key" />
+                                        <x-forms.input required id="logDrainNewRelicBaseUri"
+                                            placeholder="https://log-api.eu.newrelic.com/log/v1"
+                                            helper="For EU use: https://log-api.eu.newrelic.com/log/v1<br>For US use: https://log-api.newrelic.com/log/v1"
+                                            label="Endpoint" />
+                                    @endif
+                                </div>
+                            </div>
+                            <div class="flex justify-end gap-4 pt-6">
+                                <x-forms.button type="submit">
+                                    Save
+                                </x-forms.button>
+                            </div>
+                        </form>
+
+                        <h3>Axiom</h3>
+                        <div class="w-32">
+                            @if ($isLogDrainNewRelicEnabled || $isLogDrainCustomEnabled)
+                                <x-forms.checkbox disabled id="isLogDrainAxiomEnabled" label="Enabled" />
                             @else
-                                <x-forms.input type="password" required
-                                    id="server.settings.logdrain_newrelic_license_key" label="License Key" />
-                                <x-forms.input required id="server.settings.logdrain_newrelic_base_uri"
-                                    placeholder="https://log-api.eu.newrelic.com/log/v1"
-                                    helper="For EU use: https://log-api.eu.newrelic.com/log/v1<br>For US use: https://log-api.newrelic.com/log/v1"
-                                    label="Endpoint" />
+                                <x-forms.checkbox instantSave id="isLogDrainAxiomEnabled" label="Enabled" />
                             @endif
                         </div>
-                    </div>
-                    <div class="flex justify-end gap-4 pt-6">
-                        <x-forms.button type="submit">
-                            Save
-                        </x-forms.button>
-                    </div>
-                </form>
-
-                <h3>Axiom</h3>
-                <div class="w-32">
-                    <x-forms.checkbox instantSave='instantSave("axiom")' id="server.settings.is_logdrain_axiom_enabled"
-                        label="Enabled" />
-                </div>
-                <form wire:submit='submit("axiom")' class="flex flex-col">
-                    <div class="flex flex-col gap-4">
-                        <div class="flex flex-col w-full gap-2 xl:flex-row">
-                            @if ($server->isLogDrainEnabled())
-                                <x-forms.input disabled type="password" required
-                                    id="server.settings.logdrain_axiom_api_key" label="API Key" />
-                                <x-forms.input disabled required id="server.settings.logdrain_axiom_dataset_name"
-                                    label="Dataset Name" />
+                        <form wire:submit='submit("axiom")' class="flex flex-col">
+                            <div class="flex flex-col gap-4">
+                                <div class="flex flex-col w-full gap-2 xl:flex-row">
+                                    @if ($server->isLogDrainEnabled())
+                                        <x-forms.input disabled type="password" required id="logDrainAxiomApiKey"
+                                            label="API Key" />
+                                        <x-forms.input disabled required id="logDrainAxiomDatasetName"
+                                            label="Dataset Name" />
+                                    @else
+                                        <x-forms.input type="password" required id="logDrainAxiomApiKey"
+                                            label="API Key" />
+                                        <x-forms.input required id="logDrainAxiomDatasetName" label="Dataset Name" />
+                                    @endif
+                                </div>
+                            </div>
+                            <div class="flex justify-end gap-4 pt-6">
+                                <x-forms.button type="submit">
+                                    Save
+                                </x-forms.button>
+                            </div>
+                        </form>
+                        <h3>Custom FluentBit</h3>
+                        <div class="w-32">
+                            @if ($isLogDrainNewRelicEnabled || $isLogDrainAxiomEnabled)
+                                <x-forms.checkbox disabled id="isLogDrainCustomEnabled" label="Enabled" />
                             @else
-                                <x-forms.input type="password" required id="server.settings.logdrain_axiom_api_key"
-                                    label="API Key" />
-                                <x-forms.input required id="server.settings.logdrain_axiom_dataset_name"
-                                    label="Dataset Name" />
+                                <x-forms.checkbox instantSave id="isLogDrainCustomEnabled" label="Enabled" />
                             @endif
                         </div>
-                    </div>
-                    <div class="flex justify-end gap-4 pt-6">
-                        <x-forms.button type="submit">
-                            Save
-                        </x-forms.button>
-                    </div>
-                </form>
-                {{-- <h3>Highlight.io</h3>
-            <div class="w-32">
-                <x-forms.checkbox instantSave='instantSave("highlight")'
-                    id="server.settings.is_logdrain_highlight_enabled" label="Enabled" />
-            </div>
-            <form wire:submit='submit("highlight")' class="flex flex-col">
-                <div class="flex flex-col gap-4">
-                    <div class="flex flex-col w-full gap-2 xl:flex-row">
-                        <x-forms.input type="password" required id="server.settings.logdrain_highlight_project_id"
-                            label="Project Id" />
-                    </div>
-                </div>
-                <div class="flex justify-end gap-4 pt-6">
-                    <x-forms.button type="submit">
-                        Save
-                    </x-forms.button>
-                </div>
-            </form> --}}
-                <h3>Custom FluentBit configuration</h3>
-                <div class="w-32">
-                    <x-forms.checkbox instantSave='instantSave("custom")'
-                        id="server.settings.is_logdrain_custom_enabled" label="Enabled" />
-                </div>
-                <form wire:submit='submit("custom")' class="flex flex-col">
-                    <div class="flex flex-col gap-4">
-                        @if ($server->isLogDrainEnabled())
-                            <x-forms.textarea disabled rows="6" required
-                                id="server.settings.logdrain_custom_config" label="Custom FluentBit Configuration" />
-                            <x-forms.textarea disabled id="server.settings.logdrain_custom_config_parser"
-                                label="Custom Parser Configuration" />
-                        @else
-                            <x-forms.textarea rows="6" required id="server.settings.logdrain_custom_config"
-                                label="Custom FluentBit Configuration" />
-                            <x-forms.textarea id="server.settings.logdrain_custom_config_parser"
-                                label="Custom Parser Configuration" />
-                        @endif
+                        <form wire:submit='submit("custom")' class="flex flex-col">
+                            <div class="flex flex-col gap-4">
+                                @if ($server->isLogDrainEnabled())
+                                    <x-forms.textarea disabled rows="6" required id="logDrainCustomConfig"
+                                        label="Custom FluentBit Configuration" />
+                                    <x-forms.textarea disabled id="logDrainCustomConfigParser"
+                                        label="Custom Parser Configuration" />
+                                @else
+                                    <x-forms.textarea rows="6" required id="logDrainCustomConfig"
+                                        label="Custom FluentBit Configuration" />
+                                    <x-forms.textarea id="logDrainCustomConfigParser"
+                                        label="Custom Parser Configuration" />
+                                @endif
+
+                            </div>
+                            <div class="flex justify-end gap-4 pt-6">
+                                <x-forms.button type="submit">
+                                    Save
+                                </x-forms.button>
+                            </div>
+                        </form>
 
                     </div>
-                    <div class="flex justify-end gap-4 pt-6">
-                        <x-forms.button type="submit">
-                            Save
-                        </x-forms.button>
-                    </div>
-                </form>
-
-            </div>
+                </div>
+            @else
+                <div>Server is not validated. Validate first.</div>
+            @endif
         </div>
-    @else
-        <div>Server is not validated. Validate first.</div>
-    @endif
+    </div>
 </div>
diff --git a/resources/views/livewire/server/private-key/show.blade.php b/resources/views/livewire/server/private-key/show.blade.php
index 014de2e7c..725d10f8e 100644
--- a/resources/views/livewire/server/private-key/show.blade.php
+++ b/resources/views/livewire/server/private-key/show.blade.php
@@ -1,6 +1,43 @@
 <div>
     <x-slot:title>
-        Server Connection | Coolify
+        {{ data_get_str($server, 'name')->limit(10) }} > Server Connection | Coolify
     </x-slot>
-    <livewire:server.show-private-key :server="$server" :privateKeys="$privateKeys" />
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="private-key" />
+        <div class="w-full">
+            <div class="flex items-end gap-2">
+                <h2>Private Key</h2>
+                <x-modal-input buttonTitle="+ Add" title="New Private Key">
+                    <livewire:security.private-key.create />
+                </x-modal-input>
+                <x-forms.button isHighlighted wire:click.prevent='checkConnection'>
+                    Check connection
+                </x-forms.button>
+            </div>
+            <div class="pb-4">Change your server's private key.</div>
+            <div class="grid xl:grid-cols-2 grid-cols-1 gap-2">
+                @forelse ($privateKeys as $private_key)
+                    <div
+                        class="box-without-bg justify-between dark:bg-coolgray-100 bg-white items-center flex flex-col gap-2">
+                        <div class="flex flex-col w-full">
+                            <div class="box-title">{{ $private_key->name }}</div>
+                            <div class="box-description">{{ $private_key->description }}</div>
+                        </div>
+                        @if (data_get($server, 'privateKey.uuid') !== $private_key->uuid)
+                            <x-forms.button class="w-full" wire:click='setPrivateKey({{ $private_key->id }})'>
+                                Use this key
+                            </x-forms.button>
+                        @else
+                            <x-forms.button class="w-full" disabled>
+                                Currently used
+                            </x-forms.button>
+                        @endif
+                    </div>
+                @empty
+                    <div>No private keys found. </div>
+                @endforelse
+            </div>
+        </div>
+    </div>
 </div>
diff --git a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
index 42967efca..ec63f451b 100644
--- a/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
+++ b/resources/views/livewire/server/proxy/dynamic-configurations.blade.php
@@ -4,7 +4,7 @@
     </x-slot>
     <x-server.navbar :server="$server" :parameters="$parameters" />
     <div class="flex flex-col h-full gap-8 sm:flex-row">
-        <x-server.sidebar :server="$server" :parameters="$parameters" />
+        <x-server.sidebar-proxy :server="$server" :parameters="$parameters" />
         <div class="w-full">
             @if ($server->isFunctional())
                 <div class="flex gap-2">
diff --git a/resources/views/livewire/server/proxy/logs.blade.php b/resources/views/livewire/server/proxy/logs.blade.php
index f0c1ea85c..4556d67bd 100644
--- a/resources/views/livewire/server/proxy/logs.blade.php
+++ b/resources/views/livewire/server/proxy/logs.blade.php
@@ -4,7 +4,7 @@
     </x-slot>
     <x-server.navbar :server="$server" :parameters="$parameters" />
     <div class="flex flex-col h-full gap-8 sm:flex-row">
-        <x-server.sidebar :server="$server" :parameters="$parameters" />
+        <x-server.sidebar-proxy :server="$server" :parameters="$parameters" />
         <div class="w-full">
             <h2 class="pb-4">Logs</h2>
             <livewire:project.shared.get-logs :server="$server" container="coolify-proxy" />
diff --git a/resources/views/livewire/server/proxy/show.blade.php b/resources/views/livewire/server/proxy/show.blade.php
index 2d8d4e42a..2370ab797 100644
--- a/resources/views/livewire/server/proxy/show.blade.php
+++ b/resources/views/livewire/server/proxy/show.blade.php
@@ -5,7 +5,7 @@
     <x-server.navbar :server="$server" :parameters="$parameters" />
     @if ($server->isFunctional())
         <div class="flex flex-col h-full gap-8 sm:flex-row">
-            <x-server.sidebar :server="$server" :parameters="$parameters" />
+            <x-server.sidebar-proxy :server="$server" :parameters="$parameters" />
             <div class="w-full">
                 <livewire:server.proxy :server="$server" />
             </div>
diff --git a/resources/views/livewire/server/show-private-key.blade.php b/resources/views/livewire/server/show-private-key.blade.php
deleted file mode 100644
index 7c24a3a9b..000000000
--- a/resources/views/livewire/server/show-private-key.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<div>
-    <div class="flex items-end gap-2">
-        <h2>Private Key</h2>
-        <x-modal-input buttonTitle="+ Add" title="New Private Key">
-            <livewire:security.private-key.create />
-        </x-modal-input>
-        <x-forms.button wire:click.prevent='checkConnection'>
-            Check connection
-        </x-forms.button>
-    </div>
-
-    <div class="flex flex-col gap-2">
-        <div class="pb-4">Change your server's private key.</div>
-    </div>
-    <div class="grid xl:grid-cols-2 grid-cols-1 gap-2">
-        @forelse ($privateKeys as $private_key)
-            <div class="box-without-bg justify-between dark:bg-coolgray-100 bg-white items-center flex flex-col gap-2">
-                <div class="flex flex-col w-full">
-                    <div class="box-title">{{ $private_key->name }}</div>
-                    <div class="box-description">{{ $private_key->description }}</div>
-                </div>
-                @if (data_get($server, 'privateKey.uuid') !== $private_key->uuid)
-                    <x-forms.button class="w-full" wire:click='setPrivateKey({{ $private_key->id }})'>
-                        Use this key
-                    </x-forms.button>
-                @else
-                    <x-forms.button class="w-full" disabled>
-                        Currently used
-                    </x-forms.button>
-                @endif
-            </div>
-        @empty
-            <div>No private keys found. </div>
-        @endforelse
-    </div>
-</div>
diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php
index a5b75dcf2..6d2fdc42b 100644
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -2,71 +2,237 @@
     <x-slot:title>
         {{ data_get_str($server, 'name')->limit(10) }} > Server Configurations | Coolify
     </x-slot>
-    <x-server.navbar :server="$server" :parameters="$parameters" />
-    <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex flex-col h-full gap-8 sm:flex-row">
-        <div class="flex flex-col items-start gap-2 min-w-fit">
-            <a class="menu-item" :class="activeTab === 'general' && 'menu-item-active'"
-                @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
-            @if ($server->isFunctional())
-                <a class="menu-item" :class="activeTab === 'advanced' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'advanced'; window.location.hash = 'advanced'" href="#">Advanced
-                </a>
-            @endif
-            <a class="menu-item" :class="activeTab === 'private-key' && 'menu-item-active'"
-                @click.prevent="activeTab = 'private-key'; window.location.hash = 'private-key'" href="#">Private
-                Key</a>
-            @if ($server->isFunctional())
-                <a class="menu-item" :class="activeTab === 'cloudflare-tunnels' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'cloudflare-tunnels'; window.location.hash = 'cloudflare-tunnels'"
-                    href="#">Cloudflare Tunnels</a>
-                <a class="menu-item" :class="activeTab === 'destinations' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'destinations'; window.location.hash = 'destinations'"
-                    href="#">Destinations</a>
-                <a class="menu-item" :class="activeTab === 'log-drains' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'log-drains'; window.location.hash = 'log-drains'" href="#">Log
-                    Drains</a>
-                <a class="menu-item" :class="activeTab === 'metrics' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'metrics'; window.location.hash = 'metrics'" href="#">Metrics</a>
-            @endif
-            @if (!$server->isLocalhost())
-                <a class="menu-item" :class="activeTab === 'danger' && 'menu-item-active'"
-                    @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger</a>
-            @endif
-        </div>
+    <x-server.navbar :server="$server" />
+    <div class="flex flex-col h-full gap-8 sm:flex-row">
+        <x-server.sidebar :server="$server" activeMenu="general" />
         <div class="w-full">
-            <div x-cloak x-show="activeTab === 'general'" class="h-full">
-                <livewire:server.form :server="$server" />
-            </div>
-            <div x-cloak x-show="activeTab === 'advanced'" class="h-full">
-                <livewire:server.advanced :server="$server" />
-            </div>
-            <div x-cloak x-show="activeTab === 'private-key'" class="h-full">
-                <livewire:server.private-key.show :server="$server" />
-            </div>
-            <div x-cloak x-show="activeTab === 'cloudflare-tunnels'" class="h-full">
-                <livewire:server.cloudflare-tunnels :server="$server" />
-            </div>
-            <div x-cloak x-show="activeTab === 'destinations'" class="h-full">
-                <livewire:server.destination.show :server="$server" />
-            </div>
-            <div x-cloak x-show="activeTab === 'log-drains'" class="h-full">
-                <livewire:server.log-drains :server="$server" />
-            </div>
-            <div x-cloak x-show="activeTab === 'metrics'" class="h-full">
-                @if ($server->isFunctional() && $server->isMetricsEnabled())
-                    <h2>Metrics</h2>
-                    <div class="pb-4">Basic metrics for your container.</div>
-                    <div>
-                        <livewire:server.charts :server="$server" />
-                    </div>
-                @else
-                    No metrics available.
-                @endif
-            </div>
-            @if (!$server->isLocalhost())
-                <div x-cloak x-show="activeTab === 'danger'" class="h-full">
-                    <livewire:server.delete :server="$server" />
+            <form wire:submit.prevent='submit' class="flex flex-col">
+                <div class="flex gap-2">
+                    <h2>General</h2>
+                    @if ($server->id === 0)
+                        <x-modal-confirmation title="Confirm Server Settings Change?" buttonTitle="Save"
+                            submitAction="submit" :actions="[
+                                'If you missconfigure the server, you could lose a lot of functionalities of Coolify.',
+                            ]" :confirmWithText="false" :confirmWithPassword="false"
+                            step2ButtonText="Save" />
+                    @else
+                        <x-forms.button type="submit">Save</x-forms.button>
+                        @if ($server->isFunctional())
+                            <x-slide-over closeWithX fullScreen>
+                                <x-slot:title>Validate & configure</x-slot:title>
+                                <x-slot:content>
+                                    <livewire:server.validate-and-install :server="$server" ask />
+                                </x-slot:content>
+                                <x-forms.button @click="slideOverOpen=true" wire:click.prevent='validateServer'
+                                    isHighlighted>
+                                    Revalidate server
+                                </x-forms.button>
+                            </x-slide-over>
+                        @endif
+                    @endif
                 </div>
+                @if ($server->isFunctional())
+                    Server is reachable and validated.
+                @else
+                    You can't use this server until it is validated.
+                @endif
+                @if ((!$isReachable || !$isUsable) && $server->id !== 0)
+                    <x-slide-over closeWithX fullScreen>
+                        <x-slot:title>Validate & configure</x-slot:title>
+                        <x-slot:content>
+                            <livewire:server.validate-and-install :server="$server" />
+                        </x-slot:content>
+                        <x-forms.button @click="slideOverOpen=true"
+                            class="mt-8 mb-4 w-full font-bold box-without-bg bg-coollabs hover:bg-coollabs-100"
+                            wire:click.prevent='validateServer' isHighlighted>
+                            Validate Server & Install Docker Engine
+                        </x-forms.button>
+                    </x-slide-over>
+                    @if ($server->validation_logs)
+                        <h4>Previous Validation Logs</h4>
+                        <div class="pb-8">
+                            {!! $server->validation_logs !!}
+                        </div>
+                    @endif
+                @endif
+                @if ((!$isReachable || !$isUsable) && $server->id === 0)
+                    <x-forms.button class="mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-100"
+                        wire:click.prevent='checkLocalhostConnection' isHighlighted>
+                        Validate Server
+                    </x-forms.button>
+                @endif
+                @if ($server->isForceDisabled() && isCloud())
+                    <div class="pt-4 font-bold text-red-500">The system has disabled the server because you have
+                        exceeded the
+                        number of servers for which you have paid.</div>
+                @endif
+                <div class="flex flex-col gap-2 pt-4">
+                    <div class="flex flex-col gap-2 w-full lg:flex-row">
+                        <x-forms.input id="name" label="Name" required />
+                        <x-forms.input id="description" label="Description" />
+                        @if (!$isSwarmWorker && !$isBuildServer)
+                            <x-forms.input placeholder="https://example.com" id="wildcard_domain"
+                                label="Wildcard Domain"
+                                helper='A wildcard domain allows you to receive a randomly generated domain for your new applications. <br><br>For instance, if you set "https://example.com" as your wildcard domain, your applications will receive domains like "https://randomId.example.com".' />
+                        @endif
+
+                    </div>
+                    <div class="flex flex-col gap-2 w-full lg:flex-row">
+                        <x-forms.input type="password" id="ip" label="IP Address/Domain"
+                            helper="An IP Address (127.0.0.1) or domain (example.com). Make sure there is no protocol like http(s):// so you provide a FQDN not a URL."
+                            required />
+                        <div class="flex gap-2">
+                            <x-forms.input id="user" label="User" required />
+                            <x-forms.input type="number" id="port" label="Port" required />
+                        </div>
+                    </div>
+                    <div class="w-full" x-data="{
+                        open: false,
+                        search: '{{ $serverTimezone ?: '' }}',
+                        timezones: @js($timezones),
+                        placeholder: '{{ $serverTimezone ? 'Search timezone...' : 'Select Server Timezone' }}',
+                        init() {
+                            this.$watch('search', value => {
+                                if (value === '') {
+                                    this.open = true;
+                                }
+                            })
+                        }
+                    }">
+                        <div class="flex items-center mb-1">
+                            <label for="serverTimezone">Server
+                                Timezone</label>
+                            <x-helper class="ml-2"
+                                helper="Server's timezone. This is used for backups, cron jobs, etc." />
+                        </div>
+                        <div class="relative">
+                            <div class="inline-flex relative items-center w-64">
+                                <input autocomplete="off"
+                                    wire:dirty.class.remove='dark:focus:ring-coolgray-300 dark:ring-coolgray-300'
+                                    wire:dirty.class="dark:focus:ring-warning dark:ring-warning" x-model="search"
+                                    @focus="open = true" @click.away="open = false" @input="open = true"
+                                    class="w-full input" :placeholder="placeholder"
+                                    wire:model.debounce.300ms="serverTimezone">
+                                <svg class="absolute right-0 mr-2 w-4 h-4" xmlns="http://www.w3.org/2000/svg"
+                                    fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                                    @click="open = true">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
+                                </svg>
+                            </div>
+                            <div x-show="open"
+                                class="overflow-auto overflow-x-hidden absolute z-50 mt-1 w-64 max-h-60 bg-white rounded-md border shadow-lg dark:bg-coolgray-100 dark:border-coolgray-200 scrollbar">
+                                <template
+                                    x-for="timezone in timezones.filter(tz => tz.toLowerCase().includes(search.toLowerCase()))"
+                                    :key="timezone">
+                                    <div @click="search = timezone; open = false; $wire.set('server.settings.server_timezone', timezone)"
+                                        class="px-4 py-2 text-gray-800 cursor-pointer hover:bg-gray-100 dark:hover:bg-coolgray-300 dark:text-gray-200"
+                                        x-text="timezone"></div>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="w-full">
+                        @if (!$server->isLocalhost())
+                            <div class="w-96">
+                                <x-forms.checkbox instantSave id="isBuildServer" label="Use it as a build server?" />
+                            </div>
+
+                            @if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel)
+                                <h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span>
+                                </h3>
+                                <div class="pb-4">Read the docs <a class='underline dark:text-white'
+                                        href='https://coolify.io/docs/knowledge-base/docker/swarm'
+                                        target='_blank'>here</a>.
+                                </div>
+                                <div class="w-96">
+                                    @if ($server->settings->is_swarm_worker)
+                                        <x-forms.checkbox disabled instantSave type="checkbox" id="isSwarmManager"
+                                            helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                            label="Is it a Swarm Manager?" />
+                                    @else
+                                        <x-forms.checkbox instantSave type="checkbox" id="isSwarmManager"
+                                            helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                            label="Is it a Swarm Manager?" />
+                                    @endif
+
+                                    @if ($server->settings->is_swarm_manager)
+                                        <x-forms.checkbox disabled instantSave type="checkbox" id="isSwarmWorker"
+                                            helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                            label="Is it a Swarm Worker?" />
+                                    @else
+                                        <x-forms.checkbox instantSave type="checkbox" id="isSwarmWorker"
+                                            helper="For more information, please read the documentation <a class='dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/swarm' target='_blank'>here</a>."
+                                            label="Is it a Swarm Worker?" />
+                                    @endif
+                                </div>
+                            @endif
+                        @endif
+                    </div>
+                </div>
+            </form>
+            @if ($server->isFunctional() && !$server->isSwarm() && !$server->isBuildServer())
+                <form wire:submit.prevent='submit'>
+                    <div class="flex gap-2 items-center pt-4 pb-2">
+                        <h3>Sentinel</h3>
+                        @if ($server->isSentinelEnabled())
+                            <div class="flex gap-2 items-center">
+                                @if ($server->isSentinelLive())
+                                    <x-status.running status="In sync" noLoading title="{{ $sentinelUpdatedAt }}" />
+                                    <x-forms.button type="submit">Save</x-forms.button>
+                                    <x-forms.button wire:click='restartSentinel'>Restart</x-forms.button>
+                                @else
+                                    <x-status.stopped status="Out of sync" noLoading
+                                        title="{{ $sentinelUpdatedAt }}" />
+                                    <x-forms.button type="submit">Save</x-forms.button>
+                                    <x-forms.button wire:click='restartSentinel'>Sync</x-forms.button>
+                                @endif
+                            </div>
+                        @endif
+                    </div>
+                    <div class="flex flex-col gap-2">
+                        <div class="flex gap-2">Experimental feature <x-helper
+                                helper="Sentinel reports your server's & container's health and collects metrics." />
+                        </div>
+                        <div class="w-64">
+                            <x-forms.checkbox wire:model.live="isSentinelEnabled" label="Enable Sentinel" />
+                            @if ($server->isSentinelEnabled())
+                                <x-forms.checkbox id="isSentinelDebugEnabled" label="Enable Sentinel Debug"
+                                    instantSave />
+                                <x-forms.checkbox instantSave id="isMetricsEnabled" label="Enable Metrics" />
+                            @else
+                                <x-forms.checkbox id="isSentinelDebugEnabled" label="Enable Sentinel Debug" disabled
+                                    instantSave />
+                                <x-forms.checkbox instantSave disabled id="isMetricsEnabled" label="Enable Metrics" />
+                                label="Enable Metrics" />
+                            @endif
+                        </div>
+                        @if ($server->isSentinelEnabled())
+                            <div class="flex flex-wrap gap-2 sm:flex-nowrap items-end">
+                                <x-forms.input type="password" id="sentinelToken" label="Sentinel token" required
+                                    helper="Token for Sentinel." />
+                                <x-forms.button wire:click="regenerateSentinelToken">Regenerate</x-forms.button>
+                            </div>
+
+                            <x-forms.input id="sentinelCustomUrl" required label="Coolify URL"
+                                helper="URL to your Coolify instance. If it is empty that means you do not have a FQDN set for your Coolify instance." />
+
+                            <div class="flex flex-col gap-2">
+                                <div class="flex flex-wrap gap-2 sm:flex-nowrap">
+                                    <x-forms.input id="sentinelMetricsRefreshRateSeconds"
+                                        label="Metrics rate (seconds)" required
+                                        helper="The interval for gathering metrics. Lower means more disk space will be used." />
+                                    <x-forms.input id="sentinelMetricsHistoryDays" label="Metrics history (days)"
+                                        required helper="How many days should the metrics data should be reserved." />
+                                    <x-forms.input id="sentinelPushIntervalSeconds" label="Push interval (seconds)"
+                                        required
+                                        helper="How many seconds should the metrics data should be pushed to the collector." />
+                                </div>
+                            </div>
+                        @endif
+                    </div>
+                </form>
             @endif
         </div>
     </div>
diff --git a/routes/web.php b/routes/web.php
index b9976a088..6f442e0fe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -34,6 +34,10 @@ use App\Livewire\Project\Show as ProjectShow;
 use App\Livewire\Security\ApiTokens;
 use App\Livewire\Security\PrivateKey\Index as SecurityPrivateKeyIndex;
 use App\Livewire\Security\PrivateKey\Show as SecurityPrivateKeyShow;
+use App\Livewire\Server\Advanced as ServerAdvanced;
+use App\Livewire\Server\Charts as ServerCharts;
+use App\Livewire\Server\CloudflareTunnels;
+use App\Livewire\Server\Delete as DeleteServer;
 use App\Livewire\Server\Destination\Show as DestinationShow;
 use App\Livewire\Server\Index as ServerIndex;
 use App\Livewire\Server\LogDrains;
@@ -205,13 +209,17 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     Route::prefix('server/{server_uuid}')->group(function () {
         Route::get('/', ServerShow::class)->name('server.show');
+        Route::get('/advanced', ServerAdvanced::class)->name('server.advanced');
+        Route::get('/private-key', PrivateKeyShow::class)->name('server.private-key');
         Route::get('/resources', ResourcesShow::class)->name('server.resources');
+        Route::get('/cloudflare-tunnels', CloudflareTunnels::class)->name('server.cloudflare-tunnels');
+        Route::get('/destinations', DestinationShow::class)->name('server.destinations');
+        Route::get('/log-drains', LogDrains::class)->name('server.log-drains');
+        Route::get('/metrics', ServerCharts::class)->name('server.charts');
+        Route::get('/danger', DeleteServer::class)->name('server.delete');
         Route::get('/proxy', ProxyShow::class)->name('server.proxy');
         Route::get('/proxy/dynamic', ProxyDynamicConfigurations::class)->name('server.proxy.dynamic-confs');
         Route::get('/proxy/logs', ProxyLogs::class)->name('server.proxy.logs');
-        Route::get('/private-key', PrivateKeyShow::class)->name('server.private-key');
-        Route::get('/destinations', DestinationShow::class)->name('server.destinations');
-        Route::get('/log-drains', LogDrains::class)->name('server.log-drains');
         Route::get('/terminal', ExecuteContainerCommand::class)->name('server.command');
     });