diff --git a/src/Views/Home/Assets.cshtml b/src/Views/Home/Assets.cshtml
index 0606cb2..9b0299c 100644
--- a/src/Views/Home/Assets.cshtml
+++ b/src/Views/Home/Assets.cshtml
@@ -175,13 +175,13 @@
 
                         <div class="col-md-6">
                             <label class="form-label">@T["Location"]</label>
-                            <select class="form-select" name="Location" id="createLocationSelect">
+                            <select class="form-select" name="Location" aria-label="@T["Location"]" id="createLocationSelect">
                                 <option value="">@T["Select location"]</option>
                             </select>
                         </div>
                         <div class="col-md-6">
                             <label class="form-label">@T["Owner"]</label>
-                            <select class="form-select" name="Owner" id="createUsersSelect">
+                            <select class="form-select" name="Owner" aria-label="@T[name: "Owner"]" id="createUsersSelect">
                                 <option value="">@T["Select owner"]</option>
                             </select>
                         </div>
@@ -395,41 +395,41 @@
                 <div class="modal-body">
                     <div class="row g-3">
                         <div class="col-md-6">
-                            <label class="form-label">@T["Name"]</label>
-                            <input type="text" class="form-control" name="Name" />
+                            <label class="form-label" for="updateName">@T["Name"]</label>
+                            <input type="text" class="form-control" id="updateName" name="Name" />
                         </div>
 
                         <div class="col-md-6">
-                            <label class="form-label">@T["Location"]</label>
-                            <select class="form-select" name="Location" id="updateLocationSelect">
+                            <label class="form-label" for="updateLocationSelect">@T["Location"]</label>
+                            <select class="form-select" name="Location" aria-label="@T["Location"]" id="updateLocationSelect">
                                 <option value="">@T["Select location"]</option>
                             </select>
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Owner"]</label>
-                            <select class="form-select" name="Owner" id="updateUsersSelect">
+                            <label class="form-label" for="updateUsersSelect">@T["Owner"]</label>
+                            <select class="form-select" name="Owner" aria-label="@T["Owner"]" id="updateUsersSelect">
                                 <option value="">@T["Select owner"]</option>
                             </select>
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Serial Number"]</label>
-                            <input type="text" class="form-control" name="SerialNumber" />
+                            <label class="form-label" for="updateSerialNumber">@T["Serial Number"]</label>
+                            <input type="text" class="form-control" id="updateSerialNumber" name="SerialNumber" />
                         </div>
 
                         <hr class="my-3" />
 
                         <h4 class="fw-bold">@T["Description"]</h4>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Type"]</label>
-                            <input type="text" class="form-control" name="Description.Type" />
+                            <label class="form-label" for="updateType">@T["Type"]</label>
+                            <input type="text" class="form-control" id="updateType" name="Description.Type" />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Make"]</label>
-                            <input type="text" class="form-control" name="Description.Make" />
+                            <label class="form-label" for="updateMake">@T["Make"]</label>
+                            <input type="text" class="form-control" id="updateMake" name="Description.Make" />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Model"]</label>
-                            <input type="text" class="form-control" name="Description.Model" />
+                            <label class="form-label" for="updateModel">@T["Model"]</label>
+                            <input type="text" class="form-control" id="updateModel" name="Description.Model" />
                         </div>
 
                         <div class="col-12 mt-3">
@@ -446,20 +446,20 @@
 
                         <h4 class="fw-bold">@T["Purchase Information"]</h4>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchase Date"]</label>
-                            <input type="date" class="form-control" name="Description.Purchase.PurchaseDate" />
+                            <label class="form-label" for="updatePurchaseDate">@T["Purchase Date"]</label>
+                            <input type="date" class="form-control" id="updatePurchaseDate" name="Description.Purchase.PurchaseDate" />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchase Value"]</label>
-                            <input type="text" class="form-control" name="Description.Purchase.PurchaseValue" />
+                            <label class="form-label" for="updatePurchaseValue">@T["Purchase Value"]</label>
+                            <input type="text" class="form-control" id="updatePurchaseValue" name="Description.Purchase.PurchaseValue" />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchased At"]</label>
-                            <input type="text" class="form-control" name="Description.Purchase.PurchaseAt" />
+                            <label class="form-label" for="updatePurchaseAt">@T["Purchased At"]</label>
+                            <input type="text" class="form-control" id="updatePurchaseAt" name="Description.Purchase.PurchaseAt" />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchased By"]</label>
-                            <input type="text" class="form-control" name="Description.Purchase.PurchaseBy" />
+                            <label class="form-label" for="updatePurchaseBy">@T["Purchased By"]</label>
+                            <input type="text" class="form-control" id="updatePurchaseBy" name="Description.Purchase.PurchaseBy" />
                         </div>
                     </div>
                 </div>
@@ -486,8 +486,8 @@ document.addEventListener('DOMContentLoaded', () => {
         const row = document.createElement('div');
         row.className = 'd-flex gap-2 align-items-center attribute-row';
         row.innerHTML = `
-            <input type="text" class="form-control" placeholder="@T["Attribute name"]" data-attr-name />
-            <input type="text" class="form-control" placeholder="@T["Attribute value"]" data-attr-value />
+            <input type="text" class="form-control" placeholder="@T["Attribute name"]" aria-label="@T["Attribute name"]" data-attr-name />
+            <input type="text" class="form-control" placeholder="@T["Attribute value"]" aria-label="@T["Attribute value"]" data-attr-value />
             <button type="button" class="btn btn-danger btn-sm btn-remove-attribute">@T["Remove"]</button>
         `;
         updateAttributesContainer.appendChild(row);
@@ -535,8 +535,8 @@ document.addEventListener('DOMContentLoaded', () => {
                         const row = document.createElement('div');
                         row.className = 'd-flex gap-2 align-items-center attribute-row';
                         row.innerHTML = `
-                            <input type="text" class="form-control" value="${attrName}" data-attr-name />
-                            <input type="text" class="form-control" value="${attrValue}" data-attr-value />
+                            <input type="text" class="form-control" value="${attrName}" aria-label="@T["Attribute name"]" data-attr-name />
+                            <input type="text" class="form-control" value="${attrValue}" aria-label="@T["Attribute value"]" data-attr-value />
                             <button type="button" class="btn btn-danger btn-sm btn-remove-attribute">@T["Remove"]</button>
                         `;
                         updateAttributesContainer.appendChild(row);