diff --git a/cicm_web/Areas/Admin/Views/BrowserTests/Edit.cshtml b/cicm_web/Areas/Admin/Views/BrowserTests/Edit.cshtml
index 6893ba01..10bf7814 100644
--- a/cicm_web/Areas/Admin/Views/BrowserTests/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/BrowserTests/Edit.cshtml
@@ -175,18 +175,18 @@
                 </div>
             </div>
             <div class="form-group">
-                <input class="btn btn-default"
+                <input class="btn btn-primary"
                        type="submit"
                        value="Save" />
+                <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>
-
 @section Scripts {
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Companies/Edit.cshtml b/cicm_web/Areas/Admin/Views/Companies/Edit.cshtml
index 9de4f1e0..d5858be1 100644
--- a/cicm_web/Areas/Admin/Views/Companies/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Companies/Edit.cshtml
@@ -42,84 +42,159 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <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>
+                <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="Founded" class="control-label"></label>
-                <input asp-for="Founded" class="form-control" />
-                <span asp-validation-for="Founded" class="text-danger"></span>
+                <label asp-for="Founded"
+                       class="control-label">
+                </label>
+                <input asp-for="Founded"
+                       class="form-control" />
+                <span asp-validation-for="Founded"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Website" class="control-label"></label>
-                <input asp-for="Website" class="form-control" />
-                <span asp-validation-for="Website" class="text-danger"></span>
+                <label asp-for="Website"
+                       class="control-label">
+                </label>
+                <input asp-for="Website"
+                       class="form-control" />
+                <span asp-validation-for="Website"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Twitter" class="control-label"></label>
-                <input asp-for="Twitter" class="form-control" />
-                <span asp-validation-for="Twitter" class="text-danger"></span>
+                <label asp-for="Twitter"
+                       class="control-label">
+                </label>
+                <input asp-for="Twitter"
+                       class="form-control" />
+                <span asp-validation-for="Twitter"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Facebook" class="control-label"></label>
-                <input asp-for="Facebook" class="form-control" />
-                <span asp-validation-for="Facebook" class="text-danger"></span>
+                <label asp-for="Facebook"
+                       class="control-label">
+                </label>
+                <input asp-for="Facebook"
+                       class="form-control" />
+                <span asp-validation-for="Facebook"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Sold" class="control-label"></label>
-                <input asp-for="Sold" class="form-control" />
-                <span asp-validation-for="Sold" class="text-danger"></span>
+                <label asp-for="Sold"
+                       class="control-label">
+                </label>
+                <input asp-for="Sold"
+                       class="form-control" />
+                <span asp-validation-for="Sold"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="SoldToId" class="control-label"></label>
-                <select asp-for="SoldToId" class="form-control" asp-items="ViewBag.SoldToId"></select>
-                <span asp-validation-for="SoldToId" class="text-danger"></span>
+                <label asp-for="SoldToId"
+                       class="control-label">
+                </label>
+                <select asp-for="SoldToId"
+                        class="form-control"
+                        asp-items="ViewBag.SoldToId">
+                </select>
+                <span asp-validation-for="SoldToId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Address" class="control-label"></label>
-                <input asp-for="Address" class="form-control" />
-                <span asp-validation-for="Address" class="text-danger"></span>
+                <label asp-for="Address"
+                       class="control-label">
+                </label>
+                <input asp-for="Address"
+                       class="form-control" />
+                <span asp-validation-for="Address"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="City" class="control-label"></label>
-                <input asp-for="City" class="form-control" />
-                <span asp-validation-for="City" class="text-danger"></span>
+                <label asp-for="City"
+                       class="control-label">
+                </label>
+                <input asp-for="City"
+                       class="form-control" />
+                <span asp-validation-for="City"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Province" class="control-label"></label>
-                <input asp-for="Province" class="form-control" />
-                <span asp-validation-for="Province" class="text-danger"></span>
+                <label asp-for="Province"
+                       class="control-label">
+                </label>
+                <input asp-for="Province"
+                       class="form-control" />
+                <span asp-validation-for="Province"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="PostalCode" class="control-label"></label>
-                <input asp-for="PostalCode" class="form-control" />
-                <span asp-validation-for="PostalCode" class="text-danger"></span>
+                <label asp-for="PostalCode"
+                       class="control-label">
+                </label>
+                <input asp-for="PostalCode"
+                       class="form-control" />
+                <span asp-validation-for="PostalCode"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="CountryId" class="control-label"></label>
-                <select asp-for="CountryId" class="form-control" asp-items="ViewBag.CountryId"></select>
-                <span asp-validation-for="CountryId" class="text-danger"></span>
+                <label asp-for="CountryId"
+                       class="control-label">
+                </label>
+                <select asp-for="CountryId"
+                        class="form-control"
+                        asp-items="ViewBag.CountryId">
+                </select>
+                <span asp-validation-for="CountryId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Status" class="control-label"></label>
-                <select asp-for="Status" class="form-control"></select>
-                <span asp-validation-for="Status" class="text-danger"></span>
+                <label asp-for="Status"
+                       class="control-label">
+                </label>
+                <select asp-for="Status"
+                        class="form-control">
+                </select>
+                <span asp-validation-for="Status"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/CompanyDescriptions/Edit.cshtml b/cicm_web/Areas/Admin/Views/CompanyDescriptions/Edit.cshtml
index 9c99a31c..9b0b1da6 100644
--- a/cicm_web/Areas/Admin/Views/CompanyDescriptions/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/CompanyDescriptions/Edit.cshtml
@@ -42,29 +42,44 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
             <div class="form-group">
-                <label asp-for="CompanyId" class="control-label"></label>
-                <input asp-for="CompanyId" class="form-control" />
-                <span asp-validation-for="CompanyId" class="text-danger"></span>
+                <label asp-for="CompanyId"
+                       class="control-label">
+                </label>
+                <input asp-for="CompanyId"
+                       class="form-control" />
+                <span asp-validation-for="CompanyId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Text" class="control-label"></label>
-                <input asp-for="Text" class="form-control" />
-                <span asp-validation-for="Text" class="text-danger"></span>
+                <label asp-for="Text"
+                       class="control-label">
+                </label>
+                <input asp-for="Text"
+                       class="form-control" />
+                <span asp-validation-for="Text"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml b/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml
index 4bb9b16f..47743551 100644
--- a/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Gpus/Edit.cshtml
@@ -42,64 +42,116 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <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>
+                <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" class="control-label"></label>
-                <select asp-for="CompanyId" class="form-control" asp-items="ViewBag.CompanyId"></select>
-                <span asp-validation-for="CompanyId" class="text-danger"></span>
+                <label asp-for="CompanyId"
+                       class="control-label">
+                </label>
+                <select asp-for="CompanyId"
+                        class="form-control"
+                        asp-items="ViewBag.CompanyId">
+                </select>
+                <span asp-validation-for="CompanyId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="ModelCode" class="control-label"></label>
-                <input asp-for="ModelCode" class="form-control" />
-                <span asp-validation-for="ModelCode" class="text-danger"></span>
+                <label asp-for="ModelCode"
+                       class="control-label">
+                </label>
+                <input asp-for="ModelCode"
+                       class="form-control" />
+                <span asp-validation-for="ModelCode"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Introduced" class="control-label"></label>
-                <input asp-for="Introduced" class="form-control" />
-                <span asp-validation-for="Introduced" class="text-danger"></span>
+                <label asp-for="Introduced"
+                       class="control-label">
+                </label>
+                <input asp-for="Introduced"
+                       class="form-control" />
+                <span asp-validation-for="Introduced"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Package" class="control-label"></label>
-                <input asp-for="Package" class="form-control" />
-                <span asp-validation-for="Package" class="text-danger"></span>
+                <label asp-for="Package"
+                       class="control-label">
+                </label>
+                <input asp-for="Package"
+                       class="form-control" />
+                <span asp-validation-for="Package"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Process" class="control-label"></label>
-                <input asp-for="Process" class="form-control" />
-                <span asp-validation-for="Process" class="text-danger"></span>
+                <label asp-for="Process"
+                       class="control-label">
+                </label>
+                <input asp-for="Process"
+                       class="form-control" />
+                <span asp-validation-for="Process"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="ProcessNm" class="control-label"></label>
-                <input asp-for="ProcessNm" class="form-control" />
-                <span asp-validation-for="ProcessNm" class="text-danger"></span>
+                <label asp-for="ProcessNm"
+                       class="control-label">
+                </label>
+                <input asp-for="ProcessNm"
+                       class="form-control" />
+                <span asp-validation-for="ProcessNm"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="DieSize" class="control-label"></label>
-                <input asp-for="DieSize" class="form-control" />
-                <span asp-validation-for="DieSize" class="text-danger"></span>
+                <label asp-for="DieSize"
+                       class="control-label">
+                </label>
+                <input asp-for="DieSize"
+                       class="form-control" />
+                <span asp-validation-for="DieSize"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Transistors" class="control-label"></label>
-                <input asp-for="Transistors" class="form-control" />
-                <span asp-validation-for="Transistors" class="text-danger"></span>
+                <label asp-for="Transistors"
+                       class="control-label">
+                </label>
+                <input asp-for="Transistors"
+                       class="form-control" />
+                <span asp-validation-for="Transistors"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Edit.cshtml b/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Edit.cshtml
index 2b9feea2..078def5f 100644
--- a/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/InstructionSetExtensions/Edit.cshtml
@@ -42,24 +42,34 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
             <div class="form-group">
-                <label asp-for="Extension" class="control-label"></label>
-                <input asp-for="Extension" class="form-control" />
-                <span asp-validation-for="Extension" class="text-danger"></span>
+                <label asp-for="Extension"
+                       class="control-label">
+                </label>
+                <input asp-for="Extension"
+                       class="form-control" />
+                <span asp-validation-for="Extension"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/InstructionSets/Edit.cshtml b/cicm_web/Areas/Admin/Views/InstructionSets/Edit.cshtml
index 178c4f31..1a7949d8 100644
--- a/cicm_web/Areas/Admin/Views/InstructionSets/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/InstructionSets/Edit.cshtml
@@ -42,24 +42,34 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <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>
+                <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">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/MachineFamilies/Edit.cshtml b/cicm_web/Areas/Admin/Views/MachineFamilies/Edit.cshtml
index 1d38a9f9..cd54dddc 100644
--- a/cicm_web/Areas/Admin/Views/MachineFamilies/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/MachineFamilies/Edit.cshtml
@@ -42,29 +42,46 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
             <div class="form-group">
-                <label asp-for="CompanyId" class="control-label"></label>
-                <select asp-for="CompanyId" class="form-control" asp-items="ViewBag.CompanyId"></select>
-                <span asp-validation-for="CompanyId" class="text-danger"></span>
+                <label asp-for="CompanyId"
+                       class="control-label">
+                </label>
+                <select asp-for="CompanyId"
+                        class="form-control"
+                        asp-items="ViewBag.CompanyId">
+                </select>
+                <span asp-validation-for="CompanyId"
+                      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>
+                <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">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Machines/Edit.cshtml b/cicm_web/Areas/Admin/Views/Machines/Edit.cshtml
index bc05ef0f..7c36636c 100644
--- a/cicm_web/Areas/Admin/Views/Machines/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Machines/Edit.cshtml
@@ -42,49 +42,89 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
             <div class="form-group">
-                <label asp-for="CompanyId" class="control-label"></label>
-                <select asp-for="CompanyId" class="form-control" asp-items="ViewBag.CompanyId"></select>
-                <span asp-validation-for="CompanyId" class="text-danger"></span>
+                <label asp-for="CompanyId"
+                       class="control-label">
+                </label>
+                <select asp-for="CompanyId"
+                        class="form-control"
+                        asp-items="ViewBag.CompanyId">
+                </select>
+                <span asp-validation-for="CompanyId"
+                      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>
+                <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="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control"></select>
-                <span asp-validation-for="Type" class="text-danger"></span>
+                <label asp-for="Type"
+                       class="control-label">
+                </label>
+                <select asp-for="Type"
+                        class="form-control">
+                </select>
+                <span asp-validation-for="Type"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Introduced" class="control-label"></label>
-                <input asp-for="Introduced" class="form-control" />
-                <span asp-validation-for="Introduced" class="text-danger"></span>
+                <label asp-for="Introduced"
+                       class="control-label">
+                </label>
+                <input asp-for="Introduced"
+                       class="form-control" />
+                <span asp-validation-for="Introduced"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="FamilyId" class="control-label"></label>
-                <select asp-for="FamilyId" class="form-control" asp-items="ViewBag.FamilyId"></select>
-                <span asp-validation-for="FamilyId" class="text-danger"></span>
+                <label asp-for="FamilyId"
+                       class="control-label">
+                </label>
+                <select asp-for="FamilyId"
+                        class="form-control"
+                        asp-items="ViewBag.FamilyId">
+                </select>
+                <span asp-validation-for="FamilyId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Model" class="control-label"></label>
-                <input asp-for="Model" class="form-control" />
-                <span asp-validation-for="Model" class="text-danger"></span>
+                <label asp-for="Model"
+                       class="control-label">
+                </label>
+                <input asp-for="Model"
+                       class="form-control" />
+                <span asp-validation-for="Model"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/MemoryByMachines/Edit.cshtml b/cicm_web/Areas/Admin/Views/MemoryByMachines/Edit.cshtml
index f7e90590..5a9553dd 100644
--- a/cicm_web/Areas/Admin/Views/MemoryByMachines/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/MemoryByMachines/Edit.cshtml
@@ -42,44 +42,78 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="MachineId" class="control-label"></label>
-                <select asp-for="MachineId" class="form-control" asp-items="ViewBag.MachineId"></select>
-                <span asp-validation-for="MachineId" class="text-danger"></span>
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control"></select>
-                <span asp-validation-for="Type" class="text-danger"></span>
+                <label asp-for="MachineId"
+                       class="control-label">
+                </label>
+                <select asp-for="MachineId"
+                        class="form-control"
+                        asp-items="ViewBag.MachineId">
+                </select>
+                <span asp-validation-for="MachineId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Usage" class="control-label"></label>
-                <select asp-for="Usage" class="form-control"></select>
-                <span asp-validation-for="Usage" class="text-danger"></span>
+                <label asp-for="Type"
+                       class="control-label">
+                </label>
+                <select asp-for="Type"
+                        class="form-control">
+                </select>
+                <span asp-validation-for="Type"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Size" class="control-label"></label>
-                <input asp-for="Size" class="form-control" />
-                <span asp-validation-for="Size" class="text-danger"></span>
+                <label asp-for="Usage"
+                       class="control-label">
+                </label>
+                <select asp-for="Usage"
+                        class="form-control">
+                </select>
+                <span asp-validation-for="Usage"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Speed" class="control-label"></label>
-                <input asp-for="Speed" class="form-control" />
-                <span asp-validation-for="Speed" class="text-danger"></span>
+                <label asp-for="Size"
+                       class="control-label">
+                </label>
+                <input asp-for="Size"
+                       class="form-control" />
+                <span asp-validation-for="Size"
+                      class="text-danger">
+                </span>
             </div>
-            <input type="hidden" asp-for="Id" />
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <label asp-for="Speed"
+                       class="control-label">
+                </label>
+                <input asp-for="Speed"
+                       class="form-control" />
+                <span asp-validation-for="Speed"
+                      class="text-danger">
+                </span>
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
+            <div class="form-group">
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/News/Edit.cshtml b/cicm_web/Areas/Admin/Views/News/Edit.cshtml
index 1029f17f..4d1d0feb 100644
--- a/cicm_web/Areas/Admin/Views/News/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/News/Edit.cshtml
@@ -42,34 +42,55 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
             <div class="form-group">
-                <label asp-for="Date" class="control-label"></label>
-                <input asp-for="Date" class="form-control" />
-                <span asp-validation-for="Date" class="text-danger"></span>
+                <label asp-for="Date"
+                       class="control-label">
+                </label>
+                <input asp-for="Date"
+                       class="form-control" />
+                <span asp-validation-for="Date"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Type" class="control-label"></label>
-                <select asp-for="Type" class="form-control"></select>
-                <span asp-validation-for="Type" class="text-danger"></span>
+                <label asp-for="Type"
+                       class="control-label">
+                </label>
+                <select asp-for="Type"
+                        class="form-control">
+                </select>
+                <span asp-validation-for="Type"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="AddedId" class="control-label"></label>
-                <input asp-for="AddedId" class="form-control" />
-                <span asp-validation-for="AddedId" class="text-danger"></span>
+                <label asp-for="AddedId"
+                       class="control-label">
+                </label>
+                <input asp-for="AddedId"
+                       class="form-control" />
+                <span asp-validation-for="AddedId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Processors/Edit.cshtml b/cicm_web/Areas/Admin/Views/Processors/Edit.cshtml
index 06078c9d..5acbaf8a 100644
--- a/cicm_web/Areas/Admin/Views/Processors/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Processors/Edit.cshtml
@@ -40,146 +40,280 @@
 <h4>Processor</h4>
 <hr />
 <div class="row">
-    <div class="col-md-4">
-        <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <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" class="control-label"></label>
-                <select asp-for="CompanyId" class="form-control" asp-items="ViewBag.CompanyId"></select>
-                <span asp-validation-for="CompanyId" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="ModelCode" class="control-label"></label>
-                <input asp-for="ModelCode" class="form-control" />
-                <span asp-validation-for="ModelCode" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Introduced" class="control-label"></label>
-                <input asp-for="Introduced" class="form-control" />
-                <span asp-validation-for="Introduced" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="InstructionSetId" class="control-label"></label>
-                <select asp-for="InstructionSetId" class="form-control" asp-items="ViewBag.InstructionSetId"></select>
-                <span asp-validation-for="InstructionSetId" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Speed" class="control-label"></label>
-                <input asp-for="Speed" class="form-control" />
-                <span asp-validation-for="Speed" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Package" class="control-label"></label>
-                <input asp-for="Package" class="form-control" />
-                <span asp-validation-for="Package" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Gprs" class="control-label"></label>
-                <input asp-for="Gprs" class="form-control" />
-                <span asp-validation-for="Gprs" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="GprSize" class="control-label"></label>
-                <input asp-for="GprSize" class="form-control" />
-                <span asp-validation-for="GprSize" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Fprs" class="control-label"></label>
-                <input asp-for="Fprs" class="form-control" />
-                <span asp-validation-for="Fprs" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="FprSize" class="control-label"></label>
-                <input asp-for="FprSize" class="form-control" />
-                <span asp-validation-for="FprSize" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Cores" class="control-label"></label>
-                <input asp-for="Cores" class="form-control" />
-                <span asp-validation-for="Cores" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="ThreadsPerCore" class="control-label"></label>
-                <input asp-for="ThreadsPerCore" class="form-control" />
-                <span asp-validation-for="ThreadsPerCore" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Process" class="control-label"></label>
-                <input asp-for="Process" class="form-control" />
-                <span asp-validation-for="Process" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="ProcessNm" class="control-label"></label>
-                <input asp-for="ProcessNm" class="form-control" />
-                <span asp-validation-for="ProcessNm" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="DieSize" class="control-label"></label>
-                <input asp-for="DieSize" class="form-control" />
-                <span asp-validation-for="DieSize" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="Transistors" class="control-label"></label>
-                <input asp-for="Transistors" class="form-control" />
-                <span asp-validation-for="Transistors" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="DataBus" class="control-label"></label>
-                <input asp-for="DataBus" class="form-control" />
-                <span asp-validation-for="DataBus" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="AddrBus" class="control-label"></label>
-                <input asp-for="AddrBus" class="form-control" />
-                <span asp-validation-for="AddrBus" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="SimdRegisters" class="control-label"></label>
-                <input asp-for="SimdRegisters" class="form-control" />
-                <span asp-validation-for="SimdRegisters" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="SimdSize" class="control-label"></label>
-                <input asp-for="SimdSize" class="form-control" />
-                <span asp-validation-for="SimdSize" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="L1Instruction" class="control-label"></label>
-                <input asp-for="L1Instruction" class="form-control" />
-                <span asp-validation-for="L1Instruction" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="L1Data" class="control-label"></label>
-                <input asp-for="L1Data" class="form-control" />
-                <span asp-validation-for="L1Data" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="L2" class="control-label"></label>
-                <input asp-for="L2" class="form-control" />
-                <span asp-validation-for="L2" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <label asp-for="L3" class="control-label"></label>
-                <input asp-for="L3" class="form-control" />
-                <span asp-validation-for="L3" class="text-danger"></span>
-            </div>
-            <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
-            </div>
-        </form>
-    </div>
+<div class="col-md-4">
+<form asp-action="Edit">
+<div asp-validation-summary="ModelOnly"
+     class="text-danger">
+</div>
+<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"
+           class="control-label">
+    </label>
+    <select asp-for="CompanyId"
+            class="form-control"
+            asp-items="ViewBag.CompanyId">
+    </select>
+    <span asp-validation-for="CompanyId"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="ModelCode"
+           class="control-label">
+    </label>
+    <input asp-for="ModelCode"
+           class="form-control" />
+    <span asp-validation-for="ModelCode"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Introduced"
+           class="control-label">
+    </label>
+    <input asp-for="Introduced"
+           class="form-control" />
+    <span asp-validation-for="Introduced"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="InstructionSetId"
+           class="control-label">
+    </label>
+    <select asp-for="InstructionSetId"
+            class="form-control"
+            asp-items="ViewBag.InstructionSetId">
+    </select>
+    <span asp-validation-for="InstructionSetId"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Speed"
+           class="control-label">
+    </label>
+    <input asp-for="Speed"
+           class="form-control" />
+    <span asp-validation-for="Speed"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Package"
+           class="control-label">
+    </label>
+    <input asp-for="Package"
+           class="form-control" />
+    <span asp-validation-for="Package"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Gprs"
+           class="control-label">
+    </label>
+    <input asp-for="Gprs"
+           class="form-control" />
+    <span asp-validation-for="Gprs"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="GprSize"
+           class="control-label">
+    </label>
+    <input asp-for="GprSize"
+           class="form-control" />
+    <span asp-validation-for="GprSize"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Fprs"
+           class="control-label">
+    </label>
+    <input asp-for="Fprs"
+           class="form-control" />
+    <span asp-validation-for="Fprs"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="FprSize"
+           class="control-label">
+    </label>
+    <input asp-for="FprSize"
+           class="form-control" />
+    <span asp-validation-for="FprSize"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Cores"
+           class="control-label">
+    </label>
+    <input asp-for="Cores"
+           class="form-control" />
+    <span asp-validation-for="Cores"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="ThreadsPerCore"
+           class="control-label">
+    </label>
+    <input asp-for="ThreadsPerCore"
+           class="form-control" />
+    <span asp-validation-for="ThreadsPerCore"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Process"
+           class="control-label">
+    </label>
+    <input asp-for="Process"
+           class="form-control" />
+    <span asp-validation-for="Process"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="ProcessNm"
+           class="control-label">
+    </label>
+    <input asp-for="ProcessNm"
+           class="form-control" />
+    <span asp-validation-for="ProcessNm"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="DieSize"
+           class="control-label">
+    </label>
+    <input asp-for="DieSize"
+           class="form-control" />
+    <span asp-validation-for="DieSize"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="Transistors"
+           class="control-label">
+    </label>
+    <input asp-for="Transistors"
+           class="form-control" />
+    <span asp-validation-for="Transistors"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="DataBus"
+           class="control-label">
+    </label>
+    <input asp-for="DataBus"
+           class="form-control" />
+    <span asp-validation-for="DataBus"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="AddrBus"
+           class="control-label">
+    </label>
+    <input asp-for="AddrBus"
+           class="form-control" />
+    <span asp-validation-for="AddrBus"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="SimdRegisters"
+           class="control-label">
+    </label>
+    <input asp-for="SimdRegisters"
+           class="form-control" />
+    <span asp-validation-for="SimdRegisters"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="SimdSize"
+           class="control-label">
+    </label>
+    <input asp-for="SimdSize"
+           class="form-control" />
+    <span asp-validation-for="SimdSize"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="L1Instruction"
+           class="control-label">
+    </label>
+    <input asp-for="L1Instruction"
+           class="form-control" />
+    <span asp-validation-for="L1Instruction"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="L1Data"
+           class="control-label">
+    </label>
+    <input asp-for="L1Data"
+           class="form-control" />
+    <span asp-validation-for="L1Data"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="L2"
+           class="control-label">
+    </label>
+    <input asp-for="L2"
+           class="form-control" />
+    <span asp-validation-for="L2"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <label asp-for="L3"
+           class="control-label">
+    </label>
+    <input asp-for="L3"
+           class="form-control" />
+    <span asp-validation-for="L3"
+          class="text-danger">
+    </span>
+</div>
+<div class="form-group">
+    <input class="btn btn-primary"
+           type="submit"
+           value="Save" />
+    <a asp-action="Index"
+       class="btn btn-secondary">
+        Back to List
+    </a>
+</div>
+</form>
 </div>
-
-<div>
-    <a asp-action="Index">Back to List</a>
 </div>
 
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml
index 6de26212..2d2e06e4 100644
--- a/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/ProcessorsByMachines/Edit.cshtml
@@ -42,34 +42,58 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <div class="form-group">
-                <label asp-for="ProcessorId" class="control-label"></label>
-                <select asp-for="ProcessorId" class="form-control" asp-items="ViewBag.ProcessorId"></select>
-                <span asp-validation-for="ProcessorId" class="text-danger"></span>
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
             </div>
             <div class="form-group">
-                <label asp-for="MachineId" class="control-label"></label>
-                <select asp-for="MachineId" class="form-control" asp-items="ViewBag.MachineId"></select>
-                <span asp-validation-for="MachineId" class="text-danger"></span>
+                <label asp-for="ProcessorId"
+                       class="control-label">
+                </label>
+                <select asp-for="ProcessorId"
+                        class="form-control"
+                        asp-items="ViewBag.ProcessorId">
+                </select>
+                <span asp-validation-for="ProcessorId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Speed" class="control-label"></label>
-                <input asp-for="Speed" class="form-control" />
-                <span asp-validation-for="Speed" class="text-danger"></span>
+                <label asp-for="MachineId"
+                       class="control-label">
+                </label>
+                <select asp-for="MachineId"
+                        class="form-control"
+                        asp-items="ViewBag.MachineId">
+                </select>
+                <span asp-validation-for="MachineId"
+                      class="text-danger">
+                </span>
             </div>
-            <input type="hidden" asp-for="Id" />
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <label asp-for="Speed"
+                       class="control-label">
+                </label>
+                <input asp-for="Speed"
+                       class="form-control" />
+                <span asp-validation-for="Speed"
+                      class="text-danger">
+                </span>
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
+            <div class="form-group">
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/Resolutions/Edit.cshtml b/cicm_web/Areas/Admin/Views/Resolutions/Edit.cshtml
index eb9d66b8..e221bff7 100644
--- a/cicm_web/Areas/Admin/Views/Resolutions/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/Resolutions/Edit.cshtml
@@ -42,44 +42,74 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <input type="hidden"
+                   asp-for="Id" />
             <div class="form-group">
-                <label asp-for="Width" class="control-label"></label>
-                <input asp-for="Width" class="form-control" />
-                <span asp-validation-for="Width" class="text-danger"></span>
+                <label asp-for="Width"
+                       class="control-label">
+                </label>
+                <input asp-for="Width"
+                       class="form-control" />
+                <span asp-validation-for="Width"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Height" class="control-label"></label>
-                <input asp-for="Height" class="form-control" />
-                <span asp-validation-for="Height" class="text-danger"></span>
+                <label asp-for="Height"
+                       class="control-label">
+                </label>
+                <input asp-for="Height"
+                       class="form-control" />
+                <span asp-validation-for="Height"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Colors" class="control-label"></label>
-                <input asp-for="Colors" class="form-control" />
-                <span asp-validation-for="Colors" class="text-danger"></span>
+                <label asp-for="Colors"
+                       class="control-label">
+                </label>
+                <input asp-for="Colors"
+                       class="form-control" />
+                <span asp-validation-for="Colors"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Palette" class="control-label"></label>
-                <input asp-for="Palette" class="form-control" />
-                <span asp-validation-for="Palette" class="text-danger"></span>
+                <label asp-for="Palette"
+                       class="control-label">
+                </label>
+                <input asp-for="Palette"
+                       class="form-control" />
+                <span asp-validation-for="Palette"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Chars" class="control-label"></label>
-                <input asp-for="Chars" class="form-control" />
-                <span asp-validation-for="Chars" class="text-danger"></span>
+                <label asp-for="Chars"
+                       class="control-label">
+                </label>
+                <input asp-for="Chars"
+                       class="form-control" />
+                <span asp-validation-for="Chars"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/SoundSynths/Edit.cshtml b/cicm_web/Areas/Admin/Views/SoundSynths/Edit.cshtml
index b2361731..f2f628c0 100644
--- a/cicm_web/Areas/Admin/Views/SoundSynths/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/SoundSynths/Edit.cshtml
@@ -42,69 +42,126 @@
 <div class="row">
     <div class="col-md-4">
         <form asp-action="Edit">
-            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="Id" />
+            <div asp-validation-summary="ModelOnly"
+                 class="text-danger">
+            </div>
+            <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>
+                <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" class="control-label"></label>
-                <select asp-for="CompanyId" class="form-control" asp-items="ViewBag.CompanyId"></select>
-                <span asp-validation-for="CompanyId" class="text-danger"></span>
+                <label asp-for="CompanyId"
+                       class="control-label">
+                </label>
+                <select asp-for="CompanyId"
+                        class="form-control"
+                        asp-items="ViewBag.CompanyId">
+                </select>
+                <span asp-validation-for="CompanyId"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="ModelCode" class="control-label"></label>
-                <input asp-for="ModelCode" class="form-control" />
-                <span asp-validation-for="ModelCode" class="text-danger"></span>
+                <label asp-for="ModelCode"
+                       class="control-label">
+                </label>
+                <input asp-for="ModelCode"
+                       class="form-control" />
+                <span asp-validation-for="ModelCode"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Introduced" class="control-label"></label>
-                <input asp-for="Introduced" class="form-control" />
-                <span asp-validation-for="Introduced" class="text-danger"></span>
+                <label asp-for="Introduced"
+                       class="control-label">
+                </label>
+                <input asp-for="Introduced"
+                       class="form-control" />
+                <span asp-validation-for="Introduced"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Voices" class="control-label"></label>
-                <input asp-for="Voices" class="form-control" />
-                <span asp-validation-for="Voices" class="text-danger"></span>
+                <label asp-for="Voices"
+                       class="control-label">
+                </label>
+                <input asp-for="Voices"
+                       class="form-control" />
+                <span asp-validation-for="Voices"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Frequency" class="control-label"></label>
-                <input asp-for="Frequency" class="form-control" />
-                <span asp-validation-for="Frequency" class="text-danger"></span>
+                <label asp-for="Frequency"
+                       class="control-label">
+                </label>
+                <input asp-for="Frequency"
+                       class="form-control" />
+                <span asp-validation-for="Frequency"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Depth" class="control-label"></label>
-                <input asp-for="Depth" class="form-control" />
-                <span asp-validation-for="Depth" class="text-danger"></span>
+                <label asp-for="Depth"
+                       class="control-label">
+                </label>
+                <input asp-for="Depth"
+                       class="form-control" />
+                <span asp-validation-for="Depth"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="SquareWave" class="control-label"></label>
-                <input asp-for="SquareWave" class="form-control" />
-                <span asp-validation-for="SquareWave" class="text-danger"></span>
+                <label asp-for="SquareWave"
+                       class="control-label">
+                </label>
+                <input asp-for="SquareWave"
+                       class="form-control" />
+                <span asp-validation-for="SquareWave"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="WhiteNoise" class="control-label"></label>
-                <input asp-for="WhiteNoise" class="form-control" />
-                <span asp-validation-for="WhiteNoise" class="text-danger"></span>
+                <label asp-for="WhiteNoise"
+                       class="control-label">
+                </label>
+                <input asp-for="WhiteNoise"
+                       class="form-control" />
+                <span asp-validation-for="WhiteNoise"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <label asp-for="Type" class="control-label"></label>
-                <input asp-for="Type" class="form-control" />
-                <span asp-validation-for="Type" class="text-danger"></span>
+                <label asp-for="Type"
+                       class="control-label">
+                </label>
+                <input asp-for="Type"
+                       class="form-control" />
+                <span asp-validation-for="Type"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
-                <input type="submit" value="Save" class="btn btn-default" />
+                <input class="btn btn-primary"
+                       type="submit"
+                       value="Save" />
+                <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>
-
 @section Scripts {
-    @{await Html.RenderPartialAsync("_ValidationScriptsPartial");}
-}
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml b/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml
index d89e601a..579e8e55 100644
--- a/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml
+++ b/cicm_web/Areas/Admin/Views/StorageByMachines/Edit.cshtml
@@ -95,18 +95,18 @@
             <input type="hidden"
                    asp-for="Id" />
             <div class="form-group">
-                <input class="btn btn-default"
+                <input class="btn btn-primary"
                        type="submit"
                        value="Save" />
+                <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>
-
 @section Scripts {
     @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
 }
\ No newline at end of file