diff --git a/extensions/Servers/Proxmox/views/backups.blade.php b/extensions/Servers/Proxmox/views/backups.blade.php
index ad0ff6cf5..8f3712062 100644
--- a/extensions/Servers/Proxmox/views/backups.blade.php
+++ b/extensions/Servers/Proxmox/views/backups.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="backups" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="backups" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <div class="space-y-6">
         <div class="flex items-center justify-between">
         <div class="flex items-center gap-3">
diff --git a/extensions/Servers/Proxmox/views/boot-order.blade.php b/extensions/Servers/Proxmox/views/boot-order.blade.php
index 0f7405bc7..c4da32bf6 100644
--- a/extensions/Servers/Proxmox/views/boot-order.blade.php
+++ b/extensions/Servers/Proxmox/views/boot-order.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="boot-order" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="boot-order" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <style>
         /* Hide sidebar in problematic resolution range (768px - 1023px) */
         @media screen and (min-width: 768px) and (max-width: 1023px) {
diff --git a/extensions/Servers/Proxmox/views/cloud-init.blade.php b/extensions/Servers/Proxmox/views/cloud-init.blade.php
index b9df9b73d..1eaae33d5 100644
--- a/extensions/Servers/Proxmox/views/cloud-init.blade.php
+++ b/extensions/Servers/Proxmox/views/cloud-init.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="cloud-init" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="cloud-init" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <style>
         .formRight select {
             background-color: hsl(var(--color-background));
diff --git a/extensions/Servers/Proxmox/views/components/layout.blade.php b/extensions/Servers/Proxmox/views/components/layout.blade.php
index eb73ca0b9..e966093a2 100644
--- a/extensions/Servers/Proxmox/views/components/layout.blade.php
+++ b/extensions/Servers/Proxmox/views/components/layout.blade.php
@@ -44,13 +44,6 @@
 
                 
                     <div class="hidden lg:flex flex-row gap-2 ml-auto justify-end items-center">
-                        <button type="button"
-                                @click.prevent="!isAdvancedOnlyView && toggleView()"
-                                :disabled="isAdvancedOnlyView"
-                                class="px-4 py-2 text-sm font-semibold rounded-md transition-all duration-200 focus:outline-none focus:ring-0 focus:ring-transparent disabled:opacity-50 disabled:cursor-not-allowed w-32 whitespace-nowrap"
-                                :class="isAdvancedView ? 'bg-blue-600 text-white' : 'bg-white text-base'">
-                            <span x-text="isAdvancedView ? 'Standard View' : 'Advanced View'"></span>
-                        </button>
                         <x-button.primary wire:click="do('start')" class="disabled:cursor-not-allowed"
                             wire:loading.attr="disabled" wire:loading.class="opacity-50 cursor-not-allowed"
                             :disabled="$vmStatus !== 'stopped'">
@@ -92,13 +85,6 @@
                     </div>
 
                     <div class="flex lg:hidden w-full flex-col gap-2">
-                        <button type="button"
-                                @click.prevent="!isAdvancedOnlyView && toggleView()"
-                                :disabled="isAdvancedOnlyView"
-                                class="px-4 py-2 text-sm font-semibold rounded-md transition-all duration-200 focus:outline-none focus:ring-0 focus:ring-transparent disabled:opacity-50 disabled:cursor-not-allowed w-full whitespace-nowrap"
-                                :class="isAdvancedView ? 'bg-blue-600 text-white' : 'bg-white text-base'">
-                            <span x-text="isAdvancedView ? 'Standard View' : 'Advanced View'"></span>
-                        </button>
                         <div class="flex flex-col gap-2 w-full">
                             <x-button.primary wire:click="do('start')" class="w-full disabled:cursor-not-allowed"
                                 wire:loading.attr="disabled" wire:loading.class="opacity-50 cursor-not-allowed"
@@ -184,7 +170,7 @@
             @endphp
 
             <div class="mb-10 mt-3">
-                <div class="hidden lg:flex flex-row gap-2">
+                <div class="hidden lg:flex flex-row gap-2 items-center">
                     @foreach($tabs as $tab)
                         @php
                             $isAdvancedTab = $tab['advanced'] ?? false;
@@ -205,6 +191,15 @@
                             @endif
                         </div>
                     @endforeach
+                    <div class="ml-auto">
+                        <button type="button"
+                                @click.prevent="!isAdvancedOnlyView && toggleView()"
+                                :disabled="isAdvancedOnlyView"
+                                class="px-4 py-2 text-sm font-semibold rounded-md transition-all duration-200 focus:outline-none focus:ring-0 focus:ring-transparent disabled:opacity-50 disabled:cursor-not-allowed whitespace-nowrap"
+                                :class="isAdvancedView ? 'bg-blue-600 text-white' : 'bg-white text-base'">
+                            <span x-text="isAdvancedView ? 'Standard View' : 'Advanced View'"></span>
+                        </button>
+                    </div>
                 </div>
 
                 <div class="lg:hidden" x-data="{ 
@@ -235,11 +230,20 @@
                         }
                     });
                 ">
-                    <button @click="open = !open"
-                        class="flex items-center gap-2 bg-background-secondary border border-neutral px-4 py-2 rounded-lg w-full justify-between">
-                        <span>{{ $tabs[array_search($view, array_column($tabs, 'view'))]['label'] ?? __('Menu') }}</span>
-                        <x-ri-menu-line class="size-5" />
-                    </button>
+                    <div class="flex gap-2">
+                        <button @click="open = !open"
+                            class="flex items-center gap-2 bg-background-secondary border border-neutral px-4 py-2 rounded-lg flex-1 justify-between">
+                            <span>{{ $tabs[array_search($view, array_column($tabs, 'view'))]['label'] ?? __('Menu') }}</span>
+                            <x-ri-menu-line class="size-5" />
+                        </button>
+                        <button type="button"
+                                @click.prevent="!isAdvancedOnlyView && toggleView()"
+                                :disabled="isAdvancedOnlyView"
+                                class="px-4 py-2 text-sm font-semibold rounded-md transition-all duration-200 focus:outline-none focus:ring-0 focus:ring-transparent disabled:opacity-50 disabled:cursor-not-allowed whitespace-nowrap bg-background-secondary border border-neutral"
+                                :class="isAdvancedView ? 'bg-blue-600 text-white border-blue-600' : 'bg-background-secondary text-base'">
+                            <span x-text="isAdvancedView ? 'Standard' : 'Advanced'"></span>
+                        </button>
+                    </div>
                     <div x-show="open" x-transition @click.outside="open = false"
                         class="mt-2 bg-background-secondary border border-neutral rounded-lg shadow-lg overflow-hidden">
                         <div class="flex flex-col divide-y divide-neutral/40">
diff --git a/extensions/Servers/Proxmox/views/display.blade.php b/extensions/Servers/Proxmox/views/display.blade.php
index ca65f8bc3..b40e196b5 100644
--- a/extensions/Servers/Proxmox/views/display.blade.php
+++ b/extensions/Servers/Proxmox/views/display.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="display" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="display" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <div class="flex items-center justify-between mb-6">
         <div>
             <div class="flex items-center gap-2 min-w-0">
diff --git a/extensions/Servers/Proxmox/views/help.blade.php b/extensions/Servers/Proxmox/views/help.blade.php
index f985aeb0d..3d5c81f1e 100644
--- a/extensions/Servers/Proxmox/views/help.blade.php
+++ b/extensions/Servers/Proxmox/views/help.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="help" :status="$status" :status-polling="false">
+<x-proxmox::layout :server="$server" view="help" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <div class="space-y-6" x-data="{ 
         activeSection: 'overview',
         expandedCategories: {
diff --git a/extensions/Servers/Proxmox/views/network.blade.php b/extensions/Servers/Proxmox/views/network.blade.php
index 177d5235c..83f640e82 100644
--- a/extensions/Servers/Proxmox/views/network.blade.php
+++ b/extensions/Servers/Proxmox/views/network.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="network" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="network" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
 <style>
     @media (max-width: 767px) {
         .network-tools-grid {
diff --git a/extensions/Servers/Proxmox/views/statistics.blade.php b/extensions/Servers/Proxmox/views/statistics.blade.php
index 9083c394b..e8378f860 100644
--- a/extensions/Servers/Proxmox/views/statistics.blade.php
+++ b/extensions/Servers/Proxmox/views/statistics.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="statistics" :status="$status">
+<x-proxmox::layout :server="$server" view="statistics" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     @once
         <script src="https://cdn.jsdelivr.net/npm/apexcharts" onload="window.apexChartsLoaded = true"></script>
     @endonce
diff --git a/extensions/Servers/Proxmox/views/subdomain.blade.php b/extensions/Servers/Proxmox/views/subdomain.blade.php
index feef4592f..798d2f2b7 100644
--- a/extensions/Servers/Proxmox/views/subdomain.blade.php
+++ b/extensions/Servers/Proxmox/views/subdomain.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="subdomain" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="subdomain" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <div class="flex items-center justify-between mb-6">
         <div>
             <div class="flex items-center gap-2 min-w-0">
diff --git a/extensions/Servers/Proxmox/views/system.blade.php b/extensions/Servers/Proxmox/views/system.blade.php
index 42edec092..4104a49ae 100644
--- a/extensions/Servers/Proxmox/views/system.blade.php
+++ b/extensions/Servers/Proxmox/views/system.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="system" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="system" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
     <div class="space-y-6">
         <div class="flex flex-col gap-2">
             <div class="flex items-center gap-2 min-w-0">
diff --git a/extensions/Servers/Proxmox/views/vnc.blade.php b/extensions/Servers/Proxmox/views/vnc.blade.php
index 08f2ab22a..73869ceb5 100644
--- a/extensions/Servers/Proxmox/views/vnc.blade.php
+++ b/extensions/Servers/Proxmox/views/vnc.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="vnc" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="vnc" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
 
     <iframe src="{{ $vnc }}" class="w-full min-h-800px border-0" height="800px"></iframe>
 </x-proxmox::layout>
\ No newline at end of file
diff --git a/extensions/Servers/Proxmox/views/xterm.blade.php b/extensions/Servers/Proxmox/views/xterm.blade.php
index a0697cc16..16dee775e 100644
--- a/extensions/Servers/Proxmox/views/xterm.blade.php
+++ b/extensions/Servers/Proxmox/views/xterm.blade.php
@@ -1,4 +1,4 @@
-<x-proxmox::layout :server="$server" view="xterm" :status="$status" :status-polling="true" :status-polling-interval="$fastPolling ? '2s' : '30s'">
+<x-proxmox::layout :server="$server" view="xterm" :status="$status" :status-polling="true" :status-polling-interval="'2s'">
 
     <iframe src="{{ $xterm }}" class="w-full min-h-800px border-0" height="800px"></iframe>
 </x-proxmox::layout>