diff --git a/Wonky.Client/Components/ItemGroupComponent.razor b/Wonky.Client/Components/CatalogGroupComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemGroupComponent.razor
rename to Wonky.Client/Components/CatalogGroupComponent.razor
diff --git a/Wonky.Client/Components/ItemGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/ItemGroupComponent.razor.cs
rename to Wonky.Client/Components/CatalogGroupComponent.razor.cs
index aef8bd6c..6e55bc71 100644
--- a/Wonky.Client/Components/ItemGroupComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs
@@ -20,7 +20,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemGroupComponent
+public partial class CatalogGroupComponent
 {
     [Inject] public ILocalStorageService LocalStorage { get; set; }
     [Inject] public UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/ItemSearchComponent.razor b/Wonky.Client/Components/CatalogSearchComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemSearchComponent.razor
rename to Wonky.Client/Components/CatalogSearchComponent.razor
diff --git a/Wonky.Client/Components/ItemSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/ItemSearchComponent.razor.cs
rename to Wonky.Client/Components/CatalogSearchComponent.razor.cs
index ec5c2d1f..eb728a68 100644
--- a/Wonky.Client/Components/ItemSearchComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogSearchComponent.razor.cs
@@ -19,7 +19,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemSearchComponent : IDisposable
+public partial class CatalogSearchComponent : IDisposable
 {
     /// <summary>
     /// User preference service
diff --git a/Wonky.Client/Components/ItemSearchPhraseComponent.razor b/Wonky.Client/Components/CatalogSearchPhraseComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemSearchPhraseComponent.razor
rename to Wonky.Client/Components/CatalogSearchPhraseComponent.razor
diff --git a/Wonky.Client/Components/ItemSearchPhraseComponent.razor.cs b/Wonky.Client/Components/CatalogSearchPhraseComponent.razor.cs
similarity index 96%
rename from Wonky.Client/Components/ItemSearchPhraseComponent.razor.cs
rename to Wonky.Client/Components/CatalogSearchPhraseComponent.razor.cs
index c4a3f319..3289a7b1 100644
--- a/Wonky.Client/Components/ItemSearchPhraseComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogSearchPhraseComponent.razor.cs
@@ -19,7 +19,7 @@ using Timer = System.Timers.Timer;
 
 namespace Wonky.Client.Components
 {
-    public partial class ItemSearchPhraseComponent
+    public partial class CatalogSearchPhraseComponent
     {
         private Timer _timer { get; set; } = new();
         private string _searchTerm { get; set; } = "";
diff --git a/Wonky.Client/Components/ItemSortComponent.razor b/Wonky.Client/Components/CatalogSortComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemSortComponent.razor
rename to Wonky.Client/Components/CatalogSortComponent.razor
diff --git a/Wonky.Client/Components/ItemSortComponent.razor.cs b/Wonky.Client/Components/CatalogSortComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/ItemSortComponent.razor.cs
rename to Wonky.Client/Components/CatalogSortComponent.razor.cs
index 0b9e8ca1..15bfb5f1 100644
--- a/Wonky.Client/Components/ItemSortComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogSortComponent.razor.cs
@@ -19,7 +19,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemSortComponent : IDisposable
+public partial class CatalogSortComponent : IDisposable
 {
     /// <summary>
     /// User preference service
diff --git a/Wonky.Client/Components/ItemTableComponent.razor b/Wonky.Client/Components/CatalogTableComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemTableComponent.razor
rename to Wonky.Client/Components/CatalogTableComponent.razor
diff --git a/Wonky.Client/Components/ItemTableComponent.razor.cs b/Wonky.Client/Components/CatalogTableComponent.razor.cs
similarity index 96%
rename from Wonky.Client/Components/ItemTableComponent.razor.cs
rename to Wonky.Client/Components/CatalogTableComponent.razor.cs
index 8170aea0..79b37319 100644
--- a/Wonky.Client/Components/ItemTableComponent.razor.cs
+++ b/Wonky.Client/Components/CatalogTableComponent.razor.cs
@@ -21,7 +21,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemTableComponent
+public partial class CatalogTableComponent
 {
     [Parameter] public List<SalesItemView> SalesItems { get; set; } = new();
     [Inject] public IToastService ToastService { get; set; }
diff --git a/Wonky.Client/Components/ItemTableComponent.razor.css b/Wonky.Client/Components/CatalogTableComponent.razor.css
similarity index 100%
rename from Wonky.Client/Components/ItemTableComponent.razor.css
rename to Wonky.Client/Components/CatalogTableComponent.razor.css
diff --git a/Wonky.Client/Components/ProcessStateComponent.razor.css b/Wonky.Client/Components/ProcessStateComponent.razor.css
new file mode 100644
index 00000000..e69de29b
diff --git a/Wonky.Client/Pages/SalesCatalogPage.razor b/Wonky.Client/Pages/CatalogPage.razor
similarity index 83%
rename from Wonky.Client/Pages/SalesCatalogPage.razor
rename to Wonky.Client/Pages/CatalogPage.razor
index 1878e298..fc2096cc 100644
--- a/Wonky.Client/Pages/SalesCatalogPage.razor
+++ b/Wonky.Client/Pages/CatalogPage.razor
@@ -25,16 +25,16 @@
     <div class="container-fluid pt-3">
         <div class="row mb-3">
             <div class="col">
-                <ItemGroupComponent OnChanged="SetItemGroup"/>
+                <CatalogGroupComponent OnChanged="SetItemGroup"/>
             </div>
             <div class="col">
-                <ItemSearchComponent OnChanged="SetSearchCol"/>
+                <CatalogSearchComponent OnChanged="SetSearchCol"/>
             </div>
             <div class="col">
-                <ItemSearchPhraseComponent OnChanged="SetSearchPhrase"/>
+                <CatalogSearchPhraseComponent OnChanged="SetSearchPhrase"/>
             </div>
             <div class="col">
-                <ItemSortComponent OnChanged="SetSortCol"/>
+                <CatalogSortComponent OnChanged="SetSortCol"/>
             </div>
             <div class="col-md-2">
                 <PageSizeComponent OnChanged="SetPageSize" />
@@ -48,4 +48,4 @@
     </div>
 </div>
 
-<ItemTableComponent SalesItems="_items" />
+<CatalogTableComponent SalesItems="_items" />
diff --git a/Wonky.Client/Pages/SalesCatalogPage.razor.cs b/Wonky.Client/Pages/CatalogPage.razor.cs
similarity index 98%
rename from Wonky.Client/Pages/SalesCatalogPage.razor.cs
rename to Wonky.Client/Pages/CatalogPage.razor.cs
index 92c7b0f7..0e43b359 100644
--- a/Wonky.Client/Pages/SalesCatalogPage.razor.cs
+++ b/Wonky.Client/Pages/CatalogPage.razor.cs
@@ -29,7 +29,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Pages;
 
-public partial class SalesCatalogPage : IDisposable
+public partial class CatalogPage : IDisposable
 {
     [Inject] public ILocalStorageService Storage { get; set; }
     [Inject] public ICatalogHttpRepository ItemRepo { get; set; }
diff --git a/Wonky.Client/Pages/CrmViewActivityPage.razor.css b/Wonky.Client/Pages/CrmViewActivityPage.razor.css
new file mode 100644
index 00000000..e69de29b
diff --git a/Wonky.Client/Pages/Page401.razor b/Wonky.Client/Pages/ErrorPage401.razor
similarity index 100%
rename from Wonky.Client/Pages/Page401.razor
rename to Wonky.Client/Pages/ErrorPage401.razor
diff --git a/Wonky.Client/Pages/Page401.razor.css b/Wonky.Client/Pages/ErrorPage401.razor.css
similarity index 100%
rename from Wonky.Client/Pages/Page401.razor.css
rename to Wonky.Client/Pages/ErrorPage401.razor.css
diff --git a/Wonky.Client/Pages/Page404.razor b/Wonky.Client/Pages/ErrorPage404.razor
similarity index 100%
rename from Wonky.Client/Pages/Page404.razor
rename to Wonky.Client/Pages/ErrorPage404.razor
diff --git a/Wonky.Client/Pages/Page404.razor.cs b/Wonky.Client/Pages/ErrorPage404.razor.cs
similarity index 100%
rename from Wonky.Client/Pages/Page404.razor.cs
rename to Wonky.Client/Pages/ErrorPage404.razor.cs
diff --git a/Wonky.Client/Pages/Page404.razor.css b/Wonky.Client/Pages/ErrorPage404.razor.css
similarity index 100%
rename from Wonky.Client/Pages/Page404.razor.css
rename to Wonky.Client/Pages/ErrorPage404.razor.css
diff --git a/Wonky.Client/Pages/Page500.razor b/Wonky.Client/Pages/ErrorPage500.razor
similarity index 100%
rename from Wonky.Client/Pages/Page500.razor
rename to Wonky.Client/Pages/ErrorPage500.razor
diff --git a/Wonky.Client/Pages/Page500.razor.css b/Wonky.Client/Pages/ErrorPage500.razor.css
similarity index 100%
rename from Wonky.Client/Pages/Page500.razor.css
rename to Wonky.Client/Pages/ErrorPage500.razor.css
diff --git a/Wonky.Client/Pages/SiteErrorReport.razor b/Wonky.Client/Pages/ErrorReportPage.razor
similarity index 100%
rename from Wonky.Client/Pages/SiteErrorReport.razor
rename to Wonky.Client/Pages/ErrorReportPage.razor
diff --git a/Wonky.Client/Pages/SiteErrorReport.razor.cs b/Wonky.Client/Pages/ErrorReportPage.razor.cs
similarity index 100%
rename from Wonky.Client/Pages/SiteErrorReport.razor.cs
rename to Wonky.Client/Pages/ErrorReportPage.razor.cs
diff --git a/Wonky.Client/Pages/PreferencesPage.razor b/Wonky.Client/Pages/PreferencesPage.razor
new file mode 100644
index 00000000..5f0a8a82
--- /dev/null
+++ b/Wonky.Client/Pages/PreferencesPage.razor
@@ -0,0 +1,6 @@
+@page "/PreferencesPage"
+<h3>PreferencesPage</h3>
+
+@code {
+    
+}
\ No newline at end of file
diff --git a/Wonky.Client/wwwroot/css/app-v0.12.0.css b/Wonky.Client/wwwroot/css/app-v0.20.0.css
similarity index 93%
rename from Wonky.Client/wwwroot/css/app-v0.12.0.css
rename to Wonky.Client/wwwroot/css/app-v0.20.0.css
index 1845738d..2186d44f 100644
--- a/Wonky.Client/wwwroot/css/app-v0.12.0.css
+++ b/Wonky.Client/wwwroot/css/app-v0.20.0.css
@@ -40,19 +40,6 @@ body {
 .the-dead {
     background-color: black;
 }
-.the-good-fg {
-    color: green;
-}
-.the-bad-fg {
-    color: orange;
-}
-.the-ugly-fg {
-    color: #ff0000;
-}
-.the-draw-fg {
-    color: #9b02fc;
-}
-
 
 /* end state elements */
 
diff --git a/Wonky.Client/wwwroot/svg/box2-fill.svg b/Wonky.Client/wwwroot/svg/box2-fill.svg
new file mode 100644
index 00000000..242ad6a8
--- /dev/null
+++ b/Wonky.Client/wwwroot/svg/box2-fill.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box2-fill" viewBox="0 0 16 16">
+  <path d="M3.75 0a1 1 0 0 0-.8.4L.1 4.2a.5.5 0 0 0-.1.3V15a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V4.5a.5.5 0 0 0-.1-.3L13.05.4a1 1 0 0 0-.8-.4h-8.5ZM15 4.667V5H1v-.333L1.5 4h6V1h1v3h6l.5.667Z"/>
+</svg>
\ No newline at end of file
diff --git a/Wonky.Client/wwwroot/svg/box2.svg b/Wonky.Client/wwwroot/svg/box2.svg
new file mode 100644
index 00000000..6020bafe
--- /dev/null
+++ b/Wonky.Client/wwwroot/svg/box2.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-box2" viewBox="0 0 16 16">
+  <path d="M2.95.4a1 1 0 0 1 .8-.4h8.5a1 1 0 0 1 .8.4l2.85 3.8a.5.5 0 0 1 .1.3V15a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V4.5a.5.5 0 0 1 .1-.3L2.95.4ZM7.5 1H3.75L1.5 4h6V1Zm1 0v3h6l-2.25-3H8.5ZM15 5H1v10h14V5Z"/>
+</svg>
\ No newline at end of file
diff --git a/Wonky.Client/wwwroot/svg/lightning-charge.svg b/Wonky.Client/wwwroot/svg/lightning-charge.svg
new file mode 100644
index 00000000..8a97432e
--- /dev/null
+++ b/Wonky.Client/wwwroot/svg/lightning-charge.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-lightning-charge" viewBox="0 0 16 16">
+  <path d="M11.251.068a.5.5 0 0 1 .227.58L9.677 6.5H13a.5.5 0 0 1 .364.843l-8 8.5a.5.5 0 0 1-.842-.49L6.323 9.5H3a.5.5 0 0 1-.364-.843l8-8.5a.5.5 0 0 1 .615-.09zM4.157 8.5H7a.5.5 0 0 1 .478.647L6.11 13.59l5.732-6.09H9a.5.5 0 0 1-.478-.647L9.89 2.41 4.157 8.5z"/>
+</svg>
\ No newline at end of file
diff --git a/Wonky.Client/wwwroot/svg/truck.svg b/Wonky.Client/wwwroot/svg/truck.svg
new file mode 100644
index 00000000..1afc549c
--- /dev/null
+++ b/Wonky.Client/wwwroot/svg/truck.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-truck" viewBox="0 0 16 16">
+  <path d="M0 3.5A1.5 1.5 0 0 1 1.5 2h9A1.5 1.5 0 0 1 12 3.5V5h1.02a1.5 1.5 0 0 1 1.17.563l1.481 1.85a1.5 1.5 0 0 1 .329.938V10.5a1.5 1.5 0 0 1-1.5 1.5H14a2 2 0 1 1-4 0H5a2 2 0 1 1-3.998-.085A1.5 1.5 0 0 1 0 10.5v-7zm1.294 7.456A1.999 1.999 0 0 1 4.732 11h5.536a2.01 2.01 0 0 1 .732-.732V3.5a.5.5 0 0 0-.5-.5h-9a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .294.456zM12 10a2 2 0 0 1 1.732 1h.768a.5.5 0 0 0 .5-.5V8.35a.5.5 0 0 0-.11-.312l-1.48-1.85A.5.5 0 0 0 13.02 6H12v4zm-9 1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm9 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/>
+</svg>
\ No newline at end of file