diff --git a/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs b/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs
index 0713d369..2a19d0f8 100644
--- a/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs
+++ b/cicm_web/Areas/Admin/Controllers/StorageByMachinesController.cs
@@ -55,7 +55,8 @@ namespace cicm_web.Areas.Admin.Controllers
         {
             IIncludableQueryable<StorageByMachine, Machine> cicmContext =
                 _context.StorageByMachine.Include(s => s.Machine);
-            return View(await cicmContext.ToListAsync());
+            return View(await cicmContext.OrderBy(s => s.Machine.Company.Name).ThenBy(s => s.Machine.Name)
+                                         .ToListAsync());
         }
 
         // GET: Admin/StorageByMachines/Details/5
diff --git a/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml b/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml
index 6d67e74b..7bd4596d 100644
--- a/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByMachines/Index.cshtml
@@ -47,6 +47,12 @@
 <table class="table">
     <thead>
     <tr>
+        <th>
+            @Html.DisplayNameFor(model => model.Machine.Company)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.Machine)
+        </th>
         <th>
             @Html.DisplayNameFor(model => model.Type)
         </th>
@@ -56,9 +62,6 @@
         <th>
             @Html.DisplayNameFor(model => model.Capacity)
         </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Machine)
-        </th>
         <th></th>
     </tr>
     </thead>
@@ -66,6 +69,12 @@
     @foreach(StorageByMachine item in Model)
     {
         <tr>
+            <td>
+                @Html.DisplayFor(modelItem => item.Machine.Company.Name)
+            </td>
+            <td>
+                @Html.DisplayFor(modelItem => item.Machine.Name)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Type)
             </td>
@@ -75,9 +84,6 @@
             <td>
                 @Html.DisplayFor(modelItem => item.Capacity)
             </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Machine.Name)
-            </td>
             <td>
                 <a asp-action="Details"
                    asp-route-id="@item.Id"
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 944e7b49..e3eda38d 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.394</Version>
+    <Version>3.0.99.395</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>