diff --git a/resources/views/facturas.html b/resources/views/facturas.html
index 8ff2041..4806e8f 100644
--- a/resources/views/facturas.html
+++ b/resources/views/facturas.html
@@ -1,5 +1,3 @@
-{{template "layouts/main" .}}
-
 <div x-data="facturasApp()" x-init="init()" class="p-6">
 
   <div class="flex items-center justify-between mb-6">
@@ -39,7 +37,7 @@
         <template x-for="f in items" :key="f.ID">
           <tr class="hover:bg-slate-50">
             <td class="px-4 py-3 font-mono text-xs text-slate-500" x-text="f.numero||`#${f.ID}`"></td>
-            <td class="px-4 py-3 text-slate-700" x-text="f.cliente?.razon_social||f.cliente?.nombre||'-'"></td>
+            <td class="px-4 py-3 text-slate-700" x-text="f.cliente?.empresa||f.cliente?.nombre||'-'"></td>
             <td class="px-4 py-3 text-slate-600 max-w-xs truncate" x-text="f.descripcion"></td>
             <td class="px-4 py-3 font-semibold text-slate-800" x-text="`${f.moneda} ${Number(f.monto).toLocaleString('es-CO')}`"></td>
             <td class="px-4 py-3">
@@ -96,7 +94,7 @@
             <select x-model.number="form.cliente_id" class="input-field w-full" required>
               <option value="">Seleccionar...</option>
               <template x-for="c in clientes" :key="c.ID">
-                <option :value="c.ID" x-text="c.razon_social||c.nombre"></option>
+                <option :value="c.ID" x-text="c.empresa||c.nombre"></option>
               </template>
             </select>
           </div>
diff --git a/resources/views/portal/dashboard.html b/resources/views/portal/dashboard.html
index 4c067e0..0f3de9d 100644
--- a/resources/views/portal/dashboard.html
+++ b/resources/views/portal/dashboard.html
@@ -21,7 +21,7 @@
     {{ range .grupos }}
     <div class="mb-8">
       <h2 class="text-sm font-bold text-slate-500 uppercase tracking-wide mb-3">
-        {{ if .Cliente.RazonSocial }}{{ .Cliente.RazonSocial }}{{ else }}{{ .Cliente.Nombre }}{{ end }}
+        {{ if .Cliente.Empresa }}{{ .Cliente.Empresa }}{{ else }}{{ .Cliente.Nombre }}{{ end }}
       </h2>
       <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
         {{ range .Proyectos }}
diff --git a/resources/views/portal/proyecto.html b/resources/views/portal/proyecto.html
index 3bbb90c..88374fa 100644
--- a/resources/views/portal/proyecto.html
+++ b/resources/views/portal/proyecto.html
@@ -48,11 +48,11 @@
             </div>
             {{ else if eq $f.Estado "en_progreso" }}
             <div class="w-12 h-12 rounded-full flex items-center justify-center font-bold text-sm border-2 border-[#8eb02f] text-[#8eb02f] bg-white">
-              {{ add $i 1 }}
+              {{ $f.Orden }}
             </div>
             {{ else }}
             <div class="w-12 h-12 rounded-full flex items-center justify-center font-bold text-sm border-2 border-slate-200 text-slate-400 bg-white">
-              {{ add $i 1 }}
+              {{ $f.Orden }}
             </div>
             {{ end }}
           </div>
diff --git a/resources/views/portal_usuarios.html b/resources/views/portal_usuarios.html
index b06194e..8afe904 100644
--- a/resources/views/portal_usuarios.html
+++ b/resources/views/portal_usuarios.html
@@ -1,5 +1,3 @@
-{{template "layouts/main" .}}
-
 <div x-data="portalUsuariosApp()" x-init="init()" class="p-6">
 
   <div class="flex items-center justify-between mb-6">
@@ -39,13 +37,13 @@
             </td>
             <td class="px-4 py-3 text-slate-500 text-xs">
               <template x-if="u.rol==='cliente' && u.cliente">
-                <span x-text="u.cliente?.razon_social || u.cliente?.nombre"></span>
+                <span x-text="u.cliente?.empresa || u.cliente?.nombre"></span>
               </template>
               <template x-if="u.rol==='partner'">
                 <div class="flex flex-wrap gap-1">
                   <template x-for="acc in (u.portal_accesos||[])" :key="acc.ID">
                     <span class="bg-slate-100 px-2 py-0.5 rounded text-xs flex items-center gap-1">
-                      <span x-text="acc.cliente?.razon_social || acc.cliente?.nombre || acc.cliente_id"></span>
+                      <span x-text="acc.cliente?.empresa || acc.cliente?.nombre || acc.cliente_id"></span>
                       <button @click="removeAcceso(u, acc.cliente_id)" class="text-red-400 hover:text-red-600 ml-1">&times;</button>
                     </span>
                   </template>
@@ -94,7 +92,7 @@
             <select x-model.number="form.cliente_id" class="input-field w-full">
               <option value="">Sin asignar</option>
               <template x-for="c in clientes" :key="c.ID">
-                <option :value="c.ID" x-text="c.razon_social || c.nombre"></option>
+                <option :value="c.ID" x-text="c.empresa || c.nombre"></option>
               </template>
             </select>
           </div>
@@ -121,7 +119,7 @@
       <select x-model.number="accesoClienteId" class="input-field w-full mb-4">
         <option value="">Seleccionar...</option>
         <template x-for="c in clientes" :key="c.ID">
-          <option :value="c.ID" x-text="c.razon_social || c.nombre"></option>
+          <option :value="c.ID" x-text="c.empresa || c.nombre"></option>
         </template>
       </select>
       <div class="flex justify-end gap-3">
diff --git a/resources/views/proyectos.html b/resources/views/proyectos.html
index 560d251..fedc603 100644
--- a/resources/views/proyectos.html
+++ b/resources/views/proyectos.html
@@ -1,5 +1,3 @@
-{{template "layouts/main" .}}
-
 <div x-data="proyectosApp()" x-init="init()" class="p-6">
 
   <!-- Header -->
@@ -47,7 +45,7 @@
             <td class="px-4 py-3 font-medium text-slate-800">
               <a :href="`/app/proyectos/${p.ID}/detalle`" class="hover:underline text-primary" x-text="p.nombre"></a>
             </td>
-            <td class="px-4 py-3 text-slate-600" x-text="p.cliente?.razon_social || p.cliente?.nombre || '-'"></td>
+            <td class="px-4 py-3 text-slate-600" x-text="p.cliente?.empresa || p.cliente?.nombre || '-'"></td>
             <td class="px-4 py-3">
               <span class="badge" :class="{
                 'badge-green': p.estado==='activo',
@@ -102,7 +100,7 @@
             <select x-model="form.cliente_id" class="input-field w-full" required>
               <option value="">Seleccionar cliente</option>
               <template x-for="c in clientes" :key="c.ID">
-                <option :value="c.ID" x-text="c.razon_social || c.nombre"></option>
+                <option :value="c.ID" x-text="c.empresa || c.nombre"></option>
               </template>
             </select>
           </div>