diff --git a/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs b/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
index 2f78f5a5..40dbcb2c 100644
--- a/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
+++ b/cicm_web/Areas/Admin/Controllers/ScreensByMachineController.cs
@@ -161,9 +161,20 @@ namespace cicm_web.Areas.Admin.Controllers
         {
             if(id == null) return NotFound();
 
-            ScreensByMachine screensByMachine = await _context.ScreensByMachine
-                                                              .Include(s => s.Machine).Include(s => s.Screen)
-                                                              .FirstOrDefaultAsync(m => m.Id == id);
+            ScreensByMachineViewModel screensByMachine = await _context.ScreensByMachine
+                                                                       .Include(s => s.Machine).Include(s => s.Screen)
+                                                                       .Select(s => new ScreensByMachineViewModel
+                                                                        {
+                                                                            Id = s.Id,
+                                                                            Screen =
+                                                                                s.Screen.NativeResolution !=
+                                                                                null
+                                                                                    ? $"{s.Screen.Diagonal}\" {s.Screen.Type} with {s.Screen.NativeResolution}"
+                                                                                    : $"{s.Screen.Diagonal}\" {s.Screen}",
+                                                                            Machine =
+                                                                                $"{s.Machine.Company.Name} {s.Machine.Name}"
+                                                                        }).FirstOrDefaultAsync(m => m.Id ==
+                                                                                                    id);
             if(screensByMachine == null) return NotFound();
 
             return View(screensByMachine);
diff --git a/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml b/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml
index 8d51487e..2508be68 100644
--- a/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/ScreensByMachine/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Cicm.Database.Models.ScreensByMachine
+@model cicm_web.Areas.Admin.Models.ScreensByMachineViewModel
 
 @{
     ViewData["Title"] = "Delete";
@@ -8,20 +8,20 @@
 
 <h3>Are you sure you want to delete this?</h3>
 <div>
-    <h4>ScreensByMachine</h4>
+    <h4>Screens by machine</h4>
     <hr />
     <dl class="row">
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Screen)
         </dt>
         <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Screen.Type)
+            @Html.DisplayFor(model => model.Screen)
         </dd class>
         <dt class="col-sm-2">
             @Html.DisplayNameFor(model => model.Machine)
         </dt>
         <dd class="col-sm-10">
-            @Html.DisplayFor(model => model.Machine.Name)
+            @Html.DisplayFor(model => model.Machine)
         </dd class>
     </dl>
 
@@ -30,7 +30,10 @@
                asp-for="Id" />
         <input class="btn btn-danger"
                type="submit"
-               value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+               value="Delete" />
+        <a asp-action="Index"
+           class="btn btn-secondary">
+            Back to List
+        </a>
     </form>
 </div>
\ No newline at end of file
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 3c80f6fd..f6dd8f3f 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.749</Version>
+    <Version>3.0.99.750</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>