diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor b/Wonky.Client/Components/CustomerInventoryListComponent.razor
index 63b80cd6..1a770dd7 100644
--- a/Wonky.Client/Components/CustomerInventoryListComponent.razor
+++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor
@@ -23,10 +23,6 @@
         <div class="list-group mt-2">
             <div class="list-group-item d-print-none">
                 <div class="row">
-                    @*
-                    <div class="col-sm-4 action-link-element" onclick="@(() => SortProducts(ProductSort.Description))"><i class="bi-sort-alpha-down"></i> Navn <i class="bi-sort-alpha-up-alt"></i></div>
-                    <div class="col-sm-3 action-link-element" onclick="@(() => SortProducts(ProductSort.Sku))"><i class="bi-sort-alpha-down"></i> Varenr <i class="bi-sort-alpha-up-alt"></i></div>
-                    *@
                     <div class="col-sm-7 text-end">
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="checkbox" id="sortOrder" checked @onclick="@SetSortOrder"/>
@@ -34,17 +30,17 @@
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="description" value="description"
-                                   onclick="@(() => SortProducts(ProductSort.Description))">
+                                   onclick="@(() => SortDisplayList(SortColumn.Description))">
                             <label class="form-check-label" for="description">Navn</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="itemNumber" value="itemNumber"
-                                   onclick="@(() => SortProducts(ProductSort.Sku))">
+                                   onclick="@(() => SortDisplayList(SortColumn.Sku))">
                             <label class="form-check-label" for="itemNumber">Vare Nr.</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="lastInvoiceDate" value="itemDate"
-                                   onclick="@(() => SortProducts(ProductSort.LastInvoiceDate))" checked>
+                                   onclick="@(() => SortDisplayList(SortColumn.LastInvoiceDate))" checked>
                             <label class="form-check-label" for="lastInvoiceDate">Sidst leveret</label>
                         </div>
                     </div>
@@ -53,7 +49,7 @@
                     </div>
                 </div>
             </div>
-            @foreach (var product in FilteredList)
+            @foreach (var product in DisplayList)
             {
                 <div class="list-group-item">
                     <div class="row align-items-center">
diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
index 4fe14beb..826c8cb8 100644
--- a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
@@ -36,48 +36,49 @@ public partial class CustomerInventoryListComponent
 
     // ##############################################3333############
     // private variables
+    private List<ProductInventoryItemView> DisplayList { get; set; }
     private bool Descending { get; set; } = true;
-    private string SearchTerm { get; set; } = "";
-    private List<ProductInventoryItemView> FilteredList { get; set; }
-    private ProductSort SortColumn { get; set; } = ProductSort.LastInvoiceDate;
+    private string DisplayFilter { get; set; } = "";
+    private SortColumn SortColumn { get; set; } = SortColumn.LastInvoiceDate;
 
-    protected override void OnInitialized()
+    protected override void OnParametersSet()
     {
-        // sort base list
+        // sort the base Inventory
         Inventory = Utils.SortInventory(Inventory, SortColumn, Descending);
         // initialize FilteredList
-        FilterItems(SearchTerm);
+        ApplyInventoryFilter(DisplayFilter);
     }
-
+    
 
     private void SetSortOrder()
     {
         Descending = !Descending;
-        FilteredList = Utils.SortInventory(FilteredList, SortColumn, Descending); 
+        SortDisplayList(SortColumn); 
     }
     
     
+    private void SortDisplayList(SortColumn sortColumn)
+    {
+        SortColumn = sortColumn;
+        DisplayList = Utils.SortInventory(DisplayList, SortColumn, Descending);
+    }
+
+    
     private void OnSearchChanged(string searchTerm)
     {
         // use search input to filter list
-        FilterItems(searchTerm);
+        ApplyInventoryFilter(searchTerm);
     }    
 
     
-    private void FilterItems(string filter)
+    private void ApplyInventoryFilter(string searchTerm)
     {
-        SearchTerm = filter;
-        FilteredList = string.IsNullOrWhiteSpace(filter)
+        DisplayFilter = searchTerm;
+        DisplayList = string.IsNullOrWhiteSpace(searchTerm)
             ? Inventory
-            : Inventory.Where(i => i.Description.ToLower().Contains(filter.ToLower())).ToList();
+            : Inventory.Where(i => i.Description.ToLower().Contains(searchTerm.ToLower())).ToList();
     }
-
     
-    private void SortProducts(ProductSort column)
-    {
-        FilteredList = Utils.SortInventory(FilteredList, column, Descending);
-    }
-
     
     private async Task CallShowReorderModal(string sku)
     {
diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor b/Wonky.Client/Components/CustomerProductCheckListComponent.razor
index d83ec41b..88148237 100644
--- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor
+++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor
@@ -33,17 +33,17 @@
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="description" value="description"
-                                   onclick="@(() => SortProducts(ProductSort.Description))">
+                                   onclick="@(() => SortDisplayList(SortColumn.Description))">
                             <label class="form-check-label" for="description">Navn</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="itemNumber" value="itemNumber"
-                                   onclick="@(() => SortProducts(ProductSort.Sku))">
+                                   onclick="@(() => SortDisplayList(SortColumn.Sku))">
                             <label class="form-check-label" for="itemNumber">Vare Nr.</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="lastInvoiceDate" value="itemDate"
-                                   onclick="@(() => SortProducts(ProductSort.LastInvoiceDate))" checked>
+                                   onclick="@(() => SortDisplayList(SortColumn.LastInvoiceDate))" checked>
                             <label class="form-check-label" for="lastInvoiceDate">Sidst leveret</label>
                         </div>
                     </div>
diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
index 3b94ee3e..fbe0f67f 100644
--- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
@@ -25,46 +25,53 @@ using Wonky.Entity.Views;
 namespace Wonky.Client.Components;
 public partial class CustomerProductCheckListComponent
 {
+    // ##############################################################
+    [Inject] public ILocalStorageService Storage { get; set; }
+    
+    // ##############################################################
     [Parameter] public List<ProductInventoryItemView> Inventory { get; set; } = new();
     [Parameter] public string CompanyId { get; set; } = "";
-    [Inject] public ILocalStorageService Storage { get; set; }
-    // private variables
+    
+    // ##############################################################
     private bool Descending { get; set; } = true;
-    private string SearchTerm { get; set; } = "";
-    private List<ProductInventoryItemView> FilteredList { get; set; } = new();
+    private string DisplayFilter { get; set; } = "";
+    private List<ProductInventoryItemView> DisplayList { get; set; } = new();
+    private SortColumn SortColumn { get; set; } = SortColumn.LastInvoiceDate;
 
+    
     protected override void OnParametersSet()
     {
-        Inventory = Utils.SortInventory(Inventory, ProductSort.LastInvoiceDate, Descending);
-        FilterItems(SearchTerm);
+        Inventory = Utils.SortInventory(Inventory, SortColumn, Descending);
+        ApplyInventoryFilter(DisplayFilter);
     }
     
     
     private void SetSortOrder()
     {
         Descending = !Descending;
-        FilteredList = Utils.SortInventory(FilteredList, ProductSort.LastInvoiceDate, Descending);        
+        DisplayList = Utils.SortInventory(DisplayList, SortColumn, Descending);        
     }
     
     
     private void OnSearchChanged(string searchTerm)
     {
-        FilterItems(searchTerm);
+        ApplyInventoryFilter(searchTerm);
     }    
 
     
-    private void FilterItems(string filter)
+    private void ApplyInventoryFilter(string filter)
     {
-        SearchTerm = filter;
-        FilteredList = string.IsNullOrWhiteSpace(filter)
+        DisplayFilter = filter;
+        DisplayList = string.IsNullOrWhiteSpace(filter)
             ? Inventory
             : Inventory.Where(i => i.Description.ToLower().Contains(filter.ToLower())).ToList();
     }
     
     
-    private void SortProducts(ProductSort column)
+    private void SortDisplayList(SortColumn column)
     {
-        FilteredList = Utils.SortInventory(Inventory, column, Descending);
+        SortColumn = column;
+        DisplayList = Utils.SortInventory(DisplayList, SortColumn, Descending);
     }
 
     
diff --git a/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor b/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor
index bf2361f1..be934cdb 100644
--- a/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor
+++ b/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor
@@ -33,17 +33,17 @@
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="description" value="description"
-                                   onclick="@(() => SortProducts(ProductSort.Description))">
+                                   onclick="@(() => SortProducts(Enums.SortColumn.Description))">
                             <label class="form-check-label" for="description">Navn</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="itemNumber" value="itemNumber"
-                                   onclick="@(() => SortProducts(ProductSort.Sku))">
+                                   onclick="@(() => SortProducts(Enums.SortColumn.Sku))">
                             <label class="form-check-label" for="itemNumber">Vare Nr.</label>
                         </div>
                         <div class="form-check form-check-inline">
                             <input class="form-check-input" type="radio" name="sortCol" id="lastInvoiceDate" value="itemDate"
-                                   onclick="@(() => SortProducts(ProductSort.LastInvoiceDate))" checked>
+                                   onclick="@(() => SortProducts(Enums.SortColumn.LastInvoiceDate))" checked>
                             <label class="form-check-label" for="lastInvoiceDate">Sidst leveret</label>
                         </div>
                     </div>
diff --git a/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor.cs b/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor.cs
index ccb46de0..edc2010e 100644
--- a/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor.cs
+++ b/Wonky.Client/Components/OfficeCustomerInventoryListComponent.razor.cs
@@ -41,7 +41,7 @@ public partial class OfficeCustomerInventoryListComponent
     private bool Descending { get; set; } = true;
     private string SearchTerm { get; set; } = "";
     private List<ProductInventoryItemView> FilteredList { get; set; } = new();
-    private ProductSort SortColumn { get; set; } = ProductSort.LastInvoiceDate;
+    private SortColumn SortColumn { get; set; } = SortColumn.LastInvoiceDate;
 
 
     protected override void OnParametersSet()
@@ -73,7 +73,7 @@ public partial class OfficeCustomerInventoryListComponent
     }
 
     
-    private void SortProducts(ProductSort column)
+    private void SortProducts(SortColumn column)
     {
         FilteredList = Utils.SortInventory(FilteredList, column, Descending);
     }
diff --git a/Wonky.Client/Enums/ProductSort.cs b/Wonky.Client/Enums/SortColumn.cs
similarity index 97%
rename from Wonky.Client/Enums/ProductSort.cs
rename to Wonky.Client/Enums/SortColumn.cs
index a2959dc0..fc82ab4a 100644
--- a/Wonky.Client/Enums/ProductSort.cs
+++ b/Wonky.Client/Enums/SortColumn.cs
@@ -16,7 +16,7 @@
 
 namespace Wonky.Client.Enums;
 
-public enum ProductSort
+public enum SortColumn
 {
     Description,
     Sku,
diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs
index 3bf5528c..46faf314 100644
--- a/Wonky.Client/Helpers/Utils.cs
+++ b/Wonky.Client/Helpers/Utils.cs
@@ -28,17 +28,17 @@ namespace Wonky.Client.Helpers;
 public static class Utils
 {
     public static List<ProductInventoryItemView> SortInventory(IEnumerable<ProductInventoryItemView> inventory,
-        ProductSort column, bool descending)
+        SortColumn sortColumn, bool descending)
     {
-        return column switch
+        return sortColumn switch
         {
-            ProductSort.Description => descending
+            SortColumn.Description => descending
                 ? inventory.OrderByDescending(x => x.Description).ToList()
                 : inventory.OrderBy(x => x.Description).ToList(),
-            ProductSort.Sku => descending
+            SortColumn.Sku => descending
                 ? inventory.OrderByDescending(x => x.Sku).ToList()
                 : inventory.OrderBy(x => x.Sku).ToList(),
-            ProductSort.LastInvoiceDate => descending
+            SortColumn.LastInvoiceDate => descending
                 ? inventory.OrderByDescending(x => x.LastInvoiceDate).ToList()
                 : inventory.OrderBy(x => x.LastInvoiceDate).ToList(),
             _ => inventory.OrderByDescending(x => x.LastInvoiceDate).ToList()
diff --git a/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor
index 5d99398c..ff4e700b 100644
--- a/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor
@@ -18,7 +18,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">@CompanyName - Aktivitet oversigt</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <CustomerActivityListComponent Activities="Activities"/>
diff --git a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor
index c16e0faa..251a71b9 100644
--- a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor
@@ -17,7 +17,7 @@
     <div class="modal-dialog modal-dialog-scrollable modal-fullscreen">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <div class="card">
diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor
index 77e12699..0bdf6cfc 100644
--- a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">@CompanyName - Produktoversigt</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor
index 9027e29e..cdcb7e1d 100644
--- a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor
@@ -21,7 +21,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)</h4>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (SalesItem.Discontinued)
diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor
index 98b53a45..bae12430 100644
--- a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor
@@ -24,7 +24,7 @@
                 {
                     <h3 class="modal-title">@Company.Name - Faktura Oversigt</h3>    
                 }
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <CustomerInvoiceListComponent OnShowInvoice="@CallInvoiceModal" CompanyId="@Company.CompanyId" InvoiceList="@Invoices"/>
diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor
index d0474b0d..961fa59a 100644
--- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor
+++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor
@@ -23,7 +23,7 @@
                 {
                     <h3 class="modal-title">Faktura @Invoice.DocumentNumber</h3>    
                 }
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (!string.IsNullOrWhiteSpace(Invoice.Company.Name))
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor
index eb8121c4..78a87d7c 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">@Company.Name - Aktivitet oversigt</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @* activity list *@
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor
index bbaed648..ef269d5e 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor
@@ -18,7 +18,7 @@
     <div class="modal-dialog modal-dialog-scrollable modal-fullscreen">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <div class="card">
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor
index 1bb8e7c8..8b20f97f 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor
@@ -21,7 +21,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">@Company.Name - Produkt oversigt</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <div class="row">
@@ -43,17 +43,17 @@
                                         </div>
                                         <div class="form-check form-check-inline">
                                             <input class="form-check-input" type="radio" name="sortCol" id="description" value="description"
-                                                   onclick="@(() => SortProducts(ProductSort.Description))">
+                                                   onclick="@(() => SortProducts(SortColumn.Description))">
                                             <label class="form-check-label" for="description">Navn</label>
                                         </div>
                                         <div class="form-check form-check-inline">
                                             <input class="form-check-input" type="radio" name="sortCol" id="itemNumber" value="itemNumber"
-                                                   onclick="@(() => SortProducts(ProductSort.Sku))">
+                                                   onclick="@(() => SortProducts(SortColumn.Sku))">
                                             <label class="form-check-label" for="itemNumber">Vare Nr.</label>
                                         </div>
                                         <div class="form-check form-check-inline">
                                             <input class="form-check-input" type="radio" name="sortCol" id="lastInvoiceDate" value="itemDate"
-                                                   onclick="@(() => SortProducts(ProductSort.LastInvoiceDate))" checked>
+                                                   onclick="@(() => SortProducts(SortColumn.LastInvoiceDate))" checked>
                                             <label class="form-check-label" for="lastInvoiceDate">Sidst leveret</label>
                                         </div>
                                     </div>
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor.cs
index 78b7fa6e..77bb2819 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor.cs
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListOverlay.razor.cs
@@ -47,7 +47,7 @@ public partial class OfficeCustomerInventoryListOverlay : IDisposable
     private bool Descending { get; set; } = true;
     private string SearchTerm { get; set; } = "";
     private List<ProductInventoryItemView> FilteredList { get; set; } = new();
-    private ProductSort SortColumn { get; set; } = ProductSort.LastInvoiceDate;
+    private SortColumn SortColumn { get; set; } = SortColumn.LastInvoiceDate;
 
 
     protected override void OnInitialized()
@@ -66,7 +66,7 @@ public partial class OfficeCustomerInventoryListOverlay : IDisposable
     }
 
 
-    private void SortProducts(ProductSort column)
+    private void SortProducts(SortColumn column)
     {
         Descending = !Descending;
         FilteredList = Utils.SortInventory(FilteredList, column, Descending);
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor
index 8a75c8a5..fec0f416 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor
@@ -21,7 +21,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)</h4>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (SalesItem.Discontinued)
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor
index 25cab0ed..8a0662b3 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor
@@ -21,7 +21,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">@Company.Name - Faktura oversigt</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @* component listing invoices*@
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor
index 924032c0..1103abb9 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">Faktura</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (!string.IsNullOrWhiteSpace(Invoice.Company.Name))
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor
index 8f80795f..45eaa993 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">@Company.Name - Produktoversigt</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <OfficeCustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@Company.CompanyId" Inventory="@Inventory"/>
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor
index 35dbf077..0d8cdb44 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor
@@ -21,7 +21,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)</h4>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (SalesItem.Discontinued)
diff --git a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
index af230625..27faaaba 100644
--- a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
+++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">Pris Katalog</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <div class="sticky-top bg-dark rounded-2 p-3">
diff --git a/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor
index 84106144..1cc58138 100644
--- a/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor
+++ b/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor
@@ -19,7 +19,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h2 class="modal-title">PRODUKT GENNEMGANG</h2>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @((MarkupString) BodyMessage)
diff --git a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor
index c9afe9a0..2febbd93 100644
--- a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor
+++ b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">@ProductName</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (!string.IsNullOrWhiteSpace(ProductName))
diff --git a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor
index f35cd03c..d8ba4576 100644
--- a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor
+++ b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor
@@ -18,7 +18,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">@ProductName</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @if (!string.IsNullOrWhiteSpace(ProductName))
diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
index 0340e29d..4f729996 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
+++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
@@ -32,8 +32,8 @@
     </div>
 </div>
 
-<CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
-<CustomerInventoryReorderOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="ReorderOverlay"/>
+<CustomerInventoryListComponent OnReorderSelected="@OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
+<CustomerInventoryReorderOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="@ReorderOverlay"/>
 
 @if (Working)
 {
diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
index 9758344d..9ecc02f4 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
@@ -76,6 +76,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
         ReorderOverlay.Show();
     }    
     
+    
     private async Task OnSelectedItem(DraftItem draftItem)
     {
         // add item to order draft
@@ -85,6 +86,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
         await DraftStateProvider.SaveChangesAsync();
     }
     
+    
     private async Task FetchProductInventory()
     {
         Inventory = new List<ProductInventoryItemView>();
@@ -94,6 +96,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
         
     }
     
+    
     public void Dispose()
     {
         Interceptor.DisposeEvent();
diff --git a/Wonky.Client/Shared/ConfirmDeleteModal.razor b/Wonky.Client/Shared/ConfirmDeleteModal.razor
index f1ec6e9b..f6c96c9f 100644
--- a/Wonky.Client/Shared/ConfirmDeleteModal.razor
+++ b/Wonky.Client/Shared/ConfirmDeleteModal.razor
@@ -19,7 +19,7 @@
         <div class="modal-content">
             <div class="modal-header text-bg-danger">
                 <h2 class="modal-title">Bekræft Sletning</h2>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @((MarkupString)BodyMessage)
diff --git a/Wonky.Client/Shared/ConfirmWorkDateModal.razor b/Wonky.Client/Shared/ConfirmWorkDateModal.razor
index 5531da5b..37bc2505 100644
--- a/Wonky.Client/Shared/ConfirmWorkDateModal.razor
+++ b/Wonky.Client/Shared/ConfirmWorkDateModal.razor
@@ -19,7 +19,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title">Bekræft Venligst</h3>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <p class="fw-bold">@BodyMessage</p>
diff --git a/Wonky.Client/Shared/ConfirmationModal.razor b/Wonky.Client/Shared/ConfirmationModal.razor
index 71f05c77..5d1a2c13 100644
--- a/Wonky.Client/Shared/ConfirmationModal.razor
+++ b/Wonky.Client/Shared/ConfirmationModal.razor
@@ -19,7 +19,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h2 class="modal-title">Bekræft Venligst</h2>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 @((MarkupString) BodyMessage)
diff --git a/Wonky.Client/Shared/ContactViewEditModal.razor b/Wonky.Client/Shared/ContactViewEditModal.razor
index 2fb23480..de010dac 100644
--- a/Wonky.Client/Shared/ContactViewEditModal.razor
+++ b/Wonky.Client/Shared/ContactViewEditModal.razor
@@ -21,7 +21,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">@CompanyName</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <EditForm Model="SelectedContact" OnValidSubmit="SubmitContact">
diff --git a/Wonky.Client/Shared/InformationModal.razor b/Wonky.Client/Shared/InformationModal.razor
index f9453724..ad9aac83 100644
--- a/Wonky.Client/Shared/InformationModal.razor
+++ b/Wonky.Client/Shared/InformationModal.razor
@@ -19,7 +19,7 @@
         <div class="modal-content">
             <div class="modal-header bg-info">
                 <h5 class="modal-title">Info</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <div class="alert alert-info">
diff --git a/Wonky.Client/Shared/VatLookupDkModal.razor b/Wonky.Client/Shared/VatLookupDkModal.razor
index a6da99a1..6b9d063f 100644
--- a/Wonky.Client/Shared/VatLookupDkModal.razor
+++ b/Wonky.Client/Shared/VatLookupDkModal.razor
@@ -20,7 +20,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">CVR opslag</h5>
-                <button type="button" class="btn-close" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"></button>
+                <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
             </div>
             <div class="modal-body">
                 <VatNumberInputComponent VatNumber="@ThisVatNumber" OnValidSubmit="GetInfoFromVat"/>