diff --git a/app/Livewire/ProjectMap.php b/app/Livewire/ProjectMap.php
index 423e52e..6344d40 100644
--- a/app/Livewire/ProjectMap.php
+++ b/app/Livewire/ProjectMap.php
@@ -26,6 +26,11 @@ class ProjectMap extends Component
     public $editResponsible = '';
     public $editPhotos = [];
     public $formFullscreen = false;
+    // Tab management
+    public $activeTab = 'edit'; // edit, features, inspections
+    public $allFeatures = [];
+    public $allInspections = [];
+
 
     // Templates e inspecciones
     public $templates = [];
@@ -37,6 +42,9 @@ class ProjectMap extends Component
     public $showFeatureImages = false;
     public $featureImageMarkers = [];
 
+    // Tab management
+    public $activeTab = 'edit'; // edit or list
+
     public function mount(Project $project)
     {
         $this->project = $project;
diff --git a/resources/views/livewire/projects/project-map.blade.php b/resources/views/livewire/projects/project-map.blade.php
index e6649c4..b6cc5ca 100644
--- a/resources/views/livewire/projects/project-map.blade.php
+++ b/resources/views/livewire/projects/project-map.blade.php
@@ -72,145 +72,228 @@
         </div>
     </div>
 
-    <!-- Columna derecha: {{ __("Edit") }} de progreso / inspecciones -->
-    <div class="w-full lg:w-1/3 transition-all duration-300" :class="{'lg:w-full': formFullscreen}">
-        <div class="card bg-base-100 shadow-xl h-full flex flex-col">
-            <div class="card-body overflow-y-auto flex-1">
-                <div class="flex justify-between items-center mb-2">
-                    <h2 class="card-title">{{ __("Edit") }}</h2>
-                    <button wire:click="toggleFullscreen" class="btn btn-circle btn-sm" title="Pantalla completa">
-                        <span x-text="formFullscreen ? '✕' : '⤢'"></span>
-                    </button>
-                </div>
+<!-- Columna derecha: {{ __("Edit") }} de progreso / inspecciones -->
+<div class="w-full lg:w-1/3 transition-all duration-300" :class="{'lg:w-full': formFullscreen}">
+    <div class="card bg-base-100 shadow-xl h-full flex flex-col">
+        <div class="card-body overflow-y-auto flex-1">
+            <div class="flex justify-between items-center mb-2">
+                <h2 class="card-title">{{ __("Project Map") }}</h2>
+                <button wire:click="toggleFullscreen" class="btn btn-circle btn-sm" title="Pantalla completa">
+                    <span x-text="formFullscreen ? '✕' : '⤢'"></span>
+                </button>
+            </div>
 
-                @if($selectedFeature)
-                    {{-- Feature seleccionado --}}
-                    <div class="border rounded-lg p-3 mb-3 bg-base-200">
-                        <h3 class="font-bold text-sm">{{ $selectedFeature->name ?? 'Elemento' }}</h3>
-                        <p class="text-xs text-gray-500">Fase: {{ $selectedFeature->layer?->phase?->name ?? '—' }}</p>
-                        <p class="text-xs text-gray-500">Capa: {{ $selectedFeature->layer?->name ?? '—' }}</p>
-                    </div>
+            <!-- Tabs -->
+            <div class="tabs box mb-4">
+                <button wire:click="setActiveTab('edit')" class="tab {{ $activeTab === 'edit' ? 'tab-active' : '' }}">{{ __("Edit") }}</button>
+                <button wire:click="setActiveTab('features')" class="tab {{ $activeTab === 'features' ? 'tab-active' : '' }}">{{ __("Features") }}</button>
+                <button wire:click="setActiveTab('inspections')" class="tab {{ $activeTab === 'inspections' ? 'tab-active' : '' }}">{{ __("Inspections") }}</button>
+            </div>
 
-                    {{-- {{ __("Progress") }} --}}
-                    <div class="form-control mb-3">
-                        <label class="label-text">{{ __("Progress") }}: {{ $editProgress }}%</label>
-                        <input type="range" min="0" max="100" wire:model.live="editProgress" class="range range-primary range-sm" />
-                        <div class="flex justify-between text-xs">
-                            <span>0%</span><span>50%</span><span>100%</span>
-                        </div>
-                    </div>
-
-                    <div class="form-control mb-3">
-                        <label class="label-text">{{ __("Responsible") }}</label>
-                        <input type="text" wire:model="editResponsible" class="input input-bordered input-sm" placeholder="Nombre" />
-                    </div>
-
-                    <button wire:click="saveFeatureProgress" class="btn btn-primary btn-sm w-full mb-3">
-                        💾 {{ __("Save progress") }}
-                    </button>
-
-                    {{-- Gestor de archivos del feature --}}
-                    <details class="mb-3 border rounded-lg">
-                        <summary class="text-xs font-semibold cursor-pointer p-2 bg-base-200 rounded-t-lg">
-                            📎 {{ __("Files of element") }}
-                        </summary>
-                        <div class="p-2">
-                            @livewire('media-manager', [
-                                'mediableType' => 'App\\Models\\Feature',
-                                'mediableId' => $selectedFeature->id,
-                            ], key('media-feature-' . $selectedFeature->id))
-                        </div>
-                    </details>
-
-                    {{-- Templates / Inspecciones --}}
-                    @if($templates->isNotEmpty())
-                        <div class="divider text-xs">{{ __("Inspection") }}</div>
-                        <div class="form-control mb-2">
-                            <label class="label-text">Plantilla</label>
-                            <select wire:model.live="selectedTemplateId" wire:change="onTemplateChange" class="select select-bordered select-sm">
-                                <option value="">Seleccionar plantilla...</option>
-                                @foreach($templates as $t)
-                                    <option value="{{ $t->id }}">{{ $t->name }}</option>
-                                @endforeach
-                            </select>
+            <!-- Tab Content -->
+            <div class="tab-content">
+                @if($activeTab === 'edit')
+                    @if($selectedFeature)
+                        <!-- Feature seleccionado -->
+                        <div class="border rounded-lg p-3 mb-3 bg-base-200">
+                            <h3 class="font-bold text-sm">{{ $selectedFeature->name ?? 'Elemento' }}</h3>
+                            <p class="text-xs text-gray-500">Fase: {{ $selectedFeature->layer?->phase?->name ?? '—' }}</p>
+                            <p class="text-xs text-gray-500">Capa: {{ $selectedFeature->layer?->name ?? '—' }}</p>
                         </div>
 
-                        @if($selectedTemplateId && !empty($inspectionFormData))
-                            @php $template = $templates->firstWhere('id', $selectedTemplateId); @endphp
-                            @if($template)
-                                @foreach($template->fields as $field)
-                                    <div class="mb-2">
-                                        <label class="label-text text-xs">{{ $field['label'] }} @if($field['required'] ?? false)<span class="text-error">*</span>@endif</label>
-                                        @switch($field['type'] ?? 'text')
-                                            @case('percentage')
-                                                <div class="flex items-center gap-1">
-                                                    <input type="number" wire:model="inspectionFormData.{{ $field['name'] }}" min="0" max="100" class="input input-bordered input-sm w-16" />
-                                                    <span class="text-xs">%</span>
-                                                    <input type="range" min="0" max="100" wire:model.live="inspectionFormData.{{ $field['name'] }}" class="range range-primary range-xs flex-1" />
-                                                </div>
-                                                @break
-                                            @case('boolean')
-                                                <input type="checkbox" wire:model="inspectionFormData.{{ $field['name'] }}" class="checkbox checkbox-sm" />
-                                                @break
-                                            @case('select')
-                                                <select wire:model="inspectionFormData.{{ $field['name'] }}" class="select select-bordered select-sm w-full">
-                                                    <option value="">Seleccionar</option>
-                                                    @foreach(explode(',', $field['options'] ?? '') as $opt)
-                                                        <option value="{{ trim($opt) }}">{{ trim($opt) }}</option>
-                                                    @endforeach
-                                                </select>
-                                                @break
-                                            @case('textarea')
-                                                <textarea wire:model="inspectionFormData.{{ $field['name'] }}" rows="2" class="textarea textarea-bordered textarea-sm w-full"></textarea>
-                                                @break
-                                            @default
-                                                <input type="{{ $field['type'] ?? 'text' }}" wire:model="inspectionFormData.{{ $field['name'] }}" class="input input-bordered input-sm w-full" />
-                                        @endswitch
-                                    </div>
-                                @endforeach
-                                <button wire:click="saveInspection" class="btn btn-primary btn-xs w-full mt-1">{{ __("Register inspection") }}</button>
-                            @endif
-                        @endif
+                        {{-- {{ __("Progress") }} --}}
+                        <div class="form-control mb-3">
+                            <label class="label-text">{{ __("Progress") }}: {{ $editProgress }}%</label>
+                            <input type="range" min="0" max="100" wire:model.live="editProgress" class="range range-primary range-sm" />
+                            <div class="flex justify-between text-xs">
+                                <span>0%</span><span>50%</span><span>100%</span>
+                            </div>
+                        </div>
 
-                        {{-- {{ __("History") }} de inspecciones --}}
-                        @if($inspectionHistory->isNotEmpty())
-                            <div class="divider text-xs">{{ __("History") }}</div>
-                            <div class="space-y-1 max-h-40 overflow-y-auto">
-                                @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="text-gray-400">{{ $ins->created_at->diffForHumans() }}</span>
+                        <div class="form-control mb-3">
+                            <label class="label-text">{{ __("Responsible") }}</label>
+                            <input type="text" wire:model="editResponsible" class="input input-bordered input-sm" placeholder="Nombre" />
+                        </div>
+
+                        <button wire:click="saveFeatureProgress" class="btn btn-primary btn-sm w-full mb-3">
+                            💾 {{ __("Save progress") }}
+                        </button>
+
+                        {{-- Gestor de archivos del feature --}}
+                        <details class="mb-3 border rounded-lg">
+                            <summary class="text-xs font-semibold cursor-pointer p-2 bg-base-200 rounded-t-lg">
+                                📎 {{ __("Files of element") }}
+                            </summary>
+                            <div class="p-2">
+                                @livewire('media-manager', [
+                                    'mediableType' => 'App\\Models\\Feature',
+                                    'mediableId' => $selectedFeature->id,
+                                ], key('media-feature-' . $selectedFeature->id))
+                            </div>
+                        </details>
+
+                        {{-- Templates / Inspecciones --}}
+                        @if($templates->isNotEmpty())
+                            <div class="divider text-xs">{{ __("Inspection") }}</div>
+                            <div class="form-control mb-2">
+                                <label class="label-text">Plantilla</label>
+                                <select wire:model.live="selectedTemplateId" wire:change="onTemplateChange" class="select select-bordered select-sm">
+                                    <option value="">Seleccionar plantilla...</option>
+                                    @foreach($templates as $t)
+                                        <option value="{{ $t->id }}">{{ $t->name }}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+
+                            @if($selectedTemplateId && !empty($inspectionFormData))
+                                @php $template = $templates->firstWhere('id', $selectedTemplateId); @endphp
+                                @if($template)
+                                    @foreach($template->fields as $field)
+                                        <div class="mb-2">
+                                            <label class="label-text text-xs">{{ $field['label'] }} @if($field['required'] ?? false)<span class="text-error">*</span>@endif</label>
+                                            @switch($field['type'] ?? 'text')
+                                                @case('percentage')
+                                                    <div class="flex items-center gap-1">
+                                                        <input type="number" wire:model="inspectionFormData.{{ $field['name'] }}" min="0" max="100" class="input input-bordered input-sm w-16" />
+                                                        <span class="text-xs">%</span>
+                                                        <input type="range" min="0" max="100" wire:model.live="inspectionFormData.{{ $field['name'] }}" class="range range-primary range-xs flex-1" />
+                                                    </div>
+                                                    @break
+                                                @case('boolean')
+                                                    <input type="checkbox" wire:model="inspectionFormData.{{ $field['name'] }}" class="checkbox checkbox-sm" />
+                                                    @break
+                                                @case('select')
+                                                    <select wire:model="inspectionFormData.{{ $field['name'] }}" class="select select-bordered select-sm w-full">
+                                                        <option value="">Seleccionar</option>
+                                                        @foreach(explode(',', $field['options'] ?? '') as $opt)
+                                                            <option value="{{ trim($opt) }}">{{ trim($opt) }}</option>
+                                                        @endforeach
+                                                    </select>
+                                                    @break
+                                                @case('textarea')
+                                                    <textarea wire:model="inspectionFormData.{{ $field['name'] }}" rows="2" class="textarea textarea-bordered textarea-sm w-full"></textarea>
+                                                    @break
+                                                @default
+                                                    <input type="{{ $field['type'] ?? 'text' }}" wire:model="inspectionFormData.{{ $field['name'] }}" class="input input-bordered input-sm w-full" />
+                                            @endswitch
                                         </div>
-                                        @if($ins->user)<span class="text-gray-500">por {{ $ins->user->name }}</span>@endif
-                                    </div>
-                                @endforeach
+                                    @endforeach
+                                    <button wire:click="saveInspection" class="btn btn-primary btn-xs w-full mt-1">{{ __("Register inspection") }}</button>
+                                @endif
+                            @endif
+
+                            {{-- {{ __("History") }} de inspecciones --}}
+                            @if($inspectionHistory->isNotEmpty())
+                                <div class="divider text-xs">{{ __("History") }}</div>
+                                <div class="space-y-1 max-h-40 overflow-y-auto">
+                                    @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="text-gray-400">{{ $ins->created_at->diffForHumans() }}</span>
+                                            </div>
+                                            @if($ins->user)<span class="text-gray-500">por {{ $ins->user->name }}</span>@endif
+                                        </div>
+                                    @endforeach
+                                </div>
+                            @endif
+                        @else
+                            <div role="alert" class="alert alert-vertical sm:alert-horizontal">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
+                                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+                                </svg>
+                                <div>
+                                    <h3 class="font-bold">{{ __("No templates yet") }}</h3>
+                                    <div class="text-xs">{{ __("Create an inspection template") }}.</div>
+                                </div>
+                                <a href="{{ route('projects.templates', $project) }}" class="btn btn-primary btn-sm">{{ __("Create") }}</a>
                             </div>
                         @endif
                     @else
-                        <div role="alert" class="alert alert-vertical sm:alert-horizontal">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                            </svg>
-                            <div>
-                                <h3 class="font-bold">{{ __("No templates yet") }}</h3>
-                                <div class="text-xs">{{ __("Create an inspection template") }}.</div>
-                            </div>
-                            <a href="{{ route('projects.templates', $project) }}" class="btn btn-primary btn-sm">{{ __("Create") }}</a>
+                        <div class="text-center text-gray-400 py-8">
+                            <p class="text-lg">👆</p>
+                            <p>Haz clic en un elemento del mapa para editarlo</p>
+                        </div>
+                    @endif
+                @elseif($activeTab === 'features')
+                    <!-- Features Table -->
+                    @if($allFeatures->isNotEmpty())
+                        <div class="overflow-x-auto">
+                            <table class="table table-sm table-compact">
+                                <thead>
+                                    <tr>
+                                        <th>{{ __("Feature") }}</th>
+                                        <th>{{ __("Layer") }}</th>
+                                        <th>{{ __("Phase") }}</th>
+                                        <th>{{ __("Progress") }}</th>
+                                        <th>{{ __("Responsible") }}</th>
+                                        <th>{{ __("Template") }}</th>
+                                        <th class="w-16"></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($allFeatures as $feature)
+                                        <tr class="hover" wire:click="selectFeature({{ $feature->id }})">
+                                            <td>{{ $feature->name }}</td>
+                                            <td>{{ $feature->layer->name }}</td>
+                                            <td>{{ $feature->layer->phase->name }}</td>
+                                            <td>{{ $feature->progress }}%</td>
+                                            <td>{{ $feature->responsible ?? '-' }}</td>
+                                            <td>{{ $feature->template?->name ?? '-' }}</td>
+                                            <td class="justify-end">
+                                                <button class="btn btn-xs btn-outline btn-primary">✏️</button>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+                        <div class="text-center text-gray-400 py-8">
+                            <p class="text-lg">📋</p>
+                            <p>{{ __("No features found") }}</p>
+                        </div>
+                    @endif
+                @elseif($activeTab === 'inspections')
+                    <!-- Inspections Table -->
+                    @if($allInspections->isNotEmpty())
+                        <div class="overflow-x-auto">
+                            <table class="table table-sm table-compact">
+                                <thead>
+                                    <tr>
+                                        <th>{{ __("Date") }}</th>
+                                        <th>{{ __("Feature") }}</th>
+                                        <th>{{ __("Template") }}</th>
+                                        <th>{{ __("User") }}</th>
+                                        <th class="w-16"></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($allInspections as $inspection)
+                                        <tr>
+                                            <td>{{ $inspection->created_at->format('d/m/Y') }}</td>
+                                            <td>{{ $inspection->feature->name }}</td>
+                                            <td>{{ $inspection->template->name }}</td>
+                                            <td>{{ $inspection->user->name }}</td>
+                                            <td class="justify-end">
+                                                <button class="btn btn-xs btn-outline btn-info">👁️</button>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+                        <div class="text-center text-gray-400 py-8">
+                            <p class="text-lg">📋</p>
+                            <p>{{ __("No inspections found") }}</p>
                         </div>
                     @endif
-                @else
-                    <div class="text-center text-gray-400 py-8">
-                        <p class="text-lg">👆</p>
-                        <p>Haz clic en un elemento del mapa para editarlo</p>
-                    </div>
                 @endif
             </div>
         </div>
     </div>
-</div>
-
-@push('scripts')
+</div>@push('scripts')
 <style>
     .leaflet-container { z-index: 0 !important; }
 </style>
@@ -373,4 +456,3 @@
         };
     });
 </script>
-@endpush
\ No newline at end of file