diff --git a/extensions/Servers/Proxmox/views/firewall.blade.php b/extensions/Servers/Proxmox/views/firewall.blade.php
index 350a56c6f..f234b88fb 100644
--- a/extensions/Servers/Proxmox/views/firewall.blade.php
+++ b/extensions/Servers/Proxmox/views/firewall.blade.php
@@ -548,8 +548,9 @@
                                 return;
                             }
                             
-                            const draggedRule = this.rules[this.draggedIndex];
-                            const targetRule = this.rules[targetIndex];
+                            // Capture ORIGINAL positions before modifying the array
+                            const originalDraggedPos = this.rules[this.draggedIndex].pos;
+                            const originalTargetPos = this.rules[targetIndex].pos;
                             
                             // Optimistically update UI
                             const movedRule = this.rules.splice(this.draggedIndex, 1)[0];
@@ -560,9 +561,9 @@
                                 rule.pos = idx;
                             });
                             
-                            // Call Livewire to persist the change
+                            // Call Livewire to persist the change using ORIGINAL positions
                             try {
-                                await @this.reorderRules(draggedRule.pos, targetRule.pos);
+                                await @this.reorderRules(originalDraggedPos, originalTargetPos);
                             } catch (error) {
                                 console.error('Failed to reorder rules:', error);
                                 // Reload rules on error
@@ -2172,6 +2173,13 @@
             if (range.test(ip)) return false;
         }
         
+        // Check for IPv4-mapped IPv6 addresses (::ffff:x.x.x.x)
+        const ipv4MappedMatch = ip.match(/^::ffff:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/i);
+        if (ipv4MappedMatch) {
+            // Recursively check if the embedded IPv4 address is public
+            return isPublicIP(ipv4MappedMatch[1]);
+        }
+        
         // Check for IPv6 private ranges (very simplified)
         const ipv6PrivatePatterns = [
             /^fe80:/i,      // Link-local
diff --git a/extensions/Servers/Proxmox/views/statistics.blade.php b/extensions/Servers/Proxmox/views/statistics.blade.php
index 3658d8bd3..68b71b41f 100644
--- a/extensions/Servers/Proxmox/views/statistics.blade.php
+++ b/extensions/Servers/Proxmox/views/statistics.blade.php
@@ -3169,9 +3169,32 @@
 
     <!-- Delete Confirmation Modal -->
     <div x-data="{ showDeleteModal: @entangle('showDeleteModal') }">
-        <div x-cloak x-show="showDeleteModal" x-transition.opacity class="fixed inset-0 z-50 flex items-center justify-center">
-            <div class="absolute inset-0 bg-black/40 backdrop-blur-sm" @click="$wire.closeDeleteModal()"></div>
-            <div class="relative bg-background-secondary border border-neutral rounded-xl shadow-xl max-w-md w-full mx-4 z-10">
+        <!-- Modal Backdrop -->
+        <div x-cloak x-show="showDeleteModal" 
+             x-transition:enter="transition ease-out duration-300"
+             x-transition:enter-start="opacity-0"
+             x-transition:enter-end="opacity-100"
+             x-transition:leave="transition ease-in duration-200"
+             x-transition:leave-start="opacity-100"
+             x-transition:leave-end="opacity-0"
+             @click="$wire.closeDeleteModal()"
+             @keydown.escape.window="$wire.closeDeleteModal()"
+             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+             style="display: none;">
+        </div>
+        <!-- Modal -->
+        <div x-cloak x-show="showDeleteModal" 
+             x-transition:enter="transition ease-out duration-300"
+             x-transition:enter-start="opacity-0 scale-95"
+             x-transition:enter-end="opacity-100 scale-100"
+             x-transition:leave="transition ease-in duration-200"
+             x-transition:leave-start="opacity-100 scale-100"
+             x-transition:leave-end="opacity-0 scale-95"
+             @click.away="$wire.closeDeleteModal()"
+             @keydown.escape.window="$wire.closeDeleteModal()"
+             class="fixed inset-0 z-50 flex items-center justify-center p-4"
+             style="display: none;">
+            <div class="relative bg-background-secondary border border-neutral rounded-xl shadow-xl max-w-md w-full mx-4">
                 <div class="p-6">
                     <div class="flex items-center gap-3 mb-4">
                         <div class="flex-shrink-0 w-10 h-10 rounded-full bg-danger/20 flex items-center justify-center">
@@ -3241,9 +3264,32 @@
 
     <!-- Clear Statistics Confirmation Modal -->
     <div x-data="{ showClearStatisticsModal: @entangle('showClearStatisticsModal') }">
-        <div x-cloak x-show="showClearStatisticsModal" x-transition.opacity class="fixed inset-0 z-50 flex items-center justify-center">
-            <div class="absolute inset-0 bg-black/40 backdrop-blur-sm" @click="$wire.closeClearStatisticsModal()"></div>
-            <div class="relative bg-background-secondary border border-neutral rounded-xl shadow-xl max-w-md w-full mx-4 z-10">
+        <!-- Modal Backdrop -->
+        <div x-cloak x-show="showClearStatisticsModal" 
+             x-transition:enter="transition ease-out duration-300"
+             x-transition:enter-start="opacity-0"
+             x-transition:enter-end="opacity-100"
+             x-transition:leave="transition ease-in duration-200"
+             x-transition:leave-start="opacity-100"
+             x-transition:leave-end="opacity-0"
+             @click="$wire.closeClearStatisticsModal()"
+             @keydown.escape.window="$wire.closeClearStatisticsModal()"
+             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+             style="display: none;">
+        </div>
+        <!-- Modal -->
+        <div x-cloak x-show="showClearStatisticsModal" 
+             x-transition:enter="transition ease-out duration-300"
+             x-transition:enter-start="opacity-0 scale-95"
+             x-transition:enter-end="opacity-100 scale-100"
+             x-transition:leave="transition ease-in duration-200"
+             x-transition:leave-start="opacity-100 scale-100"
+             x-transition:leave-end="opacity-0 scale-95"
+             @click.away="$wire.closeClearStatisticsModal()"
+             @keydown.escape.window="$wire.closeClearStatisticsModal()"
+             class="fixed inset-0 z-50 flex items-center justify-center p-4"
+             style="display: none;">
+            <div class="relative bg-background-secondary border border-neutral rounded-xl shadow-xl max-w-md w-full mx-4">
                 <div class="p-6">
                     <div class="flex items-center gap-3 mb-4">
                         <div class="flex-shrink-0 w-10 h-10 rounded-full bg-danger/20 flex items-center justify-center">
@@ -3278,9 +3324,32 @@
 
     <!-- Export Info Modal -->
     <div x-data="{ showExportInfoModal: @entangle('showExportInfoModal') }">
-        <div x-cloak x-show="showExportInfoModal" x-transition.opacity class="fixed inset-0 z-50 flex items-center justify-center">
-            <div class="absolute inset-0 bg-black/40 backdrop-blur-sm" @click="$wire.closeExportInfoModal()"></div>
-            <div class="relative bg-background-secondary border border-neutral rounded-xl shadow-xl max-w-md w-full mx-4 z-10">
+        <!-- Modal Backdrop -->
+        <div x-cloak x-show="showExportInfoModal" 
+             x-transition:enter="transition ease-out duration-300"
+             x-transition:enter-start="opacity-0"
+             x-transition:enter-end="opacity-100"
+             x-transition:leave="transition ease-in duration-200"
+             x-transition:leave-start="opacity-100"
+             x-transition:leave-end="opacity-0"
+             @click="$wire.closeExportInfoModal()"
+             @keydown.escape.window="$wire.closeExportInfoModal()"
+             class="fixed inset-0 z-50 bg-black/50 backdrop-blur-sm"
+             style="display: none;">
+        </div>
+        <!-- Modal -->
+        <div x-cloak x-show="showExportInfoModal" 
+             x-transition:enter="transition ease-out duration-300"
+             x-transition:enter-start="opacity-0 scale-95"
+             x-transition:enter-end="opacity-100 scale-100"
+             x-transition:leave="transition ease-in duration-200"
+             x-transition:leave-start="opacity-100 scale-100"
+             x-transition:leave-end="opacity-0 scale-95"
+             @click.away="$wire.closeExportInfoModal()"
+             @keydown.escape.window="$wire.closeExportInfoModal()"
+             class="fixed inset-0 z-50 flex items-center justify-center p-4"
+             style="display: none;">
+            <div class="relative bg-background-secondary border border-neutral rounded-xl shadow-xl max-w-md w-full mx-4">
                 <div class="p-6 space-y-4">
                     <div class="flex items-center gap-3">
                         <div class="flex-shrink-0 w-10 h-10 rounded-full bg-info/20 flex items-center justify-center">