diff --git a/Wonky.Client/Components/AdvisorActivityListComponent.razor b/Wonky.Client/Components/AdvisorActivityListComponent.razor
index 724cdd4a..d767624d 100644
--- a/Wonky.Client/Components/AdvisorActivityListComponent.razor
+++ b/Wonky.Client/Components/AdvisorActivityListComponent.razor
@@ -18,7 +18,7 @@
 
 @if (ActivityList.Any())
 {
-    <table class="table table-bordered d-print-table table-striped">
+    <table class="table table-sm table-bordered d-print-table table-striped">
         <thead>
         <tr class="bg-dark text-white opacity-75 border-bottom">
             <th scope="col">Kunde</th>
diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor b/Wonky.Client/Components/OfficeReportActivityListComponent.razor
index e27dfb30..14c12e52 100644
--- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor
+++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor
@@ -17,7 +17,7 @@
 
 @if (ActivityList.Any())
 {
-    <table class="table table-bordered d-print-table table-striped">
+    <table class="table table-sm table-bordered d-print-table table-striped">
         <thead>
         <tr class="bg-dark text-white opacity-75 border-bottom">
             <th scope="col">Kunde</th>
diff --git a/Wonky.Client/Pages/OfficeCustomerCountryCreateOrderPage.razor b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeCustomerCountryCreateOrderPage.razor
rename to Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor
diff --git a/Wonky.Client/Pages/OfficeCustomerCountryCreateOrderPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/OfficeCustomerCountryCreateOrderPage.razor.cs
rename to Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs
index 276bef95..8a223538 100644
--- a/Wonky.Client/Pages/OfficeCustomerCountryCreateOrderPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs
@@ -26,9 +26,9 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeCustomerCountryCreateOrderPage : IDisposable
+public partial class OfficeCustomerCreatePhoneOrderPage : IDisposable
 {
-    [Inject] public ILogger<OfficeCustomerCountryCreateOrderPage> Logger { get; set; }
+    [Inject] public ILogger<OfficeCustomerCreatePhoneOrderPage> Logger { get; set; }
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public ICountryCustomerRepository CustomerRepo { get; set; }
     [Inject] public ICountryCustomerHistoryRepository InventoryRepo { get; set; }
diff --git a/Wonky.Client/Pages/OfficeCountryLandingPage.razor b/Wonky.Client/Pages/OfficeLandingPage.razor
similarity index 95%
rename from Wonky.Client/Pages/OfficeCountryLandingPage.razor
rename to Wonky.Client/Pages/OfficeLandingPage.razor
index d982ef94..8115bb09 100644
--- a/Wonky.Client/Pages/OfficeCountryLandingPage.razor
+++ b/Wonky.Client/Pages/OfficeLandingPage.razor
@@ -25,7 +25,7 @@
             <div class="card-header">Danmark</div>
             <div class="card-body">
                 <div class="list-group list-group-flush">
-                    <AuthorizeView Roles="Admin">
+                    <AuthorizeView Roles="Admin,Office">
                         <a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/dk">
                             <i class="bi-activity"></i> Sælgere
                         </a>
@@ -46,7 +46,7 @@
             <div class="card-header">Norge</div>
             <div class="card-body">
                 <div class="list-group">
-                    <AuthorizeView Roles="Admin">
+                    <AuthorizeView Roles="Admin,Office">
                         <a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/no">
                             <i class="bi-activity"></i> Sælgere
                         </a>
@@ -67,7 +67,7 @@
             <div class="card-header">Sverige</div>
             <div class="card-body">
                 <div class="list-group">
-                    <AuthorizeView Roles="Admin">
+                    <AuthorizeView Roles="Admin,Office">
                         <a class="list-group-item list-group-item-action list-group-item-warning" href="/office/users/advisors/se">
                             <i class="bi-activity"></i> Sælgere
                         </a>
diff --git a/Wonky.Client/Pages/OfficeCountryLandingPage.razor.cs b/Wonky.Client/Pages/OfficeLandingPage.razor.cs
similarity index 80%
rename from Wonky.Client/Pages/OfficeCountryLandingPage.razor.cs
rename to Wonky.Client/Pages/OfficeLandingPage.razor.cs
index 8b736cfa..4e2ca41c 100644
--- a/Wonky.Client/Pages/OfficeCountryLandingPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeLandingPage.razor.cs
@@ -4,7 +4,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeCountryLandingPage
+public partial class OfficeLandingPage
 {
     [Parameter] public string CountryCode { get; set; } = "";
 }
\ No newline at end of file
diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeAdvisorCustomerListPage.razor
rename to Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor
diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/OfficeAdvisorCustomerListPage.razor.cs
rename to Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs
index 76973e75..99590636 100644
--- a/Wonky.Client/Pages/OfficeAdvisorCustomerListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeAdvisorCustomerListPage : IDisposable
+public partial class OfficeUserAdvisorCustomerListPage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "dk";
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCountryListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeUserAdvisorCountryListPage.razor
rename to Wonky.Client/Pages/OfficeUserAdvisorListPage.razor
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCountryListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs
similarity index 94%
rename from Wonky.Client/Pages/OfficeUserAdvisorCountryListPage.razor.cs
rename to Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs
index cc2fcab0..afd82e6f 100644
--- a/Wonky.Client/Pages/OfficeUserAdvisorCountryListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs
@@ -6,7 +6,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeUserAdvisorCountryListPage :IDisposable
+public partial class OfficeUserAdvisorListPage :IDisposable
 {
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public ISystemUserRepository SystemUserRepo { get; set; }
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCountryReportListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeUserAdvisorCountryReportListPage.razor
rename to Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCountryReportListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeUserAdvisorCountryReportListPage.razor.cs
rename to Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs
index 258cfa8d..4e4116d6 100644
--- a/Wonky.Client/Pages/OfficeUserAdvisorCountryReportListPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeUserAdvisorCountryReportListPage : IDisposable
+public partial class OfficeUserAdvisorReportListPage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "";
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCountryReportViewPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeUserAdvisorCountryReportViewPage.razor
rename to Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCountryReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs
similarity index 97%
rename from Wonky.Client/Pages/OfficeUserAdvisorCountryReportViewPage.razor.cs
rename to Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs
index 2b3db1db..23afe24c 100644
--- a/Wonky.Client/Pages/OfficeUserAdvisorCountryReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs
@@ -23,7 +23,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeUserAdvisorCountryReportViewPage : IDisposable
+public partial class OfficeUserAdvisorReportViewPage : IDisposable
 {
     /// <summary>
     /// Country code from url parameter
@@ -65,7 +65,7 @@ public partial class OfficeUserAdvisorCountryReportViewPage : IDisposable
     /// Logger service
     /// </summary>
     [Inject]
-    public ILogger<OfficeUserAdvisorCountryReportViewPage> Logger { get; set; }
+    public ILogger<OfficeUserAdvisorReportViewPage> Logger { get; set; }
 
     /// <summary>
     /// Storage service
diff --git a/Wonky.Client/Pages/OfficeAdvisorViewPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor
similarity index 100%
rename from Wonky.Client/Pages/OfficeAdvisorViewPage.razor
rename to Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor
diff --git a/Wonky.Client/Pages/OfficeAdvisorViewPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs
similarity index 96%
rename from Wonky.Client/Pages/OfficeAdvisorViewPage.razor.cs
rename to Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs
index 8017af13..fb5bad54 100644
--- a/Wonky.Client/Pages/OfficeAdvisorViewPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs
@@ -26,13 +26,13 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class OfficeAdvisorViewPage : IDisposable
+public partial class OfficeUserAdvisorViewEditPage : IDisposable
 {
     [Parameter] public string UserId { get; set; } = "";
     [Parameter] public string CountryCode { get; set; } = "";
     [Inject] public HttpInterceptorService _interceptor { get; set; }
     [Inject] public ISystemUserRepository SystemUserRepo { get; set; }
-    [Inject] public ILogger<OfficeAdvisorViewPage> _logger { get; set; }
+    [Inject] public ILogger<OfficeUserAdvisorViewEditPage> _logger { get; set; }
     [Inject] public NavigationManager _navigator { get; set; }
     [Inject] public IToastService _toast { get; set; }
     private WebUserInfoView UserInfo { get; set; } = new();
diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor b/Wonky.Client/Pages/ReportPrintOrderPage.razor
index d195ce55..29207330 100644
--- a/Wonky.Client/Pages/ReportPrintOrderPage.razor
+++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor
@@ -33,7 +33,7 @@
 {
     foreach (var item in Items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none"))
     {
-        <ReportItemComponent ReportItem="@item"></ReportItemComponent>
+        <ReportItemComponent ReportItem="@item" />
     }
 }
 else
diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs
index b8a08c63..a072ada4 100644
--- a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs
+++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs
@@ -56,7 +56,6 @@ public partial class ReportPrintOrderPage
     private async Task Print()
     {
         await JsModule.InvokeVoidAsync("printInvoke");
-
         Navigator.NavigateTo(ReturnUrl);
     }
     
diff --git a/Wonky.Client/Pages/ReportPrintSummaryPage.razor b/Wonky.Client/Pages/ReportPrintSummaryPage.razor
index 26e4d413..a8c06d77 100644
--- a/Wonky.Client/Pages/ReportPrintSummaryPage.razor
+++ b/Wonky.Client/Pages/ReportPrintSummaryPage.razor
@@ -29,7 +29,7 @@
     </div>
 </div>
 
-<div class="report-main d-print-grid">
+<div class="report-main d-print-table">
     <PageTitle>@Report.ReportData.Name</PageTitle>
     <div class="row">
         <div class="col text-center align-content-center">
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 857e3c19..0761c387 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
 {
     "appInfo": {
         "name": "Wonky Client",
-        "version": "0.97.1",
+        "version": "0.97.2",
         "rc": true,
         "sandBox": false,
         "image": "grumpy-coder.png"
diff --git a/Wonky.Client/wwwroot/css/print.css b/Wonky.Client/wwwroot/css/print.css
index 775f3c3e..7701984e 100644
--- a/Wonky.Client/wwwroot/css/print.css
+++ b/Wonky.Client/wwwroot/css/print.css
@@ -17,8 +17,9 @@
         font-size: 10px;
         break-before: page;
         break-after: page;
+        break-inside: avoid;
         page-break-after: always;
-        height: initial;
+        height: 280mm;
         border: initial;
         border-radius: initial;
         box-shadow: initial;
@@ -45,6 +46,7 @@
     }
     .distance-ledger {}
     .report-ledger {
+        page-break-before: avoid;
         page-break-inside: avoid;
         page-break-after: always;
         break-after: recto;