diff --git a/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml
index 135af454..487b487f 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Delete.cshtml
@@ -42,6 +42,12 @@
     <h4>GPU</h4>
     <hr />
     <dl class="dl-horizontal">
+        <dt>
+            @Html.DisplayNameFor(model => model.Company)
+        </dt>
+        <dd>
+            @Html.DisplayFor(model => model.Company.Name)
+        </dd>
         <dt>
             @Html.DisplayNameFor(model => model.Name)
         </dt>
@@ -90,17 +96,17 @@
         <dd>
             @Html.DisplayFor(model => model.Transistors)
         </dd>
-        <dt>
-            @Html.DisplayNameFor(model => model.Company)
-        </dt>
-        <dd>
-            @Html.DisplayFor(model => model.Company.Name)
-        </dd>
     </dl>
-    
+
     <form asp-action="Delete">
-        <input type="hidden" asp-for="Id" />
-        <input type="submit" value="Delete" class="btn btn-default" /> |
-        <a asp-action="Index">Back to List</a>
+        <input type="hidden"
+               asp-for="Id" />
+        <input class="btn btn-danger"
+               type="submit"
+               value="Delete" />
+        <a asp-action="Index"
+           class="btn btn-secondary">
+            Back to List
+        </a>
     </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml
index 932fb776..8be65538 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Details.cshtml
@@ -98,6 +98,6 @@
     </dl>
 </div>
 <div>
-    <a asp-action="Edit" asp-route-id="@Model.Id">Edit</a> |
-    <a asp-action="Index">Back to List</a>
+    <a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-primary">Edit</a>
+    <a asp-action="Index" class="btn btn-secondary">Back to List</a>
 </div>
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml
index e7297e77..b9b2aa56 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml
@@ -48,17 +48,7 @@
             <input type="hidden"
                    asp-for="Id" />
             <div class="form-group">
-                <label asp-for="Name"
-                       class="control-label">
-                </label>
-                <input asp-for="Name"
-                       class="form-control" />
-                <span asp-validation-for="Name"
-                      class="text-danger">
-                </span>
-            </div>
-            <div class="form-group">
-                <label asp-for="CompanyId"
+                <label asp-for="Company"
                        class="control-label">
                 </label>
                 <select asp-for="CompanyId"
@@ -69,6 +59,16 @@
                       class="text-danger">
                 </span>
             </div>
+            <div class="form-group">
+                <label asp-for="Name"
+                       class="control-label">
+                </label>
+                <input asp-for="Name"
+                       class="form-control" />
+                <span asp-validation-for="Name"
+                      class="text-danger">
+                </span>
+            </div>
             <div class="form-group">
                 <label asp-for="ModelCode"
                        class="control-label">
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
index f8fe799b..4fdf67aa 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Index.cshtml
@@ -47,6 +47,9 @@
 <table class="table">
     <thead>
     <tr>
+        <th>
+            @Html.DisplayNameFor(model => model.Company)
+        </th>
         <th>
             @Html.DisplayNameFor(model => model.Name)
         </th>
@@ -56,24 +59,6 @@
         <th>
             @Html.DisplayNameFor(model => model.Introduced)
         </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Package)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Process)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.ProcessNm)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.DieSize)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Transistors)
-        </th>
-        <th>
-            @Html.DisplayNameFor(model => model.Company)
-        </th>
         <th></th>
     </tr>
     </thead>
@@ -81,6 +66,9 @@
     @foreach(Gpu item in Model)
     {
         <tr>
+            <td>
+                @Html.DisplayFor(modelItem => item.Company.Name)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Name)
             </td>
@@ -90,24 +78,6 @@
             <td>
                 @Html.DisplayFor(modelItem => item.Introduced)
             </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Package)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Process)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.ProcessNm)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.DieSize)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Transistors)
-            </td>
-            <td>
-                @Html.DisplayFor(modelItem => item.Company.Name)
-            </td>
             <td>
                 <a asp-action="Details"
                    asp-route-id="@item.Id"