diff --git a/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs b/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs
index c6adc0f8..3fc449df 100644
--- a/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/MachineFamiliesController.cs
@@ -54,7 +54,7 @@ namespace cicm_web.Areas.Admin.Controllers
         public async Task<IActionResult> Index()
         {
             IIncludableQueryable<MachineFamily, Company> cicmContext = _context.MachineFamilies.Include(m => m.Company);
-            return View(await cicmContext.ToListAsync());
+            return View(await cicmContext.OrderBy(m => m.Company.Name).ThenBy(m => m.Name).ToListAsync());
         }
 
         // GET: Admin/MachineFamilies/Details/5
diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Delete.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Delete.cshtml
index 831273f6..e0cb73f1 100644
--- a/cicm_web/Areas/Admin/Views/MachineFamilies/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Delete.cshtml
@@ -42,18 +42,18 @@
     <h4>Machine family</h4>
     <hr />
     <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Name)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Name)
-        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Company)
         </dt>
         <dd>
             @Html.DisplayFor(model => model.Company.Name)
         </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Name)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Name)
+        </dd>
     </dl>
 
     <form asp-action="Delete">
diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml
index 26683d37..d9053fdf 100644
--- a/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml
@@ -41,18 +41,18 @@
     <h4>Machine family</h4>
     <hr />
     <dl class="dl-horizontal">
-        <dt>
-            @Html.DisplayNameFor(model => model.Name)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Name)
-        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Company)
         </dt>
         <dd>
             @Html.DisplayFor(model => model.Company.Name)
         </dd>
+        <dt>
+            @Html.DisplayNameFor(model => model.Name)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Name)
+        </dd>
     </dl>
 </div>
 <div>
diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml
index 41c76954..e522ad0b 100644
--- a/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Index.cshtml
@@ -48,10 +48,10 @@
     <thead>
     <tr>
         <th>
-            @Html.DisplayNameFor(model => model.Name)
+            @Html.DisplayNameFor(model => model.Company)
         </th>
         <th>
-            @Html.DisplayNameFor(model => model.Company)
+            @Html.DisplayNameFor(model => model.Name)
         </th>
         <th></th>
     </tr>
@@ -61,10 +61,10 @@
     {
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.Name)
+                @Html.DisplayFor(modelItem => item.Company.Name)
             </td>
             <td>
-                @Html.DisplayFor(modelItem => item.Company.Name)
+                @Html.DisplayFor(modelItem => item.Name)
             </td>
             <td>
                 <a asp-action="Details"
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index d691f0de..3bdca7b4 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.434</Version>
+    <Version>3.0.99.435</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>