diff --git a/src/Views/Home/Inventory.cshtml b/src/Views/Home/Inventory.cshtml
index 22d878f..c057e2c 100644
--- a/src/Views/Home/Inventory.cshtml
+++ b/src/Views/Home/Inventory.cshtml
@@ -34,8 +34,8 @@
     <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header bg-info text-white">
-                <h5 class="modal-title" id="viewAssetModalLabel">@T["Asset Details"]</h5>
-                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
+                <h5 class="modal-title text-dark" id="viewAssetModalLabel">@T["Asset Details"]</h5>
+                <button type="button" class="btn-close btn-close-white" style="filter: invert(0);" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
 
             <div class="modal-body">
@@ -143,36 +143,36 @@
                     </div>
                     <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" value="${asset.Name || ''}" disabled />
+                            <label class="form-label" for="detailName">@T["Name"]</label>
+                            <input type="text" class="form-control" id="detailName" name="Name" value="${asset.Name || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Location"]</label>
-                            <input type="text" class="form-control" name="Location" value="${asset.Location || ''}" disabled />
+                            <label class="form-label" for="detailLocation">@T["Location"]</label>
+                            <input type="text" class="form-control" id="detailLocation" name="Location" value="${asset.Location || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Owner"]</label>
-                            <input type="text" class="form-control" name="Owner" value="${asset.Owner || ''}" disabled />
+                            <label class="form-label" for="detailOwner">@T["Owner"]</label>
+                            <input type="text" class="form-control" id="detailOwner" name="Owner" value="${asset.Owner || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Serial Number"]</label>
-                            <input type="text" class="form-control" name="SerialNumber" value="${asset.SerialNumber || ''}" disabled />
+                            <label class="form-label" for="detailSerialNumber">@T["Serial Number"]</label>
+                            <input type="text" class="form-control" id="detailSerialNumber" name="SerialNumber" value="${asset.SerialNumber || ''}" disabled />
                         </div>
                     </div>
                     <hr class="my-3" />
                     <div class="row g-3">
                         <h6 class="fw-bold">@T["Description"]</h6>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Type"]</label>
-                            <input type="text" class="form-control" name="Description.Type" value="${asset.Description?.Type || ''}" disabled />
+                            <label class="form-label" for="detailType">@T["Type"]</label>
+                            <input type="text" class="form-control" id="detailType" name="Description.Type" value="${asset.Description?.Type || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Make"]</label>
-                            <input type="text" class="form-control" name="Description.Make" value="${asset.Description?.Make || ''}" disabled />
+                            <label class="form-label" for="detailMake">@T["Make"]</label>
+                            <input type="text" class="form-control" id="detailMake" name="Description.Make" value="${asset.Description?.Make || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Model"]</label>
-                            <input type="text" class="form-control" name="Description.Model" value="${asset.Description?.Model || ''}" disabled />
+                            <label class="form-label" for="detailModel">@T["Model"]</label>
+                            <input type="text" class="form-control" id="detailModel" name="Description.Model" value="${asset.Description?.Model || ''}" disabled />
                         </div>
                     </div>
                     ${asset.Description?.Attributes ? `
@@ -182,8 +182,8 @@
                             ${Object.entries(asset.Description.Attributes)
                                 .map(([k,v]) => `
                                 <div class="d-flex gap-2 align-items-center attribute-row">
-                                    <input type="text" class="form-control w-50" placeholder="@T["Attribute name"]" data-attr-name disabled value="${k}" />:
-                                    <input type="text" class="form-control" placeholder="@T["Attribute value"]" data-attr-value disabled value="${v}" />
+                                    <input type="text" class="form-control w-50" placeholder="@T["Attribute name"]" aria-label="@T["Attribute name"]" data-attr-name disabled value="${k}" />:
+                                    <input type="text" class="form-control" placeholder="@T["Attribute value"]" aria-label="@T["Attribute value"]" data-attr-value disabled value="${v}" />
                                 </div>`)
                                 .join('')}
                         </div>` : ''}
@@ -193,20 +193,20 @@
                     <div class="row g-3">
                         <h6 class="fw-bold">@T["Purchase Information"]</h6>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchase Date"]</label>
-                            <input type="date" class="form-control" name="Description.Purchase.PurchaseDate" value="${asset.Description.Purchase.PurchaseDate || ''}" disabled />
+                            <label class="form-label" for="detailPurchaseDate">@T["Purchase Date"]</label>
+                            <input type="date" class="form-control" id="detailPurchaseDate" name="Description.Purchase.PurchaseDate" value="${asset.Description.Purchase.PurchaseDate || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchase Value"]</label>
-                            <input type="text" class="form-control" name="Description.Purchase.PurchaseValue" value="${asset.Description.Purchase.PurchaseValue || ''}" disabled />
+                            <label class="form-label" for="detailPurchaseValue">@T["Purchase Value"]</label>
+                            <input type="text" class="form-control" id="detailPurchaseValue" name="Description.Purchase.PurchaseValue" value="${asset.Description.Purchase.PurchaseValue || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchased At"]</label>
-                            <input type="text" class="form-control" name="Description.Purchase.PurchaseAt" value="${asset.Description.Purchase.PurchaseAt || ''}" disabled />
+                            <label class="form-label" for="detailPurchaseAt">@T["Purchased At"]</label>
+                            <input type="text" class="form-control" id="detailPurchaseAt" name="Description.Purchase.PurchaseAt" value="${asset.Description.Purchase.PurchaseAt || ''}" disabled />
                         </div>
                         <div class="col-md-6">
-                            <label class="form-label">@T["Purchased By"]</label>
-                            <input type="text" class="form-control" name="Description.Purchase.PurchaseBy" value="${asset.Description.Purchase.PurchaseBy || ''}" disabled />
+                            <label class="form-label" for="detailPurchaseBy">@T["Purchased By"]</label>
+                            <input type="text" class="form-control" id="detailPurchaseBy" name="Description.Purchase.PurchaseBy" value="${asset.Description.Purchase.PurchaseBy || ''}" disabled />
                         </div>
                     </div>` : ''}
                 </div>`;
@@ -338,7 +338,7 @@
         <div class="modal-content">
             <div class="modal-header bg-warning text-dark">
                 <h5 class="modal-title" id="updateAssetModalLabel">@T["Update Asset"]</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" style="filter: invert(0);" aria-label="Close"></button>
             </div>
 
             <form id="updateAssetForm">
@@ -346,42 +346,42 @@
                     <div class="row g-3">
                         <!-- Same fields as in Create -->
                         <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" id="updateName" class="form-control" 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" />
 
                         <h6 class="fw-bold">@T["Description"]</h6>
                         <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">
@@ -398,20 +398,20 @@
 
                         <h6 class="fw-bold">@T["Purchase Information"]</h6>
                         <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>
@@ -438,8 +438,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" aria-label="@T["Attribute name"]" placeholder="@T["Attribute name"]" data-attr-name />
+            <input type="text" class="form-control" aria-label="@T["Attribute value"]" placeholder="@T["Attribute value"]" data-attr-value />
             <button type="button" class="btn btn-danger btn-sm btn-remove-attribute">@T["Remove"]</button>
         `;
         updateAttributesContainer.appendChild(row);
@@ -489,8 +489,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" aria-label="@T["Attribute name"]" value="${attrName}" data-attr-name />
+                            <input type="text" class="form-control" aria-label="@T["Attribute value"]" value="${attrValue}" data-attr-value />
                             <button type="button" class="btn btn-danger btn-sm btn-remove-attribute">@T["Remove"]</button>
                         `;
                         updateAttributesContainer.appendChild(row);