diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor b/Wonky.Client/Components/ActivityTableCrmComponent.razor
similarity index 100%
rename from Wonky.Client/Components/AdvisorActivityTableComponent.razor
rename to Wonky.Client/Components/ActivityTableCrmComponent.razor
diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs b/Wonky.Client/Components/ActivityTableCrmComponent.razor.cs
similarity index 95%
rename from Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs
rename to Wonky.Client/Components/ActivityTableCrmComponent.razor.cs
index 86ab9e50..336fa790 100644
--- a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs
+++ b/Wonky.Client/Components/ActivityTableCrmComponent.razor.cs
@@ -18,7 +18,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components;
 
-public partial class AdvisorActivityTableComponent
+public partial class ActivityTableCrmComponent
 {
     [Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
     [Inject] public NavigationManager Navigator { get; set; }
diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor b/Wonky.Client/Components/ReportActivityTableOfficeComponent.razor
similarity index 100%
rename from Wonky.Client/Components/OfficeActivityTableComponent.razor
rename to Wonky.Client/Components/ReportActivityTableOfficeComponent.razor
diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs b/Wonky.Client/Components/ReportActivityTableOfficeComponent.razor.cs
similarity index 96%
rename from Wonky.Client/Components/OfficeActivityTableComponent.razor.cs
rename to Wonky.Client/Components/ReportActivityTableOfficeComponent.razor.cs
index e9ea64e3..2246eb19 100644
--- a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs
+++ b/Wonky.Client/Components/ReportActivityTableOfficeComponent.razor.cs
@@ -18,7 +18,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components;
 
-public partial class OfficeActivityTableComponent
+public partial class ReportActivityTableOfficeComponent
 {
     [Parameter] public List<ReportItemView> ActivityList { get; set; } = new();
     [Inject] public NavigationManager Navigator { get; set; }
diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableCrmComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ReportTableComponent.razor
rename to Wonky.Client/Components/ReportTableCrmComponent.razor
diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableCrmComponent.razor.cs
similarity index 96%
rename from Wonky.Client/Components/ReportTableComponent.razor.cs
rename to Wonky.Client/Components/ReportTableCrmComponent.razor.cs
index b33808cc..fef1e042 100644
--- a/Wonky.Client/Components/ReportTableComponent.razor.cs
+++ b/Wonky.Client/Components/ReportTableCrmComponent.razor.cs
@@ -19,7 +19,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components;
 
-public partial class ReportTableComponent
+public partial class ReportTableCrmComponent
 {
     [Parameter] public List<SalesReportListView> ReportList { get; set; } = new();
     [Parameter] public EventCallback<string> OnShowReport { get; set; }
diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor b/Wonky.Client/Components/ReportTableOfficeComponent.razor
similarity index 100%
rename from Wonky.Client/Components/OfficeReportTableComponent.razor
rename to Wonky.Client/Components/ReportTableOfficeComponent.razor
diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableOfficeComponent.razor.cs
similarity index 96%
rename from Wonky.Client/Components/OfficeReportTableComponent.razor.cs
rename to Wonky.Client/Components/ReportTableOfficeComponent.razor.cs
index 88ad540b..0b29645a 100644
--- a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs
+++ b/Wonky.Client/Components/ReportTableOfficeComponent.razor.cs
@@ -18,7 +18,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components;
 
-public partial class OfficeReportTableComponent
+public partial class ReportTableOfficeComponent
 {
     [Parameter] public List<SalesReportListView> ReportList { get; set; } = new();
     [Parameter] public string UserId { get; set; } = "";
diff --git a/Wonky.Client/Pages/ActivityCreatePage.razor b/Wonky.Client/Pages/ActivityCreateCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ActivityCreatePage.razor
rename to Wonky.Client/Pages/ActivityCreateCrmPage.razor
diff --git a/Wonky.Client/Pages/ActivityCreatePage.razor.cs b/Wonky.Client/Pages/ActivityCreateCrmPage.razor.cs
similarity index 99%
rename from Wonky.Client/Pages/ActivityCreatePage.razor.cs
rename to Wonky.Client/Pages/ActivityCreateCrmPage.razor.cs
index 0a901ba1..75cb6ed2 100644
--- a/Wonky.Client/Pages/ActivityCreatePage.razor.cs
+++ b/Wonky.Client/Pages/ActivityCreateCrmPage.razor.cs
@@ -31,13 +31,13 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class ActivityCreatePage : IDisposable
+public partial class ActivityCreateCrmPage : IDisposable
 {
     // Parameters
     [CascadingParameter] DraftStateProvider DraftProvider { get; set; }
     [Parameter] public string CompanyId { get; set; }
     // Services    
-    [Inject] public ILogger<ActivityCreatePage> Logger { get; set; }
+    [Inject] public ILogger<ActivityCreateCrmPage> Logger { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public UserProfileService Profiles { get; set; }
     [Inject] public IToastService Toast { get; set; }
diff --git a/Wonky.Client/Pages/CustomerActivityListPage.razor b/Wonky.Client/Pages/ActivityListCustomerPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CustomerActivityListPage.razor
rename to Wonky.Client/Pages/ActivityListCustomerPage.razor
diff --git a/Wonky.Client/Pages/CustomerActivityListPage.razor.cs b/Wonky.Client/Pages/ActivityListCustomerPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/CustomerActivityListPage.razor.cs
rename to Wonky.Client/Pages/ActivityListCustomerPage.razor.cs
index c6d9eb78..c255395a 100644
--- a/Wonky.Client/Pages/CustomerActivityListPage.razor.cs
+++ b/Wonky.Client/Pages/ActivityListCustomerPage.razor.cs
@@ -25,7 +25,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CustomerActivityListPage : IDisposable
+public partial class ActivityListCustomerPage : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Inject] public HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/ActivityListTodayPage.razor b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor
similarity index 95%
rename from Wonky.Client/Pages/ActivityListTodayPage.razor
rename to Wonky.Client/Pages/ActivityListTodayCrmPage.razor
index a2c0a44f..68ee182a 100644
--- a/Wonky.Client/Pages/ActivityListTodayPage.razor
+++ b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor
@@ -40,7 +40,7 @@
 </div>
 @if (ReportStatusView.ReportItems.Any())
 {
-    <AdvisorActivityTableComponent ActivityList="ReportStatusView.ReportItems"/>
+    <ActivityTableCrmComponent ActivityList="ReportStatusView.ReportItems"/>
 }
 @if (Working)
 {
diff --git a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor.cs
similarity index 95%
rename from Wonky.Client/Pages/ActivityListTodayPage.razor.cs
rename to Wonky.Client/Pages/ActivityListTodayCrmPage.razor.cs
index ad562cb4..ee65739b 100644
--- a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs
+++ b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor.cs
@@ -25,10 +25,10 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class ActivityListTodayPage : IDisposable
+public partial class ActivityListTodayCrmPage : IDisposable
 {
     [Inject] public UserProfileService UserProfileService { get; set; }
-    [Inject] public ILogger<ActivityListTodayPage> Logger { get; set; }
+    [Inject] public ILogger<ActivityListTodayCrmPage> Logger { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
     [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
diff --git a/Wonky.Client/Pages/ActivityViewPage.razor b/Wonky.Client/Pages/ActivityViewCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/ActivityViewPage.razor
rename to Wonky.Client/Pages/ActivityViewCrmPage.razor
diff --git a/Wonky.Client/Pages/ActivityViewPage.razor.cs b/Wonky.Client/Pages/ActivityViewCrmPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/ActivityViewPage.razor.cs
rename to Wonky.Client/Pages/ActivityViewCrmPage.razor.cs
index 068a48fe..32506389 100644
--- a/Wonky.Client/Pages/ActivityViewPage.razor.cs
+++ b/Wonky.Client/Pages/ActivityViewCrmPage.razor.cs
@@ -29,13 +29,13 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class ActivityViewPage : IDisposable
+public partial class ActivityViewCrmPage : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Parameter] public string OrderId { get; set; } = "";
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; }
-    [Inject] public ILogger<ActivityViewPage> Logger { get; set; }
+    [Inject] public ILogger<ActivityViewCrmPage> Logger { get; set; }
     [Inject] public IToastService Toaster { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
     private ReportItemView ReportItem { get; set; } = new();
diff --git a/Wonky.Client/Pages/CustomerCardCreatePage.razor b/Wonky.Client/Pages/CustomerCreateCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CustomerCardCreatePage.razor
rename to Wonky.Client/Pages/CustomerCreateCrmPage.razor
diff --git a/Wonky.Client/Pages/CustomerCardCreatePage.razor.cs b/Wonky.Client/Pages/CustomerCreateCrmPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/CustomerCardCreatePage.razor.cs
rename to Wonky.Client/Pages/CustomerCreateCrmPage.razor.cs
index 4597141f..06aa3abb 100644
--- a/Wonky.Client/Pages/CustomerCardCreatePage.razor.cs
+++ b/Wonky.Client/Pages/CustomerCreateCrmPage.razor.cs
@@ -37,10 +37,10 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages
 {
-    public partial class CustomerCardCreatePage : IDisposable
+    public partial class CustomerCreateCrmPage : IDisposable
     {
         [Inject] public IToastService Toaster { get; set; }
-        [Inject] public ILogger<CustomerCardCreatePage> Logger { get; set; }
+        [Inject] public ILogger<CustomerCreateCrmPage> Logger { get; set; }
         [Inject] public ILocalStorageService Storage { get; set; }
         [Inject] public NavigationManager Navigator { get; set; }
         [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
diff --git a/Wonky.Client/Pages/CustomerInvoiceListPage.razor b/Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CustomerInvoiceListPage.razor
rename to Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor
diff --git a/Wonky.Client/Pages/CustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor.cs
similarity index 95%
rename from Wonky.Client/Pages/CustomerInvoiceListPage.razor.cs
rename to Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor.cs
index b23fb487..4e8731ed 100644
--- a/Wonky.Client/Pages/CustomerInvoiceListPage.razor.cs
+++ b/Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor.cs
@@ -11,7 +11,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CustomerInvoiceListPage : IDisposable
+public partial class CustomerInvoiceListCrmPage : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
@@ -19,7 +19,7 @@ public partial class CustomerInvoiceListPage : IDisposable
     [Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; }
     [Inject] public IToastService Toaster { get; set; }
     [Inject] public ILocalStorageService Storage { get; set; }
-    [Inject] public ILogger<CustomerInvoiceListPage> Logger { get; set; }
+    [Inject] public ILogger<CustomerInvoiceListCrmPage> Logger { get; set; }
     private InvoiceListView CompanyInvoices { get; set; } = new();
     private CompanyDto Company { get; set; } = new();
     private bool Working { get; set; } = true;
diff --git a/Wonky.Client/Pages/CustomerListPage.razor b/Wonky.Client/Pages/CustomerListCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CustomerListPage.razor
rename to Wonky.Client/Pages/CustomerListCrmPage.razor
diff --git a/Wonky.Client/Pages/CustomerListPage.razor.cs b/Wonky.Client/Pages/CustomerListCrmPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/CustomerListPage.razor.cs
rename to Wonky.Client/Pages/CustomerListCrmPage.razor.cs
index e72368bb..f99730a0 100644
--- a/Wonky.Client/Pages/CustomerListPage.razor.cs
+++ b/Wonky.Client/Pages/CustomerListCrmPage.razor.cs
@@ -28,7 +28,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages
 {
-    public partial class CustomerListPage : IDisposable
+    public partial class CustomerListCrmPage : IDisposable
     {
         [Inject] public ILocalStorageService Storage { get; set; }
         [Inject] public UserProfileService ProfileService { get; set; }
diff --git a/Wonky.Client/Pages/OfficeCustomerListPage.razor b/Wonky.Client/Pages/CustomerListOfficePage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeCustomerListPage.razor
rename to Wonky.Client/Pages/CustomerListOfficePage.razor
diff --git a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs b/Wonky.Client/Pages/CustomerListOfficePage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeCustomerListPage.razor.cs
rename to Wonky.Client/Pages/CustomerListOfficePage.razor.cs
index d94f175f..60f5345c 100644
--- a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs
+++ b/Wonky.Client/Pages/CustomerListOfficePage.razor.cs
@@ -22,12 +22,12 @@ using Wonky.Entity.Requests;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeCustomerListPage : IDisposable
+public partial class CustomerListOfficePage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "dk";
 
-    [Inject] public ILogger<OfficeCustomerListPage> Logger { get; set; }
+    [Inject] public ILogger<CustomerListOfficePage> Logger { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; }
     [Inject] public UserProfileService UserProfileService { get; set; }
diff --git a/Wonky.Client/Pages/CustomerProductListPage.razor b/Wonky.Client/Pages/CustomerProductListCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CustomerProductListPage.razor
rename to Wonky.Client/Pages/CustomerProductListCrmPage.razor
diff --git a/Wonky.Client/Pages/CustomerProductListPage.razor.cs b/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/CustomerProductListPage.razor.cs
rename to Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs
index 50428004..f44b95f9 100644
--- a/Wonky.Client/Pages/CustomerProductListPage.razor.cs
+++ b/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs
@@ -27,14 +27,14 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CustomerProductListPage : IDisposable
+public partial class CustomerProductListCrmPage : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; }
     [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public IToastService Toaster { get; set; }
-    [Inject] public ILogger<CustomerProductListPage> Logger { get; set; }
+    [Inject] public ILogger<CustomerProductListCrmPage> Logger { get; set; }
     [Inject] public ILocalStorageService Storage { get; set; }
     private CompanyDto Company { get; set; } = new();
     private List<ProductInventoryView> Inventory { get; set; } = new();
diff --git a/Wonky.Client/Pages/CustomerCardPage.razor b/Wonky.Client/Pages/CustomerViewCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CustomerCardPage.razor
rename to Wonky.Client/Pages/CustomerViewCrmPage.razor
diff --git a/Wonky.Client/Pages/CustomerCardPage.razor.cs b/Wonky.Client/Pages/CustomerViewCrmPage.razor.cs
similarity index 99%
rename from Wonky.Client/Pages/CustomerCardPage.razor.cs
rename to Wonky.Client/Pages/CustomerViewCrmPage.razor.cs
index 3b485028..593bf8fc 100644
--- a/Wonky.Client/Pages/CustomerCardPage.razor.cs
+++ b/Wonky.Client/Pages/CustomerViewCrmPage.razor.cs
@@ -31,11 +31,11 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CustomerCardPage : IDisposable
+public partial class CustomerViewCrmPage : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Inject] public IToastService Toaster { get; set; }
-    [Inject] public ILogger<CustomerCardPage> Logger { get; set; }
+    [Inject] public ILogger<CustomerViewCrmPage> Logger { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
     [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; }
     [Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; }
diff --git a/Wonky.Client/Pages/AdminKrvItemViewPage.razor b/Wonky.Client/Pages/KrvItemViewAdminPage.razor
similarity index 100%
rename from Wonky.Client/Pages/AdminKrvItemViewPage.razor
rename to Wonky.Client/Pages/KrvItemViewAdminPage.razor
diff --git a/Wonky.Client/Pages/AdminKrvItemViewPage.razor.cs b/Wonky.Client/Pages/KrvItemViewAdminPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/AdminKrvItemViewPage.razor.cs
rename to Wonky.Client/Pages/KrvItemViewAdminPage.razor.cs
index 55c67be5..70819c02 100644
--- a/Wonky.Client/Pages/AdminKrvItemViewPage.razor.cs
+++ b/Wonky.Client/Pages/KrvItemViewAdminPage.razor.cs
@@ -24,7 +24,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class AdminKrvItemViewPage : IDisposable
+public partial class KrvItemViewAdminPage : IDisposable
 {
     [Parameter] public string SalesItemId { get; set; } = "";
     private SalesItemView _item { get; set; } = new ();
diff --git a/Wonky.Client/Pages/AdminKrvItemViewPage.razor.css b/Wonky.Client/Pages/KrvItemViewAdminPage.razor.css
similarity index 100%
rename from Wonky.Client/Pages/AdminKrvItemViewPage.razor.css
rename to Wonky.Client/Pages/KrvItemViewAdminPage.razor.css
diff --git a/Wonky.Client/Pages/OfficeOrderNewPage.razor b/Wonky.Client/Pages/OrderCreateOfficePage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeOrderNewPage.razor
rename to Wonky.Client/Pages/OrderCreateOfficePage.razor
diff --git a/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs b/Wonky.Client/Pages/OrderCreateOfficePage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/OfficeOrderNewPage.razor.cs
rename to Wonky.Client/Pages/OrderCreateOfficePage.razor.cs
index 18f458a9..cf85067e 100644
--- a/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs
+++ b/Wonky.Client/Pages/OrderCreateOfficePage.razor.cs
@@ -28,7 +28,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeOrderNewPage : IDisposable
+public partial class OrderCreateOfficePage : IDisposable
 {
     [CascadingParameter] DraftStateProvider DraftStateProvider { get; set; }
     [Parameter] public string CompanyId { get; set; }
@@ -37,7 +37,7 @@ public partial class OfficeOrderNewPage : IDisposable
     [Inject] public IUserHttpRepository UserRepo { get; set; }
     [Inject] public ICatalogHttpRepository CatalogRepo { get; set; }
     [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
-    [Inject] public ILogger<OfficeOrderNewPage> Logger { get; set; }
+    [Inject] public ILogger<OrderCreateOfficePage> Logger { get; set; }
 
     private ActivityDto _activity { get; set; } = new();
     private EditContext _editContext { get; set; }
diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor b/Wonky.Client/Pages/OrderListWarehousePage.razor
similarity index 100%
rename from Wonky.Client/Pages/WarehouseOrderListPage.razor
rename to Wonky.Client/Pages/OrderListWarehousePage.razor
diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OrderViewOfficePage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeOrderViewPage.razor
rename to Wonky.Client/Pages/OrderViewOfficePage.razor
diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OrderViewOfficePage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeOrderViewPage.razor.cs
rename to Wonky.Client/Pages/OrderViewOfficePage.razor.cs
index 833f3b8c..d22868ed 100644
--- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs
+++ b/Wonky.Client/Pages/OrderViewOfficePage.razor.cs
@@ -30,7 +30,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeOrderViewPage : IDisposable
+public partial class OrderViewOfficePage : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Parameter] public string OrderId { get; set; } = "";
@@ -39,7 +39,7 @@ public partial class OfficeOrderViewPage : IDisposable
     [Inject] public ISendMailService MailService { get; set; }
     [Inject] public ILocalStorageService Storage { get; set; }
     [Inject] public IUserHttpRepository UserRepo { get; set; }
-    [Inject] public ILogger<OfficeOrderViewPage> Logger { get; set; }
+    [Inject] public ILogger<OrderViewOfficePage> Logger { get; set; }
     [Inject] public IToastService Toast { get; set; }
     private ReportItemView _reportItem { get; set; } = new();
     private bool _isNotified { get; set; }
diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.css b/Wonky.Client/Pages/OrderViewOfficePage.razor.css
similarity index 100%
rename from Wonky.Client/Pages/OfficeOrderViewPage.razor.css
rename to Wonky.Client/Pages/OrderViewOfficePage.razor.css
diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/OrderViewWarehousePage.razor
similarity index 100%
rename from Wonky.Client/Pages/WarehouseOrderViewPage.razor
rename to Wonky.Client/Pages/OrderViewWarehousePage.razor
diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs
rename to Wonky.Client/Pages/OrderViewWarehousePage.razor.cs
index 5fc34add..09cb8875 100644
--- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs
+++ b/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs
@@ -25,14 +25,14 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class WarehouseOrderViewPage : IDisposable
+public partial class OrderViewWarehousePage : IDisposable
 {
     [Parameter] public string OrderId { get; set; } = "";
     [Inject] public HttpInterceptorService _interceptor { get; set; }
     [Inject] public IWarehouseHttpRepository _warehouseRepo { get; set; }
     [Inject] public NavigationManager _navigator { get; set; }
     [Inject] public IToastService _toast { get; set; }
-    [Inject] public ILogger<WarehouseOrderViewPage> _logger { get; set; }
+    [Inject] public ILogger<OrderViewWarehousePage> _logger { get; set; }
 
     private WarehouseOrderView _order { get; set; } = new();
     private bool Loading { get; set; }
diff --git a/Wonky.Client/Pages/PrintFrontPage.razor b/Wonky.Client/Pages/PrintFrontPage.razor
index b675231b..49b98e5b 100644
--- a/Wonky.Client/Pages/PrintFrontPage.razor
+++ b/Wonky.Client/Pages/PrintFrontPage.razor
@@ -44,6 +44,6 @@
             <ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
         </div>
     </div>
-    <OfficeActivityTableComponent ActivityList="Report.ReportItems"/>
+    <ReportActivityTableOfficeComponent ActivityList="Report.ReportItems"/>
     <ReportActivityLedgerComponent ReportData="Report.ReportData"/>
 </div>
\ No newline at end of file
diff --git a/Wonky.Client/Pages/QuoteListPage.razor b/Wonky.Client/Pages/QuoteListCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/QuoteListPage.razor
rename to Wonky.Client/Pages/QuoteListCrmPage.razor
diff --git a/Wonky.Client/Pages/QuoteListPage.razor.cs b/Wonky.Client/Pages/QuoteListCrmPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/QuoteListPage.razor.cs
rename to Wonky.Client/Pages/QuoteListCrmPage.razor.cs
index d3a39159..556ec6e2 100644
--- a/Wonky.Client/Pages/QuoteListPage.razor.cs
+++ b/Wonky.Client/Pages/QuoteListCrmPage.razor.cs
@@ -13,11 +13,11 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class QuoteListPage : IDisposable
+public partial class QuoteListCrmPage : IDisposable
 {
     [Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
-    [Inject] public ILogger<QuoteListPage> Logger { get; set; }
+    [Inject] public ILogger<QuoteListCrmPage> Logger { get; set; }
     [Inject] public IToastService Toaster { get; set; }
     [Inject] public ILocalStorageService Storage { get; set; }
     private List<ReportItemView> Quotes { get; set; } = new();
diff --git a/Wonky.Client/Pages/CrmReportListPage.razor b/Wonky.Client/Pages/ReportListCrmPage.razor
similarity index 80%
rename from Wonky.Client/Pages/CrmReportListPage.razor
rename to Wonky.Client/Pages/ReportListCrmPage.razor
index c670e9df..208379c3 100644
--- a/Wonky.Client/Pages/CrmReportListPage.razor
+++ b/Wonky.Client/Pages/ReportListCrmPage.razor
@@ -18,13 +18,13 @@
 @using Wonky.Client.Components
 @page "/sales-reports"
 
-<div class="row bg-dark text-white rounded-2">
-    <div class="col">
-        <h3>Rapport Arkiv --- crmreportlistpage</h3>          
+<div class="card">
+    <div class="card-header">
+        <h3>Rapport Arkiv</h3>
     </div>
+    <ReportTableCrmComponent ReportList="ReportList" OnShowReport="ShowThisReport"/>
 </div>
-
-<ReportTableComponent ReportList="ReportList" OnShowReport="ShowThisReport" />        
+        
 
 @if (Working)
 {
diff --git a/Wonky.Client/Pages/CrmReportListPage.razor.cs b/Wonky.Client/Pages/ReportListCrmPage.razor.cs
similarity index 91%
rename from Wonky.Client/Pages/CrmReportListPage.razor.cs
rename to Wonky.Client/Pages/ReportListCrmPage.razor.cs
index 10478479..65c07b1e 100644
--- a/Wonky.Client/Pages/CrmReportListPage.razor.cs
+++ b/Wonky.Client/Pages/ReportListCrmPage.razor.cs
@@ -22,12 +22,12 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CrmReportListPage : IDisposable
+public partial class ReportListCrmPage : IDisposable
 {
     [Inject] public ICrmReportHttpRepository ReportRepo { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
-    [Inject] public ILogger<CrmReportListPage> Logger { get; set; }
+    [Inject] public ILogger<ReportListCrmPage> Logger { get; set; }
 
     private List<SalesReportListView> ReportList { get; set; } = new();
     private bool Working { get; set; } = true;
@@ -46,7 +46,7 @@ public partial class CrmReportListPage : IDisposable
 
     private void ShowThisReport(string reportDate)
     {
-        Logger.LogDebug("crmreportlistpage => showthisreport <= {}", reportDate);
+        Logger.LogDebug("CrmReportListPage => ShowThisReport <= {}", reportDate);
         Navigator.NavigateTo($"/sales-reports/view/{reportDate}");
     }
     
diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor b/Wonky.Client/Pages/ReportListOfficePage.razor
similarity index 71%
rename from Wonky.Client/Pages/OfficeReportListPage.razor
rename to Wonky.Client/Pages/ReportListOfficePage.razor
index 246b0387..17b8a5c5 100644
--- a/Wonky.Client/Pages/OfficeReportListPage.razor
+++ b/Wonky.Client/Pages/ReportListOfficePage.razor
@@ -21,16 +21,10 @@
 @page "/office/users/advisors/{CountryCode}/{UserId}/reports"
 
 <div class="card">
-    <div class="card-header bg-dark text-white">
-        <div class="row">
-            <div class="col">
-                <h3>Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName</h3>          
-            </div>
-        </div>
-    </div>
-    <div class="card-body">
-        <OfficeReportTableComponent OnShowReport="ShowThisReport" CountryCode="@CountryCode" UserId="@UserId" ReportList="@ActivityReports" />        
+    <div class="card-header">
+        <h3>Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName</h3>          
     </div>
+    <ReportTableOfficeComponent OnShowReport="ShowThisReport" CountryCode="@CountryCode" UserId="@UserId" ReportList="@ActivityReports" />        
 </div>
 
 
diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/ReportListOfficePage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeReportListPage.razor.cs
rename to Wonky.Client/Pages/ReportListOfficePage.razor.cs
index 6fd46f65..d2e990a9 100644
--- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs
+++ b/Wonky.Client/Pages/ReportListOfficePage.razor.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeReportListPage : IDisposable
+public partial class ReportListOfficePage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "";
diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor b/Wonky.Client/Pages/ReportNewCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CrmReportNewPage.razor
rename to Wonky.Client/Pages/ReportNewCrmPage.razor
diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/ReportNewCrmPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/CrmReportNewPage.razor.cs
rename to Wonky.Client/Pages/ReportNewCrmPage.razor.cs
index 4304cdd4..4b9783cc 100644
--- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs
+++ b/Wonky.Client/Pages/ReportNewCrmPage.razor.cs
@@ -27,14 +27,14 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CrmReportNewPage : IDisposable
+public partial class ReportNewCrmPage : IDisposable
 {
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public UserProfileService ProfileService { get; set; }
     [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; }
     [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
-    [Inject] public ILogger<CrmReportNewPage> Logger { get; set; }
+    [Inject] public ILogger<ReportNewCrmPage> Logger { get; set; }
     [Inject] public IToastService Toaster { get; set; }
     private EditContext ReportContext { get; set; }
     private ReportDto Report { get; set; } = new();
diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor b/Wonky.Client/Pages/ReportViewCrmPage.razor
similarity index 97%
rename from Wonky.Client/Pages/CrmReportViewPage.razor
rename to Wonky.Client/Pages/ReportViewCrmPage.razor
index e16b9608..76497ca7 100644
--- a/Wonky.Client/Pages/CrmReportViewPage.razor
+++ b/Wonky.Client/Pages/ReportViewCrmPage.razor
@@ -51,7 +51,7 @@
                 <ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
             </div>
         </div>
-        <OfficeActivityTableComponent ActivityList="Report.ReportItems"/>
+        <ReportActivityTableOfficeComponent ActivityList="Report.ReportItems"/>
         <ReportActivityLedgerComponent ReportData="Report.ReportData"/>
     }
     else
diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/ReportViewCrmPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/CrmReportViewPage.razor.cs
rename to Wonky.Client/Pages/ReportViewCrmPage.razor.cs
index bac882f2..dde5d10e 100644
--- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/ReportViewCrmPage.razor.cs
@@ -23,14 +23,14 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class CrmReportViewPage : IDisposable
+public partial class ReportViewCrmPage : IDisposable
 {
     [Parameter] public string ReportDate { get; set; }
     [Inject] public ICrmReportHttpRepository ReportRepo { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
     [Inject] public ILocalStorageService Storage { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
-    [Inject] public ILogger<CrmReportViewPage> Logger { get; set; }
+    [Inject] public ILogger<ReportViewCrmPage> Logger { get; set; }
     [Inject] public UserProfileService ProfileService { get; set; }
 
     private UserPref Prefs { get; set; } = new();
diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/ReportViewOfficePage.razor
similarity index 97%
rename from Wonky.Client/Pages/OfficeReportViewPage.razor
rename to Wonky.Client/Pages/ReportViewOfficePage.razor
index b0bcb0e4..bc7311bb 100644
--- a/Wonky.Client/Pages/OfficeReportViewPage.razor
+++ b/Wonky.Client/Pages/ReportViewOfficePage.razor
@@ -53,7 +53,7 @@
                 <ReportDistanceLedgerComponent ReportData="Report.ReportData"/>
             </div>
         </div>
-        <OfficeActivityTableComponent ActivityList="Report.ReportItems"/>
+        <ReportActivityTableOfficeComponent ActivityList="Report.ReportItems"/>
         <ReportActivityLedgerComponent ReportData="Report.ReportData"/>
     }
     else
diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/ReportViewOfficePage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeReportViewPage.razor.cs
rename to Wonky.Client/Pages/ReportViewOfficePage.razor.cs
index e40b6a9e..abb21d03 100644
--- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/ReportViewOfficePage.razor.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeReportViewPage : IDisposable
+public partial class ReportViewOfficePage : IDisposable
 {
     /// <summary>
     /// Country code from url parameter
@@ -64,7 +64,7 @@ public partial class OfficeReportViewPage : IDisposable
     /// Logger service
     /// </summary>
     [Inject]
-    public ILogger<OfficeReportViewPage> Logger { get; set; }
+    public ILogger<ReportViewOfficePage> Logger { get; set; }
 
     /// <summary>
     /// Storage service
diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor b/Wonky.Client/Pages/TaskItemListCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CrmTaskItemListPage.razor
rename to Wonky.Client/Pages/TaskItemListCrmPage.razor
diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs b/Wonky.Client/Pages/TaskItemListCrmPage.razor.cs
similarity index 95%
rename from Wonky.Client/Pages/CrmTaskItemListPage.razor.cs
rename to Wonky.Client/Pages/TaskItemListCrmPage.razor.cs
index e31a5d55..2af94738 100644
--- a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs
+++ b/Wonky.Client/Pages/TaskItemListCrmPage.razor.cs
@@ -25,10 +25,10 @@ using Wonky.Entity.Views;
 
 namespace  Wonky.Client.Pages;
 
-public partial class CrmTaskItemListPage : IDisposable
+public partial class TaskItemListCrmPage : IDisposable
 {
     [Inject] public UserProfileService UserProfileService { get; set; }
-    [Inject] public ILogger<CrmTaskItemListPage> Logger { get; set; }
+    [Inject] public ILogger<TaskItemListCrmPage> Logger { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public NavigationManager Navigator { get; set; }
     [Inject] public ICrmTaskItemHttpRepository TaskItemRepo { get; set; }
diff --git a/Wonky.Client/Pages/CrmTaskItemViewPage.razor b/Wonky.Client/Pages/TaskItemViewCrmPage.razor
similarity index 100%
rename from Wonky.Client/Pages/CrmTaskItemViewPage.razor
rename to Wonky.Client/Pages/TaskItemViewCrmPage.razor
diff --git a/Wonky.Client/Pages/CrmTaskItemViewPage.razor.cs b/Wonky.Client/Pages/TaskItemViewCrmPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/CrmTaskItemViewPage.razor.cs
rename to Wonky.Client/Pages/TaskItemViewCrmPage.razor.cs
index 3c40be45..6dd66623 100644
--- a/Wonky.Client/Pages/CrmTaskItemViewPage.razor.cs
+++ b/Wonky.Client/Pages/TaskItemViewCrmPage.razor.cs
@@ -24,7 +24,7 @@ using Wonky.Entity.DTO;
 
 namespace Wonky.Client.Pages;
 
-public partial class CrmTaskItemViewPage : IDisposable
+public partial class TaskItemViewCrmPage : IDisposable
 {
     [Parameter] public string TaskItemId { get; set; }
     [Inject] public HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/OfficeUserListPage.razor b/Wonky.Client/Pages/UserListOfficePage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeUserListPage.razor
rename to Wonky.Client/Pages/UserListOfficePage.razor
diff --git a/Wonky.Client/Pages/OfficeUserListPage.razor.cs b/Wonky.Client/Pages/UserListOfficePage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeUserListPage.razor.cs
rename to Wonky.Client/Pages/UserListOfficePage.razor.cs
index 69c76f30..bb3a0880 100644
--- a/Wonky.Client/Pages/OfficeUserListPage.razor.cs
+++ b/Wonky.Client/Pages/UserListOfficePage.razor.cs
@@ -22,7 +22,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeUserListPage : IDisposable
+public partial class UserListOfficePage : IDisposable
 {
     [Parameter] public string CountryCode { get; set; } = "";
     [Inject] public HttpInterceptorService _interceptor { get; set; }
diff --git a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor b/Wonky.Client/Pages/UserListSalesRepPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor
rename to Wonky.Client/Pages/UserListSalesRepPage.razor
diff --git a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs b/Wonky.Client/Pages/UserListSalesRepPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs
rename to Wonky.Client/Pages/UserListSalesRepPage.razor.cs
index e99d35d7..4b0fed7a 100644
--- a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs
+++ b/Wonky.Client/Pages/UserListSalesRepPage.razor.cs
@@ -22,12 +22,12 @@ using Wonky.Entity.Requests;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeCustomerSalesRepListPage : IDisposable
+public partial class UserListSalesRepPage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "dk";
 
-    [Inject] public ILogger<OfficeCustomerSalesRepListPage> Logger { get; set; }
+    [Inject] public ILogger<UserListSalesRepPage> Logger { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; }
     [Inject] public UserProfileService UserProfileService { get; set; }
diff --git a/Wonky.Client/Pages/OfficeUserViewPage.razor b/Wonky.Client/Pages/UserViewOfficePage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeUserViewPage.razor
rename to Wonky.Client/Pages/UserViewOfficePage.razor
diff --git a/Wonky.Client/Pages/OfficeUserViewPage.razor.cs b/Wonky.Client/Pages/UserViewOfficePage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeUserViewPage.razor.cs
rename to Wonky.Client/Pages/UserViewOfficePage.razor.cs
index 18ca1e1b..98f0e509 100644
--- a/Wonky.Client/Pages/OfficeUserViewPage.razor.cs
+++ b/Wonky.Client/Pages/UserViewOfficePage.razor.cs
@@ -26,13 +26,13 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeUserViewPage : IDisposable
+public partial class UserViewOfficePage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "";
     [Inject] public HttpInterceptorService _interceptor { get; set; }
     [Inject] public IUserHttpRepository UserRepo { get; set; }
-    [Inject] public ILogger<OfficeUserViewPage> _logger { get; set; }
+    [Inject] public ILogger<UserViewOfficePage> _logger { get; set; }
     [Inject] public NavigationManager _navigator { get; set; }
     [Inject] public IToastService _toast { get; set; }
     private WebUserInfoView _userInfo { get; set; } = new();