diff --git a/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml
index 338948ba..e797a4f2 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Atas/Delete.cshtml
@@ -48,7 +48,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml
index f71e9fd3..70538d86 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Atas/Details.cshtml
@@ -46,6 +46,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/DiscImageChef.Server/Areas/Admin/Views/Atas/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Atas/Edit.cshtml
index 546b51b8..dc3f2f90 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Atas/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Atas/Edit.cshtml
@@ -47,12 +47,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Atas/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Atas/Index.cshtml
index 730787b9..a8dbacd1 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Atas/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Atas/Index.cshtml
@@ -49,10 +49,10 @@
                 @Html.DisplayFor(modelItem => item.Identify)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Delete.cshtml
index e8bf6efb..d0ad599a 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Delete.cshtml
@@ -60,7 +60,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Details.cshtml
index 85dbd6af..04fac569 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Details.cshtml
@@ -58,6 +58,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/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Edit.cshtml
index efc6e8dc..5c417303 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Edit.cshtml
@@ -57,12 +57,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml
index b4bc56fa..3ec04e88 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/BlockDescriptors/Index.cshtml
@@ -62,10 +62,10 @@
                 @Html.DisplayFor(modelItem => item.BlockLength)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Chs/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Chs/Delete.cshtml
index 2ea37e5e..a0621ef6 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Chs/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Chs/Delete.cshtml
@@ -60,7 +60,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Chs/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Chs/Details.cshtml
index 83555eaa..238bf3a6 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Chs/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Chs/Details.cshtml
@@ -58,6 +58,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/DiscImageChef.Server/Areas/Admin/Views/Chs/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Chs/Edit.cshtml
index ca2260e1..5da1f2d6 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Chs/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Chs/Edit.cshtml
@@ -57,12 +57,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Chs/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Chs/Index.cshtml
index 31dd0fc2..5515d96a 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Chs/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Chs/Index.cshtml
@@ -61,10 +61,10 @@
                 @Html.DisplayFor(modelItem => item.Sectors)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Commands/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Commands/Delete.cshtml
index 201255e4..5bc4b858 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Commands/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Commands/Delete.cshtml
@@ -53,7 +53,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Commands/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Commands/Details.cshtml
index 1d7f9d67..f6f2f86d 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Commands/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Commands/Details.cshtml
@@ -52,6 +52,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/DiscImageChef.Server/Areas/Admin/Views/Commands/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Commands/Edit.cshtml
index e30104b0..28b4982f 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Commands/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Commands/Edit.cshtml
@@ -51,11 +51,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Commands/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Commands/Index.cshtml
index a8f5a3bf..02803c2e 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Commands/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Commands/Index.cshtml
@@ -56,10 +56,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
index 80ec48f8..19b27485 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Delete.cshtml
@@ -83,7 +83,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Details.cshtml
index 7f922c1f..fb90c2c1 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Details.cshtml
@@ -82,6 +82,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/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
index 0282b486..57a546c9 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Edit.cshtml
@@ -76,11 +76,10 @@
                 <span asp-validation-for="Agreement" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml
index 21c6d72d..88385d4f 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/CompactDiscOffsets/Index.cshtml
@@ -86,10 +86,10 @@
                 @Html.DisplayFor(modelItem => item.Agreement)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Delete.cshtml
index f7a34a53..15992619 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Delete.cshtml
@@ -48,7 +48,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Details.cshtml
index bfb936e0..b4ce2b6c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Details.cshtml
@@ -46,6 +46,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/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Edit.cshtml
index db69b6f7..cebd87ab 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Edit.cshtml
@@ -47,12 +47,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Index.cshtml
index 4faaa14c..88ad714b 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DensityCodes/Index.cshtml
@@ -49,10 +49,10 @@
                 @Html.DisplayFor(modelItem => item.Code)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
index ce2c8c8b..c5573358 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Delete.cshtml
@@ -65,7 +65,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Details.cshtml
index 4250f812..e7350d03 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Details.cshtml
@@ -64,6 +64,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/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
index bf8ecff1..da6fd947 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Edit.cshtml
@@ -61,11 +61,10 @@
                 <span asp-validation-for="Bus" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
index 164fe627..caa55e30 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/DeviceStats/Index.cshtml
@@ -68,10 +68,10 @@
                 @Html.DisplayFor(modelItem => item.Bus)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Devices/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Devices/Delete.cshtml
index 3fa1d8f0..26ff45a4 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Devices/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Devices/Delete.cshtml
@@ -89,7 +89,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Devices/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Devices/Details.cshtml
index 8196e288..6e44b78c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Devices/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Devices/Details.cshtml
@@ -88,6 +88,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/DiscImageChef.Server/Areas/Admin/Views/Devices/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Devices/Edit.cshtml
index 2981ecdf..6411b639 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Devices/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Devices/Edit.cshtml
@@ -81,11 +81,10 @@
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Devices/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Devices/Index.cshtml
index 30a30f78..3be18b21 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Devices/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Devices/Index.cshtml
@@ -92,10 +92,10 @@
                 @Html.DisplayFor(modelItem => item.Type)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Delete.cshtml
index 41c4442c..696a43ad 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Delete.cshtml
@@ -53,7 +53,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Details.cshtml
index 4a11c455..0a94aaa8 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Details.cshtml
@@ -52,6 +52,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/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Edit.cshtml
index 7b87d1a3..937714e8 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Edit.cshtml
@@ -51,11 +51,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Index.cshtml
index 3433ad9d..62c04659 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filesystems/Index.cshtml
@@ -56,10 +56,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Filters/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filters/Delete.cshtml
index 62a22287..ab726b76 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filters/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filters/Delete.cshtml
@@ -53,7 +53,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Filters/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filters/Details.cshtml
index 8e3e5db5..ec2bc43e 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filters/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filters/Details.cshtml
@@ -52,6 +52,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/DiscImageChef.Server/Areas/Admin/Views/Filters/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filters/Edit.cshtml
index 2a5f0dfd..05bef210 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filters/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filters/Edit.cshtml
@@ -51,11 +51,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Filters/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Filters/Index.cshtml
index 14a8573f..6545a3d2 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Filters/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Filters/Index.cshtml
@@ -56,10 +56,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Delete.cshtml
index bc16f9fc..495d6ccc 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Delete.cshtml
@@ -72,7 +72,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Details.cshtml
index 41836e20..a3139254 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Details.cshtml
@@ -70,6 +70,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/DiscImageChef.Server/Areas/Admin/Views/FireWires/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Edit.cshtml
index e18a10e9..1fe732ef 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Edit.cshtml
@@ -67,12 +67,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Index.cshtml
index a574c143..bd8e4617 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/FireWires/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/FireWires/Index.cshtml
@@ -73,10 +73,10 @@
                 @Html.DisplayFor(modelItem => item.RemovableMedia)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
index 444e466b..2efc4b19 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Delete.cshtml
@@ -53,7 +53,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Details.cshtml
index 8ef82368..1c6d78a4 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Details.cshtml
@@ -52,6 +52,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/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Edit.cshtml
index 568fcc1c..4040d8a7 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Edit.cshtml
@@ -51,11 +51,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Index.cshtml
index ca6c95d8..60e60548 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MediaFormats/Index.cshtml
@@ -56,10 +56,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Medias/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Medias/Delete.cshtml
index f5726707..e0a97922 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Medias/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Medias/Delete.cshtml
@@ -59,7 +59,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Medias/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Medias/Details.cshtml
index b16b760d..9f6a047a 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Medias/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Medias/Details.cshtml
@@ -58,6 +58,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/DiscImageChef.Server/Areas/Admin/Views/Medias/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Medias/Edit.cshtml
index 0f32eea8..07bdd3bb 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Medias/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Medias/Edit.cshtml
@@ -56,11 +56,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Medias/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Medias/Index.cshtml
index e0830f4a..56259950 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Medias/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Medias/Index.cshtml
@@ -62,10 +62,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Delete.cshtml
index 4e369036..dab732d1 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Delete.cshtml
@@ -48,7 +48,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Details.cshtml
index 106c7baf..34cbc2fe 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Details.cshtml
@@ -46,6 +46,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/DiscImageChef.Server/Areas/Admin/Views/Mmc/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Edit.cshtml
index c3647d85..f79493a6 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Edit.cshtml
@@ -47,12 +47,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml
index 9430b452..48118a75 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml
@@ -49,10 +49,10 @@
                 @Html.DisplayFor(modelItem => item.ModeSense2AData)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Delete.cshtml
index edfef176..588babbe 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Delete.cshtml
@@ -786,7 +786,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml
index 75a617e7..5e45ce90 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Details.cshtml
@@ -784,6 +784,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/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Edit.cshtml
index 908add89..3c3fe812 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Edit.cshtml
@@ -662,12 +662,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml
index 07023e57..219ebfad 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcFeatures/Index.cshtml
@@ -787,10 +787,10 @@
                 @Html.DisplayFor(modelItem => item.BinaryData)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
index 44549203..a3ab5c68 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Delete.cshtml
@@ -72,7 +72,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Details.cshtml
index a386c29f..5e45f16a 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Details.cshtml
@@ -70,6 +70,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/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Edit.cshtml
index d948fbc2..97b44066 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Edit.cshtml
@@ -67,12 +67,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Index.cshtml
index 8cb26e39..6cc23b3a 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/MmcSds/Index.cshtml
@@ -73,10 +73,10 @@
                 @Html.DisplayFor(modelItem => item.ExtendedCSD)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Delete.cshtml
index d0541592..632dd11e 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Delete.cshtml
@@ -59,7 +59,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Details.cshtml
index 5ba060ff..64380b75 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Details.cshtml
@@ -58,6 +58,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/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Edit.cshtml
index 62c8e9b3..9761e3b1 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Edit.cshtml
@@ -56,11 +56,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml
index a3b8d35a..f00bdefd 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/OperatingSystems/Index.cshtml
@@ -62,10 +62,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Delete.cshtml
index 6886d64f..3c363931 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Delete.cshtml
@@ -53,7 +53,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Details.cshtml
index 559e5c05..ce9c0b0c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Details.cshtml
@@ -52,6 +52,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/DiscImageChef.Server/Areas/Admin/Views/Partitions/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Edit.cshtml
index 1384da29..d95f3c83 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Edit.cshtml
@@ -51,11 +51,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Index.cshtml
index b056eb35..ee640517 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Partitions/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Partitions/Index.cshtml
@@ -56,10 +56,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
index b59cadf7..8b44a6d3 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Delete.cshtml
@@ -78,7 +78,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Details.cshtml
index 54a385f8..e164b8fc 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Details.cshtml
@@ -76,6 +76,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/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Edit.cshtml
index 0ac18534..6c45fa36 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Edit.cshtml
@@ -72,12 +72,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Index.cshtml
index 1f38cf65..7eeb9c2e 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Pcmcias/Index.cshtml
@@ -79,10 +79,10 @@
                 @Html.DisplayFor(modelItem => item.ProductName)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Delete.cshtml
index 5a8fe684..bdf8dea2 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Delete.cshtml
@@ -48,7 +48,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
\ No newline at end of file
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml
index e5fe6078..fb1202be 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Details.cshtml
@@ -47,6 +47,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>
\ No newline at end of file
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml
index c161c8a6..6b032122 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Edit.cshtml
@@ -42,11 +42,9 @@
                 <span asp-validation-for="Type" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
\ No newline at end of file
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml
index 69f082fb..29384a21 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Reports/Index.cshtml
@@ -54,10 +54,10 @@
                 @Html.DisplayFor(modelItem => item.Type)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
index 89b912c3..e81f6879 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Delete.cshtml
@@ -78,7 +78,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Details.cshtml
index a1d6b007..da17d12f 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Details.cshtml
@@ -76,6 +76,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/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Edit.cshtml
index 1f8a53bf..38a4e815 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Edit.cshtml
@@ -72,12 +72,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Index.cshtml
index 4eb7dd36..54eaed58 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiModes/Index.cshtml
@@ -79,10 +79,10 @@
                 @Html.DisplayFor(modelItem => item.DPOandFUA)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
index fd8edb19..394dd5e3 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Delete.cshtml
@@ -60,7 +60,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Details.cshtml
index dd434429..2b36fd57 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Details.cshtml
@@ -58,6 +58,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/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Edit.cshtml
index 1c316389..cdf8750d 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Edit.cshtml
@@ -57,12 +57,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Index.cshtml
index 5a35f298..4d568dce 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/ScsiPages/Index.cshtml
@@ -61,10 +61,10 @@
                 @Html.DisplayFor(modelItem => item.value)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Delete.cshtml
index cd8c98ef..9f5d9486 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Delete.cshtml
@@ -102,7 +102,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Details.cshtml
index a7dae843..ff7958b7 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Details.cshtml
@@ -100,6 +100,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/DiscImageChef.Server/Areas/Admin/Views/Scsis/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Edit.cshtml
index 8fafbe3c..b0b9dcc0 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Edit.cshtml
@@ -92,12 +92,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Index.cshtml
index 77089d7e..d37ee8c9 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Scsis/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Scsis/Index.cshtml
@@ -103,10 +103,10 @@
                 @Html.DisplayFor(modelItem => item.ModeSense10ChangeableData)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Delete.cshtml
index d340325c..d15646d8 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Delete.cshtml
@@ -60,7 +60,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Details.cshtml
index 80df6e6a..d288ed84 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Details.cshtml
@@ -58,6 +58,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/DiscImageChef.Server/Areas/Admin/Views/Sscs/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Edit.cshtml
index 4d0faa6a..a6b3373c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Edit.cshtml
@@ -57,12 +57,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Index.cshtml
index 323e3aa0..027cf8fb 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Sscs/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Sscs/Index.cshtml
@@ -61,10 +61,10 @@
                 @Html.DisplayFor(modelItem => item.MinBlockLength)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
index 053cfdb2..7229e676 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Delete.cshtml
@@ -114,7 +114,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Details.cshtml
index d309f71d..6ab50974 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Details.cshtml
@@ -112,6 +112,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/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Edit.cshtml
index b19adf75..7a44bacd 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Edit.cshtml
@@ -102,12 +102,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml
index a30e0a9c..040ae1ee 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/SupportedDensities/Index.cshtml
@@ -115,10 +115,10 @@
                 @Html.DisplayFor(modelItem => item.Description)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
index 72fe3fd4..d0cc9c90 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Delete.cshtml
@@ -942,7 +942,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
index 66d15cf1..7333afc0 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Details.cshtml
@@ -940,6 +940,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/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
index aca2bf30..c2a548f2 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Edit.cshtml
@@ -792,12 +792,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Index.cshtml
index 708e6d14..c022a086 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedMedias/Index.cshtml
@@ -943,10 +943,10 @@
                 @Html.DisplayFor(modelItem => item.HLDTSTReadRawDVDData)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
index be7ac4f4..8515f0df 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Delete.cshtml
@@ -96,7 +96,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Details.cshtml
index 341babdf..4393da49 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Details.cshtml
@@ -94,6 +94,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/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
index 3dd0d535..57141e26 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Edit.cshtml
@@ -87,12 +87,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml
index 4f9676ac..7f27cc8d 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/TestedSequentialMedias/Index.cshtml
@@ -97,10 +97,10 @@
                 @Html.DisplayFor(modelItem => item.ModeSense10Data)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Delete.cshtml
index 86a94526..642d1236 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Delete.cshtml
@@ -71,7 +71,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Details.cshtml
index 1235dbf8..15dc7d33 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Details.cshtml
@@ -70,6 +70,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/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Edit.cshtml
index 6e98c035..ac361937 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Edit.cshtml
@@ -66,11 +66,10 @@
                 <span asp-validation-for="VendorId" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
index 899cc98d..0c44b67c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbProducts/Index.cshtml
@@ -74,10 +74,10 @@
                 @Html.DisplayFor(modelItem => item.Vendor.Id)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Delete.cshtml
index c975a9a4..e8b93d82 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Delete.cshtml
@@ -65,7 +65,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Details.cshtml
index 6b2e01d7..7ae0f53c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Details.cshtml
@@ -64,6 +64,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/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Edit.cshtml
index e6a55600..33c92824 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Edit.cshtml
@@ -61,11 +61,10 @@
                 <span asp-validation-for="ModifiedWhen" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
index 66ffbc2e..60ee02a9 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/UsbVendors/Index.cshtml
@@ -68,10 +68,10 @@
                 @Html.DisplayFor(modelItem => item.ModifiedWhen)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Delete.cshtml
index 8e2e57af..cf49be99 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Delete.cshtml
@@ -78,7 +78,7 @@
 
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-danger" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Details.cshtml
index ec028656..8449f45e 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Details.cshtml
@@ -76,6 +76,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/DiscImageChef.Server/Areas/Admin/Views/Usbs/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Edit.cshtml
index 85009cba..e4945458 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Edit.cshtml
@@ -72,12 +72,8 @@
             </div>
             <div class="form-group">
                 <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
-
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Index.cshtml
index 9729fced..e8a72e5c 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Usbs/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Usbs/Index.cshtml
@@ -79,10 +79,10 @@
                 @Html.DisplayFor(modelItem => item.Descriptors)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
 }
     </tbody>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Versions/Delete.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Versions/Delete.cshtml
index 48bc15f7..98f08fb3 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Versions/Delete.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Versions/Delete.cshtml
@@ -53,7 +53,7 @@
     </dl>
     <form asp-action="Delete">
         <input type="hidden" asp-for="Id" />
-        <input class="btn btn-danger" type="submit" value="Delete" /> |
-        <a asp-action="Index">Back to List</a>
+        <a asp-action="Index" class="btn btn-primary">Back to List</a>
+<input type="submit" value="Delete" class="btn btn-danger" />
     </form>
 </div>
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Versions/Details.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Versions/Details.cshtml
index b305cf09..7d53f4f3 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Versions/Details.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Versions/Details.cshtml
@@ -52,6 +52,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/DiscImageChef.Server/Areas/Admin/Views/Versions/Edit.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Versions/Edit.cshtml
index 30a3d3e8..4c25f653 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Versions/Edit.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Versions/Edit.cshtml
@@ -51,11 +51,10 @@
                 <span asp-validation-for="Count" class="text-danger"></span>
             </div>
             <div class="form-group">
-                <input class="btn btn-primary" type="submit" value="Save" />
+                <input type="submit" value="Save" class="btn btn-primary" />
+                <a asp-action="Index" class="btn btn-secondary">Back to List</a>
             </div>
         </form>
     </div>
 </div>
-<div>
-    <a asp-action="Index">Back to List</a>
-</div>
+
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml
index ef65f9b6..88d24aff 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml
@@ -56,10 +56,10 @@
                 @Html.DisplayFor(modelItem => item.Count)
             </td>
             <td>
-                <a asp-action="Edit" asp-route-id="@item.Id">Edit</a> |
-                <a asp-action="Details" asp-route-id="@item.Id">Details</a> |
-                <a asp-action="Delete" asp-route-id="@item.Id">Delete</a>
-            </td>
+                <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
+                <a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
+                <a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
+</td>
         </tr>
     }
     </tbody>