diff --git a/cicm_web/Areas/Admin/Controllers/GpusController.cs b/cicm_web/Areas/Admin/Controllers/GpusController.cs
index 2ecc8e8f..5dad6d89 100644
--- a/cicm_web/Areas/Admin/Controllers/GpusController.cs
+++ b/cicm_web/Areas/Admin/Controllers/GpusController.cs
@@ -54,7 +54,8 @@ namespace cicm_web.Areas.Admin.Controllers
         public async Task<IActionResult> Index()
         {
             IIncludableQueryable<Gpu, Company> cicmContext = _context.Gpus.Include(g => g.Company);
-            return View(await cicmContext.ToListAsync());
+            return View(await cicmContext.OrderBy(g => g.Company.Name).ThenBy(g => g.Name).ThenBy(g => g.Introduced)
+                                         .ToListAsync());
         }
 
         // GET: Admin/Gpus/Details/5
diff --git a/cicm_web/Areas/Admin/Views/BrowserTests/Details.cshtml b/cicm_web/Areas/Admin/Views/BrowserTests/Details.cshtml
index 6d6b0691..a6dac371 100644
--- a/cicm_web/Areas/Admin/Views/BrowserTests/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/BrowserTests/Details.cshtml
@@ -140,6 +140,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/Companies/Details.cshtml b/cicm_web/Areas/Admin/Views/Companies/Details.cshtml
index caa37f2f..f2ca0eb3 100644
--- a/cicm_web/Areas/Admin/Views/Companies/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/Companies/Details.cshtml
@@ -122,6 +122,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Details.cshtml b/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Details.cshtml
index 5cb9d185..738e2c30 100644
--- a/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Details.cshtml
@@ -50,6 +50,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/InstructionSets/Details.cshtml b/cicm_web/Areas/Admin/Views/InstructionSets/Details.cshtml
index ae455c8e..146ec8d3 100644
--- a/cicm_web/Areas/Admin/Views/InstructionSets/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/InstructionSets/Details.cshtml
@@ -50,6 +50,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml
index 394c4539..26683d37 100644
--- a/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Details.cshtml
@@ -56,6 +56,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/Machines/Details.cshtml b/cicm_web/Areas/Admin/Views/Machines/Details.cshtml
index 36383da5..8ce41482 100644
--- a/cicm_web/Areas/Admin/Views/Machines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/Machines/Details.cshtml
@@ -80,6 +80,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/MemoryByMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/MemoryByMachines/Details.cshtml
index b02bfe29..30e68764 100644
--- a/cicm_web/Areas/Admin/Views/MemoryByMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/MemoryByMachines/Details.cshtml
@@ -74,6 +74,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/News/Details.cshtml b/cicm_web/Areas/Admin/Views/News/Details.cshtml
index 7edba546..9078589e 100644
--- a/cicm_web/Areas/Admin/Views/News/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/News/Details.cshtml
@@ -62,6 +62,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/Processors/Details.cshtml b/cicm_web/Areas/Admin/Views/Processors/Details.cshtml
index 3613fab3..fe130c55 100644
--- a/cicm_web/Areas/Admin/Views/Processors/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/Processors/Details.cshtml
@@ -194,6 +194,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml
index 98885865..f1d2b441 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Details.cshtml
@@ -62,6 +62,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/Resolutions/Details.cshtml b/cicm_web/Areas/Admin/Views/Resolutions/Details.cshtml
index fd86d596..a39d5ef9 100644
--- a/cicm_web/Areas/Admin/Views/Resolutions/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/Resolutions/Details.cshtml
@@ -74,6 +74,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/SoundSynths/Details.cshtml b/cicm_web/Areas/Admin/Views/SoundSynths/Details.cshtml
index b1df69b0..c46b59e7 100644
--- a/cicm_web/Areas/Admin/Views/SoundSynths/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundSynths/Details.cshtml
@@ -104,6 +104,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/StorageByMachines/Details.cshtml b/cicm_web/Areas/Admin/Views/StorageByMachines/Details.cshtml
index e89981bb..b3a7589c 100644
--- a/cicm_web/Areas/Admin/Views/StorageByMachines/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByMachines/Details.cshtml
@@ -68,6 +68,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>