diff --git a/resources/views/components/loading.blade.php b/resources/views/components/loading.blade.php
index 966921963..2cb8b894c 100644
--- a/resources/views/components/loading.blade.php
+++ b/resources/views/components/loading.blade.php
@@ -1 +1,6 @@
-<span {{ $attributes->class(['bg-warning loading', 'loading-spinner' => !$attributes->has('class')]) }}></span>
+@props(['text' => null])
+<span class="flex items-center gap-4 text-white">
+    {{ $text }}<span
+        {{ $attributes->class(['bg-warning loading', 'loading-spinner' => !$attributes->has('class')]) }}>
+    </span>
+</span>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 42b62c6ff..4ba4444e1 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -4,66 +4,64 @@
     @if ($server->settings->is_reachable)
         @if ($server->proxy->type)
             <div x-init="$wire.checkProxySettingsInSync">
-                <div wire:loading wire:target="checkProxySettingsInSync">
-                    <x-loading />
-                </div>
-                <div wire:loading.remove>
-                    @if ($proxy_settings)
-                        @if ($selectedProxy->value === 'TRAEFIK_V2')
-                            <form wire:submit.prevent='saveConfiguration'>
-                                <div class="flex items-center gap-2">
-                                    <h2>Proxy</h2>
-                                    <x-forms.button type="submit">Save</x-forms.button>
-                                    @if ($server->proxy->status === 'exited')
-                                        <x-forms.button wire:click.prevent="switchProxy">Switch Proxy</x-forms.button>
-                                    @endif
-                                    <livewire:server.proxy.status :server="$server" />
-                                </div>
-                                <div class="pt-3 pb-4 ">Traefik v2</div>
-                                @if (
-                                    $server->proxy->last_applied_settings &&
-                                        $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
-                                    <div class="text-red-500 ">Configuration out of sync. Restart to get the new
-                                        configs.
-                                    </div>
-                                @endif
-                                <x-forms.input placeholder="https://coolify.io" id="redirect_url"
-                                    label="Default Redirect 404"
-                                    helper="All urls that has no service available will be redirected to this domain.<span class='text-helper'>You can set to your main marketing page or your social media link.</span>" />
-                                <div class="container w-full mx-auto">
-                                    <livewire:activity-monitor :header="true" />
-                                </div>
-                                <div class="flex flex-col gap-2">
+                @if ($selectedProxy->value === 'TRAEFIK_V2')
+                    <form wire:submit.prevent='saveConfiguration'>
+                        <div class="flex items-center gap-2">
+                            <h2>Proxy</h2>
+                            <x-forms.button type="submit">Save</x-forms.button>
+                            @if ($server->proxy->status === 'exited')
+                                <x-forms.button wire:click.prevent="switchProxy">Switch Proxy</x-forms.button>
+                            @endif
+                            <livewire:server.proxy.status :server="$server" />
+                        </div>
+
+                        <div class="pt-3 pb-4 ">Traefik v2</div>
+                        @if (
+                            $server->proxy->last_applied_settings &&
+                                $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
+                            <div class="text-red-500 ">Configuration out of sync. Restart to get the new
+                                configs.
+                            </div>
+                        @endif
+                        <x-forms.input placeholder="https://coolify.io" id="redirect_url" label="Default Redirect 404"
+                            helper="All urls that has no service available will be redirected to this domain.<span class='text-helper'>You can set to your main marketing page or your social media link.</span>" />
+                        <div class="container w-full mx-auto">
+                            <livewire:activity-monitor :header="true" />
+                        </div>
+                        <div wire:loading wire:target="checkProxySettingsInSync" class="pt-4">
+                            <x-loading text="Loading proxy configuration..." />
+                        </div>
+                        <div wire:loading.remove wire:target="checkProxySettingsInSync">
+                            @if ($proxy_settings)
+                                <div class="flex flex-col gap-2 pt-2">
                                     <x-forms.textarea label="Configuration file: traefik.conf" class="text-xs" noDirty
                                         name="proxy_settings" wire:model.defer="proxy_settings" rows="30" />
                                     <x-forms.button wire:click.prevent="resetProxy">
                                         Reset configuration to default
                                     </x-forms.button>
                                 </div>
-                            </form>
-                        @endif
-                    @else
-                        <div class="">Server is not validated. Validate first.</div>
-                    @endif
+                            @endif
+                        </div>
+                    </form>
+                @endif
+            @else
+                <div>
+                    <h2>Proxy</h2>
+                    <div class="pt-2 pb-10 ">Select a proxy you would like to use on this server.</div>
+                    <div class="flex gap-2">
+                        <x-forms.button class="w-32 box"
+                            wire:click="setProxy('{{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}')">
+                            Traefik
+                            v2
+                        </x-forms.button>
+                        <x-forms.button disabled class="w-32 box">
+                            Nginx
+                        </x-forms.button>
+                        <x-forms.button disabled class="w-32 box">
+                            Caddy
+                        </x-forms.button>
+                    </div>
                 </div>
-            </div>
-        @else
-            <div>
-                <h2>Proxy</h2>
-                <div class="pt-2 pb-10 ">Select a proxy you would like to use on this server.</div>
-                <div class="flex gap-2">
-                    <x-forms.button class="w-32 box" wire:click="setProxy('{{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}')">
-                        Traefik
-                        v2
-                    </x-forms.button>
-                    <x-forms.button disabled class="w-32 box">
-                        Nginx
-                    </x-forms.button>
-                    <x-forms.button disabled class="w-32 box">
-                        Caddy
-                    </x-forms.button>
-                </div>
-            </div>
         @endif
     @else
         <div class="">Server is not validated. Validate first.</div>