diff --git a/usuarios.html b/usuarios.html
index e79183e..23dfadf 100644
--- a/usuarios.html
+++ b/usuarios.html
@@ -11,119 +11,129 @@
 <body class="bg-gray-50 text-gray-800 font-sans antialiased">
 
     <div class="flex h-screen overflow-hidden">
-        
         <div id="sidebar-container" class="h-full"></div>
-
         <div class="flex-1 flex flex-col overflow-hidden relative">
-            
             <div id="header-container"></div>
-
+            
             <main class="flex-1 overflow-x-hidden overflow-y-auto bg-gray-50 p-8 fade-in">
+                <h2 class="text-2xl font-bold text-gray-800 mb-8">Gestión de Equipo</h2>
                 
-                <h2 class="text-2xl font-bold text-gray-800 mb-8">Gestión de Equipo y Gremios</h2>
-                
-                <div class="flex flex-col gap-8 max-w-4xl mx-auto">
+                <div class="flex flex-col gap-8 max-w-5xl mx-auto">
                     
                     <div class="w-full bg-white p-6 rounded-xl shadow-sm border border-gray-100">
                         <div class="flex items-center gap-3 mb-4 text-blue-600">
                             <i data-lucide="hammer" class="w-6 h-6"></i>
-                            <h3 class="text-lg font-bold text-gray-800">Gremios / Especialidades</h3>
+                            <h3 class="text-lg font-bold text-gray-800">1. Gremios / Especialidades</h3>
                         </div>
-                        <p class="text-sm text-gray-500 mb-4">Define las especialidades disponibles para tus operarios.</p>
-                        
                         <div class="flex flex-col md:flex-row gap-6">
                             <form onsubmit="addGuild(event)" class="flex gap-2 h-10 w-full md:w-1/2">
-                                <input type="text" id="newGuildName" placeholder="NUEVO GREMIO (EJ. LIMPIEZA)" required 
-                                       class="flex-1 px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500 outline-none text-sm uppercase">
-                                <button type="submit" class="bg-slate-800 text-white px-4 rounded-lg hover:bg-slate-700 font-bold">
-                                    <i data-lucide="plus" class="w-5 h-5"></i>
-                                </button>
+                                <input type="text" id="newGuildName" placeholder="NUEVO GREMIO (EJ. LIMPIEZA)" required class="flex-1 px-3 py-2 border rounded-lg focus:ring-2 focus:ring-blue-500 outline-none text-sm uppercase">
+                                <button type="submit" class="bg-slate-800 text-white px-4 rounded-lg hover:bg-slate-700 font-bold"><i data-lucide="plus" class="w-5 h-5"></i></button>
                             </form>
-                            
-                            <div class="w-full md:w-1/2 border rounded-lg bg-gray-50 p-2 max-h-40 overflow-y-auto space-y-2" id="guildsList">
-                                <p class="text-xs text-center text-gray-400 mt-2">Cargando gremios...</p>
-                            </div>
+                            <div class="w-full md:w-1/2 border rounded-lg bg-gray-50 p-2 max-h-40 overflow-y-auto space-y-2" id="guildsList"><p class="text-xs text-center text-gray-400 mt-2">Cargando...</p></div>
                         </div>
                     </div>
 
-                    <div class="w-full bg-white p-6 rounded-xl shadow-sm border border-gray-100">
+                    <div class="w-full bg-white p-6 rounded-xl shadow-sm border border-gray-100 relative">
+                        <button onclick="resetUserForm()" id="btnCancelEdit" class="hidden absolute top-6 right-6 text-sm text-red-500 hover:underline">Cancelar Edición</button>
+
                         <div class="flex items-center gap-3 mb-6 text-green-600">
                             <i data-lucide="user-plus" class="w-6 h-6"></i>
-                            <h3 class="text-lg font-bold text-gray-800">Dar de Alta Nuevo Usuario</h3>
+                            <h3 class="text-lg font-bold text-gray-800" id="formTitle">2. Nuevo Usuario</h3>
                         </div>
 
-                        <form onsubmit="createUser(event)" class="space-y-6">
-                            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                        <form onsubmit="handleUserSubmit(event)" class="space-y-6">
+                            <input type="hidden" id="editUserId"> <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
                                 <div class="space-y-4">
                                     <div>
                                         <label class="block text-xs font-bold text-gray-600 mb-1">Nombre Completo</label>
                                         <input type="text" id="uName" required class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
                                     </div>
                                     <div>
-                                        <label class="block text-xs font-bold text-gray-600 mb-1">Correo Electrónico (Login)</label>
+                                        <label class="block text-xs font-bold text-gray-600 mb-1">Correo Electrónico</label>
                                         <input type="email" id="uEmail" required class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
                                     </div>
                                 </div>
-
                                 <div class="space-y-4">
                                     <div>
-                                        <label class="block text-xs font-bold text-gray-600 mb-1">Contraseña</label>
-                                        <input type="password" id="uPass" required class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
+                                        <label class="block text-xs font-bold text-gray-600 mb-1">Teléfono</label>
+                                        <input type="tel" id="uPhone" required placeholder="+34 600..." class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none">
                                     </div>
-                                    <div>
-                                        <label class="block text-xs font-bold text-gray-600 mb-1">Rol en el sistema</label>
-                                        <select id="uRole" class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none bg-white">
-                                            <option value="operario">Operario (Básico)</option>
-                                            <option value="facturacion">Facturación</option>
-                                            <option value="admin">Administrador</option>
-                                        </select>
+                                    <div class="flex gap-4">
+                                        <div class="w-1/2">
+                                            <label class="block text-xs font-bold text-gray-600 mb-1">Rol</label>
+                                            <select id="uRole" class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none bg-white">
+                                                <option value="operario">Operario</option>
+                                                <option value="facturacion">Facturación</option>
+                                                <option value="admin">Administrador</option>
+                                            </select>
+                                        </div>
+                                        <div class="w-1/2">
+                                            <label class="block text-xs font-bold text-gray-600 mb-1">Contraseña</label>
+                                            <input type="password" id="uPass" class="w-full px-3 py-2 border rounded-lg focus:ring-2 focus:ring-green-500 outline-none" placeholder="Opcional al editar">
+                                        </div>
                                     </div>
                                 </div>
                             </div>
 
                             <div class="pt-2">
-                                <label class="block text-xs font-bold text-gray-600 mb-2">Asignar Gremios (Puede seleccionar varios)</label>
-                                <div class="p-4 border rounded-lg bg-gray-50 grid grid-cols-2 md:grid-cols-4 gap-3" id="guildsCheckboxArea">
-                                    <p class="text-xs text-gray-400">Crea gremios primero para asignarlos.</p>
-                                </div>
+                                <label class="block text-xs font-bold text-gray-600 mb-2">Asignar Gremios</label>
+                                <div class="p-4 border rounded-lg bg-gray-50 grid grid-cols-2 md:grid-cols-4 gap-3" id="guildsCheckboxArea"></div>
                             </div>
 
                             <div class="pt-4 border-t border-gray-100">
-                                <button type="submit" id="btnCreateUser" class="w-full bg-green-600 hover:bg-green-700 text-white font-bold py-3 rounded-lg transition-all shadow-lg shadow-green-500/30">
-                                    Crear Usuario
+                                <button type="submit" id="btnSubmitUser" class="w-full bg-green-600 hover:bg-green-700 text-white font-bold py-3 rounded-lg transition-all shadow-lg shadow-green-500/30">
+                                    Guardar Usuario
                                 </button>
                             </div>
                         </form>
                     </div>
 
-                </div>
+                    <div class="w-full bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
+                        <div class="p-6 border-b border-gray-100 bg-gray-50">
+                            <h3 class="font-bold text-gray-800">Listado de Personal</h3>
+                        </div>
+                        <div class="overflow-x-auto">
+                            <table class="w-full text-left border-collapse">
+                                <thead>
+                                    <tr class="bg-white text-gray-500 text-xs uppercase tracking-wider border-b">
+                                        <th class="p-4">Nombre</th>
+                                        <th class="p-4">Contacto</th>
+                                        <th class="p-4">Rol</th>
+                                        <th class="p-4">Gremios</th>
+                                        <th class="p-4 text-right">Acciones</th>
+                                    </tr>
+                                </thead>
+                                <tbody id="usersListBody" class="text-sm divide-y divide-gray-100">
+                                    <tr><td colspan="5" class="p-4 text-center text-gray-400">Cargando...</td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
 
+                </div>
             </main>
         </div>
     </div>
 
-    <div id="toast" class="fixed bottom-5 right-5 bg-slate-800 text-white px-6 py-3 rounded-lg shadow-2xl transform translate-y-20 opacity-0 transition-all duration-300 z-50 flex items-center gap-3">
-        <span id="toastMsg">Mensaje</span>
-    </div>
-
+    <div id="toast" class="fixed bottom-5 right-5 bg-slate-800 text-white px-6 py-3 rounded-lg shadow-2xl transform translate-y-20 opacity-0 transition-all duration-300 z-50 flex items-center gap-3"><span id="toastMsg">Mensaje</span></div>
     <script src="js/layout.js"></script>
 
     <script>
-        // Lógica movida desde configuracion.html
         let availableGuilds = [];
+        let currentUsers = [];
 
         document.addEventListener("DOMContentLoaded", () => {
             const token = localStorage.getItem("token");
             if (!token) { window.location.href = "index.html"; return; }
             fetchGuilds();
+            fetchUsers();
         });
 
-        // 1. GREMIOS
+        // --- GREMIOS ---
         async function fetchGuilds() {
             try {
-                const res = await fetch(`${API_URL}/guilds`, {
-                    headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` }
-                });
+                const res = await fetch(`${API_URL}/guilds`, { headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` } });
                 const data = await res.json();
                 if (data.ok) {
                     availableGuilds = data.guilds;
@@ -132,116 +142,168 @@
                 }
             } catch (e) { console.error(e); }
         }
-
         async function addGuild(e) {
             e.preventDefault();
             const name = document.getElementById('newGuildName').value;
             try {
-                const res = await fetch(`${API_URL}/guilds`, {
-                    method: 'POST',
-                    headers: { 
-                        "Content-Type": "application/json",
-                        "Authorization": `Bearer ${localStorage.getItem("token")}`
-                    },
-                    body: JSON.stringify({ name })
-                });
-                if (res.ok) {
-                    document.getElementById('newGuildName').value = "";
-                    fetchGuilds();
-                    showToast("Gremio añadido");
-                }
-            } catch (e) { showToast("Error al añadir", true); }
+                await fetch(`${API_URL}/guilds`, { method: 'POST', headers: { "Content-Type": "application/json", "Authorization": `Bearer ${localStorage.getItem("token")}` }, body: JSON.stringify({ name }) });
+                document.getElementById('newGuildName').value = ""; fetchGuilds(); showToast("Gremio añadido");
+            } catch (e) { showToast("Error", true); }
+        }
+        async function deleteGuild(id) {
+            if(!confirm("¿Borrar?")) return;
+            await fetch(`${API_URL}/guilds/${id}`, { method: 'DELETE', headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` } });
+            fetchGuilds();
         }
 
-        async function deleteGuild(id) {
-            if(!confirm("¿Borrar gremio?")) return;
+        // --- USUARIOS ---
+        async function fetchUsers() {
             try {
-                await fetch(`${API_URL}/guilds/${id}`, {
-                    method: 'DELETE',
-                    headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` }
-                });
-                fetchGuilds();
+                const res = await fetch(`${API_URL}/admin/users`, { headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` } });
+                const data = await res.json();
+                if (data.ok) {
+                    currentUsers = data.users;
+                    renderUsersTable();
+                }
             } catch (e) { console.error(e); }
         }
 
-        function renderGuildsList() {
-            const list = document.getElementById('guildsList');
-            list.innerHTML = "";
-            availableGuilds.forEach(g => {
-                list.innerHTML += `
-                    <div class="flex justify-between items-center bg-white p-2 rounded border hover:bg-blue-50 transition shadow-sm">
-                        <span class="text-sm font-medium text-gray-700">${g.name}</span>
-                        <button onclick="deleteGuild(${g.id})" class="text-gray-400 hover:text-red-500"><i data-lucide="trash-2" class="w-4 h-4"></i></button>
-                    </div>
-                `;
-            });
-            if(window.lucide) lucide.createIcons();
-        }
-
-        function renderGuildsCheckboxes() {
-            const area = document.getElementById('guildsCheckboxArea');
-            if (availableGuilds.length === 0) {
-                area.innerHTML = '<p class="text-xs text-gray-400 col-span-4">No hay gremios creados.</p>';
-                return;
-            }
-            area.innerHTML = "";
-            availableGuilds.forEach(g => {
-                area.innerHTML += `
-                    <label class="flex items-center space-x-2 cursor-pointer p-2 hover:bg-green-50 rounded border border-transparent hover:border-green-200 transition">
-                        <input type="checkbox" value="${g.id}" class="guild-checkbox form-checkbox h-4 w-4 text-green-600 rounded border-gray-300 focus:ring-green-500">
-                        <span class="text-sm font-medium text-gray-700">${g.name}</span>
-                    </label>
-                `;
-            });
-        }
-
-        // 2. USUARIOS
-        async function createUser(e) {
+        async function handleUserSubmit(e) {
             e.preventDefault();
-            const btn = document.getElementById('btnCreateUser');
+            const userId = document.getElementById('editUserId').value;
+            const isEdit = !!userId;
+            
+            const btn = document.getElementById('btnSubmitUser');
             btn.disabled = true; btn.innerText = "Procesando...";
 
             const selectedGuilds = Array.from(document.querySelectorAll('.guild-checkbox:checked')).map(cb => cb.value);
-
             const data = {
                 fullName: document.getElementById('uName').value,
                 email: document.getElementById('uEmail').value,
-                password: document.getElementById('uPass').value,
+                phone: document.getElementById('uPhone').value,
+                password: document.getElementById('uPass').value, // Puede ir vacío al editar
                 role: document.getElementById('uRole').value,
                 guilds: selectedGuilds
             };
 
+            const url = isEdit ? `${API_URL}/admin/users/${userId}` : `${API_URL}/admin/users`;
+            const method = isEdit ? 'PUT' : 'POST';
+
             try {
-                const res = await fetch(`${API_URL}/admin/users`, {
-                    method: 'POST',
-                    headers: { 
-                        "Content-Type": "application/json",
-                        "Authorization": `Bearer ${localStorage.getItem("token")}`
-                    },
+                const res = await fetch(url, {
+                    method: method,
+                    headers: { "Content-Type": "application/json", "Authorization": `Bearer ${localStorage.getItem("token")}` },
                     body: JSON.stringify(data)
                 });
                 const json = await res.json();
-                
                 if (json.ok) {
-                    showToast("✅ Usuario creado con éxito");
-                    e.target.reset();
-                    renderGuildsCheckboxes();
+                    showToast(isEdit ? "Usuario actualizado" : "Usuario creado");
+                    resetUserForm();
+                    fetchUsers();
                 } else {
                     showToast("❌ " + json.error, true);
                 }
-            } catch (e) {
-                showToast("Error de conexión", true);
-            } finally {
-                btn.disabled = false; btn.innerText = "Crear Usuario";
-            }
+            } catch (e) { showToast("Error conexión", true); }
+            finally { btn.disabled = false; btn.innerText = isEdit ? "Actualizar Usuario" : "Guardar Usuario"; }
         }
 
-        function showToast(msg, isError = false) {
-            const toast = document.getElementById('toast');
-            document.getElementById('toastMsg').innerText = msg;
-            toast.className = `fixed bottom-5 right-5 px-6 py-3 rounded-lg shadow-2xl transform transition-all duration-300 z-50 flex items-center gap-3 ${isError ? 'bg-red-600' : 'bg-slate-800'} text-white`;
-            toast.classList.remove('translate-y-20', 'opacity-0');
-            setTimeout(() => toast.classList.add('translate-y-20', 'opacity-0'), 3000);
+        async function deleteUser(id) {
+            if(!confirm("¿Seguro que quieres borrar a este usuario?")) return;
+            try {
+                const res = await fetch(`${API_URL}/admin/users/${id}`, { method: 'DELETE', headers: { "Authorization": `Bearer ${localStorage.getItem("token")}` } });
+                if(res.ok) { showToast("Usuario borrado"); fetchUsers(); }
+            } catch(e) { showToast("Error", true); }
+        }
+
+        function editUser(id) {
+            const user = currentUsers.find(u => u.id === id);
+            if(!user) return;
+
+            // Rellenar form
+            document.getElementById('editUserId').value = user.id;
+            document.getElementById('uName').value = user.full_name;
+            document.getElementById('uEmail').value = user.email;
+            document.getElementById('uPhone').value = user.phone;
+            document.getElementById('uRole').value = user.role;
+            document.getElementById('uPass').value = ""; // Limpiar pass
+            document.getElementById('uPass').placeholder = "Dejar en blanco para no cambiar";
+
+            // Marcar gremios
+            const userGuilds = user.guilds || [];
+            document.querySelectorAll('.guild-checkbox').forEach(cb => {
+                cb.checked = userGuilds.includes(parseInt(cb.value));
+            });
+
+            // Cambiar UI
+            document.getElementById('formTitle').innerText = "2. Editando Usuario";
+            document.getElementById('btnSubmitUser').innerText = "Actualizar Usuario";
+            document.getElementById('btnSubmitUser').classList.replace('bg-green-600', 'bg-blue-600');
+            document.getElementById('btnSubmitUser').classList.replace('hover:bg-green-700', 'hover:bg-blue-700');
+            document.getElementById('btnCancelEdit').classList.remove('hidden');
+
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+        }
+
+        function resetUserForm() {
+            document.getElementById('editUserId').value = "";
+            document.querySelector('form').reset();
+            document.getElementById('formTitle').innerText = "2. Nuevo Usuario";
+            document.getElementById('btnSubmitUser').innerText = "Guardar Usuario";
+            document.getElementById('btnSubmitUser').classList.replace('bg-blue-600', 'bg-green-600');
+            document.getElementById('btnSubmitUser').classList.replace('hover:bg-blue-700', 'hover:bg-green-700');
+            document.getElementById('uPass').placeholder = "Opcional al editar";
+            document.getElementById('btnCancelEdit').classList.add('hidden');
+            renderGuildsCheckboxes(); // Limpiar checks
+        }
+
+        // --- RENDERS ---
+        function renderGuildsList() {
+            const list = document.getElementById('guildsList');
+            list.innerHTML = "";
+            availableGuilds.forEach(g => {
+                list.innerHTML += `<div class="flex justify-between items-center bg-white p-2 rounded border shadow-sm"><span class="text-sm font-medium">${g.name}</span><button onclick="deleteGuild(${g.id})" class="text-gray-400 hover:text-red-500"><i data-lucide="trash-2" class="w-4 h-4"></i></button></div>`;
+            });
+            if(window.lucide) lucide.createIcons();
+        }
+        function renderGuildsCheckboxes() {
+            const area = document.getElementById('guildsCheckboxArea');
+            if (availableGuilds.length === 0) { area.innerHTML = '<p class="text-xs text-gray-400">Sin gremios.</p>'; return; }
+            area.innerHTML = "";
+            availableGuilds.forEach(g => {
+                area.innerHTML += `<label class="flex items-center space-x-2 cursor-pointer p-2 hover:bg-green-50 rounded border border-transparent hover:border-green-200"><input type="checkbox" value="${g.id}" class="guild-checkbox form-checkbox h-4 w-4 text-green-600 rounded"> <span class="text-sm font-medium">${g.name}</span></label>`;
+            });
+        }
+        function renderUsersTable() {
+            const tbody = document.getElementById('usersListBody');
+            tbody.innerHTML = "";
+            if(currentUsers.length === 0) { tbody.innerHTML = `<tr><td colspan="5" class="p-4 text-center text-gray-400">No hay usuarios registrados.</td></tr>`; return; }
+            
+            currentUsers.forEach(u => {
+                // Mapear IDs de gremios a nombres
+                const uGuildNames = (u.guilds || []).map(gid => {
+                    const g = availableGuilds.find(ag => ag.id === gid);
+                    return g ? g.name : null;
+                }).filter(Boolean).join(", ");
+
+                tbody.innerHTML += `
+                    <tr class="bg-white hover:bg-gray-50 transition border-b last:border-0">
+                        <td class="p-4 font-medium text-gray-800">${u.full_name}</td>
+                        <td class="p-4 text-gray-600 flex flex-col"><span class="text-xs text-gray-400">Email:</span> ${u.email} <span class="text-xs text-gray-400 mt-1">Tel:</span> ${u.phone}</td>
+                        <td class="p-4"><span class="bg-blue-100 text-blue-700 px-2 py-1 rounded text-xs font-bold uppercase">${u.role}</span></td>
+                        <td class="p-4 text-gray-500 text-xs">${uGuildNames || '-'}</td>
+                        <td class="p-4 text-right space-x-2">
+                            <button onclick="editUser(${u.id})" class="text-blue-500 hover:text-blue-700 font-medium text-sm">Editar</button>
+                            <button onclick="deleteUser(${u.id})" class="text-red-500 hover:text-red-700 font-medium text-sm">Borrar</button>
+                        </td>
+                    </tr>
+                `;
+            });
+        }
+        function showToast(msg, err=false){
+             const t=document.getElementById('toast'), m=document.getElementById('toastMsg');
+             t.className=`fixed bottom-5 right-5 px-6 py-3 rounded-lg shadow-2xl transition-all duration-300 z-50 flex items-center gap-3 ${err?'bg-red-600':'bg-slate-800'} text-white`;
+             m.innerText=msg; t.classList.remove('translate-y-20','opacity-0');
+             setTimeout(()=>t.classList.add('translate-y-20','opacity-0'),3000);
         }
     </script>
 </body>
