diff --git a/resources/views/livewire/projects/project-map.blade.php b/resources/views/livewire/projects/project-map.blade.php
index 58df5df..91d51f8 100644
--- a/resources/views/livewire/projects/project-map.blade.php
+++ b/resources/views/livewire/projects/project-map.blade.php
@@ -17,7 +17,7 @@
                                 class="toggle toggle-xs toggle-primary">
                             <span style="color: {{ $phase->color }};" class="text-lg">⬤</span>
                             <span class="flex-1 font-medium text-sm truncate">{{ $phase->name }}</span>
-                            <span class="badge badge-sm {{ $phase->progress_percent >= 100 ? 'badge-success' : 'badge-ghost' }}">{{ $phase->progress_percent }}%</span>
+                            <span class="badge badge-sm {{ $phase->progress_percent >= 100 ? 'badge-success' : 'badge-ghost' }}">{{ $phase->progress_percent }}</span>
                         </div>
 
                         {{-- Capas de esta fase --}}
@@ -61,7 +61,7 @@
             <div class="mt-2 space-y-1">
                 <a href="{{ route('projects.media', $project) }}" class="btn btn-sm btn-outline w-full">
                     📁 {{ __("Project files") }}
-                </a>
+                </button>
                 <button wire:click="$dispatch('centerMap')" class="btn btn-sm btn-outline w-full">
                     📍 {{ __("Centered in project") }}
                 </button>
@@ -189,7 +189,7 @@
                                     @foreach($inspectionHistory as $ins)
                                         <div class="border rounded p-2 text-xs">
                                             <div class="flex justify-between">
-                                                <span class="font-medium">{{ $ins->template?->name ?? {{ __("Inspection") }} }}</span>
+                                                <span class="font-medium">{{ $ins->template?->name ?? __("Inspection") }}</span>
                                                 <span class="text-gray-400">{{ $ins->created_at->diffForHumans() }}</span>
                                             </div>
                                             @if($ins->user)<span class="text-gray-500">por {{ $ins->user->name }}</span>@endif
@@ -293,166 +293,257 @@
             </div>
         </div>
     </div>
+
+@push('styles')
+    <style>
+        .leaflet-container { z-index: 0 !important; }
+    </style>
+@endpush
+
 @push('scripts')
-<style>
-    .leaflet-container { z-index: 0 !important; }
-</style>
-<script>
-    let map;
-    const layers = {};
-    let imageMarkersLayer = null;
-    let imageViewerModal = null;
+    <script>
+        let map;
+        const layers = {};
+        let imageMarkersLayer = null;
+        let imageViewerModal = null;
+        let mapInitialized = false;
+        let combinedBounds = null;
 
-    function initMap() {
-        if (map) return;
-        const center = [{{ $project->lat }}, {{ $project->lng }}];
-        map = L.map('map').setView(center, 16);
+        // Utility function to escape HTML
+        function escapeHtml(text) {
+            if (text === null || text === undefined) return '';
+            return String(text)
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;')
+                .replace(/"/g, '&quot;')
+                .replace(/'/g, '&#039;');
+        }
 
-        L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
-            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OSM</a> & CartoDB'
-        }).addTo(map);
+        // Utility function to validate URL
+        function isValidUrl(string) {
+            try {
+                new URL(string);
+                return true;
+            } catch (_) {
+                return false;
+            }
+        }
 
-        // Cargar fases y sus features
-        @foreach($phases as $phase)
-            @php
-                $phaseFeatures = $phase->features()->with('layer.phase')->get();
-                $fc = [
-                    'type' => 'FeatureCollection',
-                    'features' => $phaseFeatures->map(function($f) {
-                        return [
-                            'type' => 'Feature',
-                            'id' => $f->id,
-                            'geometry' => $f->geometry,
-                            'properties' => array_merge($f->properties ?? [], [
-                                'name' => $f->name,
-                                'progress' => $f->progress,
-                                'responsible' => $f->responsible,
-                                'template_id' => $f->template_id,
-                                '_feature_id' => $f->id,
-                            ])
-                        ];
-                    })->values()->toArray()
-                ];
-            @endphp
-            (function() {
-                const data = @json($fc);
-                if (data && data.features && data.features.length > 0) {
-                    const phaseLayer = L.geoJSON(data, {
-                        style: { color: '{{ $phase->color }}', weight: 3, opacity: 0.8, fillOpacity: 0.3 },
-                        onEachFeature: function(feature, layer) {
-                            const props = feature.properties || {};
-                            const featId = props._feature_id || feature.id;
-                            let content = `<b>${props.name || 'Elemento'}</b><br>
-                                         {{ __("Progress") }}: ${props.progress || 0}%<br>
-                                         {{ __("Responsible") }}: ${props.responsible || '-'}<br>
-                                         <button class="btn btn-xs btn-primary mt-1" onclick="selectFeature('${featId}')">✏️ Editar</button>`;
-                            layer.bindPopup(content);
-                            layer.on('click', function() { selectFeature(' + featId + '); });
+        function initMap() {
+            // Prevent multiple initializations
+            if (mapInitialized || map) return;
+            mapInitialized = true;
+            
+            const center = [{{ $project->lat }}, {{ $project->lng }}];
+            map = L.map('map').setView(center, 16);
+
+            L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png', {
+                attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OSM</a> & CartoDB'
+            }).addTo(map);
+
+            // Cargar fases y sus features
+            @foreach($phases as $phase)
+                @php
+                    $phaseFeatures = $phase->features()->with('layer.phase')->get();
+                    $fc = [
+                        'type' => 'FeatureCollection',
+                        'features' => $phaseFeatures->map(function($f) {
+                            return [
+                                'type' => 'Feature',
+                                'id' => $f->id,
+                                'geometry' => $f->geometry,
+                                'properties' => array_merge($f->properties ?? [], [
+                                    'name' => $f->name,
+                                    'progress' => $f->progress,
+                                    'responsible' => $f->responsible,
+                                    'template_id' => $f->template_id,
+                                    '_feature_id' => $f->id,
+                                ])
+                            ];
+                        })->values()->toArray()
+                    ];
+                @endphp
+                (function() {
+                    const data = @json($fc);
+                    if (data && data.features && data.features.length > 0) {
+                        const phaseLayer = L.geoJSON(data, {
+                            style: { color: '{{ $phase->color }}', weight: 3, opacity: 0.8, fillOpacity: 0.3 },
+                            onEachFeature: function(feature, layer) {
+                                const props = feature.properties || {};
+                                const featId = props._feature_id || feature.id;
+                                // Escape all user-generated content for HTML context
+                                const safeName = escapeHtml(props.name || 'Elemento');
+                                const safeProgress = escapeHtml(props.progress || 0);
+                                const safeResponsible = escapeHtml(props.responsible || '-');
+                                let content = `<b>${safeName}</b><br>
+                                            {{ __("Progress") }}: ${safeProgress}%<br>
+                                            {{ __("Responsible") }}: ${safeResponsible}<br>
+                                            <button class="btn btn-xs btn-primary mt-1" onclick="selectFeature('${featId}')">✏️ Editar</button>`;
+                                layer.bindPopup(content);
+                                layer.on('click', function() { selectFeature(featId); });
+                            }
+                        });
+                        layers[{{ $phase->id }}] = phaseLayer;
+                        @if(in_array($phase->id, $activeLayers))
+                            phaseLayer.addTo(map);
+                        @endif
+                    }
+                })()
+            @endforeach
+
+            // Initialize combined bounds
+            updateCombinedBounds();
+            
+            setTimeout(() => {
+                map.invalidateSize();
+                zoomToAllFeatures();
+            }, 100); // Reduced from 200ms to 100ms
+        }
+
+        function updateCombinedBounds() {
+            if (!map) return;
+            combinedBounds = L.latLngBounds();
+            let hasBounds = false;
+            for (let id in layers) {
+                const layer = layers[id];
+                if (map.hasLayer(layer) && typeof layer.getBounds === 'function') {
+                    const b = layer.getBounds();
+                    if (b.isValid()) { 
+                        combinedBounds.extend(b); 
+                        hasBounds = true; 
+                    }
+                }
+            }
+            return hasBounds;
+        }
+
+        function zoomToAllFeatures() {
+            if (!map) return;
+            
+            // Update combined bounds if needed
+            updateCombinedBounds();
+            
+            if (combinedBounds && combinedBounds.isValid()) {
+                map.fitBounds(combinedBounds, { padding: [20, 20] });
+            } else {
+                map.setView([{{ $project->lat }}, {{ $project->lng }}], 16);
+            }
+        }
+
+        function selectFeature(featureId) {
+            @this.selectFeature(featureId);
+        }
+
+        function getUserLocation() {
+            if (navigator.geolocation) {
+                navigator.geolocation.getCurrentPosition((pos) => {
+                    const latlng = [pos.coords.latitude, pos.coords.longitude];
+                    L.marker(latlng).addTo(map).bindPopup('Tu ubicación').openPopup();
+                    map.setView(latlng, 16);
+                }, () => alert('No se pudo obtener la ubicación'));
+            } else {
+                alert('Geolocalización no soportada');
+            }
+        }
+
+        document.addEventListener('livewire:init', function () {
+            setTimeout(initMap, 50); // Reduced from 100ms to 50ms
+
+            Livewire.on('layersUpdated', (activeIds) => {
+                // Livewire wraps single parameters in an array, so we need to extract the actual data
+                const ids = Array.isArray(activeIds) ? activeIds[0] : activeIds;
+                for (let id in layers) {
+                    const lid = parseInt(id);
+                    if (ids.includes(lid)) {
+                        if (!map.hasLayer(layers[id])) {
+                            layers[id].addTo(map);
+                            // Update combined bounds when adding a layer
+                            updateCombinedBounds();
+                        }
+                    } else {
+                        if (map.hasLayer(layers[id])) {
+                            map.removeLayer(layers[id]);
+                            // Update combined bounds when removing a layer
+                            updateCombinedBounds();
+                        }
+                    }
+                }
+                zoomToAllFeatures();
+            });
+
+            Livewire.on('centerMap', zoomToAllFeatures);
+            Livewire.on('mapResize', () => { 
+                if (map) {
+                    // Throttle resize events to prevent excessive calls
+                    if (!this.resizeTimeout) {
+                        this.resizeTimeout = setTimeout(() => {
+                            map.invalidateSize();
+                            this.resizeTimeout = null;
+                        }, 100);
+                    }
+                }
+            });
+
+            // Toggle imágenes en mapa
+            Livewire.on('featureImagesToggled', (show, markers) => {
+                const m = Array.isArray(markers) ? markers : markers[1];
+                const s = Array.isArray(show) ? show[0] : show;
+                if (imageMarkersLayer) { 
+                    map.removeLayer(imageMarkersLayer); 
+                    imageMarkersLayer = null; 
+                    // Update bounds when removing image markers layer
+                    updateCombinedBounds();
+                }
+                if (s && m && m.length > 0) {
+                    imageMarkersLayer = L.layerGroup().addTo(map);
+                    const photoIcon = L.divIcon({
+                        html: '<span style="font-size: 20px; filter: drop-shadow(0 2px 2px rgba(0,0,0,0.5));">&#128252;</span>',
+                        className: '',
+                        iconSize: [20, 20],
+                        iconAnchor: [10, 10]
+                    });
+                    m.forEach(marker => {
+                        // Validate URL and sanitize name for security
+                        const safeUrl = isValidUrl(marker.image_url) ? marker.image_url : '';
+                        const safeName = escapeHtml(marker.image_name || '');
+                        if (safeUrl) { // Only add marker if URL is valid
+                            const popupContent = `<b>${safeName}</b><br>
+                                            <img src="${safeUrl}" class="max-w-[200px] max-h-[150px] rounded cursor-pointer"
+                                                onclick="window.openViewer('${safeUrl}', '${safeName}')" />`;
+                            L.marker([marker.lat, marker.lng], { icon: photoIcon })
+                                .bindPopup(popupContent)
+                                .addTo(imageMarkersLayer);
                         }
                     });
-                    layers[{{ $phase->id }}] = phaseLayer;
-                    @if(in_array($phase->id, $activeLayers))
-                        phaseLayer.addTo(map);
-                    @endif
+                    // Update bounds when adding image markers layer
+                    updateCombinedBounds();
                 }
-            })();
-        @endforeach
+            });
 
-        setTimeout(() => {
-            map.invalidateSize();
-            zoomToAllFeatures();
-        }, 200);
-    }
-
-    function zoomToAllFeatures() {
-        if (!map) return;
-        const bounds = L.latLngBounds();
-        let hasBounds = false;
-        for (let id in layers) {
-            const layer = layers[id];
-            if (map.hasLayer(layer) && typeof layer.getBounds === 'function') {
-                const b = layer.getBounds();
-                if (b.isValid()) { bounds.extend(b); hasBounds = true; }
-            }
-        }
-        if (hasBounds) map.fitBounds(bounds, { padding: [20, 20] });
-        else map.setView([{{ $project->lat }}, {{ $project->lng }}], 16);
-    }
-
-    function selectFeature(featureId) {
-        @this.selectFeature(featureId);
-    }
-
-    function getUserLocation() {
-        if (navigator.geolocation) {
-            navigator.geolocation.getCurrentPosition((pos) => {
-                const latlng = [pos.coords.latitude, pos.coords.longitude];
-                L.marker(latlng).addTo(map).bindPopup('Tu ubicación').openPopup();
-                map.setView(latlng, 16);
-            }, () => alert('No se pudo obtener la ubicación'));
-        } else {
-            alert('Geolocalización no soportada');
-        }
-    }
-
-    document.addEventListener('livewire:init', function () {
-        setTimeout(initMap, 100);
-
-        Livewire.on('layersUpdated', (activeIds) => {
-            // Livewire wraps single parameters in an array, so we need to extract the actual data
-            const ids = Array.isArray(activeIds) ? activeIds[0] : activeIds;
-            for (let id in layers) {
-                const lid = parseInt(id);
-                if (ids.includes(lid)) {
-                    if (!map.hasLayer(layers[id])) layers[id].addTo(map);
-                } else {
-                    if (map.hasLayer(layers[id])) map.removeLayer(layers[id]);
+            // Modal para ver imagen al hacer clic
+            window.openViewer = function(url, name) {
+                // Validate URL and sanitize name for security
+                if (!isValidUrl(url)) {
+                    console.error('Invalid URL provided to openViewer:', url);
+                    return;
                 }
-            }
-            zoomToAllFeatures();
-        );
-
-        Livewire.on('centerMap', zoomToAllFeatures);
-        Livewire.on('mapResize', () => { if (map) setTimeout(() => map.invalidateSize(), 100); });
-
-        // Toggle imágenes en mapa
-        Livewire.on('featureImagesToggled', (show, markers) => {
-            const m = Array.isArray(markers) ? markers : markers[1];
-            const s = Array.isArray(show) ? show[0] : show;
-            if (imageMarkersLayer) { map.removeLayer(imageMarkersLayer); imageMarkersLayer = null; }
-            if (s && m && m.length > 0) {
-                imageMarkersLayer = L.layerGroup().addTo(map);
-                const photoIcon = L.divIcon({
-                    html: '<span style="font-size: 20px; filter: drop-shadow(0 2px 2px rgba(0,0,0,0.5));">&#128252;</span>',
-                    className: '',
-                    iconSize: [20, 20],
-                    iconAnchor: [10, 10]
-                });
-                m.forEach(marker => {
-                    const popupContent = `<b>${marker.name}</b><br>
-                                         <img src="${marker.image_url}" class="max-w-[200px] max-h-[150px] rounded cursor-pointer"
-                                              onclick="window.openViewer('${marker.image_url}', '${marker.image_name}')" />`;
-                    L.marker([marker.lat, marker.lng], { icon: photoIcon })
-                        .bindPopup(popupContent)
-                        .addTo(imageMarkersLayer);
-                });
-            }
+                
+                const safeName = escapeHtml(name);
+                
+                if (imageViewerModal) imageViewerModal.remove();
+                const overlay = document.createElement('div');
+                overlay.id = 'imageViewerModal';
+                overlay.style.cssText = 'position:fixed;inset:0;z-index:5000;background:rgba(0,0,0,0.85);display:flex;align-items:center;justify-content:center;padding:20px;cursor:pointer';
+                overlay.innerHTML = `<div style="position:relative;max-width:90vw;max-height:90vh">
+                    <button onclick="this.closest('#imageViewerModal').remove()" style="position:absolute;top:-30px;right:0;color:white;font-size:24px;background:none;border:none;cursor:pointer">✕</button>
+                    <img src="${url}" alt="${safeName}" style="max-width:100%;max-height:85vh;object-fit:contain;border-radius:8px;box-shadow:0 4px 20px rgba(0,0,0,0.5)" />
+                    <p style="color:white;text-align:center;margin-top:8px;font-size:14px">${safeName}</p>
+                </div>`;
+                overlay.addEventListener('click', (e) => { if (e.target === overlay) overlay.remove(); });
+                document.body.appendChild(overlay);
+                imageViewerModal = overlay;
+            };
         });
-
-        // Modal para ver imagen al hacer clic
-        window.openViewer = function(url, name) {
-            if (imageViewerModal) imageViewerModal.remove();
-            const overlay = document.createElement('div');
-            overlay.id = 'imageViewerModal';
-            overlay.style.cssText = 'position:fixed;inset:0;z-index:5000;background:rgba(0,0,0,0.85);display:flex;align-items:center;justify-content:center;padding:20px;cursor:pointer';
-            overlay.innerHTML = `<div style="position:relative;max-width:90vw;max-height:90vh">
-                <button onclick="this.closest('#imageViewerModal').remove()" style="position:absolute;top:-30px;right:0;color:white;font-size:24px;background:none;border:none;cursor:pointer">✕</button>
-                <img src="${url}" alt="${name}" style="max-width:100%;max-height:85vh;object-fit:contain;border-radius:8px;box-shadow:0 4px 20px rgba(0,0,0,0.5)" />
-                <p style="color:white;text-align:center;margin-top:8px;font-size:14px">${name}</p>
-            </div>`;
-            overlay.addEventListener('click', (e) => { if (e.target === overlay) overlay.remove(); });
-            document.body.appendChild(overlay);
-            imageViewerModal = overlay;
-        };
-    });
-</script>
+    </script>
+@endpush
\ No newline at end of file