diff --git a/WheelWizard.Test/Views/ModPreviewRetryTests.cs b/WheelWizard.Test/Features/Mods/ViewModels/ModPreviewRetryTests.cs
similarity index 98%
rename from WheelWizard.Test/Views/ModPreviewRetryTests.cs
rename to WheelWizard.Test/Features/Mods/ViewModels/ModPreviewRetryTests.cs
index 07f622add..c007c6fea 100644
--- a/WheelWizard.Test/Views/ModPreviewRetryTests.cs
+++ b/WheelWizard.Test/Features/Mods/ViewModels/ModPreviewRetryTests.cs
@@ -3,10 +3,10 @@
 using SixLabors.ImageSharp.PixelFormats;
 using WheelWizard.GameBanana;
 using WheelWizard.GameBanana.Domain;
+using WheelWizard.Mods.ViewModels;
 using WheelWizard.Shared;
-using WheelWizard.Views.ModManagement;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Features.Mods.ViewModels;
 
 public class ModPreviewRetryTests
 {
diff --git a/WheelWizard.Test/Views/ModPreviewViewModelTests.cs b/WheelWizard.Test/Features/Mods/ViewModels/ModPreviewViewModelTests.cs
similarity index 97%
rename from WheelWizard.Test/Views/ModPreviewViewModelTests.cs
rename to WheelWizard.Test/Features/Mods/ViewModels/ModPreviewViewModelTests.cs
index 63d4ae66c..581fb0000 100644
--- a/WheelWizard.Test/Views/ModPreviewViewModelTests.cs
+++ b/WheelWizard.Test/Features/Mods/ViewModels/ModPreviewViewModelTests.cs
@@ -1,9 +1,9 @@
 using WheelWizard.GameBanana;
 using WheelWizard.GameBanana.Domain;
+using WheelWizard.Mods.ViewModels;
 using WheelWizard.Shared;
-using WheelWizard.Views.ModManagement;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Features.Mods.ViewModels;
 
 public class ModPreviewViewModelTests
 {
diff --git a/WheelWizard.Test/Views/VrHistoryViewModelTests.cs b/WheelWizard.Test/Features/WheelWizardData/ViewModels/VrHistoryViewModelTests.cs
similarity index 97%
rename from WheelWizard.Test/Views/VrHistoryViewModelTests.cs
rename to WheelWizard.Test/Features/WheelWizardData/ViewModels/VrHistoryViewModelTests.cs
index 29d2fc9a3..a29b51acb 100644
--- a/WheelWizard.Test/Views/VrHistoryViewModelTests.cs
+++ b/WheelWizard.Test/Features/WheelWizardData/ViewModels/VrHistoryViewModelTests.cs
@@ -2,9 +2,9 @@
 using WheelWizard.RrRooms;
 using WheelWizard.Shared;
 using WheelWizard.Shared.Services;
-using WheelWizard.Views.Patterns;
+using WheelWizard.WheelWizardData.ViewModels;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Features.WheelWizardData.ViewModels;
 
 public class VrHistoryViewModelTests
 {
diff --git a/WheelWizard.Test/Views/Storage/FilePickerServiceTests.cs b/WheelWizard.Test/Shared/Desktop/Storage/FilePickerServiceTests.cs
similarity index 97%
rename from WheelWizard.Test/Views/Storage/FilePickerServiceTests.cs
rename to WheelWizard.Test/Shared/Desktop/Storage/FilePickerServiceTests.cs
index a963004f0..e6a0d0dbe 100644
--- a/WheelWizard.Test/Views/Storage/FilePickerServiceTests.cs
+++ b/WheelWizard.Test/Shared/Desktop/Storage/FilePickerServiceTests.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics;
 using Avalonia.Platform.Storage;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.Platform;
 using WheelWizard.Shared.Processes;
-using WheelWizard.Views.Storage;
 
-namespace WheelWizard.Test.Views.Storage;
+namespace WheelWizard.Test.Shared.Desktop.Storage;
 
 public class FilePickerServiceTests
 {
diff --git a/WheelWizard.Test/Shared/Polling/ObservablePollingServiceTests.cs b/WheelWizard.Test/Shared/Polling/ObservablePollingServiceTests.cs
index 855b347f8..49c286a8d 100644
--- a/WheelWizard.Test/Shared/Polling/ObservablePollingServiceTests.cs
+++ b/WheelWizard.Test/Shared/Polling/ObservablePollingServiceTests.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using WheelWizard.Shared.Polling;
-using WheelWizard.Views.Diagnostics;
+using WheelWizard.Views.DesignTime.Diagnostics;
 
 namespace WheelWizard.Test.Shared.Polling;
 
diff --git a/WheelWizard.Test/Views/NavigationTests.cs b/WheelWizard.Test/Views/Shell/Navigation/NavigationTests.cs
similarity index 96%
rename from WheelWizard.Test/Views/NavigationTests.cs
rename to WheelWizard.Test/Views/Shell/Navigation/NavigationTests.cs
index 52123cf4a..f9eb2114b 100644
--- a/WheelWizard.Test/Views/NavigationTests.cs
+++ b/WheelWizard.Test/Views/Shell/Navigation/NavigationTests.cs
@@ -1,8 +1,8 @@
 using Avalonia.Controls;
 using Microsoft.Extensions.DependencyInjection;
-using WheelWizard.Views.Navigation;
+using WheelWizard.Views.Shell.Navigation;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Views.Shell.Navigation;
 
 public class NavigationTests
 {
diff --git a/WheelWizard.Test/Views/DesktopStartupTests.cs b/WheelWizard.Test/Views/Shell/Startup/DesktopStartupTests.cs
similarity index 96%
rename from WheelWizard.Test/Views/DesktopStartupTests.cs
rename to WheelWizard.Test/Views/Shell/Startup/DesktopStartupTests.cs
index af04fea41..b046a6918 100644
--- a/WheelWizard.Test/Views/DesktopStartupTests.cs
+++ b/WheelWizard.Test/Views/Shell/Startup/DesktopStartupTests.cs
@@ -4,11 +4,11 @@
 using WheelWizard.AutoUpdating;
 using WheelWizard.MiiRendering.Services;
 using WheelWizard.Shared;
-using WheelWizard.Views;
-using WheelWizard.Views.Startup;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Startup;
 using WheelWizard.WiiManagement.GameLicense;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Views.Shell.Startup;
 
 public class DesktopStartupTests
 {
diff --git a/WheelWizard.Test/Views/HomeDolphinLaunchTests.cs b/WheelWizard.Test/Views/Shell/ViewModels/HomeDolphinLaunchTests.cs
similarity index 98%
rename from WheelWizard.Test/Views/HomeDolphinLaunchTests.cs
rename to WheelWizard.Test/Views/Shell/ViewModels/HomeDolphinLaunchTests.cs
index 1709e38b5..d35b615b4 100644
--- a/WheelWizard.Test/Views/HomeDolphinLaunchTests.cs
+++ b/WheelWizard.Test/Views/Shell/ViewModels/HomeDolphinLaunchTests.cs
@@ -12,10 +12,11 @@
 using WheelWizard.Shared.Calendar;
 using WheelWizard.Shared.Platform;
 using WheelWizard.Shared.Processes;
-using WheelWizard.Views.Pages;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.ViewModels;
 using TimeProvider = System.TimeProvider;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Views.Shell.ViewModels;
 
 public class HomeDolphinLaunchTests
 {
diff --git a/WheelWizard.Test/Views/HomeViewModelTests.cs b/WheelWizard.Test/Views/Shell/ViewModels/HomeViewModelTests.cs
similarity index 98%
rename from WheelWizard.Test/Views/HomeViewModelTests.cs
rename to WheelWizard.Test/Views/Shell/ViewModels/HomeViewModelTests.cs
index c4f9cace1..17627a391 100644
--- a/WheelWizard.Test/Views/HomeViewModelTests.cs
+++ b/WheelWizard.Test/Views/Shell/ViewModels/HomeViewModelTests.cs
@@ -4,9 +4,9 @@
 using WheelWizard.Settings;
 using WheelWizard.Shared;
 using WheelWizard.Shared.Calendar;
-using WheelWizard.Views.Pages;
+using WheelWizard.Views.Shell.ViewModels;
 
-namespace WheelWizard.Test.Views;
+namespace WheelWizard.Test.Views.Shell.ViewModels;
 
 public class HomeViewModelTests
 {
diff --git a/WheelWizard.UI.Test/ApplicationCompositionTests.cs b/WheelWizard.UI.Test/ApplicationCompositionTests.cs
index f6f12d54c..23e56aa22 100644
--- a/WheelWizard.UI.Test/ApplicationCompositionTests.cs
+++ b/WheelWizard.UI.Test/ApplicationCompositionTests.cs
@@ -12,17 +12,23 @@
 using NSubstitute;
 using Testably.Abstractions.Testing;
 using WheelWizard.ApplicationData;
+using WheelWizard.MiiImages.Views;
 using WheelWizard.Mods;
+using WheelWizard.Mods.Views;
+using WheelWizard.RrRooms.Views;
 using WheelWizard.Settings;
+using WheelWizard.Settings.Views;
 using WheelWizard.Shared;
 using WheelWizard.Shared.Services;
-using WheelWizard.Views;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages;
-using WheelWizard.Views.Pages.Settings;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Startup;
+using WheelWizard.Views.DesignTime;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Controls;
+using WheelWizard.Views.Shell.Navigation;
+using WheelWizard.Views.Shell.Startup;
+using WheelWizard.Views.Shell.Views;
+using WheelWizard.WheelWizardData.Views;
+using WheelWizard.WiiManagement.MiiManagement.Views;
 using Button = Avalonia.Controls.Button;
 
 namespace WheelWizard.UI.Test;
@@ -235,7 +241,7 @@ public async Task MainWindowAndPages_ConstructWithoutStaticServiceInitialization
             Assert.Equal(string.Empty, roomsButton.GetVisualDescendants().OfType<IconLabel>().Single().Text);
             Assert.Equal(19.5, roomsButton.GetVisualDescendants().OfType<IconLabel>().Single().Margin.Left);
             Assert.Equal(0, original.FindControl<TextBlock>("OtherSectionText")!.Opacity);
-            Assert.False(roomsButton.GetVisualDescendants().OfType<StateBox>().Single().IsVisible);
+            Assert.False(roomsButton.GetVisualDescendants().OfType<StatusBadge>().Single().IsVisible);
             toggle.RaiseEvent(new RoutedEventArgs(Button.ClickEvent));
             original.UpdateLayout();
             Assert.Equal(221, original.SidebarWidth);
@@ -273,6 +279,35 @@ public async Task MainWindowAndPages_ConstructWithoutStaticServiceInitialization
                 navigation.NavigateTo(page);
                 original.UpdateLayout();
                 Assert.IsType(page, navigation.CurrentPage);
+                if (navigation.CurrentPage is ModsPage modsPage)
+                {
+                    modsPage.HasMods = true;
+                    original.UpdateLayout();
+                    var gridView = modsPage.FindControl<MultiIconRadioButton>("GridViewButton")!;
+                    var listView = modsPage.FindControl<MultiIconRadioButton>("ListViewButton")!;
+                    var list = modsPage.FindControl<ListBox>("ModsListBox")!;
+                    var grid = modsPage.FindControl<ScrollViewer>("ModsGridView")!;
+                    gridView.IsChecked = true;
+                    Assert.True(grid.IsVisible);
+                    Assert.False(list.IsVisible);
+                    listView.IsChecked = true;
+                    Assert.True(list.IsVisible);
+                    Assert.False(grid.IsVisible);
+                    original.UpdateLayout();
+                    var viewToggle = modsPage.FindControl<Border>("ViewModeToggle")!;
+                    Assert.True(
+                        viewToggle.TranslatePoint(new Point(), modsPage)!.Value.Y > list.TranslatePoint(new Point(), modsPage)!.Value.Y
+                    );
+                    var enableAll = modsPage.FindControl<CheckBox>("EnableAllCheckbox")!;
+                    Assert.True(
+                        enableAll.TranslatePoint(new Point(), modsPage)!.Value.Y < list.TranslatePoint(new Point(), modsPage)!.Value.Y
+                    );
+                    var presenter = list.GetVisualDescendants().OfType<Avalonia.Controls.Presenters.ItemsPresenter>().Single();
+                    Assert.True(presenter.Margin.Bottom >= viewToggle.Bounds.Height + 12);
+                    var icon = listView.GetVisualDescendants().OfType<Avalonia.Controls.Shapes.Path>().Single();
+                    Assert.Equal(Avalonia.Media.Brushes.Transparent, icon.Fill);
+                    Assert.NotNull(icon.Stroke);
+                }
             }
             var room = new WheelWizard.Models.RRInfo.RrRoom
             {
diff --git a/WheelWizard.UI.Test/BadgeBindingTests.cs b/WheelWizard.UI.Test/BadgeBindingTests.cs
index 025cc49ac..056c62fb2 100644
--- a/WheelWizard.UI.Test/BadgeBindingTests.cs
+++ b/WheelWizard.UI.Test/BadgeBindingTests.cs
@@ -2,9 +2,10 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Headless.XUnit;
 using Avalonia.VisualTree;
+using WheelWizard.RrRooms.Views;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Patterns;
 using WheelWizard.WheelWizardData.Domain;
+using WheelWizard.WheelWizardData.Views;
 
 namespace WheelWizard.UI.Test;
 
@@ -29,7 +30,7 @@ public void Cards_DisplayAndRefreshSuppliedBadgesWithoutServiceLookup(bool isFri
         {
             window.Show();
             window.UpdateLayout();
-            Assert.Equal(initial, card.GetVisualDescendants().OfType<Badge>().Select(badge => badge.Variant));
+            Assert.Equal(initial, card.GetVisualDescendants().OfType<CommunityBadge>().Select(badge => badge.Variant));
 
             BadgeVariant[] replacement = [BadgeVariant.RrDev];
             if (card is FriendsListItem friend)
@@ -37,7 +38,7 @@ public void Cards_DisplayAndRefreshSuppliedBadgesWithoutServiceLookup(bool isFri
             else
                 ((PlayerListItem)card).BadgeVariants = replacement;
             window.UpdateLayout();
-            Assert.Equal(replacement, card.GetVisualDescendants().OfType<Badge>().Select(badge => badge.Variant));
+            Assert.Equal(replacement, card.GetVisualDescendants().OfType<CommunityBadge>().Select(badge => badge.Variant));
         }
         finally
         {
diff --git a/WheelWizard.UI.Test/MiiControlTests.cs b/WheelWizard.UI.Test/MiiControlTests.cs
index 0f36747a0..36902978d 100644
--- a/WheelWizard.UI.Test/MiiControlTests.cs
+++ b/WheelWizard.UI.Test/MiiControlTests.cs
@@ -7,10 +7,11 @@
 using NSubstitute;
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
+using WheelWizard.MiiImages.Views;
 using WheelWizard.MiiRendering.Services;
 using WheelWizard.Shared;
 using WheelWizard.Shared.Calendar;
-using WheelWizard.Views.Patterns;
+using WheelWizard.WheelWizardData.Views;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
diff --git a/WheelWizard.UI.Test/ModBrowserPreviewTests.cs b/WheelWizard.UI.Test/ModBrowserPreviewTests.cs
index 55ef948b2..03dd994ae 100644
--- a/WheelWizard.UI.Test/ModBrowserPreviewTests.cs
+++ b/WheelWizard.UI.Test/ModBrowserPreviewTests.cs
@@ -1,23 +1,83 @@
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Headless;
 using Avalonia.Headless.XUnit;
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using NSubstitute;
 using WheelWizard.GameBanana;
 using WheelWizard.GameBanana.Domain;
+using WheelWizard.Models.Mods;
 using WheelWizard.Mods;
+using WheelWizard.Mods.ViewModels;
+using WheelWizard.Mods.Views;
+using WheelWizard.Mods.Views.Dialogs;
 using WheelWizard.Shared;
 using WheelWizard.Shared.Downloads;
 using WheelWizard.Shared.Services;
-using WheelWizard.Views.ModManagement;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Popups.ModManagement;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Shell.Navigation;
 
 namespace WheelWizard.UI.Test;
 
 public class ModBrowserPreviewTests
 {
+    [AvaloniaFact]
+    public void DisabledGridCard_RestoresColorOnWholeCardHover_AndTracksEnabledState()
+    {
+        using var preview = new ModPreviewViewModel(
+            0,
+            Substitute.For<IGameBananaSingletonService>(),
+            Substitute.For<IGameBananaMediaService>()
+        );
+        var mod = new Mod
+        {
+            Title = "Test mod",
+            IsEnabled = false,
+            HasIncompatibleFiles = true,
+        };
+        var card = new GridModPanel { DataContext = new ModListItem(mod, false, false, preview) };
+        var window = new Window
+        {
+            Content = card,
+            Width = 300,
+            Height = 220,
+        };
+        try
+        {
+            window.Show();
+            window.UpdateLayout();
+            var grayImage = card.FindControl<Image>("DisabledThumbnailImage")!;
+            var originalSize = card.FindControl<Border>("RootCardBorder")!.Bounds.Size;
+            Assert.True(grayImage.IsVisible);
+            Assert.True(card.FindControl<PathIcon>("CompatibilityWarning")!.IsVisible);
+            window.MouseMove(new Point(25, 130));
+            Assert.False(grayImage.IsVisible);
+            window.MouseMove(card.FindControl<Border>("ThumbnailHeader")!.TranslatePoint(new Point(20, 40), window)!.Value);
+            Assert.False(grayImage.IsVisible);
+            window.MouseMove(new Point(25, 130));
+            Assert.False(grayImage.IsVisible);
+            window.MouseDown(new Point(25, 130), Avalonia.Input.MouseButton.Left);
+            window.MouseUp(new Point(25, 130), Avalonia.Input.MouseButton.Left);
+            Assert.True(mod.IsEnabled);
+            window.UpdateLayout();
+            Assert.Equal(originalSize, card.FindControl<Border>("RootCardBorder")!.Bounds.Size);
+            window.MouseDown(new Point(25, 130), Avalonia.Input.MouseButton.Left);
+            window.MouseUp(new Point(25, 130), Avalonia.Input.MouseButton.Left);
+            Assert.False(mod.IsEnabled);
+            window.MouseMove(new Point(1, 1));
+            Assert.True(grayImage.IsVisible);
+            mod.IsEnabled = true;
+            Assert.False(grayImage.IsVisible);
+            mod.IsEnabled = false;
+            Assert.True(grayImage.IsVisible);
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
     [AvaloniaFact]
     public async Task ClosedBrowser_DiscardsPendingSearchResults()
     {
@@ -219,7 +279,10 @@ public async Task RecycledCard_LoadsAndBindsItsCurrentPreview()
     {
         var mods = Substitute.For<IGameBananaSingletonService>();
         var media = Substitute.For<IGameBananaMediaService>();
-        var png = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jvX0AAAAASUVORK5CYII=");
+        using var pixels = new SkiaSharp.SKBitmap(2, 2);
+        pixels.Erase(SkiaSharp.SKColors.Red);
+        using var encoded = pixels.Encode(SkiaSharp.SKEncodedImageFormat.Png, 100);
+        var png = encoded.ToArray();
         media.GetImageAsync(Arg.Any<string>(), Arg.Any<CancellationToken>()).Returns((OperationResult<byte[]>)png);
         using var first = new ModPreviewViewModel(1, mods, media, "https://images.test/first.png");
         using var second = new ModPreviewViewModel(2, mods, media, "https://images.test/second.png");
@@ -238,6 +301,9 @@ public async Task RecycledCard_LoadsAndBindsItsCurrentPreview()
             await first.LoadAsync();
             var image = Assert.Single(card.GetVisualDescendants().OfType<Image>());
             Assert.NotNull(first.Image);
+            Assert.NotNull(first.GrayscaleImage);
+            Assert.NotSame(first.Image, first.GrayscaleImage);
+            Assert.Same(first.GrayscaleImage, first.GrayscaleImage);
             Assert.Same(first.Image, image.Source);
 
             card.Preview = second;
diff --git a/WheelWizard.UI.Test/SharedControlTests.cs b/WheelWizard.UI.Test/SharedControlTests.cs
new file mode 100644
index 000000000..612187f9f
--- /dev/null
+++ b/WheelWizard.UI.Test/SharedControlTests.cs
@@ -0,0 +1,240 @@
+using System.ComponentModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Headless;
+using Avalonia.Headless.XUnit;
+using Avalonia.Input;
+using Avalonia.Input.Raw;
+using Avalonia.Media;
+using Avalonia.Threading;
+using Avalonia.VisualTree;
+using WheelWizard.Shared;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell.Controls;
+using Button = WheelWizard.Views.Components.Button;
+
+namespace WheelWizard.UI.Test;
+
+public class SharedControlTests
+{
+    [AvaloniaFact]
+    public void Button_RendersNativeContentAndOpensItsFlyoutFromKeyboard()
+    {
+        var content = new TextBlock { Text = "Custom content" };
+        var menu = new MenuFlyout();
+        menu.Items.Add(new MenuItem { Header = "Import" });
+        var button = new Button
+        {
+            Content = content,
+            Flyout = menu,
+            Variant = ButtonVariant.Primary,
+        };
+        button.Classes.Add("caller-class");
+        var window = new Window { Content = button };
+        try
+        {
+            window.Show();
+            window.UpdateLayout();
+            Assert.Contains(content, button.GetVisualDescendants());
+            var initialBackground = button.Background;
+            button.Variant = ButtonVariant.Danger;
+            Assert.NotEqual(initialBackground, button.Background);
+            Assert.Equal(new[] { "caller-class" }, button.Classes);
+            button.Focus();
+            window.KeyPress(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            window.KeyRelease(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            Assert.True(menu.IsOpen);
+            menu.Hide();
+            Assert.False(menu.IsOpen);
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
+    [AvaloniaFact]
+    public void SidebarButton_NavigatesFromKeyboardActivation()
+    {
+        var button = new SidebarRadioButton { PageType = typeof(TextInputWindow) };
+        Type? requested = null;
+        button.NavigationRequested += (_, page) => requested = page;
+        var window = new Window { Content = button };
+        try
+        {
+            window.Show();
+            window.UpdateLayout();
+            button.Focus();
+            window.KeyPress(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            Assert.Null(requested);
+            window.KeyRelease(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            Assert.Equal(typeof(TextInputWindow), requested);
+            Assert.True(button.IsChecked);
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
+    [AvaloniaFact]
+    public void TextField_PreservesCallerBindingAndDerivesErrorsFromText()
+    {
+        var model = new InputModel();
+        var field = new TextField { DataContext = model, ErrorText = "Invalid value" };
+        field.Bind(TextField.TextProperty, new Binding(nameof(InputModel.Value)));
+        var window = new Window
+        {
+            Content = field,
+            Width = 320,
+            Height = 160,
+        };
+        try
+        {
+            window.Show();
+            window.UpdateLayout();
+            var input = Assert.Single(field.GetVisualDescendants().OfType<TextBox>());
+            Assert.Same(model, field.DataContext);
+            Assert.Equal("Initial", input.Text);
+            Assert.True(field.HasError);
+            Assert.Contains("error", input.Classes);
+            input.SetCurrentValue(TextBox.TextProperty, "Edited");
+            Dispatcher.UIThread.RunJobs();
+            Assert.Equal("Edited", model.Value);
+            model.Value = "Updated";
+            Dispatcher.UIThread.RunJobs();
+            Assert.Equal("Updated", input.Text);
+            foreach (var cleared in new string?[] { null, "", "   " })
+            {
+                field.ErrorText = cleared;
+                Assert.False(field.HasError);
+                Assert.DoesNotContain("error", input.Classes);
+            }
+            field.ErrorText = "Duplicate friend code";
+            Assert.True(field.HasError);
+            Assert.Contains("error", input.Classes);
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
+    [AvaloniaFact]
+    public void TextInput_ValidationImmediatelyDisablesInvalidInitialValues()
+    {
+        var dialog = new TextInputWindow()
+            .SetInitialText("duplicate")
+            .SetValidation((_, text) => text == "duplicate" ? OperationError.Fail("Already in your list") : OperationResult.Ok());
+        var field = dialog.FindControl<TextField>("InputField")!;
+        var submit = dialog.FindControl<Button>("SubmitButton")!;
+        Assert.True(field.HasError);
+        Assert.Equal("Already in your list", field.ErrorText);
+        Assert.False(submit.IsEnabled);
+        dialog.SetInitialText("unique");
+        Assert.False(field.HasError);
+        Assert.True(submit.IsEnabled);
+    }
+
+    [AvaloniaFact]
+    public void LinkButton_UsesNativeKeyboardClickAndDisabledBehavior()
+    {
+        var button = new LinkButton
+        {
+            Text = "Open",
+            Width = 100,
+            Height = 40,
+        };
+        var window = new Window { Content = button };
+        var clicks = 0;
+        button.Click += (_, _) => clicks++;
+        try
+        {
+            window.Show();
+            window.UpdateLayout();
+            button.Focus();
+            window.KeyPress(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            Assert.Equal(0, clicks);
+            window.KeyRelease(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            Assert.Equal(1, clicks);
+            button.IsEnabled = false;
+            window.KeyPress(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            window.KeyRelease(Key.Space, RawInputModifiers.None, PhysicalKey.Space, " ");
+            Assert.Equal(1, clicks);
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
+    [AvaloniaFact]
+    public void HoverGlow_MovesWithoutChangingButtonLayout()
+    {
+        foreach (Control button in new Control[] { new TileButton(), new ListActionButton(), new SidebarRadioButton() })
+        {
+            var window = new Window
+            {
+                Content = button,
+                Width = 300,
+                Height = 200,
+            };
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+                var before = button.Bounds;
+                var desired = button.DesiredSize;
+                var glow = Assert.Single(button.GetVisualDescendants().OfType<HoverGlow>());
+                var transform = Assert.IsType<TranslateTransform>(glow.RenderTransform);
+                window.MouseMove(button.TranslatePoint(new Point(10, 10), window)!.Value);
+                var initialX = transform.X;
+                window.MouseMove(button.TranslatePoint(new Point(button.Bounds.Width - 2, 15), window)!.Value);
+                window.UpdateLayout();
+                Assert.NotEqual(initialX, transform.X);
+                Assert.Equal(before, button.Bounds);
+                Assert.Equal(desired, button.DesiredSize);
+                Assert.False(glow.IsHitTestVisible);
+            }
+            finally
+            {
+                window.Close();
+            }
+        }
+    }
+
+    [AvaloniaFact]
+    public void AspectGrid_ResizesWithoutPinningWidthOrHeight()
+    {
+        var grid = new AspectGrid { AspectRatio = 2 };
+        grid.Children.Add(new Border());
+        foreach (var available in new[] { new Size(300, 100), new Size(120, 200), new Size(500, 300) })
+        {
+            grid.Measure(available);
+            grid.Arrange(new Rect(available));
+            Assert.Equal(2, grid.Bounds.Width / grid.Bounds.Height);
+            Assert.True(grid.Bounds.Width <= available.Width);
+            Assert.True(grid.Bounds.Height <= available.Height);
+            Assert.True(double.IsNaN(grid.Width));
+            Assert.True(double.IsNaN(grid.Height));
+        }
+        Assert.Throws<ArgumentException>(() => grid.AspectRatio = 0);
+    }
+
+    private sealed class InputModel : INotifyPropertyChanged
+    {
+        private string? _value = "Initial";
+        public string? Value
+        {
+            get => _value;
+            set
+            {
+                _value = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+            }
+        }
+        public event PropertyChangedEventHandler? PropertyChanged;
+    }
+}
diff --git a/WheelWizard.UI.Test/ToolTipBubbleBehaviorTests.cs b/WheelWizard.UI.Test/ToolTipBubbleBehaviorTests.cs
new file mode 100644
index 000000000..06e761146
--- /dev/null
+++ b/WheelWizard.UI.Test/ToolTipBubbleBehaviorTests.cs
@@ -0,0 +1,103 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Headless;
+using Avalonia.Headless.XUnit;
+using Avalonia.Threading;
+
+namespace WheelWizard.UI.Test;
+
+public class ToolTipBubbleBehaviorTests
+{
+    private static void SetActive(Window window, bool active) =>
+        typeof(WindowBase)
+            .GetMethod(
+                active ? "HandleActivated" : "HandleDeactivated",
+                System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic
+            )!
+            .Invoke(window, null);
+
+    [AvaloniaFact]
+    public async Task Hover_OpensWithoutTimer_AndExitStartsExistingAnimationImmediately()
+    {
+        var target = new Border
+        {
+            Width = 100,
+            Height = 100,
+            Background = Avalonia.Media.Brushes.Transparent,
+        };
+        ToolTip.SetTip(target, new ToolTip { Content = "Hover" });
+        var window = new Window
+        {
+            Content = target,
+            Width = 300,
+            Height = 300,
+        };
+        try
+        {
+            window.Show();
+            // Headless windows do not receive native activation notifications.
+            SetActive(window, true);
+            window.UpdateLayout();
+            window.MouseMove(target.TranslatePoint(new Point(50, 50), window)!.Value);
+            Dispatcher.UIThread.RunJobs();
+            Assert.True(target.IsPointerOver);
+            Assert.True(window.IsActive, "Window should be active");
+            Assert.False(ToolTip.GetServiceEnabled(target), "Custom tooltip service should be initialized");
+            Assert.True(ToolTip.GetIsOpen(target));
+            var tip = Assert.IsType<ToolTip>(ToolTip.GetTip(target));
+            Assert.Contains("BubbleAnimateIn", tip.Classes);
+
+            window.MouseMove(new Point(1, 1));
+            Dispatcher.UIThread.RunJobs();
+            Assert.Contains("BubbleAnimateOut", tip.Classes);
+            await Task.Delay(80);
+            Dispatcher.UIThread.RunJobs();
+            Assert.False(ToolTip.GetIsOpen(target));
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
+    [AvaloniaFact]
+    public void LosingFocus_ClosesTooltip_AndPreventsHoverReopeningInBackground()
+    {
+        var target = new Border
+        {
+            Width = 100,
+            Height = 100,
+            Background = Avalonia.Media.Brushes.Transparent,
+        };
+        ToolTip.SetTip(target, "Hover");
+        var window = new Window
+        {
+            Content = target,
+            Width = 300,
+            Height = 300,
+        };
+        try
+        {
+            window.Show();
+            // Headless windows do not receive native activation notifications.
+            SetActive(window, true);
+            window.UpdateLayout();
+            window.MouseMove(target.TranslatePoint(new Point(50, 50), window)!.Value);
+            Dispatcher.UIThread.RunJobs();
+            Assert.True(window.IsActive, "Window should be active");
+            Assert.False(ToolTip.GetServiceEnabled(target), "Custom tooltip service should be initialized");
+            Assert.True(ToolTip.GetIsOpen(target));
+
+            SetActive(window, false);
+            Assert.False(ToolTip.GetIsOpen(target));
+            window.MouseMove(new Point(1, 1));
+            window.MouseMove(target.TranslatePoint(new Point(50, 50), window)!.Value);
+            Dispatcher.UIThread.RunJobs();
+            Assert.False(ToolTip.GetIsOpen(target));
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+}
diff --git a/WheelWizard.UI.Test/WindowCompositionTests.cs b/WheelWizard.UI.Test/WindowCompositionTests.cs
index e239a2e11..c72016c0a 100644
--- a/WheelWizard.UI.Test/WindowCompositionTests.cs
+++ b/WheelWizard.UI.Test/WindowCompositionTests.cs
@@ -1,18 +1,102 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Headless;
 using Avalonia.Headless.XUnit;
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using WheelWizard.Settings.Types;
-using WheelWizard.Views;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Controls;
 
 namespace WheelWizard.UI.Test;
 
 public class WindowCompositionTests
 {
+    [AvaloniaTheory]
+    [InlineData(64.0)]
+    [InlineData(221.0)]
+    public void SidebarHover_MovesGlowWithoutChangingLayout(double width)
+    {
+        var button = new WheelWizard.Views.Shell.Controls.SidebarRadioButton { Text = "Home" };
+        var window = new Window
+        {
+            Width = width,
+            Height = 46,
+            Content = button,
+        };
+        try
+        {
+            window.Show();
+            window.UpdateLayout();
+            var bounds = button.Bounds;
+            var desiredSize = button.DesiredSize;
+            var glow = button.GetVisualDescendants().OfType<Border>().Single(border => border.Name == "PART_HoverEffect");
+            Assert.False(glow.IsHitTestVisible);
+            foreach (var x in new[] { 2.0, width / 2, width - 1 })
+            {
+                window.MouseMove(new Point(x, 23));
+                window.UpdateLayout();
+                Assert.True(glow.IsVisible);
+                Assert.Equal(x - 23, Assert.IsType<TranslateTransform>(glow.RenderTransform).X);
+                Assert.Equal(bounds, button.Bounds);
+                Assert.Equal(desiredSize, button.DesiredSize);
+            }
+        }
+        finally
+        {
+            window.Close();
+        }
+    }
+
+    [AvaloniaTheory]
+    [InlineData(400.0)]
+    [InlineData(500.0)]
+    public void ProgressContent_KeepsDefinedMeasuredWidth_ButFillsExtraAvailableWidth(double preferredWidth)
+    {
+        var content = new WheelWizard.Views.Dialogs.ProgressWindow("Download");
+        Assert.IsType<Grid>(content.Content).Width = preferredWidth;
+        content.SetGoal(new string('W', 150));
+        content.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+        Assert.Equal(preferredWidth, content.DesiredSize.Width);
+        content.Arrange(new Rect(0, 0, 600, 200));
+        Assert.Equal(600, Assert.IsType<Grid>(content.Content).Bounds.Width);
+        Assert.Equal(600, content.FindControl<ProgressBar>("ProgressBar")!.Bounds.Width);
+        content.Close();
+    }
+
+    [AvaloniaTheory]
+    [InlineData(true, false)]
+    [InlineData(false, false)]
+    [InlineData(true, true)]
+    public void ProgressNativeClose_CancelsOnlyCancelableUserRequests(bool canCancel, bool programmatic)
+    {
+        using var cancellation = new CancellationTokenSource();
+        var content = new WheelWizard.Views.Dialogs.ProgressWindow("Download");
+        if (canCancel)
+            content.SetCancellationTokenSource(cancellation);
+        content.Show();
+        var popup = Assert.IsType<PopupWindow>(TopLevel.GetTopLevel(content));
+        try
+        {
+            var args = CreateClosingArgs(programmatic);
+            typeof(PopupWindow)
+                .GetMethod("OnClosing", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic)!
+                .Invoke(popup, [args]);
+            Assert.Equal(canCancel && !programmatic, cancellation.IsCancellationRequested);
+            Assert.Equal(canCancel && !programmatic, content.WasCancellationRequested);
+            Assert.Equal(!programmatic, args.Cancel);
+        }
+        finally
+        {
+            content.SetCancellationTokenSource(null);
+            content.Close();
+        }
+    }
+
     [AvaloniaFact]
     public void DesktopCaptionButtons_UseNavigationColorsAndMinimizeHoverBackground()
     {
diff --git a/WheelWizard/Views/Updating/UpdatePresentation.cs b/WheelWizard/Features/AutoUpdating/Presentation/UpdatePresentation.cs
similarity index 98%
rename from WheelWizard/Views/Updating/UpdatePresentation.cs
rename to WheelWizard/Features/AutoUpdating/Presentation/UpdatePresentation.cs
index 66d3cbd80..f7f5db670 100644
--- a/WheelWizard/Views/Updating/UpdatePresentation.cs
+++ b/WheelWizard/Features/AutoUpdating/Presentation/UpdatePresentation.cs
@@ -1,9 +1,9 @@
 using Avalonia.Threading;
 using WheelWizard.AutoUpdating;
 using WheelWizard.Shared.Downloads;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Updating;
+namespace WheelWizard.AutoUpdating.Presentation;
 
 public sealed class UpdatePresentation : IUpdatePresentation
 {
diff --git a/WheelWizard/Views/Distributions/DistributionOperationPresentation.cs b/WheelWizard/Features/CustomDistributions/Presentation/DistributionOperationPresentation.cs
similarity index 92%
rename from WheelWizard/Views/Distributions/DistributionOperationPresentation.cs
rename to WheelWizard/Features/CustomDistributions/Presentation/DistributionOperationPresentation.cs
index 569a80953..e6ef6bde5 100644
--- a/WheelWizard/Views/Distributions/DistributionOperationPresentation.cs
+++ b/WheelWizard/Features/CustomDistributions/Presentation/DistributionOperationPresentation.cs
@@ -1,7 +1,7 @@
 using WheelWizard.CustomDistributions;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Distributions;
+namespace WheelWizard.CustomDistributions.Presentation;
 
 public sealed class DistributionOperationPresentation : IDistributionOperationPresentation
 {
diff --git a/WheelWizard/Views/Distributions/DistributionPresentation.cs b/WheelWizard/Features/CustomDistributions/Presentation/DistributionPresentation.cs
similarity index 96%
rename from WheelWizard/Views/Distributions/DistributionPresentation.cs
rename to WheelWizard/Features/CustomDistributions/Presentation/DistributionPresentation.cs
index e7cf1fb96..c1eab4b73 100644
--- a/WheelWizard/Views/Distributions/DistributionPresentation.cs
+++ b/WheelWizard/Features/CustomDistributions/Presentation/DistributionPresentation.cs
@@ -1,7 +1,7 @@
 using WheelWizard.CustomDistributions;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Distributions;
+namespace WheelWizard.CustomDistributions.Presentation;
 
 // Existing screens retain ownership of their windows while consuming the feature's progress contract.
 public static class DistributionPresentation
diff --git a/WheelWizard/Views/Distributions/DistributionPrompts.cs b/WheelWizard/Features/CustomDistributions/Presentation/DistributionPrompts.cs
similarity index 90%
rename from WheelWizard/Views/Distributions/DistributionPrompts.cs
rename to WheelWizard/Features/CustomDistributions/Presentation/DistributionPrompts.cs
index cf256a7ff..431a93e17 100644
--- a/WheelWizard/Views/Distributions/DistributionPrompts.cs
+++ b/WheelWizard/Features/CustomDistributions/Presentation/DistributionPrompts.cs
@@ -1,7 +1,7 @@
 using WheelWizard.CustomDistributions;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Distributions;
+namespace WheelWizard.CustomDistributions.Presentation;
 
 public sealed class DistributionPrompts : IDistributionPrompts
 {
diff --git a/WheelWizard/Views/Launching/DolphinLaunchPresentation.cs b/WheelWizard/Features/Launching/Presentation/DolphinLaunchPresentation.cs
similarity index 91%
rename from WheelWizard/Views/Launching/DolphinLaunchPresentation.cs
rename to WheelWizard/Features/Launching/Presentation/DolphinLaunchPresentation.cs
index 4e7cacd32..93776e450 100644
--- a/WheelWizard/Views/Launching/DolphinLaunchPresentation.cs
+++ b/WheelWizard/Features/Launching/Presentation/DolphinLaunchPresentation.cs
@@ -1,9 +1,11 @@
 using WheelWizard.DolphinInstaller;
 using WheelWizard.Launching;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 using Button = WheelWizard.Views.Components.Button;
 
-namespace WheelWizard.Views.Launching;
+namespace WheelWizard.Launching.Presentation;
 
 public sealed class DolphinLaunchPresentation : IDolphinLaunchPresentation
 {
@@ -17,7 +19,7 @@ public async Task ShowUnverifiedVersionAsync() =>
     public async Task<DolphinVersionAction> ChooseOutdatedVersionActionAsync(string? version)
     {
         var popup = new YesNoWindow()
-            .SetButtonVariants(Button.ButtonsVariantType.Primary, Button.ButtonsVariantType.Danger)
+            .SetButtonVariants(ButtonVariant.Primary, ButtonVariant.Danger)
             .SetButtonText(t("action.update"), t("action.play_anyway"))
             .SetMainText(t("question.dolphin_outdated.title"))
             .SetExtraText(
diff --git a/WheelWizard/Views/Launching/LaunchPrompts.cs b/WheelWizard/Features/Launching/Presentation/LaunchPrompts.cs
similarity index 83%
rename from WheelWizard/Views/Launching/LaunchPrompts.cs
rename to WheelWizard/Features/Launching/Presentation/LaunchPrompts.cs
index c897640c0..d59a2333c 100644
--- a/WheelWizard/Views/Launching/LaunchPrompts.cs
+++ b/WheelWizard/Features/Launching/Presentation/LaunchPrompts.cs
@@ -1,7 +1,7 @@
 using WheelWizard.Launching;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Launching;
+namespace WheelWizard.Launching.Presentation;
 
 public sealed class LaunchPrompts : ILaunchPrompts
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/BaseMiiImage.cs b/WheelWizard/Features/MiiImages/Views/BaseMiiImage.cs
similarity index 99%
rename from WheelWizard/Views/Patterns/MiiImages/BaseMiiImage.cs
rename to WheelWizard/Features/MiiImages/Views/BaseMiiImage.cs
index d670ad3ea..0c8dae22d 100644
--- a/WheelWizard/Views/Patterns/MiiImages/BaseMiiImage.cs
+++ b/WheelWizard/Features/MiiImages/Views/BaseMiiImage.cs
@@ -7,7 +7,7 @@
 using WheelWizard.MiiImages.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public abstract class BaseMiiImage : UserControl, INotifyPropertyChanged
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/Mii3DRender.cs b/WheelWizard/Features/MiiImages/Views/Mii3DRender.cs
similarity index 97%
rename from WheelWizard/Views/Patterns/MiiImages/Mii3DRender.cs
rename to WheelWizard/Features/MiiImages/Views/Mii3DRender.cs
index 46f533713..c66ad9383 100644
--- a/WheelWizard/Views/Patterns/MiiImages/Mii3DRender.cs
+++ b/WheelWizard/Features/MiiImages/Views/Mii3DRender.cs
@@ -3,7 +3,7 @@
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public sealed class Mii3DRender : MiiImageControl
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiControlThemes.cs b/WheelWizard/Features/MiiImages/Views/MiiControlThemes.cs
similarity index 99%
rename from WheelWizard/Views/Patterns/MiiImages/MiiControlThemes.cs
rename to WheelWizard/Features/MiiImages/Views/MiiControlThemes.cs
index 4b72f92b9..64b8de34c 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiControlThemes.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiControlThemes.cs
@@ -7,7 +7,7 @@
 using WheelWizard.MiiRendering.Services;
 using WheelWizard.Shared.Calendar;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 /// <summary>Composes rendering views inside standard Avalonia control templates.</summary>
 public sealed class MiiControlThemes(IMiiImagesSingletonService images, ISeasonalCalendar calendar, IMiiNativeRenderer nativeRenderer)
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiHoverView.axaml b/WheelWizard/Features/MiiImages/Views/MiiHoverView.axaml
similarity index 93%
rename from WheelWizard/Views/Patterns/MiiImages/MiiHoverView.axaml
rename to WheelWizard/Features/MiiImages/Views/MiiHoverView.axaml
index 8347e9ea4..cdbddaf1e 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiHoverView.axaml
+++ b/WheelWizard/Features/MiiImages/Views/MiiHoverView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="400"
-             x:Class="WheelWizard.Views.Patterns.MiiHoverView"
-             xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns"
+             x:Class="WheelWizard.MiiImages.Views.MiiHoverView"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:conv="clr-namespace:WheelWizard.Views.Converters"
-             x:DataType="behaviorComp:MiiHoverView" x:Name="Self"
-             VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+             x:DataType="miiImages:MiiHoverView" x:Name="Self"
+             VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views">
     <components:AspectGrid x:Name="MiiImageContainer" ClipToBounds="True" ColumnDefinitions="*,3*,*"
                              RowDefinitions="*,3*,*"
                              VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiHoverView.axaml.cs b/WheelWizard/Features/MiiImages/Views/MiiHoverView.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Patterns/MiiImages/MiiHoverView.axaml.cs
rename to WheelWizard/Features/MiiImages/Views/MiiHoverView.axaml.cs
index acdb2d316..80d50e671 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiHoverView.axaml.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiHoverView.axaml.cs
@@ -4,9 +4,10 @@
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
 using WheelWizard.Shared.Calendar;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public partial class MiiHoverView : BaseMiiImage
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiImageControl.cs b/WheelWizard/Features/MiiImages/Views/MiiImageControl.cs
similarity index 97%
rename from WheelWizard/Views/Patterns/MiiImages/MiiImageControl.cs
rename to WheelWizard/Features/MiiImages/Views/MiiImageControl.cs
index 97d3071cb..cc37c2931 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiImageControl.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiImageControl.cs
@@ -3,7 +3,7 @@
 using Avalonia.Controls.Primitives;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 /// <summary>Public XAML input surface; the control theme owns rendering-view construction.</summary>
 public abstract class MiiImageControl : TemplatedControl
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiImageLoader.cs b/WheelWizard/Features/MiiImages/Views/MiiImageLoader.cs
similarity index 96%
rename from WheelWizard/Views/Patterns/MiiImages/MiiImageLoader.cs
rename to WheelWizard/Features/MiiImages/Views/MiiImageLoader.cs
index 176be4a0e..7fd718306 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiImageLoader.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiImageLoader.cs
@@ -2,8 +2,9 @@
 using Avalonia.Media;
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public sealed class MiiImageLoader : MiiImageControl
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiImageLoaderWithHover.cs b/WheelWizard/Features/MiiImages/Views/MiiImageLoaderWithHover.cs
similarity index 97%
rename from WheelWizard/Views/Patterns/MiiImages/MiiImageLoaderWithHover.cs
rename to WheelWizard/Features/MiiImages/Views/MiiImageLoaderWithHover.cs
index 25043e1b6..b7639bab2 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiImageLoaderWithHover.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiImageLoaderWithHover.cs
@@ -2,8 +2,9 @@
 using Avalonia.Media;
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public sealed class MiiImageLoaderWithHover : MiiImageControl
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiImageView.axaml b/WheelWizard/Features/MiiImages/Views/MiiImageView.axaml
similarity index 94%
rename from WheelWizard/Views/Patterns/MiiImages/MiiImageView.axaml
rename to WheelWizard/Features/MiiImages/Views/MiiImageView.axaml
index e3a2975c6..1ece7ece3 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiImageView.axaml
+++ b/WheelWizard/Features/MiiImages/Views/MiiImageView.axaml
@@ -3,12 +3,12 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="400"
-             x:Class="WheelWizard.Views.Patterns.MiiImageView"
-             xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns"
+             x:Class="WheelWizard.MiiImages.Views.MiiImageView"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:conv="clr-namespace:WheelWizard.Views.Converters"
-             x:DataType="behaviorComp:MiiImageView" x:Name="Self"
-             VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+             x:DataType="miiImages:MiiImageView" x:Name="Self"
+             VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views">
     <components:AspectGrid x:Name="MiiImageContainer" ClipToBounds="True" ColumnDefinitions="*,3*,*"
                              RowDefinitions="*,3*,*"
                              VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiImageView.axaml.cs b/WheelWizard/Features/MiiImages/Views/MiiImageView.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Patterns/MiiImages/MiiImageView.axaml.cs
rename to WheelWizard/Features/MiiImages/Views/MiiImageView.axaml.cs
index 027d2bc59..6c47120bb 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiImageView.axaml.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiImageView.axaml.cs
@@ -4,9 +4,10 @@
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
 using WheelWizard.Shared.Calendar;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public partial class MiiImageView : BaseMiiImage
 {
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiRenderView.axaml b/WheelWizard/Features/MiiImages/Views/MiiRenderView.axaml
similarity index 94%
rename from WheelWizard/Views/Patterns/MiiImages/MiiRenderView.axaml
rename to WheelWizard/Features/MiiImages/Views/MiiRenderView.axaml
index a55142e59..6289428ea 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiRenderView.axaml
+++ b/WheelWizard/Features/MiiImages/Views/MiiRenderView.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="WheelWizard.Views.Patterns.MiiRenderView">
+             x:Class="WheelWizard.MiiImages.Views.MiiRenderView">
 
     <Border Padding="6"
             CornerRadius="6"
diff --git a/WheelWizard/Views/Patterns/MiiImages/MiiRenderView.axaml.cs b/WheelWizard/Features/MiiImages/Views/MiiRenderView.axaml.cs
similarity index 99%
rename from WheelWizard/Views/Patterns/MiiImages/MiiRenderView.axaml.cs
rename to WheelWizard/Features/MiiImages/Views/MiiRenderView.axaml.cs
index d39ec93d9..053586677 100644
--- a/WheelWizard/Views/Patterns/MiiImages/MiiRenderView.axaml.cs
+++ b/WheelWizard/Features/MiiImages/Views/MiiRenderView.axaml.cs
@@ -12,7 +12,7 @@
 using WheelWizard.Shared.Calendar;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.MiiImages.Views;
 
 public partial class MiiRenderView : BaseMiiImage
 {
diff --git a/WheelWizard/Views/ModManagement/ModInstallRequestPresentation.cs b/WheelWizard/Features/Mods/Presentation/ModInstallRequestPresentation.cs
similarity index 80%
rename from WheelWizard/Views/ModManagement/ModInstallRequestPresentation.cs
rename to WheelWizard/Features/Mods/Presentation/ModInstallRequestPresentation.cs
index 500dc3f1f..5d9306414 100644
--- a/WheelWizard/Views/ModManagement/ModInstallRequestPresentation.cs
+++ b/WheelWizard/Features/Mods/Presentation/ModInstallRequestPresentation.cs
@@ -1,9 +1,8 @@
 using WheelWizard.GameBanana.InstallRequests;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Popups.ModManagement;
+using WheelWizard.Mods.Views.Dialogs;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.ModManagement;
+namespace WheelWizard.Mods.Presentation;
 
 public sealed class ModInstallRequestPresentation(IPopupFactory popups) : IModInstallRequestPresentation
 {
diff --git a/WheelWizard/Views/ModManagement/ModOperationPresentation.cs b/WheelWizard/Features/Mods/Presentation/ModOperationPresentation.cs
similarity index 97%
rename from WheelWizard/Views/ModManagement/ModOperationPresentation.cs
rename to WheelWizard/Features/Mods/Presentation/ModOperationPresentation.cs
index b59322ee1..e38839937 100644
--- a/WheelWizard/Views/ModManagement/ModOperationPresentation.cs
+++ b/WheelWizard/Features/Mods/Presentation/ModOperationPresentation.cs
@@ -1,7 +1,7 @@
 using WheelWizard.Mods;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.ModManagement;
+namespace WheelWizard.Mods.Presentation;
 
 public sealed class ModOperationPresentation : IModOperationPresentation
 {
diff --git a/WheelWizard/Views/ModManagement/ModPreviewViewModel.cs b/WheelWizard/Features/Mods/ViewModels/ModPreviewViewModel.cs
similarity index 66%
rename from WheelWizard/Views/ModManagement/ModPreviewViewModel.cs
rename to WheelWizard/Features/Mods/ViewModels/ModPreviewViewModel.cs
index 39a10c727..b11d4f42d 100644
--- a/WheelWizard/Views/ModManagement/ModPreviewViewModel.cs
+++ b/WheelWizard/Features/Mods/ViewModels/ModPreviewViewModel.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel;
 using Avalonia.Media.Imaging;
+using SkiaSharp;
 using WheelWizard.GameBanana;
 
-namespace WheelWizard.Views.ModManagement;
+namespace WheelWizard.Mods.ViewModels;
 
 public sealed class ModPreviewViewModel(
     int modId,
@@ -15,6 +16,29 @@ public sealed class ModPreviewViewModel(
     private Task? _loading;
     private bool _disposed;
     public Bitmap? Image { get; private set; }
+    private Bitmap? _grayscaleImage;
+    private byte[]? _imageBytes;
+    public Bitmap? GrayscaleImage
+    {
+        get
+        {
+            if (Image is null || _grayscaleImage is not null)
+                return _grayscaleImage;
+            using var bitmap = SKBitmap.Decode(_imageBytes!);
+            if (bitmap == null)
+                return Image;
+            using var gray = new SKBitmap(bitmap.Width, bitmap.Height);
+            using var canvas = new SKCanvas(gray);
+            using var filter = SKColorFilter.CreateColorMatrix(
+                [0.2126f, 0.7152f, 0.0722f, 0, 0, 0.2126f, 0.7152f, 0.0722f, 0, 0, 0.2126f, 0.7152f, 0.0722f, 0, 0, 0, 0, 0, 1, 0]
+            );
+            using var paint = new SKPaint { ColorFilter = filter };
+            canvas.DrawBitmap(bitmap, 0, 0, paint);
+            using var encoded = gray.Encode(SKEncodedImageFormat.Png, 100);
+            using var stream = encoded.AsStream();
+            return _grayscaleImage = new Bitmap(stream);
+        }
+    }
     public bool ShowPlaceholder => Image is null;
     public event PropertyChangedEventHandler? PropertyChanged;
 
@@ -50,6 +74,7 @@ private async Task LoadCoreAsync()
                 return;
             using var stream = new MemoryStream(result.Value);
             Image = new Bitmap(stream);
+            _imageBytes = result.Value;
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(string.Empty));
         }
         catch (OperationCanceledException) when (_disposed) { }
@@ -66,6 +91,9 @@ public void Dispose()
         _disposed = true;
         _lifetime.Cancel();
         _lifetime.Dispose();
+        _grayscaleImage?.Dispose();
+        _grayscaleImage = null;
+        _imageBytes = null;
         Image?.Dispose();
         Image = null;
     }
diff --git a/WheelWizard/Views/Popups/ModManagement/ModBrowserWindow.axaml b/WheelWizard/Features/Mods/Views/Dialogs/ModBrowserWindow.axaml
similarity index 84%
rename from WheelWizard/Views/Popups/ModManagement/ModBrowserWindow.axaml
rename to WheelWizard/Features/Mods/Views/Dialogs/ModBrowserWindow.axaml
index 399e82e9b..a8f6831d4 100644
--- a/WheelWizard/Views/Popups/ModManagement/ModBrowserWindow.axaml
+++ b/WheelWizard/Features/Mods/Views/Dialogs/ModBrowserWindow.axaml
@@ -1,4 +1,4 @@
-<base:PopupContent x:Class="WheelWizard.Views.Popups.ModManagement.ModBrowserWindow"
+<dialogBase:PopupContent x:Class="WheelWizard.Mods.Views.Dialogs.ModBrowserWindow"
                      xmlns="https://github.com/avaloniaui"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,11 +6,10 @@
                      ClipToBounds="False"
                      xmlns:loc="clr-namespace:WheelWizard.Localization"
                      xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                     xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
-                     xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
-                     xmlns:self="clr-namespace:WheelWizard.Views.Popups.ModManagement"
-                     xmlns:wheelWizard="clr-namespace:WheelWizard"
-                     mc:Ignorable="d" d:DesignHeight="600" d:DesignWidth="800">
+                     mc:Ignorable="d" d:DesignHeight="600" d:DesignWidth="800"
+        xmlns:mods="clr-namespace:WheelWizard.Mods.Views"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base"
+        xmlns:modDialogs="clr-namespace:WheelWizard.Mods.Views.Dialogs">
     <Grid ColumnDefinitions="2*,3*" Width="800" Height="750">
         <!-- Mod List -->
         <Grid Grid.Column="0" Margin="10" RowDefinitions="Auto,Auto,Auto,*">
@@ -43,8 +42,8 @@
                      ScrollViewer.VerticalScrollBarVisibility="Auto">
 
                 <ListBox.ItemTemplate>
-                    <DataTemplate DataType="self:ModSearchResult">
-                        <patterns:ModBrowserListItem Width="284" Height="89" Margin="0,4,9,4"
+                    <DataTemplate DataType="modDialogs:ModSearchResult">
+                        <mods:ModBrowserListItem Width="284" Height="89" Margin="0,4,9,4"
                                                        ModTitle="{Binding Mod.Name}"
                                                        ModAuthor="{Binding Mod.Author.Name}"
                                                        ViewCount="{Binding Mod.ViewCount}"
@@ -62,4 +61,4 @@
         <Border Grid.Column="1" Background="{StaticResource BackgroundLineColor}" Width="1"
                 Margin="0,-10" HorizontalAlignment="Left" VerticalAlignment="Stretch" />
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/ModManagement/ModBrowserWindow.axaml.cs b/WheelWizard/Features/Mods/Views/Dialogs/ModBrowserWindow.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Popups/ModManagement/ModBrowserWindow.axaml.cs
rename to WheelWizard/Features/Mods/Views/Dialogs/ModBrowserWindow.axaml.cs
index 4071ee84e..02f471994 100644
--- a/WheelWizard/Views/Popups/ModManagement/ModBrowserWindow.axaml.cs
+++ b/WheelWizard/Features/Mods/Views/Dialogs/ModBrowserWindow.axaml.cs
@@ -7,14 +7,14 @@
 using Avalonia.Interactivity;
 using WheelWizard.GameBanana;
 using WheelWizard.GameBanana.Domain;
-using WheelWizard.Views.ModManagement;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages;
-using WheelWizard.Views.Popups.Base;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Mods.ViewModels;
+using WheelWizard.Mods.Views;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.Views.Shell.Navigation;
 using VisualExtensions = Avalonia.VisualTree.VisualExtensions;
 
-namespace WheelWizard.Views.Popups.ModManagement;
+namespace WheelWizard.Mods.Views.Dialogs;
 
 public record ModSearchResult(GameBananaModPreview Mod, ModPreviewViewModel? Preview);
 
diff --git a/WheelWizard/Views/Popups/ModManagement/ModContent.axaml b/WheelWizard/Features/Mods/Views/Dialogs/ModContent.axaml
similarity index 91%
rename from WheelWizard/Views/Popups/ModManagement/ModContent.axaml
rename to WheelWizard/Features/Mods/Views/Dialogs/ModContent.axaml
index 7dc543ddb..848dd5d07 100644
--- a/WheelWizard/Views/Popups/ModManagement/ModContent.axaml
+++ b/WheelWizard/Features/Mods/Views/Dialogs/ModContent.axaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="WheelWizard.Views.Popups.ModManagement.ModContent"
+<UserControl x:Class="WheelWizard.Mods.Views.Dialogs.ModContent"
              xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,8 +7,8 @@
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:html="clr-namespace:TheArtOfDev.HtmlRenderer.Avalonia;assembly=Avalonia.HtmlRenderer"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:modManagement="clr-namespace:WheelWizard.Views.Popups.ModManagement"
-             mc:Ignorable="d" d:DesignHeight="670" d:DesignWidth="550">
+             mc:Ignorable="d" d:DesignHeight="670" d:DesignWidth="550"
+        xmlns:modDialogs="clr-namespace:WheelWizard.Mods.Views.Dialogs">
     <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 
         <components:LoadingIcon x:Name="LoadingView" Width="90" Height="90" IsVisible="False" />
@@ -42,13 +42,13 @@
                            Classes="PageTitleText" Margin="3" />
 
                 <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal">
-                    <components:StateBox x:Name="LikesCountBox" Text="0" TipText="{loc:T attribute.likes}"
+                    <components:StatusBadge x:Name="LikesCountBox" Text="0" TipText="{loc:T attribute.likes}"
                                          IconData="{StaticResource Heart}"
                                          TipPlacement="Top" Margin="3" />
-                    <components:StateBox x:Name="ViewsCountBox" Text="0" TipText="{loc:T attribute.views}"
+                    <components:StatusBadge x:Name="ViewsCountBox" Text="0" TipText="{loc:T attribute.views}"
                                          IconData="{StaticResource Eye}"
                                          TipPlacement="Top" Margin="3" />
-                    <components:StateBox x:Name="DownloadsCountBox" Text="0" TipText="{loc:T attribute.downloads}"
+                    <components:StatusBadge x:Name="DownloadsCountBox" Text="0" TipText="{loc:T attribute.downloads}"
                                          IconData="{StaticResource Download}"
                                          TipPlacement="Top" Margin="3" />
                 </StackPanel>
@@ -59,13 +59,13 @@
             <Grid Grid.Row="1">
                 <StackPanel Orientation="Horizontal"
                             VerticalAlignment="Top" HorizontalAlignment="Left">
-                    <components:IconLabelButton
+                    <components:LinkButton
                         Foreground="{StaticResource Primary300}"
                         HoverForeground="{StaticResource Primary200}"
                         Text="somebody" x:Name="AuthorButton"
                         IconData="{StaticResource User}"
                         IconSize="16" FontSize="13" Click="AuthorLink_Click" />
-                    <components:IconLabelButton Margin="10,0,0,0"
+                    <components:LinkButton Margin="10,0,0,0"
                                                 Foreground="{StaticResource Primary300}"
                                                 HoverForeground="{StaticResource Primary200}"
                                                 IsIconLeft="False" Text="{loc:T action.gamebanana_page}"
@@ -86,7 +86,7 @@
                         Click="UnInstall_Click" />
                 </StackPanel>
 
-                <components:IconLabelButton Foreground="{StaticResource Danger400}"
+                <components:LinkButton Foreground="{StaticResource Danger400}"
                                             HoverForeground="{StaticResource Danger300}"
                                             Text="{loc:T action.report}" x:Name="ReportButton"
                                             HorizontalAlignment="Right" VerticalAlignment="Top" IsIconLeft="False"
@@ -109,7 +109,7 @@
                                     </ItemsPanelTemplate>
                                 </ItemsControl.ItemsPanel>
                                 <ItemsControl.ItemTemplate>
-                                    <DataTemplate DataType="modManagement:ModItem">
+                                    <DataTemplate DataType="modDialogs:ModItem">
                                         <Image Source="{Binding FullImageUrl}"
                                                Height="150"
                                                Margin="5"
diff --git a/WheelWizard/Views/Popups/ModManagement/ModContent.axaml.cs b/WheelWizard/Features/Mods/Views/Dialogs/ModContent.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Popups/ModManagement/ModContent.axaml.cs
rename to WheelWizard/Features/Mods/Views/Dialogs/ModContent.axaml.cs
index 7423b2e50..fc9d311cf 100644
--- a/WheelWizard/Views/Popups/ModManagement/ModContent.axaml.cs
+++ b/WheelWizard/Features/Mods/Views/Dialogs/ModContent.axaml.cs
@@ -5,11 +5,12 @@
 using WheelWizard.GameBanana.Domain;
 using WheelWizard.Mods;
 using WheelWizard.Shared.Downloads;
+using WheelWizard.Shared.Downloads.Presentation;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Downloads;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Popups.ModManagement;
+namespace WheelWizard.Mods.Views.Dialogs;
 
 public record ModItem(Bitmap FullImageUrl);
 
@@ -367,21 +368,21 @@ public void HideViewer()
         IsVisible = false;
     }
 
-    private void AuthorLink_Click(object? sender, EventArgs eventArgs)
+    private void AuthorLink_Click(object? sender, RoutedEventArgs eventArgs)
     {
         var profileUrl = CurrentMod?.Author.ProfileUrl;
         if (profileUrl != null)
             ViewUtils.OpenLink(profileUrl);
     }
 
-    private void GameBananaLink_Click(object? sender, EventArgs eventArgs)
+    private void GameBananaLink_Click(object? sender, RoutedEventArgs eventArgs)
     {
         var profileUrl = CurrentMod?.ProfileUrl;
         if (profileUrl != null)
             ViewUtils.OpenLink(profileUrl);
     }
 
-    private void ReportLink_Click(object? sender, EventArgs eventArgs)
+    private void ReportLink_Click(object? sender, RoutedEventArgs eventArgs)
     {
         var url = $"https://gamebanana.com/support/add?s=Mod.{CurrentMod?.Id}";
         ViewUtils.OpenLink(url);
diff --git a/WheelWizard/Views/Popups/ModManagement/ModIndependentWindow.axaml b/WheelWizard/Features/Mods/Views/Dialogs/ModIndependentWindow.axaml
similarity index 86%
rename from WheelWizard/Views/Popups/ModManagement/ModIndependentWindow.axaml
rename to WheelWizard/Features/Mods/Views/Dialogs/ModIndependentWindow.axaml
index 975661b83..ddcbd8964 100644
--- a/WheelWizard/Views/Popups/ModManagement/ModIndependentWindow.axaml
+++ b/WheelWizard/Features/Mods/Views/Dialogs/ModIndependentWindow.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" ClipToBounds="False"
-             x:Class="WheelWizard.Views.Popups.ModManagement.ModIndependentWindow">
+             x:Class="WheelWizard.Mods.Views.Dialogs.ModIndependentWindow">
      <Grid Width="500" Height="700">
          <!-- Use the ModDetailViewer component to display mod details -->
          <ContentControl x:Name="ModDetailHost"/>
diff --git a/WheelWizard/Views/Popups/ModManagement/ModIndependentWindow.axaml.cs b/WheelWizard/Features/Mods/Views/Dialogs/ModIndependentWindow.axaml.cs
similarity index 85%
rename from WheelWizard/Views/Popups/ModManagement/ModIndependentWindow.axaml.cs
rename to WheelWizard/Features/Mods/Views/Dialogs/ModIndependentWindow.axaml.cs
index 0dead302f..bb06dafb1 100644
--- a/WheelWizard/Views/Popups/ModManagement/ModIndependentWindow.axaml.cs
+++ b/WheelWizard/Features/Mods/Views/Dialogs/ModIndependentWindow.axaml.cs
@@ -1,8 +1,8 @@
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Mods.Views;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.Views.Shell.Navigation;
 
-namespace WheelWizard.Views.Popups.ModManagement;
+namespace WheelWizard.Mods.Views.Dialogs;
 
 public partial class ModIndependentWindow : PopupContent
 {
diff --git a/WheelWizard/Views/Patterns/GridModPanel.axaml b/WheelWizard/Features/Mods/Views/GridModPanel.axaml
similarity index 51%
rename from WheelWizard/Views/Patterns/GridModPanel.axaml
rename to WheelWizard/Features/Mods/Views/GridModPanel.axaml
index 1cccd71a1..0a3ec03c9 100644
--- a/WheelWizard/Views/Patterns/GridModPanel.axaml
+++ b/WheelWizard/Features/Mods/Views/GridModPanel.axaml
@@ -1,51 +1,42 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
-             xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:patches="clr-namespace:WheelWizard.Features.Patches"
-             x:Class="WheelWizard.Views.Patterns.GridModPanel"
-             x:DataType="pages:ModListItem">
+             x:Class="WheelWizard.Mods.Views.GridModPanel"
+             x:DataType="mods:ModListItem"
+        xmlns:mods="clr-namespace:WheelWizard.Mods.Views">
 
-    <Border x:Name="RootCardBorder"
-            CornerRadius="8" Background="{StaticResource Neutral900}"
-            ClipToBounds="True" Margin="4" Height="160">
-        <Grid>
+    <UserControl.Styles>
+        <Style Selector="Border#RootCardBorder">
+            <Setter Property="BorderBrush" Value="{StaticResource Neutral600}" />
+            <Setter Property="Background" Value="{StaticResource Neutral900}" />
+            <Setter Property="Cursor" Value="Hand" />
+        </Style>
+        <Style Selector="Border#RootCardBorder:pointerover">
+            <Setter Property="BorderBrush" Value="{StaticResource Neutral500}" />
+            <Setter Property="Background" Value="{StaticResource Neutral700}" />
+        </Style>
+        <Style Selector="Border#RootCardBorder.Enabled">
+            <Setter Property="BorderBrush" Value="{StaticResource Primary400}" />
+        </Style>
+        <Style Selector="Border#RootCardBorder.Enabled:pointerover">
+            <Setter Property="BorderBrush" Value="{StaticResource Primary400}" />
+            <Setter Property="Background" Value="{StaticResource Neutral800}" />
+        </Style>
+    </UserControl.Styles>
+    <Border x:Name="RootCardBorder" Classes.Enabled="{Binding Mod.IsEnabled}"
+            BorderThickness="1"
+            CornerRadius="8"
+            ClipToBounds="True" Margin="4" Height="134">
+        <Grid x:Name="CardSurface" RowDefinitions="80,52">
             <!-- Image area -->
-            <Border Background="{StaticResource Neutral700}" ClipToBounds="True">
+            <Border x:Name="ThumbnailHeader" Grid.Row="0" Background="{StaticResource Neutral700}" ClipToBounds="True">
                 <Panel>
-                    <Image Source="{Binding Preview.Image}" Stretch="UniformToFill" />
-                    <!-- Placeholder icon when no image is loaded -->
-                    <PathIcon IsVisible="{Binding Preview.ShowPlaceholder}"
-                              Data="{StaticResource CubesStacked}"
-                              Width="36" Height="36"
-                              Foreground="{StaticResource Neutral500}"
-                              HorizontalAlignment="Center" VerticalAlignment="Center" />
-                </Panel>
-            </Border>
-
-            <!-- Gradient overlay for the bottom area -->
-            <Border VerticalAlignment="Bottom" Height="100" IsHitTestVisible="False">
-                <Border.Background>
-                    <LinearGradientBrush StartPoint="0%,0%" EndPoint="0%,100%">
-                        <GradientStop Color="Transparent" Offset="0.0" />
-                        <GradientStop Color="{StaticResource Neutral900}" Offset="0.7" />
-                        <GradientStop Color="{StaticResource Neutral900}" Offset="1.0" />
-                    </LinearGradientBrush>
-                </Border.Background>
-            </Border>
-
-            <!-- Content -->
-            <Grid RowDefinitions="*, Auto, Auto">
-                <Border Width="34"
-                        Height="14"
-                        CornerRadius="3"
-                        Background="{StaticResource Danger500}"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Top"
-                        Margin="0,8,8,0"
-                        IsVisible="{Binding Mod.HasIncompatibleFiles}"
-                        ToolTip.Placement="Top">
+                    <Image x:Name="ThumbnailImage" Source="{Binding Preview.Image}" Stretch="UniformToFill" />
+                    <Image x:Name="DisabledThumbnailImage" Source="{Binding Preview.GrayscaleImage}"
+                           Stretch="UniformToFill" IsVisible="False" />
+                    <PathIcon x:Name="CompatibilityWarning" Data="{StaticResource WarningTip}"
+                              Width="16" Height="16" Foreground="{StaticResource Danger500}" Margin="8" HorizontalAlignment="Right" VerticalAlignment="Top"
+                              IsVisible="{Binding Mod.HasIncompatibleFiles}" ToolTip.Placement="Top">
                     <ToolTip.Tip>
                         <StackPanel MaxWidth="300">
                             <TextBlock Text="{x:Static patches:ModPatchCompatibilityText.IncompatibleTitle}"
@@ -56,23 +47,28 @@
                                        Foreground="{StaticResource Neutral100}" />
                         </StackPanel>
                     </ToolTip.Tip>
-                </Border>
-
-                <!-- Title -->
-                <TextBlock Grid.Row="1" Text="{Binding Mod.Title}" FontSize="13" FontWeight="SemiBold"
-                           Foreground="{StaticResource Neutral100}"
-                           TextTrimming="CharacterEllipsis"
-                           Margin="10,0,10,4" />
+                    </PathIcon>
+                    <!-- Placeholder icon when no image is loaded -->
+                    <PathIcon IsVisible="{Binding Preview.ShowPlaceholder}"
+                              Data="{StaticResource CubesStacked}"
+                              Width="36" Height="36"
+                              Foreground="{StaticResource Neutral500}"
+                              HorizontalAlignment="Center" VerticalAlignment="Center" />
+                </Panel>
+            </Border>
 
-                <!-- Bottom controls bar: Enabled switch + Priority -->
-                <Border Grid.Row="2" Padding="8,0,8,8">
-                    <Grid ColumnDefinitions="Auto, *, Auto">
-                        <CheckBox Grid.Column="0"
-                                  IsChecked="{Binding Mod.IsEnabled, Mode=TwoWay}"
-                                  Classes="SwitchDark"
-                                  VerticalAlignment="Center" />
+            <Border Grid.Row="1" x:Name="EnabledBackgroundGlow" CornerRadius="99999"
+                    HorizontalAlignment="Right" VerticalAlignment="Top" Height="70" Width="50"
+                    Background="{StaticResource Primary200}" Opacity="0.7" Effect="blur(130)"
+                    IsVisible="{Binding Mod.IsEnabled}" IsHitTestVisible="False" />
 
-                        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="4"
+            <!-- Fixed-height body keeps both enabled states and title lengths the same size. -->
+            <Grid x:Name="CardBody" Grid.Row="1" ColumnDefinitions="*,Auto" Margin="10,8">
+                <TextBlock x:Name="ModTitle" Text="{Binding Mod.Title}" FontSize="13" FontWeight="SemiBold"
+                           Foreground="{StaticResource Neutral100}" TextTrimming="CharacterEllipsis"
+                           TextWrapping="Wrap" MaxLines="2" LineHeight="18" Height="36"
+                           Margin="0,0,8,0" VerticalAlignment="Center" />
+                        <StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="4"
                                     VerticalAlignment="Center">
                             <TextBlock Text="#" FontSize="13"
                                        Foreground="{StaticResource Neutral500}"
@@ -99,16 +95,8 @@
                                 </TextBox.Styles>
                             </TextBox>
                         </StackPanel>
-                    </Grid>
-                </Border>
             </Grid>
         </Grid>
 
-        <!-- Hover effect -->
-        <Border.Styles>
-            <Style Selector="Border#RootCardBorder:pointerover">
-                <Setter Property="Background" Value="{StaticResource Neutral700}" />
-            </Style>
-        </Border.Styles>
     </Border>
 </UserControl>
diff --git a/WheelWizard/Features/Mods/Views/GridModPanel.axaml.cs b/WheelWizard/Features/Mods/Views/GridModPanel.axaml.cs
new file mode 100644
index 000000000..b828b4eeb
--- /dev/null
+++ b/WheelWizard/Features/Mods/Views/GridModPanel.axaml.cs
@@ -0,0 +1,136 @@
+using System.ComponentModel;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+using WheelWizard.Models.Mods;
+using WheelWizard.Mods.Views;
+
+namespace WheelWizard.Mods.Views;
+
+public partial class GridModPanel : UserControl
+{
+    private Mod? _observedMod;
+
+    public GridModPanel()
+    {
+        InitializeComponent();
+        DataContextChanged += OnDataContextChanged;
+        RootCardBorder.PointerEntered += (_, _) => UpdateThumbnail();
+        RootCardBorder.PointerExited += (_, _) => UpdateThumbnail();
+        CardSurface.SizeChanged += (_, _) => CardSurface.Clip = new RectangleGeometry(new Rect(CardSurface.Bounds.Size), 7, 7);
+        RootCardBorder.PointerPressed += OnCardPointerPressed;
+        RootCardBorder.PointerReleased += OnCardPointerReleased;
+        Focusable = true;
+        KeyDown += OnCardKeyDown;
+    }
+
+    private bool _cardPressed;
+
+    private static bool IsPriorityInput(object? source) =>
+        source is Visual visual && (visual is TextBox || visual.GetVisualAncestors().OfType<TextBox>().Any());
+
+    private void OnCardPointerPressed(object? sender, PointerPressedEventArgs e)
+    {
+        _cardPressed = e.GetCurrentPoint(RootCardBorder).Properties.IsLeftButtonPressed && !IsPriorityInput(e.Source);
+        if (_cardPressed)
+            Focus();
+    }
+
+    private void OnCardPointerReleased(object? sender, PointerReleasedEventArgs e)
+    {
+        var toggle =
+            _cardPressed && e.InitialPressMouseButton == MouseButton.Left && RootCardBorder.IsPointerOver && !IsPriorityInput(e.Source);
+        _cardPressed = false;
+        if (toggle && _observedMod != null)
+        {
+            _observedMod.IsEnabled = !_observedMod.IsEnabled;
+            e.Handled = true;
+        }
+    }
+
+    private void OnCardKeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.Space && !IsPriorityInput(e.Source) && _observedMod != null)
+        {
+            _observedMod.IsEnabled = !_observedMod.IsEnabled;
+            e.Handled = true;
+        }
+    }
+
+    private async void OnDataContextChanged(object? sender, EventArgs e)
+    {
+        if (_observedMod != null)
+            _observedMod.PropertyChanged -= OnModChanged;
+        _observedMod = (DataContext as ModListItem)?.Mod;
+        if (_observedMod != null)
+            _observedMod.PropertyChanged += OnModChanged;
+        UpdateThumbnail();
+        if (DataContext is ModListItem item)
+            await item.Preview.LoadAsync();
+    }
+
+    private void OnModChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(Mod.IsEnabled))
+            UpdateThumbnail();
+    }
+
+    private void UpdateThumbnail()
+    {
+        var gray = _observedMod is { IsEnabled: false } && !RootCardBorder.IsPointerOver;
+        DisabledThumbnailImage.IsVisible = gray;
+        ThumbnailImage.IsVisible = !gray;
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        if (_observedMod != null)
+            _observedMod.PropertyChanged -= OnModChanged;
+        base.OnDetachedFromVisualTree(e);
+    }
+
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        if (_observedMod != null)
+        {
+            _observedMod.PropertyChanged -= OnModChanged;
+            _observedMod.PropertyChanged += OnModChanged;
+        }
+        UpdateThumbnail();
+    }
+
+    private void PriorityText_OnLostFocus(object? sender, RoutedEventArgs e)
+    {
+        if (DataContext is not ModListItem item || e.Source is not TextBox textBox)
+            return;
+
+        textBox.Classes.Remove("error");
+        if (int.TryParse(textBox.Text, out var newPriority))
+            item.Mod.Priority = newPriority;
+        else
+            textBox.Text = item.Mod.Priority.ToString();
+    }
+
+    private void PriorityText_OnTextChanged(object? sender, TextChangedEventArgs e)
+    {
+        if (e.Source is not TextBox textBox)
+            return;
+
+        if (int.TryParse(textBox.Text, out _))
+            textBox.Classes.Remove("error");
+        else if (!textBox.Classes.Contains("error"))
+            textBox.Classes.Add("error");
+    }
+
+    private void PriorityText_OnKeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key != Key.Enter || sender is not TextBox)
+            return;
+
+        this.Focus();
+    }
+}
diff --git a/WheelWizard/Views/Patterns/ModBrowserListItem.axaml b/WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml
similarity index 88%
rename from WheelWizard/Views/Patterns/ModBrowserListItem.axaml
rename to WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml
index 95be38a97..48ca1194e 100644
--- a/WheelWizard/Views/Patterns/ModBrowserListItem.axaml
+++ b/WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml
@@ -1,35 +1,35 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:components="using:WheelWizard.Views.Components"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:mods="clr-namespace:WheelWizard.Mods.Views">
     <Design.PreviewWith>
         <StackPanel Spacing="6" Background="{StaticResource Neutral950}">
-            <patterns:ModBrowserListItem Width="294" Height="89"
+            <mods:ModBrowserListItem Width="294" Height="89"
                                            ModTitle="My Title"
                                            ModAuthor="Me"/>
             
-            <patterns:ModBrowserListItem Width="294" Height="89"
+            <mods:ModBrowserListItem Width="294" Height="89"
                                            ModTitle="Some other mod with quite a long title"
                                            UsesPatches="true"
                                            ModAuthor="somebody else with also a long name and the name"/>
             
-            <patterns:ModBrowserListItem Width="294" Height="89"
+            <mods:ModBrowserListItem Width="294" Height="89"
                                            ModTitle="Coolest mod ever made"
                                            ModAuthor="random guy"
                                            Classes="TestSelected"/> <!-- Dont use this class in the code, it servers no real usefull purpose -->
             
-            <patterns:ModBrowserListItem Width="294" Height="89"
+            <mods:ModBrowserListItem Width="294" Height="89"
                                            ModTitle="My Title"
                                            ModAuthor="Me"/>
             
-            <patterns:ModBrowserListItem Width="294" Height="89"
+            <mods:ModBrowserListItem Width="294" Height="89"
                                            ModTitle="LOADING"
                                            ModAuthor="LOADING"/>
         </StackPanel>
       
     </Design.PreviewWith>
 
-    <Style Selector="patterns|ModBrowserListItem">
+    <Style Selector="mods|ModBrowserListItem">
         <Setter Property="Template">
             <ControlTemplate>
                 <Border x:Name="PART_ModItemBorder"
@@ -88,14 +88,14 @@
                         <!-- Icon -->
                         <StackPanel Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Right"
                                     Orientation="Horizontal" Spacing="2" Margin="4">
-                            <components:StateBox Text="{TemplateBinding LikeCount}" TipText="Likes" 
+                            <components:StatusBadge Text="{TemplateBinding LikeCount}" TipText="Likes"
                                                  IconData="{StaticResource Heart}"
                                                  Margin="3" Variant="Dark"/>
-                            <components:StateBox Text="{TemplateBinding ViewCount}" TipText="Views" 
+                            <components:StatusBadge Text="{TemplateBinding ViewCount}" TipText="Views"
                                                  IconData="{StaticResource Eye}"
                                                  Margin="3" Variant="Dark"/>
                             <!-- Apparently its hard to get the downloads count without sending a request constantly
-                            <components:StateBox Text="{TemplateBinding DownloadCount}" TipText="Downloads" 
+                            <components:StatusBadge Text="{TemplateBinding DownloadCount}" TipText="Downloads"
                                                  IconData="{StaticResource Download}"
                                                  Margin="3" Variant="Dark"/> -->
                         </StackPanel>
@@ -128,18 +128,18 @@
                             <Style Selector="^ Border#PART_ImageBorder">
                                 <Setter Property="Background" Value="{StaticResource Neutral500}"/>
                             </Style>
-                            <Style Selector="^ components|StateBox">
+                            <Style Selector="^ components|StatusBadge">
                                 <Setter Property="Variant" Value="Default"/>
                             </Style>
                         </Style>
                         
-                        <Style Selector="ListBoxItem:selected Border#PART_ModItemBorder, patterns|ModBrowserListItem.TestSelected Border#PART_ModItemBorder">
+                        <Style Selector="ListBoxItem:selected Border#PART_ModItemBorder, mods|ModBrowserListItem.TestSelected Border#PART_ModItemBorder">
                             <Style Selector="^ Border#PART_OverlayBorder, ^ Border#PART_SelectedBlur">
                                 <Setter Property="IsVisible" Value="True"/>
                             </Style>
                         </Style>
 
-                        <Style Selector="patterns|ModBrowserListItem[UsesPatches=true] Border#PART_ModItemBorder">
+                        <Style Selector="mods|ModBrowserListItem[UsesPatches=true] Border#PART_ModItemBorder">
                             <Setter Property="Background" Value="#173726"/>
                             <Style Selector="^ Border#PART_ImageBorder">
                                 <Setter Property="Background" Value="#28503B"/>
@@ -149,7 +149,7 @@
                             </Style>
                         </Style>
                         
-                        <Style Selector="patterns|ModBrowserListItem[ModTitle=LOADING][ModAuthor=LOADING] Border#PART_ModItemBorder">
+                        <Style Selector="mods|ModBrowserListItem[ModTitle=LOADING][ModAuthor=LOADING] Border#PART_ModItemBorder">
                             <Style Selector="^ Border#PART_OverlayLoading">
                                 <Setter Property="IsVisible" Value="True"/>
                             </Style>
diff --git a/WheelWizard/Views/Patterns/ModBrowserListItem.axaml.cs b/WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Patterns/ModBrowserListItem.axaml.cs
rename to WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml.cs
index 9741d2acf..fe9ab9378 100644
--- a/WheelWizard/Views/Patterns/ModBrowserListItem.axaml.cs
+++ b/WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using WheelWizard.Views.ModManagement;
+using WheelWizard.Mods.ViewModels;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.Mods.Views;
 
 public class ModBrowserListItem : TemplatedControl
 {
diff --git a/WheelWizard/Views/Pages/ModsPage.axaml b/WheelWizard/Features/Mods/Views/ModsPage.axaml
similarity index 61%
rename from WheelWizard/Views/Pages/ModsPage.axaml
rename to WheelWizard/Features/Mods/Views/ModsPage.axaml
index 6a186c81a..84c9efc38 100644
--- a/WheelWizard/Views/Pages/ModsPage.axaml
+++ b/WheelWizard/Features/Mods/Views/ModsPage.axaml
@@ -4,15 +4,31 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
              xmlns:patches="clr-namespace:WheelWizard.Features.Patches"
              mc:Ignorable="d" d:DesignWidth="450" d:DesignHeight="876"
-             x:Class="WheelWizard.Views.Pages.ModsPage"
-             x:DataType="pages:ModsPage">
+             x:Class="WheelWizard.Mods.Views.ModsPage"
+             x:DataType="mods:ModsPage"
+        xmlns:mods="clr-namespace:WheelWizard.Mods.Views">
+    <UserControl.Styles>
+        <Style Selector="components|MultiIconRadioButton.ModView /template/ Path#Part_SingleIcon">
+            <Setter Property="Stroke" Value="{Binding Color1, RelativeSource={RelativeSource TemplatedParent}}" />
+            <Setter Property="StrokeThickness" Value="2" />
+            <Setter Property="StrokeLineCap" Value="Round" />
+            <Setter Property="StrokeJoin" Value="Round" />
+            <Setter Property="Fill" Value="Transparent" />
+        </Style>
+        <Style Selector="components|MultiIconRadioButton.ModView:pointerover /template/ Path#Part_SingleIcon">
+            <Setter Property="Stroke" Value="{StaticResource Neutral300}" />
+            <Setter Property="Fill" Value="Transparent" />
+        </Style>
+        <Style Selector="components|MultiIconRadioButton.ModView:checked /template/ Path#Part_SingleIcon">
+            <Setter Property="Stroke" Value="{StaticResource Primary400}" />
+            <Setter Property="Fill" Value="Transparent" />
+        </Style>
+    </UserControl.Styles>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="{StaticResource TopRowSize}" />
+            <RowDefinition Height="Auto" MinHeight="95" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
@@ -21,20 +37,44 @@
         <Border Grid.Row="1" Background="{StaticResource BackgroundLineColor}" Height="1"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" />
 
-        <TextBlock Grid.Row="0" Text="{Binding StoragePageTitle}"
-                   HorizontalAlignment="Left" VerticalAlignment="Bottom"
-                   Classes="PageTitleText" />
+        <StackPanel Grid.Row="0" Orientation="Vertical" VerticalAlignment="Bottom">
+            <CheckBox Classes="Switch" x:Name="EnableAllCheckbox"
+                      HorizontalAlignment="Left" VerticalAlignment="Center" Margin="3,6,0,0" IsVisible="{Binding HasMods}"
+                      Click="ToggleButton_OnIsCheckedChanged" Content="{loc:T action.enable_all}" />
+
+        <StackPanel Orientation="Horizontal" Spacing="8"
+                    HorizontalAlignment="Left" VerticalAlignment="Bottom">
+            <TextBlock Text="{Binding StoragePageTitle}" Classes="PageTitleText" />
+            <components:StatusBadge Text="0" IconSize="0" x:Name="ListItemCount"
+                                 VerticalAlignment="Center" />
+        </StackPanel>
+        </StackPanel>
 
         <StackPanel Grid.Row="0" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10,12"
                     Orientation="Vertical" x:Name="TopBarButtons" Spacing="3">
-            <StackPanel Orientation="Horizontal" Spacing="8" IsVisible="{Binding HasMods}">
-                <components:Button Variant="Primary" 
+            <Grid ColumnDefinitions="Auto,Auto" IsVisible="{Binding HasMods}">
+                <components:Button Grid.Column="0" Variant="Primary" Height="40" CornerRadius="6,0,0,6"
                                    Text="{loc:T action.browse}" IconData="{StaticResource Search}"
-                                   Click="BrowseMod_Click" HorizontalAlignment="Center" />
-                <components:Button Variant="Default"
-                                   IconData="{StaticResource FileImport}"
-                                   Click="ImportMod_Click" HorizontalAlignment="Center" />
-            </StackPanel>
+                                   Click="BrowseMod_Click" />
+                <components:Button x:Name="ModActionsButton" Grid.Column="1" Variant="Primary" Height="40"
+                                   IconData="{StaticResource ChevronDown}" IconSize="16"
+                                   Padding="10,10" CornerRadius="0,6,6,0"
+                                   AutomationProperties.Name="{loc:T action.browse}">
+                    <components:Button.Flyout>
+                        <MenuFlyout Placement="BottomEdgeAlignedRight">
+                            <MenuItem Header="{loc:T action.browse}" Click="BrowseMod_Click">
+                                <MenuItem.Icon><PathIcon Data="{StaticResource Search}" /></MenuItem.Icon>
+                            </MenuItem>
+                            <MenuItem Header="{loc:T action.import}" Click="ImportMod_Click">
+                                <MenuItem.Icon><PathIcon Data="{StaticResource FileImport}" /></MenuItem.Icon>
+                            </MenuItem>
+                        </MenuFlyout>
+                    </components:Button.Flyout>
+                </components:Button>
+                <Border Grid.Column="1" Width="1" Height="16" HorizontalAlignment="Left"
+                        VerticalAlignment="Center" Background="{StaticResource Primary50}"
+                        Opacity="0.25" IsHitTestVisible="False" />
+            </Grid>
         </StackPanel>
 
         <!-- Empty Mods Message -->
@@ -43,59 +83,35 @@
             <components:EmptyPageInfo Title="{loc:T empty_content.no_mods_title}"
                                       BodyText="{loc:T empty_content.no_mods}"
                                       HorizontalAlignment="Center" />
-            <UniformGrid Margin="0,12" Columns="2" Rows="1">
-                <components:Button Variant="Primary" Margin="3,0"
+            <Grid ColumnDefinitions="Auto,Auto" Margin="0,12" HorizontalAlignment="Center">
+                <components:Button Grid.Column="0" Variant="Primary" Height="40" CornerRadius="6,0,0,6"
                                    Text="{loc:T action.browse}" IconData="{StaticResource Search}"
-                                   Click="BrowseMod_Click" HorizontalAlignment="Stretch" />
-                <components:Button Variant="Default" Margin="3,0"
-                                   Text="{loc:T action.import}"
-                                   IconData="{StaticResource FileImport}"
-                                   Click="ImportMod_Click" HorizontalAlignment="Stretch" />
-            </UniformGrid>
+                                   Click="BrowseMod_Click" />
+                <components:Button x:Name="EmptyModActionsButton" Grid.Column="1" Variant="Primary" Height="40"
+                                   IconData="{StaticResource ChevronDown}" IconSize="16"
+                                   Padding="10,10" CornerRadius="0,6,6,0"
+                                   AutomationProperties.Name="{loc:T action.browse}">
+                    <components:Button.Flyout>
+                        <MenuFlyout Placement="BottomEdgeAlignedRight">
+                            <MenuItem Header="{loc:T action.browse}" Click="BrowseMod_Click">
+                                <MenuItem.Icon><PathIcon Data="{StaticResource Search}" /></MenuItem.Icon>
+                            </MenuItem>
+                            <MenuItem Header="{loc:T action.import}" Click="ImportMod_Click">
+                                <MenuItem.Icon><PathIcon Data="{StaticResource FileImport}" /></MenuItem.Icon>
+                            </MenuItem>
+                        </MenuFlyout>
+                    </components:Button.Flyout>
+                </components:Button>
+                <Border Grid.Column="1" Width="1" Height="16" HorizontalAlignment="Left"
+                        VerticalAlignment="Center" Background="{StaticResource Primary50}"
+                        Opacity="0.25" IsHitTestVisible="False" />
+            </Grid>
         </StackPanel>
 
-        <Grid Grid.Row="1" x:Name="PageWithMods" RowDefinitions="*, 12*" IsVisible="{Binding HasMods}">
-            <Grid Grid.Row="0" Margin="10,0">
-
-                <StackPanel HorizontalAlignment="Right" VerticalAlignment="Stretch" Grid.Column="0"
-                            Orientation="Horizontal">
-                    <CheckBox Classes="Switch" x:Name="EnableAllCheckbox"
-                              VerticalAlignment="Center" Margin="0,5,30,5"
-                              Click="ToggleButton_OnIsCheckedChanged"
-                              Content="{loc:T action.enable_all}" />
-
-                    <components:Button HorizontalAlignment="Right" VerticalAlignment="Center" IconSize="26"
-                                       Click="ToggleModsPageView_OnClick" x:Name="ToggleButton"
-                                       Padding="13,7">
-                        <components:Button.Styles>
-                            <!-- If the current Style is blocks, then the button should show the rows icon -->
-                            <Style Selector="components|Button.Blocks">
-                                <Setter Property="IconData" Value="{StaticResource TableBars}" />
-                            </Style>
-                            <Style Selector="components|Button">
-                                <Setter Property="IconData" Value="{StaticResource TableBlocks}" />
-                            </Style>
-                        </components:Button.Styles>
-                    </components:Button>
-                </StackPanel>
-
-                <!-- THIS IS A COOL IDEA, BUT IT HAS TO BE SUPPORTED FIRST
-             <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,6" HorizontalAlignment="Right">
-                 <components:FormFieldLabel Text="Sort by:" VerticalAlignment="Center"/>
-                 <ComboBox x:Name="SortByDropdown" MinWidth="160" VerticalAlignment="Top"
-                           SelectionChanged="SortByDropdown_OnSelectionChanged" />
-             </StackPanel> -->
-
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,6">
-                    <components:FormFieldLabel Text="Mods" />
-                    <components:StateBox Text="0" IconSize="0" x:Name="ListItemCount" />
-                </StackPanel>
-                <Border Background="{StaticResource BackgroundLineColor}" Height="1" HorizontalAlignment="Stretch"
-                        VerticalAlignment="Bottom" />
-            </Grid>
+        <Grid Grid.Row="1" x:Name="PageWithMods" RowDefinitions="Auto,*" IsVisible="{Binding HasMods}">
 
             <!-- Mods List (Blocks / arrow mode) -->
-            <ListBox Grid.Row="1" x:Name="ModsListBox" ItemsSource="{Binding Mods}" Margin="10,5">
+            <ListBox Grid.Row="1" x:Name="ModsListBox" ItemsSource="{Binding Mods}" Margin="10,5" Padding="0,0,0,68">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <Border Classes="BoxItemBackground" Height="50">
@@ -117,6 +133,7 @@
                                     <ColumnDefinition Width="30" />
                                     <ColumnDefinition Width="50" />
                                     <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
                                 <!-- Drag handle -->
@@ -131,38 +148,15 @@
                                           HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 <TextBlock Text="{Binding Mod.Title}" FontSize="14"
                                            Foreground="{StaticResource Neutral100}"
-                                           Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0" />
+                                           Grid.Column="2" VerticalAlignment="Center" Margin="10,0,8,0"
+                                           TextTrimming="CharacterEllipsis" TextWrapping="NoWrap" />
 
-                                <Border Width="34"
-                                        Height="14"
-                                        CornerRadius="3"
-                                        Background="{StaticResource Danger500}"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Top"
-                                        IsVisible="{Binding Mod.HasIncompatibleFiles}"
-                                        ToolTip.Placement="Top">
-                                    <ToolTip.Tip>
-                                        <StackPanel MaxWidth="300">
-                                            <TextBlock Text="{x:Static patches:ModPatchCompatibilityText.IncompatibleTitle}"
-                                                       FontWeight="Bold"
-                                                       Foreground="{StaticResource Neutral50}" />
-                                            <TextBlock Text="{x:Static patches:ModPatchCompatibilityText.IncompatibleMessage}"
-                                                       TextWrapping="Wrap"
-                                                       Foreground="{StaticResource Neutral100}" />
-                                        </StackPanel>
-                                    </ToolTip.Tip>
-                                </Border>
 
                                 <!-- Yes i know that it already works without any change event if we remove Mode=OneWay -->
                                 <!-- Removing that will make it so editing that will also edit the model -->
                                 <!-- however, it works really weird if you do that -->
-                                <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right"
+                                <StackPanel Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right"
                                             VerticalAlignment="Center">
-                                    <TextBlock Text="{loc:T attribute.priority}" FontSize="14"
-                                               Foreground="{StaticResource Neutral100}"
-                                               VerticalAlignment="Center" Margin="10,0,0,0" />
-                                    <TextBlock Text=": " FontSize="14" Foreground="{StaticResource Neutral100}"
-                                               VerticalAlignment="Center" />
                                     <TextBox Text="{Binding Mod.Priority, Mode=OneWay}" Classes="dark"
                                              TextChanged="PriorityText_OnTextChanged"
                                              LostFocus="PriorityText_OnLostFocus" Padding="0"
@@ -181,6 +175,22 @@
                                         </TextBox.Styles>
                                     </TextBox>
 
+                                    <Border Width="16" Margin="8,0" VerticalAlignment="Center">
+                                        <PathIcon Data="{StaticResource WarningTip}" Width="16" Height="16"
+                                                  Foreground="{StaticResource Danger500}"
+                                                  IsVisible="{Binding Mod.HasIncompatibleFiles}" ToolTip.Placement="Top">
+                                    <ToolTip.Tip>
+                                        <StackPanel MaxWidth="300">
+                                            <TextBlock Text="{x:Static patches:ModPatchCompatibilityText.IncompatibleTitle}"
+                                                       FontWeight="Bold"
+                                                       Foreground="{StaticResource Neutral50}" />
+                                            <TextBlock Text="{x:Static patches:ModPatchCompatibilityText.IncompatibleMessage}"
+                                                       TextWrapping="Wrap"
+                                                       Foreground="{StaticResource Neutral100}" />
+                                        </StackPanel>
+                                    </ToolTip.Tip>
+                                        </PathIcon>
+                                    </Border>
                                     <StackPanel Margin="10,0,0,0" Spacing="2" x:Name="VisibleWithBlocks">
                                         <components:Button HorizontalAlignment="Right"
                                                            IconData="{StaticResource ChevronUp}"
@@ -196,7 +206,7 @@
                                         <StackPanel.Styles>
                                             <Style
                                                 Selector="ListBoxItem Border.BoxItemBackground:pointerover components|Button">
-                                                <Setter Property="Variant" Value="UglyLight" />
+                                                <Setter Property="Variant" Value="Light" />
                                             </Style>
                                         </StackPanel.Styles>
                                     </StackPanel>
@@ -211,7 +221,7 @@
                                     </StackPanel.Styles>
                                 </StackPanel>
 
-                                <!-- <components:StateBox Grid.Column="1" IconSize="0" Text="{Binding Priority}"
+                                <!-- <components:StatusBadge Grid.Column="1" IconSize="0" Text="{Binding Priority}"
                                                   TipText="Priority" Variant="Dark" TipPlacement="Top"
                                                   HorizontalAlignment="Right" VerticalAlignment="Center" /> -->
                             </Grid>
@@ -224,7 +234,7 @@
             <ScrollViewer Grid.Row="1" x:Name="ModsGridView" IsVisible="False" Margin="10,5"
                           HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
                           VerticalContentAlignment="Top">
-                <ItemsControl ItemsSource="{Binding Mods}" VerticalAlignment="Top">
+                <ItemsControl ItemsSource="{Binding Mods}" VerticalAlignment="Top" Margin="0,0,0,68">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
                             <UniformGrid Columns="2" VerticalAlignment="Top" />
@@ -233,7 +243,7 @@
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <Border>
-                                <patterns:GridModPanel />
+                                <mods:GridModPanel />
                                 <Border.ContextMenu>
                                     <ContextMenu>
                                         <MenuItem Header="{loc:T action.rename}" Click="RenameMod_Click" />
@@ -252,6 +262,22 @@
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
             </ScrollViewer>
+            <Border Grid.Row="1" x:Name="ViewModeToggle" ZIndex="10" CornerRadius="6"
+                    Background="{StaticResource Neutral900}" Margin="0,0,12,12"
+                    HorizontalAlignment="Right" VerticalAlignment="Bottom">
+                <StackPanel Orientation="Horizontal" Spacing="6" Margin="6">
+                    <components:MultiIconRadioButton x:Name="GridViewButton" Classes="ModView"
+                        GroupName="ModsView" Width="40" Height="40" IconGeo="{StaticResource Grid2x2}"
+                        Color1="{StaticResource Neutral400}" HoverColor1="{StaticResource Neutral300}"
+                        SelectedColor1="{StaticResource Primary400}" AutomationProperties.Name="Grid view"
+                        IsCheckedChanged="ModsView_OnCheckedChanged" />
+                    <components:MultiIconRadioButton x:Name="ListViewButton" Classes="ModView"
+                        GroupName="ModsView" Width="40" Height="40" IconGeo="{StaticResource Rows3}"
+                        Color1="{StaticResource Neutral400}" HoverColor1="{StaticResource Neutral300}"
+                        SelectedColor1="{StaticResource Primary400}" AutomationProperties.Name="List view"
+                        IsCheckedChanged="ModsView_OnCheckedChanged" />
+                </StackPanel>
+            </Border>
         </Grid>
 
         <!-- Drag-and-drop overlay canvas -->
diff --git a/WheelWizard/Views/Pages/ModsPage.axaml.cs b/WheelWizard/Features/Mods/Views/ModsPage.axaml.cs
similarity index 96%
rename from WheelWizard/Views/Pages/ModsPage.axaml.cs
rename to WheelWizard/Features/Mods/Views/ModsPage.axaml.cs
index d9ecffb16..f445d4698 100644
--- a/WheelWizard/Views/Pages/ModsPage.axaml.cs
+++ b/WheelWizard/Features/Mods/Views/ModsPage.axaml.cs
@@ -10,15 +10,16 @@
 using WheelWizard.Features.Patches;
 using WheelWizard.Models.Mods;
 using WheelWizard.Mods;
+using WheelWizard.Mods.ViewModels;
+using WheelWizard.Mods.Views.Dialogs;
 using WheelWizard.Settings;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.ModManagement;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Popups.ModManagement;
-using WheelWizard.Views.Storage;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Mods.Views;
 
 public record ModListItem(Mod Mod, bool IsLowest, bool IsHighest, ModPreviewViewModel Preview);
 
@@ -377,7 +378,7 @@ private void PriorityText_OnTextChanged(object? sender, TextChangedEventArgs e)
         if (mod == null || e.Source is not TextBox textBox)
             return;
 
-        // We intentionally don't use the FeedbackTextBox here since that component is a bit to big for this use case.
+        // We intentionally don't use the TextField here since that component is a bit to big for this use case.
         if (int.TryParse(textBox.Text, out _))
             textBox.Classes.Remove("error");
         else if (!textBox.Classes.Contains("error"))
@@ -414,16 +415,20 @@ private async void ButtonDown_OnClick(object? sender, RoutedEventArgs e)
             MessageTranslationHelper.ShowMessage(priorityResult.Error);
     }
 
-    private void ToggleModsPageView_OnClick(object? sender, RoutedEventArgs e)
+    private void ModsView_OnCheckedChanged(object? sender, RoutedEventArgs e)
     {
-        var current = SettingsService.Get<bool>(SettingsService.PREFERS_MODS_ROW_VIEW);
-        SettingsService.Set(SettingsService.PREFERS_MODS_ROW_VIEW, !current);
+        if (sender is not RadioButton { IsChecked: true } button)
+            return;
+        var gridView = ReferenceEquals(button, GridViewButton);
+        if (SettingsService.Get<bool>(SettingsService.PREFERS_MODS_ROW_VIEW) == gridView)
+            return;
+        SettingsService.Set(SettingsService.PREFERS_MODS_ROW_VIEW, gridView);
         SetModsViewVariant();
     }
 
     private void SetModsViewVariant()
     {
-        Control[] elementsToSwapClasses = [ToggleButton, ModsListBox];
+        Control[] elementsToSwapClasses = [ModsListBox];
         var asRows = SettingsService.Get<bool>(SettingsService.PREFERS_MODS_ROW_VIEW);
 
         foreach (var elementToSwapClass in elementsToSwapClasses)
@@ -442,6 +447,8 @@ private void SetModsViewVariant()
         // Toggle between list view (Blocks/arrows mode) and grid view (Rows/priority text mode)
         ModsListBox.IsVisible = !asRows;
         ModsGridView.IsVisible = asRows;
+        GridViewButton.IsChecked = asRows;
+        ListViewButton.IsChecked = !asRows;
     }
 
     private void PriorityText_OnKeyDown(object? sender, KeyEventArgs e)
diff --git a/WheelWizard/Views/Recomp/RecompPresentation.cs b/WheelWizard/Features/Recomp/Presentation/RecompPresentation.cs
similarity index 97%
rename from WheelWizard/Views/Recomp/RecompPresentation.cs
rename to WheelWizard/Features/Recomp/Presentation/RecompPresentation.cs
index 0ed38a400..2fe3177f0 100644
--- a/WheelWizard/Views/Recomp/RecompPresentation.cs
+++ b/WheelWizard/Features/Recomp/Presentation/RecompPresentation.cs
@@ -1,7 +1,7 @@
 using WheelWizard.Recomp;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Recomp;
+namespace WheelWizard.Recomp.Presentation;
 
 public sealed class RecompPresentation : IRecompPresentation
 {
diff --git a/WheelWizard/Views/Patterns/PlayerListItem.axaml b/WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml
similarity index 88%
rename from WheelWizard/Views/Patterns/PlayerListItem.axaml
rename to WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml
index 5cb9fb66d..df80b6226 100644
--- a/WheelWizard/Views/Patterns/PlayerListItem.axaml
+++ b/WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml
@@ -3,12 +3,13 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:loc="clr-namespace:WheelWizard.Localization"
         xmlns:components="using:WheelWizard.Views.Components"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
         xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-        xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:communityControls="clr-namespace:WheelWizard.WheelWizardData.Views">
     <Design.PreviewWith>
         <StackPanel Background="{StaticResource Neutral950}">
-            <patterns:PlayerListItem Width="428" Height="124"
+            <rooms:PlayerListItem Width="428" Height="124"
                                        FriendCode="1234-5678-9012"
                                        UserName="Lum Patch"
                                        Vr="5000"
@@ -17,13 +18,13 @@
                                        IsTopPlayer="True"
                                        TopLabel="TOP 3" />
 
-            <patterns:PlayerListItem Width="428" Height="124"
+            <rooms:PlayerListItem Width="428" Height="124"
                                        FriendCode="1234-5678-9012"
                                        UserName="Someone Else"
                                        Vr="5000"
                                        HasBadges="True" />
 
-            <patterns:PlayerListItem Width="428" Height="124"
+            <rooms:PlayerListItem Width="428" Height="124"
                                        FriendCode="1234-5678-9012"
                                        UserName="WantToBeeMe"
                                        Vr="5000"
@@ -31,13 +32,13 @@
                                        IsTopPlayer="True"
                                        TopLabel="TOP 12" />
 
-            <patterns:PlayerListItem Width="428" Height="124"
+            <rooms:PlayerListItem Width="428" Height="124"
                                        FriendCode="1234-5678-9012"
                                        UserName="Random Guy"
                                        Vr="5000"
                                        HasBadges="False" />
 
-            <patterns:PlayerListItem Width="428" Height="124"
+            <rooms:PlayerListItem Width="428" Height="124"
                                        FriendCode="1234-5678-9012"
                                        UserName="Someone Else"
                                        Vr="5000"
@@ -45,14 +46,14 @@
         </StackPanel>
     </Design.PreviewWith>
 
-    <Style Selector="patterns|PlayerListItem">
+    <Style Selector="rooms|PlayerListItem">
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Classes="BoxItemBackground">
                     <Grid ColumnDefinitions="Auto,130,80,*">
                         <Border Grid.Column="0" CornerRadius="999999" ClipToBounds="True"
                                 Background="{StaticResource Neutral950}" Width="50" Height="50" Margin="0,3">
-                            <behaviorComponent:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                            <miiImages:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                                               LoadingColor="{StaticResource Neutral600}"
                                                               Mii="{TemplateBinding Mii}"
                                                               FallBackColor="{StaticResource Neutral600}"
@@ -87,7 +88,7 @@
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate x:DataType="domain:BadgeVariant">
-                                                <components:Badge Variant="{Binding}" Width="30" Height="30" />
+                                                <communityControls:CommunityBadge Variant="{Binding}" Width="30" Height="30" />
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
                                     </ItemsControl>
@@ -136,16 +137,16 @@
         </Setter>
     </Style>
 
-    <Style Selector="patterns|PlayerListItem /template/ Border#PART_TopLabelBadge">
+    <Style Selector="rooms|PlayerListItem /template/ Border#PART_TopLabelBadge">
         <Setter Property="Background" Value="{StaticResource Primary600}" />
         <Setter Property="BorderThickness" Value="0" />
     </Style>
 
-    <Style Selector="patterns|PlayerListItem /template/ TextBlock#PART_TopLabelText">
+    <Style Selector="rooms|PlayerListItem /template/ TextBlock#PART_TopLabelText">
         <Setter Property="Foreground" Value="White" />
     </Style>
 
-    <Style Selector="patterns|PlayerListItem[ShowJoinRoomButton=true][IsOnline=true] /template/ components|Button#PART_JoinRoomButton">
+    <Style Selector="rooms|PlayerListItem[ShowJoinRoomButton=true][IsOnline=true] /template/ components|Button#PART_JoinRoomButton">
         <Setter Property="IsVisible" Value="True" />
     </Style>
 </Styles>
diff --git a/WheelWizard/Views/Patterns/PlayerListItem.axaml.cs b/WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Patterns/PlayerListItem.axaml.cs
rename to WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml.cs
index a159cbb10..1320ce4b1 100644
--- a/WheelWizard/Views/Patterns/PlayerListItem.axaml.cs
+++ b/WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml.cs
@@ -2,10 +2,11 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Interactivity;
+using WheelWizard.Views.Components;
 using WheelWizard.WheelWizardData.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.RrRooms.Views;
 
 public class PlayerListItem : TemplatedControl
 {
diff --git a/WheelWizard/Views/Pages/RoomDetailsPage.axaml b/WheelWizard/Features/RrRooms/Views/RoomDetailsPage.axaml
similarity index 91%
rename from WheelWizard/Views/Pages/RoomDetailsPage.axaml
rename to WheelWizard/Features/RrRooms/Views/RoomDetailsPage.axaml
index 51e84e79a..f38ef6c0a 100644
--- a/WheelWizard/Views/Pages/RoomDetailsPage.axaml
+++ b/WheelWizard/Features/RrRooms/Views/RoomDetailsPage.axaml
@@ -5,10 +5,9 @@
              mc:Ignorable="d" d:DesignHeight="876" d:DesignWidth="456"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
-             x:Class="WheelWizard.Views.Pages.RoomDetailsPage"
-             x:DataType="pages:RoomDetailsPage">
+             x:Class="WheelWizard.RrRooms.Views.RoomDetailsPage"
+             x:DataType="rooms:RoomDetailsPage"
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="{StaticResource TopRowSize}" />
@@ -32,7 +31,7 @@
             </PathIcon.IsVisible>
         </PathIcon>
      
-        <components:IconLabelButton Grid.Row="0"
+        <components:LinkButton Grid.Row="0"
                                     IconData="{StaticResource ArrowLeft}"
                                     Text="{loc:T page_title.rooms}"
                                     Foreground="{StaticResource TitleTextColor}"
@@ -60,7 +59,7 @@
 
             <StackPanel Grid.Column="1" Grid.Row="1">
                 <components:FormFieldLabel Text="{loc:T attribute.average_room_vr}" Margin="0,0,2,0" />
-                <components:StateBox IconSize="0" Text="{Binding Room.AverageVr}" HorizontalAlignment="Left" />
+                <components:StatusBadge IconSize="0" Text="{Binding Room.AverageVr}" HorizontalAlignment="Left" />
             </StackPanel>
         </Grid>
 
@@ -73,7 +72,7 @@
                 </Grid>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,6">
                     <components:FormFieldLabel Text="{loc:T list_title.players}" />
-                    <components:StateBox Text="{Binding Room.PlayerCount}" IconSize="0" />
+                    <components:StatusBadge Text="{Binding Room.PlayerCount}" IconSize="0" />
                 </StackPanel>
                 <Border Background="{StaticResource BackgroundLineColor}" Height="1" HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom" />
@@ -87,7 +86,7 @@
                      SelectionChanged="PlayerView_SelectionChanged">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <patterns:PlayerListItem
+                        <rooms:PlayerListItem
                             UserName="{Binding Name}"
                             FriendCode="{Binding FriendCode}"
                             Vr="{Binding VrDisplay}"
diff --git a/WheelWizard/Views/Pages/RoomDetailsPage.axaml.cs b/WheelWizard/Features/RrRooms/Views/RoomDetailsPage.axaml.cs
similarity index 95%
rename from WheelWizard/Views/Pages/RoomDetailsPage.axaml.cs
rename to WheelWizard/Features/RrRooms/Views/RoomDetailsPage.axaml.cs
index 98ddee158..f341fa92c 100644
--- a/WheelWizard/Views/Pages/RoomDetailsPage.axaml.cs
+++ b/WheelWizard/Features/RrRooms/Views/RoomDetailsPage.axaml.cs
@@ -5,19 +5,22 @@
 using Avalonia.Interactivity;
 using WheelWizard.Models;
 using WheelWizard.Models.RRInfo;
+using WheelWizard.Mods.Views;
 using WheelWizard.RrRooms;
 using WheelWizard.Settings;
 using WheelWizard.Shared.Polling;
 using WheelWizard.Views.DesignTime;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.MiiManagement;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WheelWizardData;
+using WheelWizard.WheelWizardData.Views.Dialogs;
 using WheelWizard.WiiManagement.FriendCodes;
 using WheelWizard.WiiManagement.GameLicense;
 using WheelWizard.WiiManagement.MiiManagement;
+using WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.RrRooms.Views;
 
 public partial class RoomDetailsPage : UserControl, INotifyPropertyChanged, IPollingListener
 {
@@ -113,7 +116,7 @@ public void OnUpdate(ObservablePollingService sender)
         }
     }
 
-    private void GoBackClick(object? sender, EventArgs eventArgs) => Navigation.NavigateTo<RoomsPage>();
+    private void GoBackClick(object? sender, RoutedEventArgs eventArgs) => Navigation.NavigateTo<RoomsPage>();
 
     private void CopyFriendCode_OnClick(object sender, RoutedEventArgs e)
     {
diff --git a/WheelWizard/Views/Pages/RoomsPage.axaml b/WheelWizard/Features/RrRooms/Views/RoomsPage.axaml
similarity index 93%
rename from WheelWizard/Views/Pages/RoomsPage.axaml
rename to WheelWizard/Features/RrRooms/Views/RoomsPage.axaml
index 0a99c15b4..941f3cdad 100644
--- a/WheelWizard/Views/Pages/RoomsPage.axaml
+++ b/WheelWizard/Features/RrRooms/Views/RoomsPage.axaml
@@ -5,10 +5,10 @@
              mc:Ignorable="d" d:DesignWidth="656" d:DesignHeight="876"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
-             x:Class="WheelWizard.Views.Pages.RoomsPage"
-             x:DataType="pages:RoomsPage">
+             x:Class="WheelWizard.RrRooms.Views.RoomsPage"
+             x:DataType="rooms:RoomsPage"
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views"
+        xmlns:communityControls="clr-namespace:WheelWizard.WheelWizardData.Views">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="{StaticResource TopRowSize}" />
@@ -51,7 +51,7 @@
             <Grid Grid.Row="0">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,6">
                     <components:FormFieldLabel Text="{loc:T list_title.rooms}" />
-                    <components:MemeNumberState Text="0" IconSize="0" x:Name="RoomsListItemCount"
+                    <communityControls:CommunityCountBadge Text="0" IconSize="0" x:Name="RoomsListItemCount"
                                                 IconData="{StaticResource Dice}" />
                 </StackPanel>
                 <Border Background="{StaticResource BackgroundLineColor}" Height="1" HorizontalAlignment="Stretch"
@@ -101,7 +101,7 @@
                                                Margin="10,0,0,0" />
                                 </StackPanel>
 
-                                <components:StateBox Grid.Column="2" IconData="{StaticResource UserCouple}"
+                                <components:StatusBadge Grid.Column="2" IconData="{StaticResource UserCouple}"
                                                      Text="{Binding PlayerCount}" VerticalAlignment="Center"
                                                      Variant="Dark"
                                                      HorizontalAlignment="Right" Margin="0,0,10,0" />
@@ -126,7 +126,7 @@
             <Grid Grid.Row="0">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,6">
                     <components:FormFieldLabel Text="{loc:T list_title.players}" />
-                    <components:MemeNumberState Text="0" IconSize="0" x:Name="PlayerListItemCount" />
+                    <communityControls:CommunityCountBadge Text="0" IconSize="0" x:Name="PlayerListItemCount" />
                 </StackPanel>
                 <Border Background="{StaticResource BackgroundLineColor}" Height="1" HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom" />
@@ -140,7 +140,7 @@
                      SelectionChanged="PlayerView_SelectionChanged">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
-                        <patterns:PlayerListItem
+                        <rooms:PlayerListItem
                             UserName="{Binding Name}"
                             FriendCode="{Binding FriendCode}"
                             Vr="{Binding VrDisplay}"
diff --git a/WheelWizard/Views/Pages/RoomsPage.axaml.cs b/WheelWizard/Features/RrRooms/Views/RoomsPage.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Pages/RoomsPage.axaml.cs
rename to WheelWizard/Features/RrRooms/Views/RoomsPage.axaml.cs
index 58abff018..593f3704b 100644
--- a/WheelWizard/Views/Pages/RoomsPage.axaml.cs
+++ b/WheelWizard/Features/RrRooms/Views/RoomsPage.axaml.cs
@@ -5,10 +5,10 @@
 using WheelWizard.Models.RRInfo;
 using WheelWizard.RrRooms;
 using WheelWizard.Shared.Polling;
-using WheelWizard.Views.Navigation;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WheelWizardData;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.RrRooms.Views;
 
 public partial class RoomsPage : UserControl, INotifyPropertyChanged, IPollingListener
 {
diff --git a/WheelWizard/Views/Pages/Settings/AppInfo.axaml b/WheelWizard/Features/Settings/Views/AppInfo.axaml
similarity index 90%
rename from WheelWizard/Views/Pages/Settings/AppInfo.axaml
rename to WheelWizard/Features/Settings/Views/AppInfo.axaml
index 2f8539c5b..3896c77cb 100644
--- a/WheelWizard/Views/Pages/Settings/AppInfo.axaml
+++ b/WheelWizard/Features/Settings/Views/AppInfo.axaml
@@ -4,14 +4,15 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="444" d:DesignHeight="716"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             x:Class="WheelWizard.Views.Pages.Settings.AppInfo">
+             x:Class="WheelWizard.Settings.Views.AppInfo"
+        xmlns:communityControls="clr-namespace:WheelWizard.WheelWizardData.Views">
     <Grid>
         <StackPanel Margin="0,5,0,0">
             
             <!-- WHWZ DEVS -->
             <Border Classes="AboutBlockStyle" Margin="0,10,0,0">
                 <Grid ColumnDefinitions="60,*">
-                    <components:Badge Variant="WhWzDev" VerticalAlignment="Center" HorizontalAlignment="Left" 
+                    <communityControls:CommunityBadge Variant="WhWzDev" VerticalAlignment="Center" HorizontalAlignment="Left"
                                       Width="38" Height="38" Margin="1,0,0,0"/>
                     <Border Grid.Column="0" Classes="AboutBlockLineStyle" HorizontalAlignment="Right"/>
                     
@@ -27,7 +28,7 @@
             <!-- RR dEVS -->
             <Border Classes="AboutBlockStyle" Margin="0,10,0,0">
                 <Grid ColumnDefinitions="60,*">
-                    <components:Badge Variant="RrDev" VerticalAlignment="Center" HorizontalAlignment="Left" 
+                    <communityControls:CommunityBadge Variant="RrDev" VerticalAlignment="Center" HorizontalAlignment="Left"
                                       Width="38" Height="38" Margin="1,0,0,0"/>
                     <Border Grid.Column="0" Classes="AboutBlockLineStyle" HorizontalAlignment="Right"/>
                     
@@ -42,7 +43,7 @@
             <!-- TRANSLATORS -->
             <Border Classes="AboutBlockStyle" Margin="0,10,0,0">
                 <Grid ColumnDefinitions="60,*">
-                    <components:Badge Variant="Translator" VerticalAlignment="Center" HorizontalAlignment="Left" 
+                    <communityControls:CommunityBadge Variant="Translator" VerticalAlignment="Center" HorizontalAlignment="Left"
                                       Width="38" Height="38" Margin="1,0,0,0"/>
                     <Border Grid.Column="0" Classes="AboutBlockLineStyle" HorizontalAlignment="Right"/>
                     
@@ -71,7 +72,7 @@
                         <SelectableTextBlock Classes="TinyText" Text="Wheel Wizard uses the Roboto font. This Font Software is "/>
                         <StackPanel Orientation="Horizontal">
                             <SelectableTextBlock Classes="TinyText" Text="licensed under the"/>
-                            <components:IconLabelButton Text=" SIL Open Font License, Version 1.1" FontSize="12"
+                            <components:LinkButton Text=" SIL Open Font License, Version 1.1" FontSize="12"
                                                         Foreground="{StaticResource Primary300}"
                                                         HoverForeground="{StaticResource Primary200}"
                                                         IsUnderlined="True"  Tag="https://openfontlicense.org/open-font-license-official-text/" 
@@ -81,7 +82,7 @@
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
                             <SelectableTextBlock Classes="TinyText" Text="Copyright 2011 The Roboto Project Authors ("/>
-                            <components:IconLabelButton Text="source code" FontSize="12"
+                            <components:LinkButton Text="source code" FontSize="12"
                                                         Foreground="{StaticResource Primary300}"
                                                         HoverForeground="{StaticResource Primary200}"
                                                         IsUnderlined="True" Tag="https://github.com/googlefonts/roboto-classic" 
@@ -107,7 +108,7 @@
                        
                         <StackPanel Orientation="Horizontal">
                             <SelectableTextBlock Classes="TinyText" Text="Wheel Wizard uses icons from" />
-                            <components:IconLabelButton Text=" Game Icons" FontSize="12"
+                            <components:LinkButton Text=" Game Icons" FontSize="12"
                                                         Foreground="{StaticResource Primary300}"
                                                         HoverForeground="{StaticResource Primary200}"
                                                         IsUnderlined="True"  Tag="https://game-icons.net/about.html" 
@@ -116,14 +117,14 @@
                             <SelectableTextBlock Classes="TinyText" Text=". Specifically the"/>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <components:IconLabelButton Text=" Car Wheel icon" FontSize="12"
+                            <components:LinkButton Text=" Car Wheel icon" FontSize="12"
                                                         Foreground="{StaticResource Primary300}"
                                                         HoverForeground="{StaticResource Primary200}"
                                                         IsUnderlined="True"  Tag="https://game-icons.net/1x1/delapouite/car-wheel.html" 
                                                         Click="OpenLick_OnClick"
                             />
                             <SelectableTextBlock Classes="TinyText" Text=" and the" />
-                            <components:IconLabelButton Text=" Flat Tire icon" FontSize="12"
+                            <components:LinkButton Text=" Flat Tire icon" FontSize="12"
                                                         Foreground="{StaticResource Primary300}"
                                                         HoverForeground="{StaticResource Primary200}"
                                                         IsUnderlined="True"  Tag="https://game-icons.net/1x1/delapouite/flat-tire.html" 
diff --git a/WheelWizard/Views/Pages/Settings/AppInfo.axaml.cs b/WheelWizard/Features/Settings/Views/AppInfo.axaml.cs
similarity index 91%
rename from WheelWizard/Views/Pages/Settings/AppInfo.axaml.cs
rename to WheelWizard/Features/Settings/Views/AppInfo.axaml.cs
index 36007b37f..0edb80e51 100644
--- a/WheelWizard/Views/Pages/Settings/AppInfo.axaml.cs
+++ b/WheelWizard/Features/Settings/Views/AppInfo.axaml.cs
@@ -1,10 +1,12 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 using WheelWizard.Branding;
 using WheelWizard.CustomDistributions;
 using WheelWizard.Shared;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Pages.Settings;
+namespace WheelWizard.Settings.Views;
 
 public partial class AppInfo : UserControl
 {
@@ -37,7 +39,7 @@ IBrandingSingletonService brandingSingletonService
         ReleaseText.Text = $"{part1} - {part2}";
     }
 
-    private void OpenLick_OnClick(object? sender, EventArgs e)
+    private void OpenLick_OnClick(object? sender, RoutedEventArgs e)
     {
         if (sender is not TemplatedControl control)
             return;
diff --git a/WheelWizard/Views/Pages/Settings/OtherSettings.axaml b/WheelWizard/Features/Settings/Views/OtherSettings.axaml
similarity index 97%
rename from WheelWizard/Views/Pages/Settings/OtherSettings.axaml
rename to WheelWizard/Features/Settings/Views/OtherSettings.axaml
index 731e2c880..8f4311c95 100644
--- a/WheelWizard/Views/Pages/Settings/OtherSettings.axaml
+++ b/WheelWizard/Features/Settings/Views/OtherSettings.axaml
@@ -5,7 +5,7 @@
              mc:Ignorable="d" d:DesignWidth="444" d:DesignHeight="831"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components1="clr-namespace:WheelWizard.Views.Components"
-             x:Class="WheelWizard.Views.Pages.Settings.OtherSettings">
+             x:Class="WheelWizard.Settings.Views.OtherSettings">
 
     <Grid x:Name="DolphinBorder">
         <StackPanel Margin="0,15,0,0">
@@ -73,7 +73,7 @@
                         <components1:Button Grid.Column="1"
                                             x:Name="DolphinReinstallButton"
                                             Variant="Warning"
-                                            ButtonSize="Compact"
+                                            Size="Compact"
                                             IsEnabled="True"
                                             IconData="{StaticResource Download}"
                                             Text="{loc:T option.reinstall}"
@@ -99,7 +99,7 @@
                         <components1:Button Grid.Column="1"
                                             x:Name="OpenGameFolderButton"
                                             Variant="Default"
-                                            ButtonSize="Compact"
+                                            Size="Compact"
                                             IsEnabled="True"
                                             IconData="{StaticResource Folder}"
                                             Text="{loc:T action.open}"
@@ -119,7 +119,7 @@
                         <components1:Button Grid.Column="1"
                                             x:Name="OpenSaveFolderButton"
                                             Variant="Default"
-                                            ButtonSize="Compact"
+                                            Size="Compact"
                                             IsEnabled="True"
                                             IconData="{StaticResource Folder}"
                                             Text="{loc:T action.open}"
diff --git a/WheelWizard/Views/Pages/Settings/OtherSettings.axaml.cs b/WheelWizard/Features/Settings/Views/OtherSettings.axaml.cs
similarity index 96%
rename from WheelWizard/Views/Pages/Settings/OtherSettings.axaml.cs
rename to WheelWizard/Features/Settings/Views/OtherSettings.axaml.cs
index d42a0cf47..a10332d4e 100644
--- a/WheelWizard/Views/Pages/Settings/OtherSettings.axaml.cs
+++ b/WheelWizard/Features/Settings/Views/OtherSettings.axaml.cs
@@ -1,14 +1,14 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using WheelWizard.CustomDistributions;
+using WheelWizard.CustomDistributions.Presentation;
 using WheelWizard.Recomp;
 using WheelWizard.Settings;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Distributions;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Storage;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages.Settings;
+namespace WheelWizard.Settings.Views;
 
 public partial class OtherSettings : UserControl
 {
diff --git a/WheelWizard/Views/Pages/Settings/RecompSettings.axaml b/WheelWizard/Features/Settings/Views/RecompSettings.axaml
similarity index 98%
rename from WheelWizard/Views/Pages/Settings/RecompSettings.axaml
rename to WheelWizard/Features/Settings/Views/RecompSettings.axaml
index d502eb800..6f2e8a271 100644
--- a/WheelWizard/Views/Pages/Settings/RecompSettings.axaml
+++ b/WheelWizard/Features/Settings/Views/RecompSettings.axaml
@@ -5,7 +5,7 @@
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="444" d:DesignHeight="716"
-             x:Class="WheelWizard.Views.Pages.Settings.RecompSettings">
+             x:Class="WheelWizard.Settings.Views.RecompSettings">
     <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
         <StackPanel Margin="0,15,0,0">
             <Grid Margin="0,-10,0,10" MinHeight="40" x:Name="NotInstalledText" IsVisible="False">
@@ -173,7 +173,7 @@
                         <components:Button Grid.Column="1"
                                            x:Name="CloneDolphinDataButton"
                                            Variant="Default"
-                                           ButtonSize="Compact"
+                                           Size="Compact"
                                            Text="{loc:T action.clone}"
                                            IconData="{StaticResource Duplicate}"
                                            HorizontalAlignment="Right"
@@ -198,7 +198,7 @@
                         <components:Button Grid.Column="1"
                                            x:Name="OpenInstallFolder"
                                            Variant="Default"
-                                           ButtonSize="Compact"
+                                           Size="Compact"
                                            IconData="{StaticResource Folder}"
                                            Text="{loc:T action.open}"
                                            HorizontalAlignment="Right"
@@ -223,7 +223,7 @@
                         <components:Button Grid.Column="1"
                                            x:Name="UninstallButton"
                                            Variant="Danger"
-                                           ButtonSize="Compact"
+                                           Size="Compact"
                                            IconData="{StaticResource Trash}"
                                            Text="{loc:T action.un_install}"
                                            HorizontalAlignment="Right"
diff --git a/WheelWizard/Views/Pages/Settings/RecompSettings.axaml.cs b/WheelWizard/Features/Settings/Views/RecompSettings.axaml.cs
similarity index 96%
rename from WheelWizard/Views/Pages/Settings/RecompSettings.axaml.cs
rename to WheelWizard/Features/Settings/Views/RecompSettings.axaml.cs
index cada035a6..8a128ac9d 100644
--- a/WheelWizard/Views/Pages/Settings/RecompSettings.axaml.cs
+++ b/WheelWizard/Features/Settings/Views/RecompSettings.axaml.cs
@@ -2,11 +2,13 @@
 using Avalonia.Interactivity;
 using WheelWizard.Recomp;
 using WheelWizard.Settings;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Storage;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Pages.Settings;
+namespace WheelWizard.Settings.Views;
 
 public partial class RecompSettings : UserControl
 {
@@ -224,10 +226,7 @@ private async void ShareDolphinData_OnChanged(object? sender, RoutedEventArgs e)
             .SetMainText(t("question.recomp_share_dolphin_data.title"))
             .SetExtraText(t("question.recomp_share_dolphin_data.extra"))
             .SetButtonText(t("action.recomp_nand_share"), t("action.cancel"))
-            .SetButtonVariants(
-                WheelWizard.Views.Components.Button.ButtonsVariantType.Warning,
-                WheelWizard.Views.Components.Button.ButtonsVariantType.Default
-            )
+            .SetButtonVariants(WheelWizard.Views.Components.ButtonVariant.Warning, WheelWizard.Views.Components.ButtonVariant.Default)
             .AwaitAnswer();
         if (!confirmed)
         {
@@ -276,10 +275,7 @@ private async void CloneDolphinData_OnClick(object? sender, RoutedEventArgs e)
                 .SetMainText(t("question.recomp_overwrite_dolphin_clone.title"))
                 .SetExtraText(t("question.recomp_overwrite_dolphin_clone.extra"))
                 .SetButtonText(t("action.clone"), t("action.cancel"))
-                .SetButtonVariants(
-                    WheelWizard.Views.Components.Button.ButtonsVariantType.Warning,
-                    WheelWizard.Views.Components.Button.ButtonsVariantType.Default
-                )
+                .SetButtonVariants(WheelWizard.Views.Components.ButtonVariant.Warning, WheelWizard.Views.Components.ButtonVariant.Default)
                 .AwaitAnswer();
             if (!overwrite)
                 return;
diff --git a/WheelWizard/Views/Pages/Settings/SettingsEditing.cs b/WheelWizard/Features/Settings/Views/SettingsEditing.cs
similarity index 92%
rename from WheelWizard/Views/Pages/Settings/SettingsEditing.cs
rename to WheelWizard/Features/Settings/Views/SettingsEditing.cs
index 7d4243949..8ad9725b8 100644
--- a/WheelWizard/Views/Pages/Settings/SettingsEditing.cs
+++ b/WheelWizard/Features/Settings/Views/SettingsEditing.cs
@@ -2,7 +2,7 @@
 using WheelWizard.Settings.Types;
 using WheelWizard.Shared.MessageTranslations;
 
-namespace WheelWizard.Views.Pages.Settings;
+namespace WheelWizard.Settings.Views;
 
 internal static class SettingsEditing
 {
diff --git a/WheelWizard/Views/Pages/SettingsPage.axaml b/WheelWizard/Features/Settings/Views/SettingsPage.axaml
similarity index 97%
rename from WheelWizard/Views/Pages/SettingsPage.axaml
rename to WheelWizard/Features/Settings/Views/SettingsPage.axaml
index cda7ad5d9..33d4dc3e0 100644
--- a/WheelWizard/Views/Pages/SettingsPage.axaml
+++ b/WheelWizard/Features/Settings/Views/SettingsPage.axaml
@@ -5,7 +5,7 @@
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="656" d:DesignHeight="876"
-             x:Class="WheelWizard.Views.Pages.SettingsPage">
+             x:Class="WheelWizard.Settings.Views.SettingsPage">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="{StaticResource TopRowSize}" />
diff --git a/WheelWizard/Views/Pages/SettingsPage.axaml.cs b/WheelWizard/Features/Settings/Views/SettingsPage.axaml.cs
similarity index 95%
rename from WheelWizard/Views/Pages/SettingsPage.axaml.cs
rename to WheelWizard/Features/Settings/Views/SettingsPage.axaml.cs
index 3191baa6a..941bb2986 100644
--- a/WheelWizard/Views/Pages/SettingsPage.axaml.cs
+++ b/WheelWizard/Features/Settings/Views/SettingsPage.axaml.cs
@@ -1,12 +1,13 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using WheelWizard.Settings;
+using WheelWizard.Settings.Views;
 using WheelWizard.Shared;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages.Settings;
-using WheelWizard.Views.Popups;
+using WheelWizard.Views.DesignTime;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell.Navigation;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Settings.Views;
 
 public partial class SettingsPage : UserControl
 {
diff --git a/WheelWizard/Views/Pages/Settings/VideoSettings.axaml b/WheelWizard/Features/Settings/Views/VideoSettings.axaml
similarity index 98%
rename from WheelWizard/Views/Pages/Settings/VideoSettings.axaml
rename to WheelWizard/Features/Settings/Views/VideoSettings.axaml
index 24d3da8b9..4e4d243e6 100644
--- a/WheelWizard/Views/Pages/Settings/VideoSettings.axaml
+++ b/WheelWizard/Features/Settings/Views/VideoSettings.axaml
@@ -3,10 +3,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="444" d:DesignHeight="716"
-             xmlns:settings="clr-namespace:WheelWizard.Views.Pages.Settings"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components1="clr-namespace:WheelWizard.Views.Components"
-             x:Class="WheelWizard.Views.Pages.Settings.VideoSettings">
+             x:Class="WheelWizard.Settings.Views.VideoSettings">
     
     <Grid x:Name="VideoBorder">
         <StackPanel Margin="0,15,0,0">
diff --git a/WheelWizard/Views/Pages/Settings/VideoSettings.axaml.cs b/WheelWizard/Features/Settings/Views/VideoSettings.axaml.cs
similarity index 99%
rename from WheelWizard/Views/Pages/Settings/VideoSettings.axaml.cs
rename to WheelWizard/Features/Settings/Views/VideoSettings.axaml.cs
index d7bee432d..c8711eac0 100644
--- a/WheelWizard/Views/Pages/Settings/VideoSettings.axaml.cs
+++ b/WheelWizard/Features/Settings/Views/VideoSettings.axaml.cs
@@ -4,7 +4,7 @@
 using WheelWizard.Settings.Types;
 using WheelWizard.Shared.MessageTranslations;
 
-namespace WheelWizard.Views.Pages.Settings;
+namespace WheelWizard.Settings.Views;
 
 public partial class VideoSettings : UserControl
 {
diff --git a/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml b/WheelWizard/Features/Settings/Views/WhWzSettings.axaml
similarity index 96%
rename from WheelWizard/Views/Pages/Settings/WhWzSettings.axaml
rename to WheelWizard/Features/Settings/Views/WhWzSettings.axaml
index a3baeef07..9547f40f7 100644
--- a/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml
+++ b/WheelWizard/Features/Settings/Views/WhWzSettings.axaml
@@ -5,7 +5,7 @@
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components1="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="444" d:DesignHeight="716"
-             x:Class="WheelWizard.Views.Pages.Settings.WhWzSettings">
+             x:Class="WheelWizard.Settings.Views.WhWzSettings">
 
     <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
         <StackPanel>
@@ -52,7 +52,7 @@
                             <components1:Button Grid.Column="2"
                                                 x:Name="DolphinExecutableChangeButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text="{loc:T action.change}"
                                                 IconData="{StaticResource Pen}"
                                                 VerticalAlignment="Center"
@@ -60,7 +60,7 @@
                             <components1:Button Grid.Column="3"
                                                 x:Name="DolphinExecutableOpenButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text=""
                                                 IconData="{StaticResource Folder}"
                                                 ToolTip.Tip="{loc:T action.open}"
@@ -101,7 +101,7 @@
                             <components1:Button Grid.Column="2"
                                                 x:Name="GameLocationChangeButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text="{loc:T action.change}"
                                                 IconData="{StaticResource Pen}"
                                                 VerticalAlignment="Center"
@@ -109,7 +109,7 @@
                             <components1:Button Grid.Column="3"
                                                 x:Name="GameLocationOpenButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text=""
                                                 IconData="{StaticResource Folder}"
                                                 ToolTip.Tip="{loc:T action.open}"
@@ -148,7 +148,7 @@
                             <components1:Button Grid.Column="2"
                                                 x:Name="DolphinUserFolderChangeButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text="{loc:T action.change}"
                                                 IconData="{StaticResource Pen}"
                                                 VerticalAlignment="Center"
@@ -156,7 +156,7 @@
                             <components1:Button Grid.Column="3"
                                                 x:Name="DolphinUserFolderOpenButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text=""
                                                 IconData="{StaticResource Folder}"
                                                 ToolTip.Tip="{loc:T action.open}"
@@ -187,7 +187,7 @@
                         <components1:Button Grid.Column="1"
                                                 x:Name="AppDataLocationChangeButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text="{loc:T action.change}"
                                                 IconData="{StaticResource Pen}"
                                                 VerticalAlignment="Center"
@@ -195,7 +195,7 @@
                         <components1:Button Grid.Column="2"
                                                 x:Name="AppDataLocationOpenButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text=""
                                                 IconData="{StaticResource Folder}"
                                                 ToolTip.Tip="{loc:T action.open}"
@@ -207,7 +207,7 @@
                         <components1:Button Grid.Column="3"
                                                 x:Name="AppDataLocationResetButton"
                                                 Variant="Default"
-                                                ButtonSize="Compact"
+                                                Size="Compact"
                                                 Text=""
                                                 IconData="{StaticResource Refresh}"
                                                 ToolTip.Tip="{loc:T option.reset_data_folder}"
diff --git a/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs b/WheelWizard/Features/Settings/Views/WhWzSettings.axaml.cs
similarity index 99%
rename from WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs
rename to WheelWizard/Features/Settings/Views/WhWzSettings.axaml.cs
index 2dffb65b2..a9f701dba 100644
--- a/WheelWizard/Views/Pages/Settings/WhWzSettings.axaml.cs
+++ b/WheelWizard/Features/Settings/Views/WhWzSettings.axaml.cs
@@ -9,14 +9,16 @@
 using WheelWizard.Dolphin.Paths;
 using WheelWizard.Settings;
 using WheelWizard.Settings.Types;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.IO;
 using WheelWizard.Shared.MessageTranslations;
 using WheelWizard.Shared.Processes;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Storage;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 using SettingsButton = WheelWizard.Views.Components.Button;
 
-namespace WheelWizard.Views.Pages.Settings;
+namespace WheelWizard.Settings.Views;
 
 public partial class WhWzSettings : UserControl
 {
@@ -437,7 +439,7 @@ private static void SetLocationRowState(PathIcon completeIcon, PathIcon warningI
     {
         completeIcon.IsVisible = isValid;
         warningIcon.IsVisible = !isValid;
-        changeButton.Variant = isValid ? SettingsButton.ButtonsVariantType.Default : SettingsButton.ButtonsVariantType.Warning;
+        changeButton.Variant = isValid ? ButtonVariant.Default : ButtonVariant.Warning;
     }
 
     private static bool CanOpenContainingFolder(string filePath)
diff --git a/WheelWizard/Views/Patterns/VrHistoryViewModel.cs b/WheelWizard/Features/WheelWizardData/ViewModels/VrHistoryViewModel.cs
similarity index 98%
rename from WheelWizard/Views/Patterns/VrHistoryViewModel.cs
rename to WheelWizard/Features/WheelWizardData/ViewModels/VrHistoryViewModel.cs
index 8c545d184..dfe11f18f 100644
--- a/WheelWizard/Views/Patterns/VrHistoryViewModel.cs
+++ b/WheelWizard/Features/WheelWizardData/ViewModels/VrHistoryViewModel.cs
@@ -2,7 +2,7 @@
 using WheelWizard.RrRooms;
 using WheelWizard.Shared.Services;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.WheelWizardData.ViewModels;
 
 public sealed class VrHistoryViewModel(IApiCaller<IRwfcApi> apiCaller) : INotifyPropertyChanged, IDisposable
 {
diff --git a/WheelWizard/Views/Components/Badge.axaml b/WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml
similarity index 87%
rename from WheelWizard/Views/Components/Badge.axaml
rename to WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml
index 144ef696c..cc33bd95b 100644
--- a/WheelWizard/Views/Components/Badge.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml
@@ -1,43 +1,44 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:WheelWizard.Views.Components">
+        xmlns:controls="using:WheelWizard.Views.Components"
+        xmlns:communityControls="clr-namespace:WheelWizard.WheelWizardData.Views">
     <Design.PreviewWith>
         <Border Padding="2" Background="{StaticResource Neutral950}">
             <UniformGrid Columns="4">
                 <!-- Just so you know, the border is not necessary, its just here to also show the bounding box-->
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="WhWzDev" />
+                    <communityControls:CommunityBadge Variant="WhWzDev" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="RrDev" />
+                    <communityControls:CommunityBadge Variant="RrDev" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="Translator" />
+                    <communityControls:CommunityBadge Variant="Translator" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="TranslatorLead" />
+                    <communityControls:CommunityBadge Variant="TranslatorLead" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="Heart" />
+                    <communityControls:CommunityBadge Variant="Heart" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="Firestarter_GoldWinner" />
+                    <communityControls:CommunityBadge Variant="Firestarter_GoldWinner" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="Firestarter_SilverWinner" />
+                    <communityControls:CommunityBadge Variant="Firestarter_SilverWinner" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="Firestarter_BronzeWinner" />
+                    <communityControls:CommunityBadge Variant="Firestarter_BronzeWinner" />
                 </Border>
 
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="SummitShowdown_GoldWinner" />
+                    <communityControls:CommunityBadge Variant="SummitShowdown_GoldWinner" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="SummitShowdown_SilverWinner" />
+                    <communityControls:CommunityBadge Variant="SummitShowdown_SilverWinner" />
                 </Border>
                 <Border Width="31" Height="31" Margin="5" CornerRadius="999" Background="{StaticResource Neutral900}">
-                    <controls:Badge Variant="SummitShowdown_BronzeWinner" />
+                    <communityControls:CommunityBadge Variant="SummitShowdown_BronzeWinner" />
                 </Border>
             </UniformGrid>
         </Border>
@@ -53,7 +54,7 @@
         - LOOK OUT WITH USING UNIFORM STRETCH, IT WORKS BAD, DON'T TOUCH THE AWARDS, they are made with uniform stretch lol, and they work but they can fall apart easily
     -->
 
-    <Style Selector="controls|Badge">
+    <Style Selector="communityControls|CommunityBadge">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid>
@@ -69,7 +70,7 @@
         </Style>
     </Style>
 
-    <Style Selector="controls|Badge.WhWzDev">
+    <Style Selector="communityControls|CommunityBadge[Variant=WhWzDev]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*,1*,10*,1*,1*" ColumnDefinitions="1*,1*,10*,1*,1*">
@@ -88,7 +89,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.RrDev">
+    <Style Selector="communityControls|CommunityBadge[Variant=RrDev]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*,1*,10*,1*,1*" ColumnDefinitions="1*,1*,10*,1*,1*">
@@ -107,7 +108,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.TranslatorLead">
+    <Style Selector="communityControls|CommunityBadge[Variant=TranslatorLead]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*,1*,10*,1*,1*" ColumnDefinitions="1*,1*,10*,1*,1*">
@@ -138,7 +139,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.Translator">
+    <Style Selector="communityControls|CommunityBadge[Variant=Translator]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*,1*,10*,1*,1*" ColumnDefinitions="1*,1*,10*,1*,1*">
@@ -157,7 +158,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.Heart">
+    <Style Selector="communityControls|CommunityBadge[Variant=Heart]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*,1*,10*,1*,1*" ColumnDefinitions="1*,1*,10*,1*,1*">
@@ -178,7 +179,7 @@
     </Style>
 
     <!-- FIRESTARTER BADGES -->
-    <Style Selector="controls|Badge.Firestarter_GoldWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=Firestarter_GoldWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -199,7 +200,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.Firestarter_SilverWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=Firestarter_SilverWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -220,7 +221,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.Firestarter_BronzeWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=Firestarter_BronzeWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -241,7 +242,7 @@
     </Style>
    
     <!-- SUMMIT SHOWDOWN BADGES -->
-    <Style Selector="controls|Badge.SummitShowdown_GoldWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=SummitShowdown_GoldWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -262,7 +263,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.SummitShowdown_SilverWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=SummitShowdown_SilverWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -283,7 +284,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="controls|Badge.SummitShowdown_BronzeWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=SummitShowdown_BronzeWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -303,7 +304,7 @@
         </Setter>
     </Style>
         <!-- LEAFSTRUCK BADGES -->
-    <Style Selector="controls|Badge.Leafstruck_GoldWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=Leafstruck_GoldWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -324,7 +325,7 @@
         </Setter>
     </Style>
     
-    <Style Selector="controls|Badge.Leafstruck_SilverWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=Leafstruck_SilverWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
@@ -345,7 +346,7 @@
         </Setter>
     </Style>
     
-    <Style Selector="controls|Badge.Leafstruck_BronzeWinner">
+    <Style Selector="communityControls|CommunityBadge[Variant=Leafstruck_BronzeWinner]">
         <Setter Property="Template">
             <ControlTemplate>
                 <Grid RowDefinitions="1*, 2*, 2*" ColumnDefinitions="1*, 2*, 1*">
diff --git a/WheelWizard/Views/Components/Badge.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml.cs
similarity index 74%
rename from WheelWizard/Views/Components/Badge.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml.cs
index 704643081..d947cbd57 100644
--- a/WheelWizard/Views/Components/Badge.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml.cs
@@ -1,12 +1,12 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls.Primitives;
 using WheelWizard.WheelWizardData.Domain;
 
-namespace WheelWizard.Views.Components;
+namespace WheelWizard.WheelWizardData.Views;
 
-public class Badge : TemplatedControl
+public class CommunityBadge : TemplatedControl
 {
-    public static readonly Dictionary<BadgeVariant, string> BadgeToolTip = new()
+    private static readonly Dictionary<BadgeVariant, string> BadgeToolTip = new()
     {
         { BadgeVariant.None, "This is not a badge" },
         { BadgeVariant.WhWzDev, "Wheel Wizard Developer (hiii!)" },
@@ -26,7 +26,7 @@ public class Badge : TemplatedControl
         { BadgeVariant.Leafstruck_BronzeWinner, "Leafstruck Tournament Runner-Up" },
     };
 
-    public static readonly StyledProperty<string> HoverTipProperty = AvaloniaProperty.Register<Badge, string>(
+    public static readonly StyledProperty<string> HoverTipProperty = AvaloniaProperty.Register<CommunityBadge, string>(
         nameof(HoverTip),
         BadgeToolTip[BadgeVariant.None]
     );
@@ -37,7 +37,9 @@ public string HoverTip
         set => SetValue(HoverTipProperty, value);
     }
 
-    public static readonly StyledProperty<BadgeVariant> VariantProperty = AvaloniaProperty.Register<Badge, BadgeVariant>(nameof(Variant));
+    public static readonly StyledProperty<BadgeVariant> VariantProperty = AvaloniaProperty.Register<CommunityBadge, BadgeVariant>(
+        nameof(Variant)
+    );
 
     public BadgeVariant Variant
     {
@@ -45,16 +47,9 @@ public BadgeVariant Variant
         set => SetValue(VariantProperty, value);
     }
 
-    private void UpdateStyleClasses(BadgeVariant variant)
+    private void UpdateTooltip(BadgeVariant variant)
     {
-        var types = Enum.GetValues<BadgeVariant>();
-        foreach (var enumType in types)
-        {
-            Classes.Remove(enumType.ToString());
-        }
-
-        Classes.Add(variant.ToString());
-        HoverTip = BadgeToolTip[variant];
+        HoverTip = BadgeToolTip.GetValueOrDefault(variant, BadgeToolTip[BadgeVariant.None]);
     }
 
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -62,6 +57,6 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
         base.OnPropertyChanged(change);
 
         if (change.Property == VariantProperty)
-            UpdateStyleClasses(change.GetNewValue<BadgeVariant>());
+            UpdateTooltip(change.GetNewValue<BadgeVariant>());
     }
 }
diff --git a/WheelWizard/Views/Components/MemeNumberState.axaml b/WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml
similarity index 70%
rename from WheelWizard/Views/Components/MemeNumberState.axaml
rename to WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml
index a32779b77..c4eb6ff09 100644
--- a/WheelWizard/Views/Components/MemeNumberState.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml
@@ -1,68 +1,69 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:components="clr-namespace:WheelWizard.Views.Components">
+        xmlns:components="clr-namespace:WheelWizard.Views.Components"
+        xmlns:communityControls="clr-namespace:WheelWizard.WheelWizardData.Views">
 
     <Design.PreviewWith>
         <Border Padding="20" Background="{StaticResource Neutral950}">
             <StackPanel Spacing="40" Orientation="Horizontal">
                 <StackPanel Spacing="10">
-                    <components:MemeNumberState Text="10" IconSize="0" Enable67="False" Enable69="False"/>
-                    <components:MemeNumberState Text="69" IconSize="0" Enable67="False" Enable69="False"/>
-                    <components:MemeNumberState Text="67" IconSize="0" Enable67="False" Enable69="False"/>
+                    <communityControls:CommunityCountBadge Text="10" IconSize="0" Enable67="False" Enable69="False"/>
+                    <communityControls:CommunityCountBadge Text="69" IconSize="0" Enable67="False" Enable69="False"/>
+                    <communityControls:CommunityCountBadge Text="67" IconSize="0" Enable67="False" Enable69="False"/>
                 </StackPanel>
                 
                 <StackPanel Spacing="10">
-                    <components:MemeNumberState Text="10" IconSize="0" />
-                    <components:MemeNumberState Text="69" IconSize="0" />
-                    <components:MemeNumberState Text="67" IconSize="0" />
+                    <communityControls:CommunityCountBadge Text="10" IconSize="0" />
+                    <communityControls:CommunityCountBadge Text="69" IconSize="0" />
+                    <communityControls:CommunityCountBadge Text="67" IconSize="0" />
                 </StackPanel>
                 
                 <StackPanel Spacing="10">
-                    <components:MemeNumberState IconData="{StaticResource Award}" Text="10" />
-                    <components:MemeNumberState IconData="{StaticResource Award}" Text="69" />
-                    <components:MemeNumberState IconData="{StaticResource Award}" Text="67" />
+                    <communityControls:CommunityCountBadge IconData="{StaticResource Award}" Text="10" />
+                    <communityControls:CommunityCountBadge IconData="{StaticResource Award}" Text="69" />
+                    <communityControls:CommunityCountBadge IconData="{StaticResource Award}" Text="67" />
                 </StackPanel>
             </StackPanel>
 
         </Border>
     </Design.PreviewWith>
 
-    <Style Selector="components|MemeNumberState">
+    <Style Selector="communityControls|CommunityCountBadge">
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center">
 
                     <Panel>
                         <!-- Normal State -->
-                        <components:StateBox x:Name="PART_StateBox"
+                        <components:StatusBadge x:Name="PART_StateBox"
                                              IconData="{TemplateBinding IconData}"
                                              IconSize="{TemplateBinding IconSize}"
                                              Text="{TemplateBinding Text}"
-                                             FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=components:MemeNumberState}}"
+                                             FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=communityControls:CommunityCountBadge}}"
                                              Variant="{TemplateBinding Variant}"
                                              TipText="{TemplateBinding TipText}" />
 
                         <!-- 67 Special State -->
-                        <components:StateBox x:Name="PART_SpecialBadge"
+                        <components:StatusBadge x:Name="PART_SpecialBadge"
                                              IconData="{TemplateBinding IconData}"
                                              IconSize="{TemplateBinding IconSize}"
                                              Variant="{TemplateBinding Variant}"
-                                             FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=components:MemeNumberState}}"
+                                             FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=communityControls:CommunityCountBadge}}"
                                              TipText="{TemplateBinding TipText}"
                                              IsVisible="False">
-                            <components:StateBox.Content>
+                            <components:StatusBadge.Content>
                                 <Grid ColumnDefinitions="Auto, Auto">
                                     <TextBlock Text="6" Classes="BobUp"
                                                Foreground="{StaticResource Warning100}"
-                                               FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=components:MemeNumberState}}"
+                                               FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=communityControls:CommunityCountBadge}}"
                                                VerticalAlignment="Center" />
                                     <TextBlock Grid.Column="1" Text="7" Classes="BobDown" Margin="1,0,0,0"
                                                Foreground="{StaticResource Warning100}"
-                                               FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=components:MemeNumberState}}"
+                                               FontSize="{Binding FontSize, RelativeSource={RelativeSource AncestorType=communityControls:CommunityCountBadge}}"
                                                VerticalAlignment="Center" />
                                 </Grid>
-                            </components:StateBox.Content>
-                        </components:StateBox>
+                            </components:StatusBadge.Content>
+                        </components:StatusBadge>
                     </Panel>
 
                     <components:FormFieldLabel Foreground="{StaticResource Primary400}"
diff --git a/WheelWizard/Views/Components/MemeNumberState.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml.cs
similarity index 67%
rename from WheelWizard/Views/Components/MemeNumberState.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml.cs
index 4dc62a870..0d22c05a8 100644
--- a/WheelWizard/Views/Components/MemeNumberState.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml.cs
@@ -2,16 +2,17 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
+using WheelWizard.Views.Components;
 
-namespace WheelWizard.Views.Components;
+namespace WheelWizard.WheelWizardData.Views;
 
-public class MemeNumberState : TemplatedControl
+public class CommunityCountBadge : TemplatedControl
 {
-    private StateBox? _stateBox;
-    private StateBox? _specialBadge;
+    private StatusBadge? _stateBox;
+    private StatusBadge? _specialBadge;
     private FormFieldLabel? _niceLabel;
 
-    public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<MemeNumberState, string>(nameof(Text), "0");
+    public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<CommunityCountBadge, string>(nameof(Text), "0");
 
     public string Text
     {
@@ -19,7 +20,7 @@ public string Text
         set => SetValue(TextProperty, value);
     }
 
-    public static readonly StyledProperty<Geometry> IconDataProperty = AvaloniaProperty.Register<MemeNumberState, Geometry>(
+    public static readonly StyledProperty<Geometry> IconDataProperty = AvaloniaProperty.Register<CommunityCountBadge, Geometry>(
         nameof(IconData)
     );
 
@@ -29,7 +30,7 @@ public Geometry IconData
         set => SetValue(IconDataProperty, value);
     }
 
-    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<MemeNumberState, double>(
+    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<CommunityCountBadge, double>(
         nameof(IconSize),
         20
     );
@@ -40,7 +41,7 @@ public double IconSize
         set => SetValue(IconSizeProperty, value);
     }
 
-    public static readonly StyledProperty<string> TipTextProperty = AvaloniaProperty.Register<MemeNumberState, string>(nameof(TipText));
+    public static readonly StyledProperty<string> TipTextProperty = AvaloniaProperty.Register<CommunityCountBadge, string>(nameof(TipText));
 
     public string TipText
     {
@@ -48,18 +49,21 @@ public string TipText
         set => SetValue(TipTextProperty, value);
     }
 
-    public static readonly StyledProperty<StateBox.StateBoxVariantType> VariantProperty = AvaloniaProperty.Register<
-        MemeNumberState,
-        StateBox.StateBoxVariantType
-    >(nameof(Variant), StateBox.StateBoxVariantType.Default);
+    public static readonly StyledProperty<StatusVariant> VariantProperty = AvaloniaProperty.Register<CommunityCountBadge, StatusVariant>(
+        nameof(Variant),
+        StatusVariant.Default
+    );
 
-    public StateBox.StateBoxVariantType Variant
+    public StatusVariant Variant
     {
         get => GetValue(VariantProperty);
         set => SetValue(VariantProperty, value);
     }
 
-    public static readonly StyledProperty<bool> Enable67Property = AvaloniaProperty.Register<MemeNumberState, bool>(nameof(Enable67), true);
+    public static readonly StyledProperty<bool> Enable67Property = AvaloniaProperty.Register<CommunityCountBadge, bool>(
+        nameof(Enable67),
+        true
+    );
 
     public bool Enable67
     {
@@ -67,7 +71,10 @@ public bool Enable67
         set => SetValue(Enable67Property, value);
     }
 
-    public static readonly StyledProperty<bool> Enable69Property = AvaloniaProperty.Register<MemeNumberState, bool>(nameof(Enable69), true);
+    public static readonly StyledProperty<bool> Enable69Property = AvaloniaProperty.Register<CommunityCountBadge, bool>(
+        nameof(Enable69),
+        true
+    );
 
     public bool Enable69
     {
@@ -78,8 +85,8 @@ public bool Enable69
     protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     {
         base.OnApplyTemplate(e);
-        _stateBox = e.NameScope.Find<StateBox>("PART_StateBox");
-        _specialBadge = e.NameScope.Find<StateBox>("PART_SpecialBadge");
+        _stateBox = e.NameScope.Find<StatusBadge>("PART_StateBox");
+        _specialBadge = e.NameScope.Find<StatusBadge>("PART_SpecialBadge");
         _niceLabel = e.NameScope.Find<FormFieldLabel>("PART_NiceLabel");
 
         UpdateState();
@@ -88,7 +95,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
     protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
     {
         base.OnPropertyChanged(change);
-        if (change.Property == TextProperty)
+        if (change.Property == TextProperty || change.Property == Enable67Property || change.Property == Enable69Property)
         {
             UpdateState();
         }
@@ -106,8 +113,6 @@ private void UpdateState()
         _stateBox.IsVisible = true;
         _specialBadge.IsVisible = false;
 
-        _stateBox.Text = val; // Always ensure text is set for normal cases
-
         if (val == "69" && Enable69)
         {
             _niceLabel.IsVisible = true;
diff --git a/WheelWizard/Views/Patterns/CurrentUserProfile.axaml b/WheelWizard/Features/WheelWizardData/Views/CurrentUserProfile.axaml
similarity index 84%
rename from WheelWizard/Views/Patterns/CurrentUserProfile.axaml
rename to WheelWizard/Features/WheelWizardData/Views/CurrentUserProfile.axaml
index 1517ad46e..4dea2682d 100644
--- a/WheelWizard/Views/Patterns/CurrentUserProfile.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/CurrentUserProfile.axaml
@@ -1,8 +1,8 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns"
-             x:Class="WheelWizard.Views.Patterns.CurrentUserProfile"
-             x:DataType="behaviorComponent:CurrentUserProfile">
+             x:Class="WheelWizard.WheelWizardData.Views.CurrentUserProfile"
+             x:DataType="community:CurrentUserProfile"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views">
 
     <Grid Background="Transparent" ColumnDefinitions="58,*" x:Name="ProfileRoot">
         <StackPanel Grid.Column="1" Orientation="Vertical" HorizontalAlignment="Left"
diff --git a/WheelWizard/Views/Patterns/CurrentUserProfile.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/CurrentUserProfile.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Patterns/CurrentUserProfile.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/CurrentUserProfile.axaml.cs
index 78100fd9a..c5b457e66 100644
--- a/WheelWizard/Views/Patterns/CurrentUserProfile.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/CurrentUserProfile.axaml.cs
@@ -4,7 +4,7 @@
 using WheelWizard.Settings.Types;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.WheelWizardData.Views;
 
 public partial class CurrentUserProfile : UserControl
 {
diff --git a/WheelWizard/Views/Popups/AddFriendConfirmationWindow.axaml b/WheelWizard/Features/WheelWizardData/Views/Dialogs/AddFriendConfirmationWindow.axaml
similarity index 80%
rename from WheelWizard/Views/Popups/AddFriendConfirmationWindow.axaml
rename to WheelWizard/Features/WheelWizardData/Views/Dialogs/AddFriendConfirmationWindow.axaml
index b19cc4dbb..62a75b5ba 100644
--- a/WheelWizard/Views/Popups/AddFriendConfirmationWindow.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/Dialogs/AddFriendConfirmationWindow.axaml
@@ -1,16 +1,16 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns"
                    xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
                    xmlns:loc="clr-namespace:WheelWizard.Localization"
-                   xmlns:popups="clr-namespace:WheelWizard.Views.Popups"
-                   x:Class="WheelWizard.Views.Popups.AddFriendConfirmationWindow"
-                   x:DataType="popups:AddFriendConfirmationWindow"
-                   mc:Ignorable="d" d:DesignWidth="420" d:DesignHeight="320">
+                   x:Class="WheelWizard.WheelWizardData.Views.Dialogs.AddFriendConfirmationWindow"
+                   x:DataType="communityDialogs:AddFriendConfirmationWindow"
+                   mc:Ignorable="d" d:DesignWidth="420" d:DesignHeight="320"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:communityDialogs="clr-namespace:WheelWizard.WheelWizardData.Views.Dialogs">
     <Grid Width="400" RowDefinitions="Auto,Auto,Auto,Auto">
         <TextBlock Grid.Row="0" Classes="TitleText" FontSize="20"
                    Foreground="{StaticResource FormFieldLabelColor}"
@@ -20,7 +20,7 @@
         <Grid Grid.Row="1" Margin="0,16,0,10" ColumnDefinitions="Auto,*">
             <Border Grid.Column="0" Width="96" Height="96" CornerRadius="999999"
                     ClipToBounds="True" Background="{StaticResource Neutral950}" Margin="0,0,16,0">
-                <behavior:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                <miiImages:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                          Mii="{Binding FriendMii}"
                                          LoadingColor="{StaticResource Neutral600}"
                                          FallBackColor="{StaticResource Neutral600}"
@@ -34,7 +34,7 @@
                 <TextBlock Classes="BodyText" FontSize="14"
                            Foreground="{StaticResource Neutral300}"
                            Text="{Binding FriendCode}" />
-                <components:StateBox Text="{Binding FriendVr, StringFormat='VR {0}'}"
+                <components:StatusBadge Text="{Binding FriendVr, StringFormat='VR {0}'}"
                                      Variant="Success"
                                      IconSize="0"
                                      HorizontalAlignment="Left" />
@@ -56,4 +56,4 @@
                                Click="AddFriend_OnClick" />
         </UniformGrid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/AddFriendConfirmationWindow.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/Dialogs/AddFriendConfirmationWindow.axaml.cs
similarity index 93%
rename from WheelWizard/Views/Popups/AddFriendConfirmationWindow.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/Dialogs/AddFriendConfirmationWindow.axaml.cs
index ad5d6d716..a90bdf858 100644
--- a/WheelWizard/Views/Popups/AddFriendConfirmationWindow.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/Dialogs/AddFriendConfirmationWindow.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia.Interactivity;
 using WheelWizard.Models;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups;
+namespace WheelWizard.WheelWizardData.Views.Dialogs;
 
 public partial class AddFriendConfirmationWindow : PopupContent
 {
diff --git a/WheelWizard/Views/Popups/PlayerProfileWindow.axaml b/WheelWizard/Features/WheelWizardData/Views/Dialogs/PlayerProfileWindow.axaml
similarity index 87%
rename from WheelWizard/Views/Popups/PlayerProfileWindow.axaml
rename to WheelWizard/Features/WheelWizardData/Views/Dialogs/PlayerProfileWindow.axaml
index d405b9a9f..d2db3b7d1 100644
--- a/WheelWizard/Views/Popups/PlayerProfileWindow.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/Dialogs/PlayerProfileWindow.axaml
@@ -1,17 +1,17 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                   xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
                    xmlns:loc="clr-namespace:WheelWizard.Localization"
                    xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
-                   xmlns:popups="clr-namespace:WheelWizard.Views.Popups"
                    xmlns:conv="clr-namespace:WheelWizard.Views.Converters"
                    mc:Ignorable="d" d:DesignWidth="560" d:DesignHeight="700" ClipToBounds="False"
-                   x:Class="WheelWizard.Views.Popups.PlayerProfileWindow"
-                   x:DataType="popups:PlayerProfileWindow">
+                   x:Class="WheelWizard.WheelWizardData.Views.Dialogs.PlayerProfileWindow"
+                   x:DataType="communityDialogs:PlayerProfileWindow"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base"
+        xmlns:communityDialogs="clr-namespace:WheelWizard.WheelWizardData.Views.Dialogs">
     <Grid Width="540" MinHeight="400" MaxHeight="760">
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="20"
                     IsVisible="{Binding IsLoading}">
@@ -33,7 +33,7 @@
                 <Grid ColumnDefinitions="Auto,*">
                     <Border Grid.Column="0" CornerRadius="999999" ClipToBounds="True"
                             Background="{StaticResource Neutral950}" Width="84" Height="84" Margin="0,0,14,0">
-                        <behavior:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                        <miiImages:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                                  LoadingColor="{StaticResource Neutral600}"
                                                  Mii="{Binding DisplayMii}"
                                                  FallBackColor="{StaticResource Neutral600}"
@@ -46,10 +46,10 @@
                         <TextBlock Text="{Binding Profile.FriendCode}" Classes="BodyText" FontSize="12"
                                    Foreground="{StaticResource Neutral400}" />
                         <StackPanel Orientation="Horizontal" Spacing="6">
-                            <components:StateBox Text="{Binding Profile.Rank, StringFormat='Rank #{0}'}"
+                            <components:StatusBadge Text="{Binding Profile.Rank, StringFormat='Rank #{0}'}"
                                                  Variant="Success" IconSize="0" HorizontalAlignment="Left"
                                                  IsVisible="{Binding Profile.Rank, Converter={x:Static conv:NumberConverters.GreaterThan0}}" />
-                            <components:StateBox Text="Suspicious" Variant="Danger" IconSize="0"
+                            <components:StatusBadge Text="Suspicious" Variant="Danger" IconSize="0"
                                                  HorizontalAlignment="Left"
                                                  IsVisible="{Binding Profile.IsSuspicious}" />
                         </StackPanel>
@@ -92,4 +92,4 @@
             </StackPanel>
         </ScrollViewer>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/PlayerProfileWindow.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/Dialogs/PlayerProfileWindow.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Popups/PlayerProfileWindow.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/Dialogs/PlayerProfileWindow.axaml.cs
index cf53da069..47b92b396 100644
--- a/WheelWizard/Views/Popups/PlayerProfileWindow.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/Dialogs/PlayerProfileWindow.axaml.cs
@@ -5,12 +5,12 @@
 using WheelWizard.Models;
 using WheelWizard.RrRooms;
 using WheelWizard.Shared.Services;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.WheelWizardData.Views;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups;
+namespace WheelWizard.WheelWizardData.Views.Dialogs;
 
 public partial class PlayerProfileWindow : PopupContent, INotifyPropertyChanged
 {
diff --git a/WheelWizard/Views/Patterns/FriendsListItem.axaml b/WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml
similarity index 90%
rename from WheelWizard/Views/Patterns/FriendsListItem.axaml
rename to WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml
index 443738506..3a769e8dc 100644
--- a/WheelWizard/Views/Patterns/FriendsListItem.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml
@@ -4,39 +4,39 @@
         xmlns:loc="clr-namespace:WheelWizard.Localization"
         xmlns:components="clr-namespace:WheelWizard.Views.Components"
         xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-        xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views">
     <Design.PreviewWith>
         <StackPanel Spacing="6" Background="{StaticResource Neutral950}">
-            <patterns:FriendsListItem Width="428" Height="124"
+            <community:FriendsListItem Width="428" Height="124"
                                         FriendCode="1234-5678-9012"
                                         UserName="Lum Patch"
                                         Vr="5000" Br="5000"
                                         HasBadges="True"
                                         TotalLosses="12" TotalWon="1345" />
 
-            <patterns:FriendsListItem Width="428" Height="124" IsOnline="True"
+            <community:FriendsListItem Width="428" Height="124" IsOnline="True"
                                         FriendCode="1234-5678-9012"
                                         UserName="Someone Else"
                                         Vr="5000" Br="5000"
                                         HasBadges="True"
                                         TotalLosses="213" TotalWon="12" />
 
-            <patterns:FriendsListItem Width="428" Height="124"
+            <community:FriendsListItem Width="428" Height="124"
                                         FriendCode="1234-5678-9012"
                                         UserName="WantToBeeMe"
                                         Vr="5000" Br="5000"
                                         HasBadges="False"
                                         TotalLosses="213" TotalWon="12" />
 
-            <patterns:FriendsListItem Width="428" Height="124"
+            <community:FriendsListItem Width="428" Height="124"
                                         FriendCode="1234-5678-9012"
                                         UserName="Random Guy"
                                         Vr="5000" Br="5000"
                                         HasBadges="False"
                                         TotalLosses="213" TotalWon="12" />
 
-            <patterns:FriendsListItem Width="428" Height="124" IsOnline="True"
+            <community:FriendsListItem Width="428" Height="124" IsOnline="True"
                                         FriendCode="1234-5678-9012"
                                         UserName="Someone Else"
                                         Vr="5000" Br="5000"
@@ -45,7 +45,7 @@
         </StackPanel>
     </Design.PreviewWith>
 
-    <Style Selector="patterns|FriendsListItem">
+    <Style Selector="community|FriendsListItem">
         <Setter Property="Template">
             <ControlTemplate>
                 <Border Background="{StaticResource Neutral900}" CornerRadius="6" Padding="10,5"
@@ -55,7 +55,7 @@
                         <Border Grid.Column="0" Background="{StaticResource Neutral700}"
                                 Width="78" HorizontalAlignment="Left"
                                 Margin="-10,-5,0,-5" CornerRadius="7,0,0,7" />
-                        <behaviorComponent:MiiImageLoader Grid.Column="0" Margin="-43,-25,0,-5"
+                        <miiImages:MiiImageLoader Grid.Column="0" Margin="-43,-25,0,-5"
                                                           Width="144" Height="144"
                                                           HorizontalAlignment="Left"
                                                           VerticalAlignment="Top"
@@ -185,7 +185,7 @@
                                         </ItemsControl.ItemsPanel>
                                         <ItemsControl.ItemTemplate>
                                             <DataTemplate x:DataType="domain:BadgeVariant">
-                                                <components:Badge Variant="{Binding}" Width="30" Height="30" />
+                                                <community:CommunityBadge Variant="{Binding}" Width="30" Height="30" />
                                             </DataTemplate>
                                         </ItemsControl.ItemTemplate>
                                     </ItemsControl>
@@ -216,26 +216,26 @@
     </Style>
 
     <Style
-        Selector="patterns|FriendsListItem[IsOnline=true][IsPending=false] /template/ Border#PART_BorderColor,
-                     patterns|FriendsListItem[IsOnline=true][IsPending=false] /template/ Border#PART_BadgeBorder">
+        Selector="community|FriendsListItem[IsOnline=true][IsPending=false] /template/ Border#PART_BorderColor,
+                     community|FriendsListItem[IsOnline=true][IsPending=false] /template/ Border#PART_BadgeBorder">
         <Setter Property="BorderBrush" Value="{StaticResource Primary400}" />
     </Style>
 
     <Style
-        Selector="patterns|FriendsListItem[IsPending=true] /template/ Border#PART_BorderColor,
-                     patterns|FriendsListItem[IsPending=true] /template/ Border#PART_BadgeBorder">
+        Selector="community|FriendsListItem[IsPending=true] /template/ Border#PART_BorderColor,
+                     community|FriendsListItem[IsPending=true] /template/ Border#PART_BadgeBorder">
         <Setter Property="BorderBrush" Value="{StaticResource Warning500}" />
     </Style>
 
-    <Style Selector="patterns|FriendsListItem[IsPending=true] /template/ behaviorComponent|MiiImageLoader">
+    <Style Selector="community|FriendsListItem[IsPending=true] /template/ miiImages|MiiImageLoader">
         <Setter Property="ImageVariant" Value="{x:Static miiVars:MiiImageVariants.FriendsSideProfilePending}" />
     </Style>
 
-    <Style Selector="patterns|FriendsListItem[IsPending=true] /template/ components|Button#ViewRoomButton">
+    <Style Selector="community|FriendsListItem[IsPending=true] /template/ components|Button#ViewRoomButton">
         <Setter Property="Variant" Value="Warning" />
     </Style>
 
-    <Style Selector="patterns|FriendsListItem[HasBadges=true] /template/ components|Button#ViewRoomButton">
+    <Style Selector="community|FriendsListItem[HasBadges=true] /template/ components|Button#ViewRoomButton">
         <Setter Property="Padding" Value="10" />
         <Setter Property="Text" Value="" />
     </Style>
diff --git a/WheelWizard/Views/Patterns/FriendsListItem.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Patterns/FriendsListItem.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml.cs
index a3a26a3b1..e799ab773 100644
--- a/WheelWizard/Views/Patterns/FriendsListItem.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml.cs
@@ -5,7 +5,7 @@
 using WheelWizard.WheelWizardData.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.WheelWizardData.Views;
 
 public class FriendsListItem : TemplatedControl
 {
diff --git a/WheelWizard/Views/Pages/FriendsPage.axaml b/WheelWizard/Features/WheelWizardData/Views/FriendsPage.axaml
similarity index 95%
rename from WheelWizard/Views/Pages/FriendsPage.axaml
rename to WheelWizard/Features/WheelWizardData/Views/FriendsPage.axaml
index 3e0850e35..3c098da0c 100644
--- a/WheelWizard/Views/Pages/FriendsPage.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/FriendsPage.axaml
@@ -5,9 +5,9 @@
              mc:Ignorable="d" d:DesignWidth="656" d:DesignHeight="876"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
              xmlns:domain="clr-namespace:WheelWizard.WiiManagement.GameLicense.Domain"
-             x:Class="WheelWizard.Views.Pages.FriendsPage">
+             x:Class="WheelWizard.WheelWizardData.Views.FriendsPage"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="{StaticResource TopRowSize}" />
@@ -58,7 +58,7 @@
 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,6">
                     <components:FormFieldLabel Text="{loc:T list_title.friends}" />
-                    <components:StateBox Text="0" IconSize="0" x:Name="ListItemCount" />
+                    <components:StatusBadge Text="0" IconSize="0" x:Name="ListItemCount" />
                 </StackPanel>
                 <Border Background="{StaticResource BackgroundLineColor}" Height="1" HorizontalAlignment="Stretch"
                         VerticalAlignment="Bottom" />
@@ -75,7 +75,7 @@
                 </ListBox.Styles>
                 <ListBox.ItemTemplate>
                     <DataTemplate DataType="domain:FriendProfile">
-                        <patterns:FriendsListItem HorizontalAlignment="Stretch" Height="124"
+                        <community:FriendsListItem HorizontalAlignment="Stretch" Height="124"
                                                     Margin="0,5"
                                                     UserName="{Binding NameOfMii}"
                                                     FriendCode="{Binding FriendCode}"
diff --git a/WheelWizard/Views/Pages/FriendsPage.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/FriendsPage.axaml.cs
similarity index 95%
rename from WheelWizard/Views/Pages/FriendsPage.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/FriendsPage.axaml.cs
index 1248eabeb..7b7ceee58 100644
--- a/WheelWizard/Views/Pages/FriendsPage.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/FriendsPage.axaml.cs
@@ -4,22 +4,25 @@
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using WheelWizard.Models;
+using WheelWizard.Mods.Views;
 using WheelWizard.RrRooms;
+using WheelWizard.RrRooms.Views;
 using WheelWizard.Settings;
 using WheelWizard.Shared.MessageTranslations;
 using WheelWizard.Shared.Polling;
 using WheelWizard.Shared.Services;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Popups.MiiManagement;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WheelWizardData;
+using WheelWizard.WheelWizardData.Views.Dialogs;
 using WheelWizard.WiiManagement.FriendCodes;
 using WheelWizard.WiiManagement.GameLicense;
 using WheelWizard.WiiManagement.GameLicense.Domain;
 using WheelWizard.WiiManagement.MiiManagement;
+using WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.WheelWizardData.Views;
 
 public partial class FriendsPage : UserControl, INotifyPropertyChanged, IPollingListener
 {
@@ -187,7 +190,6 @@ private async void AddFriend_OnClick(object? sender, RoutedEventArgs e)
             .SetPlaceholderText("0000-0000-0000")
             .SetButtonText(t("action.cancel"), t("action.submit"))
             .SetValidation((_, newText) => ValidateFriendCodeInput(newText))
-            .SetWarningValidation((_, newText) => ValidateFriendCodeWarning(newText))
             .ShowDialog();
 
         if (inputFriendCode == null)
@@ -249,23 +251,13 @@ private OperationResult ValidateFriendCodeInput(string? rawFriendCode)
         if (currentProfileId != 0 && currentProfileId == friendProfileId)
             return Fail("You cannot add your own friend code.");
 
-        return Ok();
-    }
-
-    private string? ValidateFriendCodeWarning(string? rawFriendCode)
-    {
-        var normalizedFriendCodeResult = NormalizeFriendCode(rawFriendCode ?? string.Empty);
-        if (normalizedFriendCodeResult.IsFailure)
-            return null;
-
-        var friendProfileId = FriendCode.FriendCodeToProfileId(normalizedFriendCodeResult.Value);
         var duplicateFriend = GameLicenseService.ActiveCurrentFriends.Any(friend =>
         {
             var existingPid = FriendCode.FriendCodeToProfileId(friend.FriendCode);
             return existingPid != 0 && existingPid == friendProfileId;
         });
 
-        return duplicateFriend ? "This friend is already in your list." : null;
+        return duplicateFriend ? Fail("This friend is already in your list.") : Ok();
     }
 
     private static OperationResult<string> NormalizeFriendCode(string friendCode)
diff --git a/WheelWizard/Views/Pages/LeaderboardPage.axaml b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPage.axaml
similarity index 90%
rename from WheelWizard/Views/Pages/LeaderboardPage.axaml
rename to WheelWizard/Features/WheelWizardData/Views/LeaderboardPage.axaml
index 5ce2673b0..97eea34b3 100644
--- a/WheelWizard/Views/Pages/LeaderboardPage.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPage.axaml
@@ -4,13 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
              mc:Ignorable="d"
              d:DesignWidth="477"
              d:DesignHeight="700"
-             x:Class="WheelWizard.Views.Pages.LeaderboardPage"
-             x:DataType="pages:LeaderboardPage">
+             x:Class="WheelWizard.WheelWizardData.Views.LeaderboardPage"
+             x:DataType="community:LeaderboardPage"
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views">
     <UserControl.Styles>
         <Style Selector="Border.PodiumStep">
             <Setter Property="CornerRadius" Value="8,8,0,0" />
@@ -47,21 +47,21 @@
         </Style>
 
         <!-- Match RoomDetailsPage entry background treatment for PlayerListItem -->
-        <Style Selector="patterns|PlayerListItem /template/ Border.BoxItemBackground">
+        <Style Selector="rooms|PlayerListItem /template/ Border.BoxItemBackground">
             <Setter Property="CornerRadius" Value="6" />
             <Setter Property="Margin" Value="0,3" />
             <Setter Property="Padding" Value="7,0" />
             <Setter Property="Background" Value="{StaticResource Neutral900}" />
         </Style>
-        <Style Selector="patterns|PlayerListItem:pointerover /template/ Border.BoxItemBackground">
+        <Style Selector="rooms|PlayerListItem:pointerover /template/ Border.BoxItemBackground">
             <Setter Property="Background" Value="{StaticResource Neutral700}" />
         </Style>
-        <Style Selector="patterns|PlayerListItem /template/ Border#PART_TopLabelBadge">
+        <Style Selector="rooms|PlayerListItem /template/ Border#PART_TopLabelBadge">
             <Setter Property="Background" Value="{StaticResource Neutral800}" />
             <Setter Property="BorderBrush" Value="{StaticResource Neutral600}" />
             <Setter Property="BorderThickness" Value="1" />
         </Style>
-        <Style Selector="patterns|PlayerListItem /template/ TextBlock#PART_TopLabelText">
+        <Style Selector="rooms|PlayerListItem /template/ TextBlock#PART_TopLabelText">
             <Setter Property="Foreground" Value="{StaticResource Neutral100}" />
         </Style>
     </UserControl.Styles>
@@ -174,7 +174,7 @@
                                   RowDefinitions="Auto,16"
                                   VerticalAlignment="Center"
                                   ColumnDefinitions="*,1.1*,*">
-                                <patterns:LeaderboardPodiumCard Grid.Column="0"
+                                <community:LeaderboardPodiumCard Grid.Column="0"
                                                                   Grid.Row="0"
                                                                   Margin="4,16,4,0"
                                                                   IsVisible="{Binding HasPodiumSecond}"
@@ -187,7 +187,7 @@
                                                                   ShowBadge="{Binding PodiumSecond.HasBadge}"
                                                                   BadgeVariant="{Binding PodiumSecond.PrimaryBadge}"
                                                                   IsSuspicious="{Binding PodiumSecond.IsSuspicious}">
-                                    <patterns:LeaderboardPodiumCard.ContextMenu>
+                                    <community:LeaderboardPodiumCard.ContextMenu>
                                         <ContextMenu DataContext="{Binding PodiumSecond}">
                                             <MenuItem Header="{loc:T action.copy_friend_code}"
                                                       Click="CopyFriendCode_OnClick" />
@@ -201,10 +201,10 @@
                                             <MenuItem Header="View player on RWFC"
                                                       Click="ViewOnRwfc_OnClick" />
                                         </ContextMenu>
-                                    </patterns:LeaderboardPodiumCard.ContextMenu>
-                                </patterns:LeaderboardPodiumCard>
+                                    </community:LeaderboardPodiumCard.ContextMenu>
+                                </community:LeaderboardPodiumCard>
 
-                                <patterns:LeaderboardPodiumCard Grid.Column="1"
+                                <community:LeaderboardPodiumCard Grid.Column="1"
                                                                   Grid.Row="0"
                                                                   Margin="4,0,4,0"
                                                                   IsVisible="{Binding HasPodiumFirst}"
@@ -218,7 +218,7 @@
                                                                   ShowBadge="{Binding PodiumFirst.HasBadge}"
                                                                   BadgeVariant="{Binding PodiumFirst.PrimaryBadge}"
                                                                   IsSuspicious="{Binding PodiumFirst.IsSuspicious}">
-                                    <patterns:LeaderboardPodiumCard.ContextMenu>
+                                    <community:LeaderboardPodiumCard.ContextMenu>
                                         <ContextMenu DataContext="{Binding PodiumFirst}">
                                             <MenuItem Header="{loc:T action.copy_friend_code}"
                                                       Click="CopyFriendCode_OnClick" />
@@ -232,10 +232,10 @@
                                             <MenuItem Header="View player on RWFC"
                                                       Click="ViewOnRwfc_OnClick" />
                                         </ContextMenu>
-                                    </patterns:LeaderboardPodiumCard.ContextMenu>
-                                </patterns:LeaderboardPodiumCard>
+                                    </community:LeaderboardPodiumCard.ContextMenu>
+                                </community:LeaderboardPodiumCard>
 
-                                <patterns:LeaderboardPodiumCard Grid.Column="2"
+                                <community:LeaderboardPodiumCard Grid.Column="2"
                                                                   Grid.Row="0"
                                                                   Margin="4,16,4,0"
                                                                   IsVisible="{Binding HasPodiumThird}"
@@ -248,7 +248,7 @@
                                                                   ShowBadge="{Binding PodiumThird.HasBadge}"
                                                                   BadgeVariant="{Binding PodiumThird.PrimaryBadge}"
                                                                   IsSuspicious="{Binding PodiumThird.IsSuspicious}">
-                                    <patterns:LeaderboardPodiumCard.ContextMenu>
+                                    <community:LeaderboardPodiumCard.ContextMenu>
                                         <ContextMenu DataContext="{Binding PodiumThird}">
                                             <MenuItem Header="{loc:T action.copy_friend_code}"
                                                       Click="CopyFriendCode_OnClick" />
@@ -262,16 +262,16 @@
                                             <MenuItem Header="View player on RWFC"
                                                       Click="ViewOnRwfc_OnClick" />
                                         </ContextMenu>
-                                    </patterns:LeaderboardPodiumCard.ContextMenu>
-                                </patterns:LeaderboardPodiumCard>
+                                    </community:LeaderboardPodiumCard.ContextMenu>
+                                </community:LeaderboardPodiumCard>
                             </Grid>
                         </Grid>
                     </Border>
 
                     <ItemsControl ItemsSource="{Binding RemainingPlayers}">
                         <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="pages:LeaderboardPlayerItem">
-                                <patterns:PlayerListItem UserName="{Binding Name}"
+                            <DataTemplate x:DataType="community:LeaderboardPlayerItem">
+                                <rooms:PlayerListItem UserName="{Binding Name}"
                                                            FriendCode="{Binding FriendCode}"
                                                            Vr="{Binding VrDisplay}"
                                                            Mii="{Binding FirstMii}"
@@ -282,7 +282,7 @@
                                                            HasBadges="{Binding HasBadges}" BadgeVariants="{Binding BadgeVariants}"
                                                            IsTopPlayer="True"
                                                            TopLabel="{Binding TopLabel}">
-                                    <patterns:PlayerListItem.ContextMenu>
+                                    <rooms:PlayerListItem.ContextMenu>
                                         <ContextMenu>
                                             <MenuItem Header="{loc:T action.copy_friend_code}"
                                                       Click="CopyFriendCode_OnClick" />
@@ -296,8 +296,8 @@
                                             <MenuItem Header="View player on RWFC"
                                                       Click="ViewOnRwfc_OnClick" />
                                         </ContextMenu>
-                                    </patterns:PlayerListItem.ContextMenu>
-                                </patterns:PlayerListItem>
+                                    </rooms:PlayerListItem.ContextMenu>
+                                </rooms:PlayerListItem>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
diff --git a/WheelWizard/Views/Pages/LeaderboardPage.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPage.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Pages/LeaderboardPage.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/LeaderboardPage.axaml.cs
index 1b8cd5c36..8b0748e35 100644
--- a/WheelWizard/Views/Pages/LeaderboardPage.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPage.axaml.cs
@@ -7,18 +7,21 @@
 using WheelWizard.Localization;
 using WheelWizard.Models;
 using WheelWizard.RrRooms;
+using WheelWizard.RrRooms.Views;
 using WheelWizard.Settings;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.MiiManagement;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WheelWizardData;
 using WheelWizard.WheelWizardData.Domain;
+using WheelWizard.WheelWizardData.Views.Dialogs;
 using WheelWizard.WiiManagement.FriendCodes;
 using WheelWizard.WiiManagement.GameLicense;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
+using WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.WheelWizardData.Views;
 
 public sealed record LeaderboardPlayerItem
 {
diff --git a/WheelWizard/Views/Patterns/LeaderboardPodiumCard.axaml b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml
similarity index 91%
rename from WheelWizard/Views/Patterns/LeaderboardPodiumCard.axaml
rename to WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml
index 9b462117f..f416bfe88 100644
--- a/WheelWizard/Views/Patterns/LeaderboardPodiumCard.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml
@@ -1,13 +1,13 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:components="using:WheelWizard.Views.Components"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
-        xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns"
-        xmlns:miiVars="using:WheelWizard.MiiImages.Domain">
+        xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views">
     <Design.PreviewWith>
         <Border Background="{StaticResource Neutral950}" Padding="20">
             <Grid ColumnDefinitions="*,*,*">
-                <patterns:LeaderboardPodiumCard Grid.Column="0"
+                <community:LeaderboardPodiumCard Grid.Column="0"
                                                   Classes="Silver EntrySecond FloatB"
                                                   Rank="2"
                                                   PlacementLabel="2nd Place"
@@ -15,7 +15,7 @@
                                                   VrText="18,611"
                                                   ShowBadge="True"
                                                   BadgeVariant="Translator" />
-                <patterns:LeaderboardPodiumCard Grid.Column="1"
+                <community:LeaderboardPodiumCard Grid.Column="1"
                                                   Margin="4,-10,4,0"
                                                   Classes="Gold EntryFirst FloatA"
                                                   Rank="1"
@@ -25,7 +25,7 @@
                                                   AvatarSize="122"
                                                   ShowBadge="True"
                                                   BadgeVariant="WhWzDev" />
-                <patterns:LeaderboardPodiumCard Grid.Column="2"
+                <community:LeaderboardPodiumCard Grid.Column="2"
                                                   Classes="Bronze EntryThird FloatC"
                                                   Rank="3"
                                                   PlacementLabel="3rd Place"
@@ -37,7 +37,7 @@
         </Border>
     </Design.PreviewWith>
 
-    <Style Selector="patterns|LeaderboardPodiumCard">
+    <Style Selector="community|LeaderboardPodiumCard">
         <Setter Property="MinWidth" Value="126" />
         <Setter Property="MinHeight" Value="190" />
         <Setter Property="Padding" Value="0" />
@@ -116,7 +116,7 @@
                                                   VerticalAlignment="Center"
                                                   Foreground="#52FFFFFF"
                                                   IsHitTestVisible="False" />
-                                        <behaviorComponent:MiiImageLoader HorizontalAlignment="Stretch"
+                                        <miiImages:MiiImageLoader HorizontalAlignment="Stretch"
                                                                           VerticalAlignment="Stretch"
                                                                           LoadingColor="{StaticResource Neutral600}"
                                                                           FallBackColor="{StaticResource Neutral600}"
@@ -135,7 +135,7 @@
                                         Background="{StaticResource Neutral950}"
                                         BorderBrush="{StaticResource Neutral700}"
                                         BorderThickness="1">
-                                    <components:Badge Variant="{TemplateBinding BadgeVariant}"
+                                    <community:CommunityBadge Variant="{TemplateBinding BadgeVariant}"
                                                       Width="20"
                                                       Height="20"
                                                       HorizontalAlignment="Center"
@@ -237,7 +237,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard /template/ Border#PART_CardSurface">
+    <Style Selector="community|LeaderboardPodiumCard /template/ Border#PART_CardSurface">
         <Setter Property="Transitions">
             <Transitions>
                 <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.22" Easing="CircularEaseOut" />
@@ -247,12 +247,12 @@
         </Setter>
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard:pointerover /template/ Border#PART_CardSurface">
+    <Style Selector="community|LeaderboardPodiumCard:pointerover /template/ Border#PART_CardSurface">
         <Setter Property="RenderTransform" Value="scale(1.03)" />
         <Setter Property="BoxShadow" Value="0 24 44 0 #32000000" />
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard.Gold">
+    <Style Selector="community|LeaderboardPodiumCard.Gold">
         <Setter Property="Background">
             <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                 <GradientStop Color="#2E341B07" Offset="0" />
@@ -261,7 +261,7 @@
         </Setter>
         <Setter Property="BorderBrush" Value="#EEC21E" />
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard.Silver">
+    <Style Selector="community|LeaderboardPodiumCard.Silver">
         <Setter Property="Background">
             <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                 <GradientStop Color="#27363A42" Offset="0" />
@@ -270,7 +270,7 @@
         </Setter>
         <Setter Property="BorderBrush" Value="#90A9B8D7" />
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard.Bronze">
+    <Style Selector="community|LeaderboardPodiumCard.Bronze">
         <Setter Property="Background">
             <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                 <GradientStop Color="#2C3C2418" Offset="0" />
@@ -280,7 +280,7 @@
         <Setter Property="BorderBrush" Value="#A8D77E47" />
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard.EntryFirst">
+    <Style Selector="community|LeaderboardPodiumCard.EntryFirst">
         <Style.Animations>
             <Animation Duration="0:0:0.45" FillMode="Forward" Easing="CircularEaseOut">
                 <KeyFrame Cue="0%">
@@ -294,7 +294,7 @@
             </Animation>
         </Style.Animations>
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard.EntrySecond">
+    <Style Selector="community|LeaderboardPodiumCard.EntrySecond">
         <Style.Animations>
             <Animation Delay="0:0:0.08" Duration="0:0:0.45" FillMode="Forward" Easing="CircularEaseOut">
                 <KeyFrame Cue="0%">
@@ -308,7 +308,7 @@
             </Animation>
         </Style.Animations>
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard.EntryThird">
+    <Style Selector="community|LeaderboardPodiumCard.EntryThird">
         <Style.Animations>
             <Animation Delay="0:0:0.16" Duration="0:0:0.45" FillMode="Forward" Easing="CircularEaseOut">
                 <KeyFrame Cue="0%">
@@ -323,7 +323,7 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard.FloatA /template/ Border#PART_CardSurface">
+    <Style Selector="community|LeaderboardPodiumCard.FloatA /template/ Border#PART_CardSurface">
         <Style.Animations>
             <Animation Duration="0:0:5.2" IterationCount="INFINITE" Easing="SineEaseInOut">
                 <KeyFrame Cue="0%">
@@ -338,7 +338,7 @@
             </Animation>
         </Style.Animations>
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard.FloatB /template/ Border#PART_CardSurface">
+    <Style Selector="community|LeaderboardPodiumCard.FloatB /template/ Border#PART_CardSurface">
         <Style.Animations>
             <Animation Duration="0:0:4.7" IterationCount="INFINITE" Easing="SineEaseInOut">
                 <KeyFrame Cue="0%">
@@ -353,7 +353,7 @@
             </Animation>
         </Style.Animations>
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard.FloatC /template/ Border#PART_CardSurface">
+    <Style Selector="community|LeaderboardPodiumCard.FloatC /template/ Border#PART_CardSurface">
         <Style.Animations>
             <Animation Duration="0:0:5.7" IterationCount="INFINITE" Easing="SineEaseInOut">
                 <KeyFrame Cue="0%">
@@ -369,7 +369,7 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard /template/ Border#PART_Aura">
+    <Style Selector="community|LeaderboardPodiumCard /template/ Border#PART_Aura">
         <Style.Animations>
             <Animation Duration="0:0:9" IterationCount="INFINITE">
                 <KeyFrame Cue="0%">
@@ -393,7 +393,7 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard /template/ Border#PART_Shimmer">
+    <Style Selector="community|LeaderboardPodiumCard /template/ Border#PART_Shimmer">
         <Style.Animations>
             <Animation Duration="0:0:3.8" IterationCount="INFINITE" Easing="CircularEaseInOut">
                 <KeyFrame Cue="0%">
@@ -414,7 +414,7 @@
         </Style.Animations>
     </Style>
 
-    <Style Selector="patterns|LeaderboardPodiumCard /template/ Border#PART_ParticleA">
+    <Style Selector="community|LeaderboardPodiumCard /template/ Border#PART_ParticleA">
         <Style.Animations>
             <Animation Duration="0:0:3.2" IterationCount="INFINITE" Easing="SineEaseInOut">
                 <KeyFrame Cue="0%">
@@ -432,7 +432,7 @@
             </Animation>
         </Style.Animations>
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard /template/ Border#PART_ParticleB">
+    <Style Selector="community|LeaderboardPodiumCard /template/ Border#PART_ParticleB">
         <Style.Animations>
             <Animation Duration="0:0:2.9" IterationCount="INFINITE" Easing="SineEaseInOut">
                 <KeyFrame Cue="0%">
@@ -450,7 +450,7 @@
             </Animation>
         </Style.Animations>
     </Style>
-    <Style Selector="patterns|LeaderboardPodiumCard /template/ Border#PART_ParticleC">
+    <Style Selector="community|LeaderboardPodiumCard /template/ Border#PART_ParticleC">
         <Style.Animations>
             <Animation Duration="0:0:3.7" IterationCount="INFINITE" Easing="SineEaseInOut">
                 <KeyFrame Cue="0%">
diff --git a/WheelWizard/Views/Patterns/LeaderboardPodiumCard.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Patterns/LeaderboardPodiumCard.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml.cs
index b9cc1fee5..af904c3c6 100644
--- a/WheelWizard/Views/Patterns/LeaderboardPodiumCard.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml.cs
@@ -3,7 +3,7 @@
 using WheelWizard.WheelWizardData.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.WheelWizardData.Views;
 
 public class LeaderboardPodiumCard : TemplatedControl
 {
diff --git a/WheelWizard/Views/Pages/UserProfilePage.axaml b/WheelWizard/Features/WheelWizardData/Views/UserProfilePage.axaml
similarity index 96%
rename from WheelWizard/Views/Pages/UserProfilePage.axaml
rename to WheelWizard/Features/WheelWizardData/Views/UserProfilePage.axaml
index 12f8dcafc..5ac000250 100644
--- a/WheelWizard/Views/Pages/UserProfilePage.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/UserProfilePage.axaml
@@ -4,13 +4,13 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="656" d:DesignHeight="876"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:animation="clr-namespace:Avalonia.Animation;assembly=Avalonia.Base"
              xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
-             x:Class="WheelWizard.Views.Pages.UserProfilePage"
-             x:DataType="pages:UserProfilePage">
+             x:Class="WheelWizard.WheelWizardData.Views.UserProfilePage"
+             x:DataType="community:UserProfilePage"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views">
     <UserControl.Styles>
         <Style Selector="Border.carouselDot">
             <Setter Property="Width" Value="10" />
@@ -182,7 +182,7 @@
                             BorderThickness="1" Margin="0,0,5,10" CornerRadius="4" x:Name="PART_HeadBorderFace"
                             Background="{StaticResource Neutral950}">
                         <Grid>
-                            <behavior:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                            <miiImages:MiiImageLoader HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                                      LowQualitySpeedup="True"
                                                      Mii="{Binding CurrentMii}"
                                                      FallBackColor="{StaticResource Neutral700}"
@@ -191,7 +191,7 @@
                             <StackPanel Margin="7" HorizontalAlignment="Left" VerticalAlignment="Top">
                                 <StackPanel Orientation="Horizontal">
                                     <SelectableTextBlock Classes="TitleText" x:Name="ProfileAttribUserName" />
-                                    <components:IconLabelButton VerticalAlignment="Center" x:Name="EditMiiName"
+                                    <components:LinkButton VerticalAlignment="Center" x:Name="EditMiiName"
                                                                 IconData="{StaticResource Pen}"
                                                                 Click="RenameMii_OnClick"
                                                                 Margin="7,0,0,0" IconSize="20"
@@ -200,7 +200,7 @@
                                 </StackPanel>
                                 <StackPanel Orientation="Horizontal">
                                     <SelectableTextBlock Classes="BodyText" x:Name="ProfileAttribFriendCode" />
-                                    <components:IconLabelButton VerticalAlignment="Center" x:Name="CopyFcButton"
+                                    <components:LinkButton VerticalAlignment="Center" x:Name="CopyFcButton"
                                                                 Click="CopyFriendCode_OnClick"
                                                                 IconData="{StaticResource Copy}"
                                                                 Margin="7,0,0,0" IconSize="20"
@@ -239,7 +239,7 @@
                     <Grid Grid.Row="2" x:Name="CarouselNavigation" VerticalAlignment="Center" HorizontalAlignment="Center"
                           Margin="0,2,0,2" ColumnDefinitions="Auto,Auto,Auto" IsVisible="{Binding HasProfileInfo}">
                         <components:Button Grid.Column="0" IconData="{StaticResource ArrowLeft}" IconSize="12"
-                                           Width="26" Height="26" Padding="0" Variant="UglyLight"
+                                           Width="26" Height="26" Padding="0" Variant="Light"
                                            VerticalAlignment="Center" Margin="0,0,8,0"
                                            Click="PrevCarouselPage_OnClick" />
 
@@ -250,7 +250,7 @@
                         </StackPanel>
 
                         <components:Button Grid.Column="2" IconData="{StaticResource ArrowRight}" IconSize="12"
-                                           Width="26" Height="26" Padding="0" Variant="UglyLight"
+                                           Width="26" Height="26" Padding="0" Variant="Light"
                                            VerticalAlignment="Center" Margin="8,0,0,0"
                                            Click="NextCarouselPage_OnClick" />
                     </Grid>
@@ -307,7 +307,7 @@
                                 </Grid>
 
                                 <Grid Background="Transparent">
-                                <behavior:Mii3DRender VerticalAlignment="Bottom" HorizontalAlignment="Center"
+                                <miiImages:Mii3DRender VerticalAlignment="Bottom" HorizontalAlignment="Center"
                                                       Mii="{Binding CurrentMii}"
                                                       Margin="0,0,0,15"
                                                       ImageVariant="{x:Static miiVars:MiiImageVariants.FullBodyCarousel}"
diff --git a/WheelWizard/Views/Pages/UserProfilePage.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/UserProfilePage.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Pages/UserProfilePage.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/UserProfilePage.axaml.cs
index d1797ee0c..ec93e5b55 100644
--- a/WheelWizard/Views/Pages/UserProfilePage.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/UserProfilePage.axaml.cs
@@ -9,22 +9,24 @@
 using WheelWizard.CustomDistributions;
 using WheelWizard.Models.Enums;
 using WheelWizard.RrRooms;
+using WheelWizard.RrRooms.Views;
 using WheelWizard.Settings;
 using WheelWizard.Settings.Types;
 using WheelWizard.Shared.MessageTranslations;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Popups.MiiManagement;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WheelWizardData;
+using WheelWizard.WheelWizardData.Views;
 using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.GameLicense;
 using WheelWizard.WiiManagement.GameLicense.Domain;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
+using WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.WheelWizardData.Views;
 
 public partial class UserProfilePage : UserControl, INotifyPropertyChanged
 {
@@ -277,7 +279,7 @@ private void UpdatePage()
         ProfileAttribTotalWins.Text = currentPlayer.Statistics.Performance.FirstPlaces.ToString();
 
         BadgeContainer.Children.Clear();
-        var badges = BadgeService.GetBadges(currentPlayer.FriendCode).Select(variant => new Badge { Variant = variant });
+        var badges = BadgeService.GetBadges(currentPlayer.FriendCode).Select(variant => new CommunityBadge { Variant = variant });
         foreach (var badge in badges)
         {
             badge.Height = 30;
@@ -408,7 +410,7 @@ private void ViewRoom_OnClick(object? sender, RoutedEventArgs e)
         MessageTranslationHelper.ShowMessage(MessageTranslation.Warning_CouldNotFindRoom);
     }
 
-    private void CopyFriendCode_OnClick(object? sender, EventArgs e)
+    private void CopyFriendCode_OnClick(object? sender, RoutedEventArgs e)
     {
         if (currentPlayer?.FriendCode == null)
             return;
@@ -428,7 +430,7 @@ private OperationResult ValidateMiiName(string? oldName, string newName)
         return Ok();
     }
 
-    private async void RenameMii_OnClick(object? sender, EventArgs e)
+    private async void RenameMii_OnClick(object? sender, RoutedEventArgs e)
     {
         var oldName = CurrentMii?.Name.ToString();
         var extraText = t("question.enter_new_name.extra", new { name = oldName ?? string.Empty }) ?? string.Empty;
diff --git a/WheelWizard/Views/Patterns/VrHistoryGraph.axaml b/WheelWizard/Features/WheelWizardData/Views/VrHistoryGraph.axaml
similarity index 97%
rename from WheelWizard/Views/Patterns/VrHistoryGraph.axaml
rename to WheelWizard/Features/WheelWizardData/Views/VrHistoryGraph.axaml
index c751722b0..7e49406fc 100644
--- a/WheelWizard/Views/Patterns/VrHistoryGraph.axaml
+++ b/WheelWizard/Features/WheelWizardData/Views/VrHistoryGraph.axaml
@@ -2,14 +2,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              mc:Ignorable="d"
              d:DesignWidth="560"
              d:DesignHeight="390"
-             x:Class="WheelWizard.Views.Patterns.VrHistoryGraph"
-             x:DataType="behaviorComp:VrHistoryGraph">
+             x:Class="WheelWizard.WheelWizardData.Views.VrHistoryGraph"
+             x:DataType="community:VrHistoryGraph"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views">
     <UserControl.Styles>
         <Style Selector="Border.profileStatCard">
             <Setter Property="Background" Value="{StaticResource Neutral900}" />
@@ -21,7 +21,7 @@
             Margin="0"
             Background="Transparent"
             BorderThickness="0"
-            DataContext="{Binding RelativeSource={RelativeSource AncestorType=behaviorComp:VrHistoryGraph}}">
+            DataContext="{Binding RelativeSource={RelativeSource AncestorType=community:VrHistoryGraph}}">
         <Grid RowDefinitions="Auto,Auto,*">
             <Grid Grid.Row="0"
                   ColumnDefinitions="*,*,*"
diff --git a/WheelWizard/Views/Patterns/VrHistoryGraph.axaml.cs b/WheelWizard/Features/WheelWizardData/Views/VrHistoryGraph.axaml.cs
similarity index 99%
rename from WheelWizard/Views/Patterns/VrHistoryGraph.axaml.cs
rename to WheelWizard/Features/WheelWizardData/Views/VrHistoryGraph.axaml.cs
index 72df58b27..aeb746a68 100644
--- a/WheelWizard/Views/Patterns/VrHistoryGraph.axaml.cs
+++ b/WheelWizard/Features/WheelWizardData/Views/VrHistoryGraph.axaml.cs
@@ -5,8 +5,9 @@
 using Avalonia.Threading;
 using Avalonia.VisualTree;
 using WheelWizard.RrRooms;
+using WheelWizard.WheelWizardData.ViewModels;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.WheelWizardData.Views;
 
 public partial class VrHistoryGraph : UserControl, INotifyPropertyChanged
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiCarouselWindow.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiCarouselWindow.axaml
similarity index 65%
rename from WheelWizard/Views/Popups/MiiManagement/MiiCarouselWindow.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiCarouselWindow.axaml
index f0e79db99..840b2e312 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiCarouselWindow.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiCarouselWindow.axaml
@@ -1,17 +1,17 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                   xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
                    xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" ClipToBounds="False"
-                   x:Class="WheelWizard.Views.Popups.MiiManagement.MiiCarouselWindow">
+                   x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiCarouselWindow"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid Width="440" Height="300">
         <components:LoadingIcon HorizontalAlignment="Center" VerticalAlignment="Center" Width="180" Height="180"
                                 x:Name="MiiLoadingIcon" Foreground="{StaticResource Neutral800}" />
-        <behavior:Mii3DRender x:Name="Carousel" VerticalAlignment="Center" HorizontalAlignment="Stretch" Height="280" 
+        <miiImages:Mii3DRender x:Name="Carousel" VerticalAlignment="Center" HorizontalAlignment="Stretch" Height="280"
                               ImageVariant="{x:Static miiVars:MiiImageVariants.FullBodyCarousel}"/>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiCarouselWindow.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiCarouselWindow.axaml.cs
similarity index 86%
rename from WheelWizard/Views/Popups/MiiManagement/MiiCarouselWindow.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiCarouselWindow.axaml.cs
index eca10f400..76ece14d0 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiCarouselWindow.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiCarouselWindow.axaml.cs
@@ -1,7 +1,7 @@
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
 public partial class MiiCarouselWindow : PopupContent
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorBeardPage.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorBeardPage.axaml
similarity index 95%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorBeardPage.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorBeardPage.axaml
index 6f0fe949d..0ef9ba645 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorBeardPage.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorBeardPage.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="550"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorFacialHair">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorFacialHair">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.facial_hair}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorBeardPage.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorBeardPage.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorBeardPage.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorBeardPage.axaml.cs
index 77bcc4c80..e95108388 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorBeardPage.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorBeardPage.axaml.cs
@@ -1,9 +1,10 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorFacialHair : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEmpty.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEmpty.axaml
similarity index 87%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEmpty.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEmpty.axaml
index e16f4e9a9..5553e0edf 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEmpty.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEmpty.axaml
@@ -5,13 +5,13 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorEmpty">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorEmpty">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <TextBlock Classes="BodyText" Margin="10" Text="EMPTY!!!" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}" 
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEmpty.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEmpty.axaml.cs
similarity index 68%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEmpty.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEmpty.axaml.cs
index b5af03e60..c3757b462 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEmpty.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEmpty.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorEmpty : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyebrows.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyebrows.axaml
similarity index 96%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyebrows.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyebrows.axaml
index 76bfb294e..91805f799 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyebrows.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyebrows.axaml
@@ -5,13 +5,13 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorEyebrows">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorEyebrows">
     <!-- Header remains the same -->
     <Grid RowDefinitions="40,*">
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.eyebrows}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyebrows.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyebrows.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyebrows.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyebrows.axaml.cs
index 383101104..ccea96d21 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyebrows.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyebrows.axaml.cs
@@ -1,9 +1,10 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorEyebrows : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyes.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyes.axaml
similarity index 96%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyes.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyes.axaml
index 0e22e3db9..962cb9c3b 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyes.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyes.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorEyes">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorEyes">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.eyes}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyes.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyes.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyes.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyes.axaml.cs
index 46255ebcc..5c721f09b 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorEyes.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorEyes.axaml.cs
@@ -1,9 +1,10 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorEyes : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorFace.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorFace.axaml
similarity index 92%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorFace.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorFace.axaml
index 2f4795088..0b810e663 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorFace.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorFace.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorFace">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorFace">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.face}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorFace.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorFace.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorFace.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorFace.axaml.cs
index 59890fefc..592eb4575 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorFace.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorFace.axaml.cs
@@ -1,9 +1,10 @@
 using Avalonia.Controls;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorFace : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGeneral.axaml
similarity index 90%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGeneral.axaml
index a34dfeaa2..d033f1425 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGeneral.axaml
@@ -4,15 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorGeneral">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorGeneral">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.general}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" />
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}"
                                     IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left"
                                     Margin="10,0"
@@ -26,7 +25,7 @@
                 <StackPanel> <!-- Mii Name -->
                     <components:FormFieldLabel Text="{loc:T attribute.mii.name}" />
                     <Grid HorizontalAlignment="Stretch" ColumnDefinitions="*,Auto" VerticalAlignment="Top">
-                        <behavior:FeedbackTextBox x:Name="MiiName" Watermark="{loc:T placeholder.enter_mii_name}"
+                        <components:TextField x:Name="MiiName" PlaceholderText="{loc:T placeholder.enter_mii_name}"
                                                   TextChanged="Name_TextChanged" VerticalAlignment="Top"/>
                         <components:Button Grid.Column="1" Variant="Default" Margin="10,0,0,0"
                                            Padding="10,5" IconSize="23" VerticalAlignment="Top"
@@ -37,7 +36,7 @@
 
                 <StackPanel> <!-- Creator Name -->
                     <components:FormFieldLabel Text="{loc:T attribute.mii.creator_name}" />
-                    <behavior:FeedbackTextBox x:Name="CreatorName" Watermark="{loc:T helper_text.optional}"
+                    <components:TextField x:Name="CreatorName" PlaceholderText="{loc:T helper_text.optional}"
                                               TextChanged="Name_TextChanged" />
                 </StackPanel>
 
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGeneral.axaml.cs
similarity index 94%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGeneral.axaml.cs
index 5a02f6e04..77eb95818 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGeneral.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGeneral.axaml.cs
@@ -3,12 +3,13 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using WheelWizard.CustomCharacters;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorGeneral : MiiEditorBaseControl
 {
@@ -73,12 +74,12 @@ private void Name_TextChanged(object sender, TextChangedEventArgs e)
         // MiiName
         var validationMiiNameResult = ValidateMiiName(null, MiiName.Text);
         _hasMiiNameError = validationMiiNameResult.IsFailure;
-        MiiName.ErrorMessage = validationMiiNameResult.Error?.Message ?? "";
+        MiiName.ErrorText = validationMiiNameResult.Error?.Message ?? "";
 
         // CreatorName
         var validationCreatorNameResult = ValidateCreatorName(CreatorName.Text);
         _hasCreatorNameError = validationCreatorNameResult.IsFailure;
-        CreatorName.ErrorMessage = validationCreatorNameResult.Error?.Message ?? "";
+        CreatorName.ErrorText = validationCreatorNameResult.Error?.Message ?? "";
     }
 
     private OperationResult ValidateMiiName(string? _, string newName)
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGlasses.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGlasses.axaml
similarity index 95%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGlasses.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGlasses.axaml
index b801a1fa8..36a903e02 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGlasses.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGlasses.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorGlasses">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorGlasses">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.glasses}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGlasses.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGlasses.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGlasses.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGlasses.axaml.cs
index f96b3977c..373621990 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorGlasses.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorGlasses.axaml.cs
@@ -1,9 +1,10 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorGlasses : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorHair.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorHair.axaml
similarity index 92%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorHair.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorHair.axaml
index 78ed3d597..7500218ec 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorHair.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorHair.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorHair">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorHair">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.hair}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorHair.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorHair.axaml.cs
similarity index 96%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorHair.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorHair.axaml.cs
index 863d3f49e..ef9861eae 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorHair.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorHair.axaml.cs
@@ -1,9 +1,10 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorHair : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorLips.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorLips.axaml
similarity index 95%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorLips.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorLips.axaml
index c47794454..daeb2a5c0 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorLips.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorLips.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorLips">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorLips">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.lips}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorLips.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorLips.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorLips.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorLips.axaml.cs
index b50db788b..6c6a6d1a7 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorLips.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorLips.axaml.cs
@@ -3,7 +3,7 @@
 using WheelWizard.WiiManagement.MiiManagement.Domain;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorLips : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorMole.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorMole.axaml
similarity index 96%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorMole.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorMole.axaml
index 0024caa23..234af9c3f 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorMole.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorMole.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="500"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorMole">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorMole">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.mole}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorMole.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorMole.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorMole.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorMole.axaml.cs
index c52c26b85..0cd9560e8 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorMole.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorMole.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Interactivity;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorMole : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorNose.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorNose.axaml
similarity index 94%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorNose.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorNose.axaml
index 3d6feebaf..b9ea4f210 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorNose.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorNose.axaml
@@ -5,14 +5,14 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorNose">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorNose">
     <!-- FOR EVERY EDITOR PAGE -->
     <Grid RowDefinitions="40,*">
         <!-- Updated Title -->
         <TextBlock Classes="BodyText" Margin="10" Text="{loc:T attribute.mii_section.nose}" HorizontalAlignment="Right" />
         <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
                 HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1"/>
-        <components:IconLabelButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
+        <components:LinkButton Grid.Row="0" Text="{loc:T action.back}" IconData="{StaticResource ArrowLeft}"
                                     Click="BackButton_OnClick" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,0"
                                     Foreground="{StaticResource TitleTextColor}" FontSize="16"
                                     HoverForeground="{StaticResource Primary200}"/>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorNose.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorNose.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorNose.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorNose.axaml.cs
index 31ad68b98..455c977e4 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorNose.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorNose.axaml.cs
@@ -1,8 +1,9 @@
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorNose : MiiEditorBaseControl
 {
diff --git a/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorStartPage.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorStartPage.axaml
new file mode 100644
index 000000000..db2060f6f
--- /dev/null
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorStartPage.axaml
@@ -0,0 +1,74 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:components="clr-namespace:WheelWizard.Views.Components"
+             xmlns:loc="clr-namespace:WheelWizard.Localization"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor.EditorStartPage"
+        xmlns:editor="clr-namespace:WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor">
+    <Grid RowDefinitions="40,*,60">
+        <StackPanel Orientation="Horizontal"  Margin="10" Spacing="10">
+            <!-- EmptyStarIcon -->
+            <components:LinkButton Text="" VerticalAlignment="Center" x:Name="FavoriteButton" Click="FavoriteButton_OnClick">
+                
+                <components:LinkButton.Styles>
+                    <Style Selector="components|LinkButton">
+                        <Setter Property="IconData" Value="{StaticResource EmptyStarIcon}" />
+                        <Setter Property="Foreground" Value="{StaticResource TitleTextColor}" />
+                        <Setter Property="HoverForeground" Value="{StaticResource Warning300}" />
+                    </Style>
+                    
+                    <Style Selector="components|LinkButton.favorite">
+                        <Setter Property="IconData" Value="{StaticResource StarIcon}" />
+                        <Setter Property="Foreground" Value="{StaticResource Warning500}" />
+                        <Setter Property="HoverForeground" Value="{StaticResource Warning300}" />
+                    </Style>
+                </components:LinkButton.Styles>
+            </components:LinkButton>
+            <SelectableTextBlock Classes="BodyText" x:Name="MiiName" />
+        </StackPanel>
+        
+        <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
+                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" />
+        <Border Grid.Row="2" Background="{StaticResource BackgroundLineColor}"
+                HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="1" />
+        
+        <components:Button Variant="Default" Grid.Row="2" Margin="10"  VerticalAlignment="Top" 
+                           HorizontalAlignment="Left" Padding="12,6" IconSize="28"
+                           IconData="{StaticResource Dice}" Click="RandomizeMii_OnClick" />
+        <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="10"
+                    VerticalAlignment="Top" HorizontalAlignment="Right" Spacing="10">
+            <components:Button Text="{loc:T action.cancel}" Variant="Warning"
+                               IconData="{StaticResource XMark}" Click="CancelButton_OnClick" />
+            <components:Button Text="{loc:T action.save}" Variant="Primary"
+                               x:Name="SaveButton"
+                               IconData="{StaticResource CheckMark}" Click="SaveButton_OnClick" />
+        </StackPanel>
+        
+        <ScrollViewer Grid.Row="1">
+            <StackPanel>
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.general}"
+                                            CommandParameter="{x:Type editor:EditorGeneral}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.face}"
+                                            CommandParameter="{x:Type editor:EditorFace}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.hair}"
+                                            CommandParameter="{x:Type editor:EditorHair}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.eyebrows}"
+                                            CommandParameter="{x:Type editor:EditorEyebrows}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.eyes}"
+                                            CommandParameter="{x:Type editor:EditorEyes}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.nose}"
+                                            CommandParameter="{x:Type editor:EditorNose}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.lips}"
+                                            CommandParameter="{x:Type editor:EditorLips}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.glasses}"
+                                            CommandParameter="{x:Type editor:EditorGlasses}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.facial_hair}"
+                                            CommandParameter="{x:Type editor:EditorFacialHair}" />
+                <components:ListActionButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.mole}"
+                                            CommandParameter="{x:Type editor:EditorMole}" />
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorStartPage.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorStartPage.axaml.cs
similarity index 86%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorStartPage.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorStartPage.axaml.cs
index e60ce1c46..73181c424 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorStartPage.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/EditorStartPage.axaml.cs
@@ -3,7 +3,7 @@
 using WheelWizard.Views.Components;
 using MiiFactory = WheelWizard.WiiManagement.MiiManagement.MiiFactory;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public partial class EditorStartPage : MiiEditorBaseControl
 {
@@ -21,10 +21,10 @@ public EditorStartPage(IRandomSystem random, MiiEditorWindow ew)
 
     private void PopupPageButton_OnClick(object? sender, RoutedEventArgs e)
     {
-        if (sender is not PopupListButton button)
+        if (sender is not ListActionButton button)
             return;
 
-        if (button.Type is not { } pageType)
+        if (button.CommandParameter is not Type pageType)
             return;
 
         Editor.SetEditorPage(pageType);
@@ -48,7 +48,7 @@ private void RandomizeMii_OnClick(object? sender, RoutedEventArgs e)
 
     private void SaveButton_OnClick(object? sender, RoutedEventArgs e) => Editor.SignalSaveMii();
 
-    private void FavoriteButton_OnClick(object? sender, EventArgs e)
+    private void FavoriteButton_OnClick(object? sender, RoutedEventArgs e)
     {
         Editor.Mii.IsFavorite = !Editor.Mii.IsFavorite;
 
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/MiiColorMappings.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/MiiColorMappings.cs
similarity index 96%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/MiiColorMappings.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/MiiColorMappings.cs
index 7c7d3d9d7..025a62c33 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/MiiColorMappings.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/MiiColorMappings.cs
@@ -1,8 +1,8 @@
 using Avalonia.Media;
-using WheelWizard.Views;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public static class MiiColorMappings
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/MiiEditorBaseControl.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/MiiEditorBaseControl.cs
similarity index 91%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditor/MiiEditorBaseControl.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/MiiEditorBaseControl.cs
index dbd4b6903..598e14ae1 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/MiiEditorBaseControl.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditor/MiiEditorBaseControl.cs
@@ -1,10 +1,12 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
+using Avalonia.Interactivity;
 using Avalonia.Media;
 using WheelWizard.Views.Components;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
 public class MiiEditorBaseControl : UserControl
 {
@@ -12,7 +14,7 @@ public class MiiEditorBaseControl : UserControl
 
     protected MiiEditorBaseControl(MiiEditorWindow editor) => Editor = editor;
 
-    protected void BackButton_OnClick(object? sender, EventArgs e)
+    protected void BackButton_OnClick(object? sender, RoutedEventArgs e)
     {
         BeforeBack();
         Editor.SetEditorPage(typeof(EditorStartPage));
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditorWindow.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditorWindow.axaml
similarity index 82%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditorWindow.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditorWindow.axaml
index 56c43066c..c0efbdfa5 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditorWindow.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditorWindow.axaml
@@ -1,15 +1,15 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns"
                    xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
-                   xmlns:miiManagement="clr-namespace:WheelWizard.Views.Popups.MiiManagement"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                   x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditorWindow"
-                   x:DataType="miiManagement:MiiEditorWindow" ClipToBounds="False">
+                   x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditorWindow"
+                   x:DataType="miiDialogs:MiiEditorWindow" ClipToBounds="False"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base"
+        xmlns:miiDialogs="clr-namespace:WheelWizard.WiiManagement.MiiManagement.Views.Dialogs">
     <Grid Height="460" ColumnDefinitions="370,20,450" ClipToBounds="False">
         <Border Grid.Column="0" CornerRadius="{StaticResource GlobalCornerRadius}" VerticalAlignment="Stretch"
                 HorizontalAlignment="Stretch" Background="{StaticResource Neutral900}">
@@ -22,7 +22,7 @@
            <Grid Grid.Row="0" x:Name="VisualizationFace" IsVisible="True">
                <Border CornerRadius="6"  BorderBrush="{StaticResource BackgroundLineColor}" BorderThickness="1"
                        Height="350" Width="350" HorizontalAlignment="Center" VerticalAlignment="Center">
-                   <behavior:MiiImageLoader  x:Name="MiiFaceImage" ReloadMethod="KeepInstanceUntilNew"
+                   <miiImages:MiiImageLoader  x:Name="MiiFaceImage" ReloadMethod="KeepInstanceUntilNew"
                                             Mii="{Binding Mii}" FallBackColor="{StaticResource Neutral700}"
                                             ImageVariant="{x:Static miiVars:MiiImageVariants.MiiEditorSmall}"/>
                </Border>
@@ -30,7 +30,7 @@
            </Grid>
 
            <Grid Grid.Row="0" x:Name="VisualizationCarousel" IsVisible="False">
-               <behavior:Mii3DRender x:Name="Mii3DRenderControl" Height="350" Width="388" HorizontalAlignment="Center" VerticalAlignment="Center"
+               <miiImages:Mii3DRender x:Name="Mii3DRenderControl" Height="350" Width="388" HorizontalAlignment="Center" VerticalAlignment="Center"
                                      ReloadMethod="KeepInstanceUntilNew"
                                      ImageVariant="{x:Static miiVars:MiiImageVariants.MiiEditorPreviewCarousel}"
                                      Mii="{Binding Mii}"/>
@@ -57,4 +57,4 @@
 
        </Grid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditorWindow.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditorWindow.axaml.cs
similarity index 94%
rename from WheelWizard/Views/Popups/MiiManagement/MiiEditorWindow.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditorWindow.axaml.cs
index b6dea9be4..abefeafb7 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditorWindow.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiEditorWindow.axaml.cs
@@ -2,15 +2,15 @@
 using Avalonia.Interactivity;
 using Avalonia.Threading;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Popups.Base;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Popups.MiiManagement.MiiEditor;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
+using WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiEditor;
 
-namespace WheelWizard.Views.Popups.MiiManagement;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
 public partial class MiiEditorWindow : PopupContent, INotifyPropertyChanged
 {
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiSelectorWindow.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiSelectorWindow.axaml
similarity index 86%
rename from WheelWizard/Views/Popups/MiiManagement/MiiSelectorWindow.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiSelectorWindow.axaml
index c978129f4..b4a8450d4 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiSelectorWindow.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiSelectorWindow.axaml
@@ -1,12 +1,12 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:loc="clr-namespace:WheelWizard.Localization"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                   x:Class="WheelWizard.Views.Popups.MiiManagement.MiiSelectorWindow">
+                   x:Class="WheelWizard.WiiManagement.MiiManagement.Views.Dialogs.MiiSelectorWindow"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid MinWidth="400" MaxHeight="950" RowDefinitions="*,*,*">
         <ScrollViewer Margin="0,0,0,10">
             <UniformGrid Columns="5" HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="MiiList">
@@ -27,4 +27,4 @@
                                Click="yesButton_Click" Margin="5,0,0,0"/>
         </UniformGrid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiSelectorWindow.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiSelectorWindow.axaml.cs
similarity index 94%
rename from WheelWizard/Views/Popups/MiiManagement/MiiSelectorWindow.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiSelectorWindow.axaml.cs
index d238d4b68..23f9ab198 100644
--- a/WheelWizard/Views/Popups/MiiManagement/MiiSelectorWindow.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/Dialogs/MiiSelectorWindow.axaml.cs
@@ -1,13 +1,13 @@
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using Avalonia.Threading;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
+using WheelWizard.WiiManagement.MiiManagement.Views;
 
-namespace WheelWizard.Views.Popups.MiiManagement;
+namespace WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
 public partial class MiiSelectorWindow : PopupContent
 {
diff --git a/WheelWizard/Views/Patterns/MiiBlock.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml
similarity index 89%
rename from WheelWizard/Views/Patterns/MiiBlock.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml
index ee89e2419..c7dcee9d4 100644
--- a/WheelWizard/Views/Patterns/MiiBlock.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml
@@ -1,19 +1,18 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="using:WheelWizard.Views.Components"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
         xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
-        xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:miis="clr-namespace:WheelWizard.WiiManagement.MiiManagement.Views"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views">
     <Design.PreviewWith>
         <StackPanel Spacing="13" Background="{StaticResource Neutral950}">
-            <patterns:MiiBlock Width="90" Height="90" IsGlobal="True"/>
-            <patterns:MiiBlock Width="90" Height="90" IsChecked="True" />
-            <patterns:MiiBlock Width="90" Height="90" />
-            <patterns:MiiBlock Width="90" Height="90" IsFavorite="True" />
+            <miis:MiiBlock Width="90" Height="90" IsGlobal="True"/>
+            <miis:MiiBlock Width="90" Height="90" IsChecked="True" />
+            <miis:MiiBlock Width="90" Height="90" />
+            <miis:MiiBlock Width="90" Height="90" IsFavorite="True" />
         </StackPanel>
     </Design.PreviewWith>
 
-    <Style Selector="patterns|MiiBlock">
+    <Style Selector="miis|MiiBlock">
         <!-- Set Defaults -->
         <Setter Property="Template">
             <ControlTemplate>
@@ -45,7 +44,7 @@
                                       IsVisible="{TemplateBinding Mii, Converter={x:Static ObjectConverters.IsNull} }"
                                       Width="1000" Foreground="{StaticResource Neutral500}" />
                             
-                            <behaviorComponent:MiiImageLoaderWithHover x:Name="PART_MiiImageLoader" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                            <miiImages:MiiImageLoaderWithHover x:Name="PART_MiiImageLoader" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                                                                         IsVisible="{TemplateBinding Mii, Converter={x:Static ObjectConverters.IsNotNull} }"
                                                                         Mii="{TemplateBinding Mii}" ImageOnlyMargin="-4,-9,-4,0"
                                                                         FallBackColor="{StaticResource Neutral500}"
@@ -87,7 +86,7 @@
             <Setter Property="Opacity" Value="1" />
         </Style>
         
-        <Style Selector="^:pointerover /template/ behaviorComponent|MiiImageLoaderWithHover#PART_MiiImageLoader">
+        <Style Selector="^:pointerover /template/ miiImages|MiiImageLoaderWithHover#PART_MiiImageLoader">
             <Setter Property="IsHovered" Value="True" />
         </Style>
         
diff --git a/WheelWizard/Views/Patterns/MiiBlock.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Patterns/MiiBlock.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml.cs
index 110107ba9..6958112a9 100644
--- a/WheelWizard/Views/Patterns/MiiBlock.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml.cs
@@ -5,11 +5,12 @@
 using Avalonia.Interactivity;
 using WheelWizard.MiiImages;
 using WheelWizard.MiiImages.Domain;
+using WheelWizard.MiiImages.Views;
 using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.WiiManagement.MiiManagement.Views;
 
 public class MiiBlock : RadioButton
 {
diff --git a/WheelWizard/Views/Pages/MiiListPage.axaml b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiListPage.axaml
similarity index 94%
rename from WheelWizard/Views/Pages/MiiListPage.axaml
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiListPage.axaml
index 8d4ba3728..793a7aa0e 100644
--- a/WheelWizard/Views/Pages/MiiListPage.axaml
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiListPage.axaml
@@ -3,10 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              mc:Ignorable="d" d:DesignWidth="456" d:DesignHeight="776"
-             x:Class="WheelWizard.Views.Pages.MiiListPage">
+             x:Class="WheelWizard.WiiManagement.MiiManagement.Views.MiiListPage"
+        xmlns:miis="clr-namespace:WheelWizard.WiiManagement.MiiManagement.Views">
     <Grid x:Name="CompleteGrid" x:CompileBindings="False">
         <Grid.RowDefinitions>
             <RowDefinition Height="{StaticResource TopRowSize}" />
@@ -22,7 +22,7 @@
                         Spacing="8">
                 <TextBlock Text="{loc:T page_title.my_miis}"
                            Classes="PageTitleText" />
-                <components:StateBox Text="0"
+                <components:StatusBadge Text="0"
                                      IconSize="0"
                                      x:Name="ListItemCount"
                                      VerticalAlignment="Center" />
@@ -104,12 +104,12 @@
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
-                                    <behaviorComponent:MiiBlock Width="90" Height="90" Margin="8,10"
+                                    <miis:MiiBlock Width="90" Height="90" Margin="8,10"
                                                                 Mii="{Binding Mii}" IsGlobal="{Binding IsGlobal}"
                                                                 GroupName="{Binding SelectionGroup}"
                                                                 IsChecked="{Binding IsSelected, Mode=TwoWay}"
                                                                 Click="MiiBlock_OnClick">
-                                        <behaviorComponent:MiiBlock.ContextMenu>
+                                        <miis:MiiBlock.ContextMenu>
                                             <ContextMenu>
                                                 <MenuItem Header="{Binding FavoriteActionHeader}"
                                                           CommandParameter="{Binding}" Click="FavoriteContextMenu_OnClick"
@@ -127,8 +127,8 @@
                                                           CommandParameter="{Binding}" Click="DeleteContextMenu_OnClick"
                                                           IsEnabled="{Binding HasMii}" />
                                             </ContextMenu>
-                                        </behaviorComponent:MiiBlock.ContextMenu>
-                                    </behaviorComponent:MiiBlock>
+                                        </miis:MiiBlock.ContextMenu>
+                                    </miis:MiiBlock>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
diff --git a/WheelWizard/Views/Pages/MiiListPage.axaml.cs b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiListPage.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Pages/MiiListPage.axaml.cs
rename to WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiListPage.axaml.cs
index 9a6f1fa47..530228b89 100644
--- a/WheelWizard/Views/Pages/MiiListPage.axaml.cs
+++ b/WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiListPage.axaml.cs
@@ -8,18 +8,18 @@
 using Testably.Abstractions;
 using WheelWizard.CustomCharacters;
 using WheelWizard.Settings;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Components;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.Generic;
-using WheelWizard.Views.Popups.MiiManagement;
-using WheelWizard.Views.Storage;
+using WheelWizard.Views.DesignTime;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
 using WheelWizard.WiiManagement;
 using WheelWizard.WiiManagement.MiiManagement;
 using WheelWizard.WiiManagement.MiiManagement.Domain.Mii;
+using WheelWizard.WiiManagement.MiiManagement.Views;
+using WheelWizard.WiiManagement.MiiManagement.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.WiiManagement.MiiManagement.Views;
 
 public partial class MiiListPage : UserControl
 {
diff --git a/WheelWizard/Program.cs b/WheelWizard/Program.cs
index f95d5c08a..3da1392b7 100644
--- a/WheelWizard/Program.cs
+++ b/WheelWizard/Program.cs
@@ -5,12 +5,13 @@
 using WheelWizard.ApplicationData;
 using WheelWizard.ApplicationIntegration;
 using WheelWizard.ApplicationLifecycle.Logging;
+using WheelWizard.MiiImages.Views;
 using WheelWizard.Settings;
 using WheelWizard.Shared.Platform;
 using WheelWizard.Shared.Services;
 using WheelWizard.Views;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Startup;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Startup;
 
 namespace WheelWizard;
 
diff --git a/WheelWizard/SetupExtensions.cs b/WheelWizard/SetupExtensions.cs
index 846ad0a05..44d92d0e5 100644
--- a/WheelWizard/SetupExtensions.cs
+++ b/WheelWizard/SetupExtensions.cs
@@ -17,7 +17,7 @@
 using WheelWizard.Recomp;
 using WheelWizard.RrRooms;
 using WheelWizard.Settings;
-using WheelWizard.Views;
+using WheelWizard.Views.Shell;
 using WheelWizard.WheelWizardData;
 using WheelWizard.WiiManagement;
 
diff --git a/WheelWizard/Views/Polling/AvaloniaPollingScheduler.cs b/WheelWizard/Shared/Desktop/Polling/AvaloniaPollingScheduler.cs
similarity index 94%
rename from WheelWizard/Views/Polling/AvaloniaPollingScheduler.cs
rename to WheelWizard/Shared/Desktop/Polling/AvaloniaPollingScheduler.cs
index 0bedef0e5..f99726dcd 100644
--- a/WheelWizard/Views/Polling/AvaloniaPollingScheduler.cs
+++ b/WheelWizard/Shared/Desktop/Polling/AvaloniaPollingScheduler.cs
@@ -1,7 +1,7 @@
 using Avalonia.Threading;
 using WheelWizard.Shared.Polling;
 
-namespace WheelWizard.Views.Polling;
+namespace WheelWizard.Shared.Desktop.Polling;
 
 public sealed class AvaloniaPollingScheduler : IPollingScheduler
 {
diff --git a/WheelWizard/Views/Storage/DesktopStorageProviderAccessor.cs b/WheelWizard/Shared/Desktop/Storage/DesktopStorageProviderAccessor.cs
similarity index 92%
rename from WheelWizard/Views/Storage/DesktopStorageProviderAccessor.cs
rename to WheelWizard/Shared/Desktop/Storage/DesktopStorageProviderAccessor.cs
index 021b2f6b5..fd55ad1ca 100644
--- a/WheelWizard/Views/Storage/DesktopStorageProviderAccessor.cs
+++ b/WheelWizard/Shared/Desktop/Storage/DesktopStorageProviderAccessor.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform.Storage;
 
-namespace WheelWizard.Views.Storage;
+namespace WheelWizard.Shared.Desktop.Storage;
 
 public interface IStorageProviderAccessor
 {
diff --git a/WheelWizard/Views/Storage/FilePickerFilters.cs b/WheelWizard/Shared/Desktop/Storage/FilePickerFilters.cs
similarity index 92%
rename from WheelWizard/Views/Storage/FilePickerFilters.cs
rename to WheelWizard/Shared/Desktop/Storage/FilePickerFilters.cs
index 8007da814..74c7e74c9 100644
--- a/WheelWizard/Views/Storage/FilePickerFilters.cs
+++ b/WheelWizard/Shared/Desktop/Storage/FilePickerFilters.cs
@@ -1,6 +1,6 @@
 using Avalonia.Platform.Storage;
 
-namespace WheelWizard.Views.Storage;
+namespace WheelWizard.Shared.Desktop.Storage;
 
 public static class FilePickerFilters
 {
diff --git a/WheelWizard/Views/Storage/FilePickerService.cs b/WheelWizard/Shared/Desktop/Storage/FilePickerService.cs
similarity index 98%
rename from WheelWizard/Views/Storage/FilePickerService.cs
rename to WheelWizard/Shared/Desktop/Storage/FilePickerService.cs
index cf4d4105c..6a062184a 100644
--- a/WheelWizard/Views/Storage/FilePickerService.cs
+++ b/WheelWizard/Shared/Desktop/Storage/FilePickerService.cs
@@ -3,7 +3,7 @@
 using WheelWizard.Shared.Platform;
 using WheelWizard.Shared.Processes;
 
-namespace WheelWizard.Views.Storage;
+namespace WheelWizard.Shared.Desktop.Storage;
 
 public sealed class FilePickerService(IStorageProviderAccessor storage, IRuntimeEnvironment environment, IProcessLauncher processes)
     : IFilePickerService
diff --git a/WheelWizard/Views/Storage/IFilePickerService.cs b/WheelWizard/Shared/Desktop/Storage/IFilePickerService.cs
similarity index 93%
rename from WheelWizard/Views/Storage/IFilePickerService.cs
rename to WheelWizard/Shared/Desktop/Storage/IFilePickerService.cs
index 61695efb1..4c095b3b7 100644
--- a/WheelWizard/Views/Storage/IFilePickerService.cs
+++ b/WheelWizard/Shared/Desktop/Storage/IFilePickerService.cs
@@ -1,6 +1,6 @@
 using Avalonia.Platform.Storage;
 
-namespace WheelWizard.Views.Storage;
+namespace WheelWizard.Shared.Desktop.Storage;
 
 public interface IFilePickerService
 {
diff --git a/WheelWizard/Views/Storage/StoragePaths.cs b/WheelWizard/Shared/Desktop/Storage/StoragePaths.cs
similarity index 96%
rename from WheelWizard/Views/Storage/StoragePaths.cs
rename to WheelWizard/Shared/Desktop/Storage/StoragePaths.cs
index d5d18f0e4..94b2dc235 100644
--- a/WheelWizard/Views/Storage/StoragePaths.cs
+++ b/WheelWizard/Shared/Desktop/Storage/StoragePaths.cs
@@ -1,6 +1,6 @@
 using Avalonia.Platform.Storage;
 
-namespace WheelWizard.Views.Storage;
+namespace WheelWizard.Shared.Desktop.Storage;
 
 public static class StoragePaths
 {
diff --git a/WheelWizard/Views/Downloads/DownloadPresentation.cs b/WheelWizard/Shared/Downloads/Presentation/DownloadPresentation.cs
similarity index 96%
rename from WheelWizard/Views/Downloads/DownloadPresentation.cs
rename to WheelWizard/Shared/Downloads/Presentation/DownloadPresentation.cs
index f246ce39f..89164e15b 100644
--- a/WheelWizard/Views/Downloads/DownloadPresentation.cs
+++ b/WheelWizard/Shared/Downloads/Presentation/DownloadPresentation.cs
@@ -1,7 +1,7 @@
 using WheelWizard.Shared.Downloads;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Downloads;
+namespace WheelWizard.Shared.Downloads.Presentation;
 
 // Presentation adapts download progress and cancellation to the existing dialogs.
 // The download service itself has no dependency on Avalonia or global application state.
diff --git a/WheelWizard/Shared/MessageTranslations/MessageTranslationHelper.cs b/WheelWizard/Shared/MessageTranslations/MessageTranslationHelper.cs
index 84b54b8f0..f4a5eba3b 100644
--- a/WheelWizard/Shared/MessageTranslations/MessageTranslationHelper.cs
+++ b/WheelWizard/Shared/MessageTranslations/MessageTranslationHelper.cs
@@ -1,5 +1,5 @@
 using Serilog;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
 namespace WheelWizard.Shared.MessageTranslations;
 
diff --git a/WheelWizard/Views/App.axaml b/WheelWizard/Views/App.axaml
index 6335471c3..43f3844e3 100644
--- a/WheelWizard/Views/App.axaml
+++ b/WheelWizard/Views/App.axaml
@@ -105,7 +105,7 @@
                     Value="{OnPlatform Default={StaticResource DesktopWindowDecorations}, macOS={x:Null}}" />
         </Style>
         <!-- !!Only used for the designer!! -->
-        <StyleInclude Source="Styles/Util/MultiColorExampleComponent.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml" />
         <!-- !!Only used for the designer!! -->
 
         <!-- STYLES -->
@@ -121,24 +121,25 @@
         <StyleInclude Source="Components/MultiColoredIcon.axaml" />
         <StyleInclude Source="Components/MultiIconRadioButton.axaml" />
         <StyleInclude Source="Components/IconLabel.axaml" />
-        <StyleInclude Source="Components/IconLabelButton.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Views/Components/LinkButton.axaml" />
         <StyleInclude Source="Components/Button.axaml" />
-        <StyleInclude Source="Components/OptionButton.axaml" />
-        <StyleInclude Source="Components/StateBox.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Views/Components/TileButton.axaml" />
+        <StyleInclude Source="Components/StatusBadge.axaml" />
         <StyleInclude Source="Components/EmptyPageInfo.axaml" />
         <StyleInclude Source="Components/FormFieldLabel.axaml" />
+        <StyleInclude Source="Components/TextField.axaml" />
         <StyleInclude Source="Components/LoadingIcon.axaml" />
-        <StyleInclude Source="Patterns/SidebarRadioButton.axaml" />
-        <StyleInclude Source="Components/PopupListButton.axaml" />
-        <StyleInclude Source="Components/MemeNumberState.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Views/Components/ListActionButton.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/WheelWizardData/Views/CommunityCountBadge.axaml" />
 
         <!-- PAGE/WHWZ SPECIFIC COMPONENTS -->
-        <StyleInclude Source="Patterns/ModBrowserListItem.axaml" />
-        <StyleInclude Source="Patterns/FriendsListItem.axaml" />
-        <StyleInclude Source="Patterns/PlayerListItem.axaml" />
-        <StyleInclude Source="Components/Badge.axaml" />
-        <StyleInclude Source="Patterns/MiiBlock.axaml" />
-        <StyleInclude Source="Components/WheelTrail.axaml" />
-        <StyleInclude Source="Patterns/LeaderboardPodiumCard.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/Mods/Views/ModBrowserListItem.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/WheelWizardData/Views/FriendsListItem.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/RrRooms/Views/PlayerListItem.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/WheelWizardData/Views/CommunityBadge.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/WiiManagement/MiiManagement/Views/MiiBlock.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Views/Shell/Controls/WheelTrail.axaml" />
+        <StyleInclude Source="avares://WheelWizard/Features/WheelWizardData/Views/LeaderboardPodiumCard.axaml" />
     </Application.Styles>
 </Application>
diff --git a/WheelWizard/Views/App.axaml.cs b/WheelWizard/Views/App.axaml.cs
index cfd703a83..b4d3a7ca4 100644
--- a/WheelWizard/Views/App.axaml.cs
+++ b/WheelWizard/Views/App.axaml.cs
@@ -7,7 +7,8 @@
 using Serilog;
 using WheelWizard.ApplicationLifecycle;
 using WheelWizard.Views.Behaviors;
-using WheelWizard.Views.Startup;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Startup;
 
 namespace WheelWizard.Views;
 
@@ -80,7 +81,8 @@ public override void OnFrameworkInitializationCompleted()
         if (_createStartup is not null && ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
             desktop.ShutdownMode = ShutdownMode.OnExplicitShutdown;
-            desktop.MainWindow = new SplashWindow();
+            // Activate from the dispatcher after the native event loop has started.
+            desktop.MainWindow = new SplashWindow { ShowActivated = false };
             desktop.MainWindow.Show();
             var shutdown = new CancellationTokenSource();
             var cancellationToken = shutdown.Token;
@@ -94,6 +96,7 @@ public override void OnFrameworkInitializationCompleted()
                 {
                     try
                     {
+                        desktop.MainWindow?.Activate();
                         var startup = await _createStartup();
                         cancellationToken.ThrowIfCancellationRequested();
                         await startup.StartAsync(desktop, StartupOptions.Parse(desktop.Args ?? []), cancellationToken);
diff --git a/WheelWizard/Views/Behaviors/ToolTipBubbleBehavior.cs b/WheelWizard/Views/Behaviors/ToolTipBubbleBehavior.cs
index 87fcc26a7..c1231bd73 100644
--- a/WheelWizard/Views/Behaviors/ToolTipBubbleBehavior.cs
+++ b/WheelWizard/Views/Behaviors/ToolTipBubbleBehavior.cs
@@ -19,10 +19,9 @@ public static class ToolTipBubbleBehavior
     private const string BubbleAnimateOutClass = "BubbleAnimateOut";
     private const double TailCenterOffsetFromSide = 22d;
     private const double TooltipVerticalOffset = -4d;
-    private static readonly TimeSpan HoverOpenDelay = TimeSpan.FromMilliseconds(200);
-    private static readonly TimeSpan MinimumVisibleTime = TimeSpan.FromSeconds(1);
     private static readonly TimeSpan CloseAnimationDuration = TimeSpan.FromMilliseconds(40);
     private static readonly ConditionalWeakTable<Control, ToolTipState> ToolTipStates = new();
+    private static readonly ConditionalWeakTable<Window, HashSet<Control>> OpenToolTips = new();
     private static bool _isInitialized;
 
     public static void Initialize()
@@ -35,6 +34,7 @@ public static void Initialize()
         ToolTip.ToolTipOpeningEvent.AddClassHandler<Control>(OnToolTipOpening);
         ToolTip.IsOpenProperty.Changed.AddClassHandler<Control>(OnIsOpenChanged);
         InputElement.IsPointerOverProperty.Changed.AddClassHandler<Control>(OnIsPointerOverChanged);
+        WindowBase.IsActiveProperty.Changed.AddClassHandler<Window>(OnWindowActiveChanged);
     }
 
     private static void OnTipChanged(Control control, AvaloniaPropertyChangedEventArgs args)
@@ -83,6 +83,21 @@ private static void OnIsPointerOverChanged(Control control, AvaloniaPropertyChan
         OnPointerExited(control);
     }
 
+    private static void OnWindowActiveChanged(Window window, AvaloniaPropertyChangedEventArgs args)
+    {
+        if (args.GetNewValue<bool>() || !OpenToolTips.TryGetValue(window, out var controls))
+            return;
+
+        // Native tooltip popups must disappear immediately when their owner loses focus.
+        foreach (var control in controls.ToArray())
+        {
+            var state = GetState(control);
+            CancelPendingOpen(state);
+            CancelPendingClose(state);
+            ToolTip.SetIsOpen(control, false);
+        }
+    }
+
     private static void OnIsOpenChanged(Control control, AvaloniaPropertyChangedEventArgs args)
     {
         var wasOpen = args.GetOldValue<bool>();
@@ -94,7 +109,9 @@ private static void OnIsOpenChanged(Control control, AvaloniaPropertyChangedEven
 
         if (isOpen)
         {
-            state.OpenedAt = DateTimeOffset.UtcNow;
+            state.OwnerWindow = TopLevel.GetTopLevel(control) as Window;
+            if (state.OwnerWindow != null)
+                OpenToolTips.GetOrCreateValue(state.OwnerWindow).Add(control);
             CancelPendingOpen(state);
             CancelPendingClose(state);
             return;
@@ -102,6 +119,9 @@ private static void OnIsOpenChanged(Control control, AvaloniaPropertyChangedEven
 
         CancelPendingOpen(state);
         CancelPendingClose(state);
+        if (state.OwnerWindow != null && OpenToolTips.TryGetValue(state.OwnerWindow, out var controls))
+            controls.Remove(control);
+        state.OwnerWindow = null;
         ClearBubbleAnimationClasses(control);
     }
 
@@ -124,7 +144,7 @@ private static void OnPointerEntered(Control control)
 
         var cts = new CancellationTokenSource();
         state.PendingOpenCts = cts;
-        _ = DeferredOpenAsync(control, state, HoverOpenDelay, cts.Token);
+        _ = OpenAsync(control, state, cts.Token);
     }
 
     private static void OnPointerExited(Control control)
@@ -135,15 +155,10 @@ private static void OnPointerExited(Control control)
         var state = GetState(control);
         CancelPendingOpen(state);
 
-        var elapsed = DateTimeOffset.UtcNow - state.OpenedAt;
-        var remaining = MinimumVisibleTime - elapsed;
-        if (remaining < TimeSpan.Zero)
-            remaining = TimeSpan.Zero;
-
         CancelPendingClose(state);
         var cts = new CancellationTokenSource();
         state.PendingCloseCts = cts;
-        _ = DeferredCloseAsync(control, state, remaining, cts.Token);
+        _ = CloseAsync(control, state, cts.Token);
     }
 
     private static void ApplyPointerClass(ToolTip toolTip, PlacementMode placement)
@@ -244,17 +259,8 @@ private static void CancelPendingOpen(ToolTipState state)
         state.PendingOpenCts = null;
     }
 
-    private static async Task DeferredOpenAsync(Control control, ToolTipState state, TimeSpan delay, CancellationToken cancellationToken)
+    private static async Task OpenAsync(Control control, ToolTipState state, CancellationToken cancellationToken)
     {
-        try
-        {
-            await Task.Delay(delay, cancellationToken);
-        }
-        catch (TaskCanceledException)
-        {
-            return;
-        }
-
         await Dispatcher.UIThread.InvokeAsync(() =>
         {
             if (cancellationToken.IsCancellationRequested)
@@ -263,6 +269,9 @@ await Dispatcher.UIThread.InvokeAsync(() =>
             state.PendingOpenCts?.Dispose();
             state.PendingOpenCts = null;
 
+            if (TopLevel.GetTopLevel(control) is Window { IsActive: false })
+                return;
+
             if (!control.IsPointerOver || ToolTip.GetIsOpen(control) || !HasToolTip(control))
                 return;
 
@@ -291,18 +300,8 @@ private static void PrepareToolTipAfterOpen(Control control, CancellationToken c
         );
     }
 
-    private static async Task DeferredCloseAsync(Control control, ToolTipState state, TimeSpan delay, CancellationToken cancellationToken)
+    private static async Task CloseAsync(Control control, ToolTipState state, CancellationToken cancellationToken)
     {
-        try
-        {
-            if (delay > TimeSpan.Zero)
-                await Task.Delay(delay, cancellationToken);
-        }
-        catch (TaskCanceledException)
-        {
-            return;
-        }
-
         var shouldAnimateOut = false;
         await Dispatcher.UIThread.InvokeAsync(() =>
         {
@@ -378,7 +377,7 @@ private static PlacementMode NormalizePlacement(PlacementMode placement) =>
 
     private sealed class ToolTipState
     {
-        public DateTimeOffset OpenedAt { get; set; }
+        public Window? OwnerWindow { get; set; }
         public CancellationTokenSource? PendingOpenCts { get; set; }
         public CancellationTokenSource? PendingCloseCts { get; set; }
     }
diff --git a/WheelWizard/Views/Components/AspectGrid.axaml b/WheelWizard/Views/Components/AspectGrid.axaml
deleted file mode 100644
index c5354c7c8..000000000
--- a/WheelWizard/Views/Components/AspectGrid.axaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<Grid xmlns="https://github.com/avaloniaui"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-      x:Class="WheelWizard.Views.Components.AspectGrid"
-      SizeChanged="OnSizeChanged">
-    <ContentPresenter x:Name="ContentHost" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-</Grid>
diff --git a/WheelWizard/Views/Components/AspectGrid.axaml.cs b/WheelWizard/Views/Components/AspectGrid.axaml.cs
index da51dc21a..7005bbabe 100644
--- a/WheelWizard/Views/Components/AspectGrid.axaml.cs
+++ b/WheelWizard/Views/Components/AspectGrid.axaml.cs
@@ -3,62 +3,37 @@
 
 namespace WheelWizard.Views.Components;
 
-public partial class AspectGrid : Grid
+public class AspectGrid : Grid
 {
-    #region Properties
-
-    /// <summary>
-    /// Defines the AspectRatio property.
-    /// </summary>
     public static readonly StyledProperty<double> AspectRatioProperty = AvaloniaProperty.Register<AspectGrid, double>(
         nameof(AspectRatio),
-        1.0
+        1,
+        validate: value => double.IsFinite(value) && value > 0
     );
 
-    /// <summary>
-    /// Gets or sets the aspect ratio. Default is 1.0 (square).
-    /// </summary>
+    static AspectGrid() => AffectsMeasure<AspectGrid>(AspectRatioProperty);
+
     public double AspectRatio
     {
         get => GetValue(AspectRatioProperty);
         set => SetValue(AspectRatioProperty, value);
     }
 
-    /// <summary>
-    /// Defines the UseMaxDimension property.
-    /// </summary>
-    public static readonly StyledProperty<bool> UseMaxDimensionProperty = AvaloniaProperty.Register<AspectGrid, bool>(
-        nameof(UseMaxDimension)
-    );
-
-    /// <summary>
-    /// Gets or sets whether to use the maximum dimension for sizing.
-    /// If true, uses the larger of width/height. If false, uses the smaller.
-    /// </summary>
-    public bool UseMaxDimension
+    protected override Size MeasureOverride(Size availableSize)
     {
-        get => GetValue(UseMaxDimensionProperty);
-        set => SetValue(UseMaxDimensionProperty, value);
+        var fitted = Fit(availableSize);
+        var desired = base.MeasureOverride(fitted);
+        if (double.IsFinite(fitted.Width) && double.IsFinite(fitted.Height))
+            return fitted;
+        var height = Math.Max(desired.Width / AspectRatio, desired.Height);
+        return new Size(height * AspectRatio, height);
     }
 
-    #endregion
+    protected override Size ArrangeOverride(Size finalSize) => base.ArrangeOverride(Fit(finalSize));
 
-    public AspectGrid()
+    private Size Fit(Size size)
     {
-        InitializeComponent();
-    }
-
-    private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-    {
-        if (e.NewSize.Width <= 0 || e.NewSize.Height <= 0)
-            return;
-
-        var heightSize = UseMaxDimension
-            ? Math.Max(e.NewSize.Width / AspectRatio, e.NewSize.Height)
-            : Math.Min(e.NewSize.Width / AspectRatio, e.NewSize.Height);
-
-        // Set both width and height to the larger dimension to create a square
-        Width = heightSize * AspectRatio;
-        Height = heightSize;
+        var height = Math.Min(size.Width / AspectRatio, size.Height);
+        return new Size(height * AspectRatio, height);
     }
 }
diff --git a/WheelWizard/Views/Components/Button.axaml b/WheelWizard/Views/Components/Button.axaml
index 9e911d22d..732d692da 100644
--- a/WheelWizard/Views/Components/Button.axaml
+++ b/WheelWizard/Views/Components/Button.axaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:components1="clr-namespace:WheelWizard.Views.Components">
 
@@ -6,10 +6,10 @@
         <Border Padding="20" Background="{StaticResource Neutral950}">
             <StackPanel Spacing="5">
                 <components1:Button Width="150" Text="Default" Variant="Default"/>
-                <components1:Button Width="150" Text="Ugly Light" Variant="UglyLight"/>
-                <!-- Ugly light is not ugly actually, its just because i don't want you to use it unless strictly necessary-->
+                <components1:Button Width="150" Text="Light" Variant="Light"/>
+
                 <components1:Button Width="150" Text="Primary" Variant="Primary"/>
-                <components1:Button Width="150" Text="Compact" Variant="Primary" ButtonSize="Compact"/>
+                <components1:Button Width="150" Text="Compact" Variant="Primary" Size="Compact"/>
                 <components1:Button Width="150" Text="Secondary" Variant="Warning" />
                 <components1:Button Width="150" Text="Danger" Variant="Danger" FontSize="30"/>
                 <components1:Button x:Name="PlayButton"
@@ -33,7 +33,8 @@
     </Design.PreviewWith>
 
     <Style Selector="components1|Button">
-        <!-- Set Defaults -->
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="CornerRadius" Value="{DynamicResource GlobalCornerRadius}" />
@@ -46,20 +47,27 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                    <components1:IconLabel
+                    <Grid>
+                    <components1:IconLabel IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNull}}"
                         IconData="{TemplateBinding IconData}"
-                        IconSize="{TemplateBinding IconSize}"
+                        IconSize="{TemplateBinding IconSize}" IsIconLeft="{TemplateBinding IsIconLeft}"
                         Text="{TemplateBinding Text}"
                         VerticalAlignment="Center"
-                        HorizontalAlignment="Center"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                         Foreground="{TemplateBinding Foreground}"
                     />
+                    <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
+                        ContentTemplate="{TemplateBinding ContentTemplate}"
+                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                        IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                    </Grid>
                 </Border>
             </ControlTemplate>
         </Setter>
     </Style>
 
-    <Style Selector="components1|Button.Compact">
+    <Style Selector="components1|Button[Size=Compact]">
         <Setter Property="Height" Value="28" />
         <Setter Property="Padding" Value="10,6" />
         <Setter Property="IconSize" Value="16" />
@@ -74,79 +82,79 @@
     </Style>
 
     <!-- DEFAULT -->
-    <Style Selector="components1|Button.Default">
+    <Style Selector="components1|Button[Variant=Default]">
         <Setter Property="Foreground" Value="{StaticResource Neutral300}" />
         <Setter Property="Background" Value="{StaticResource Neutral700}" />
     </Style>
-    <Style Selector="components1|Button.Default:pointerover">
+    <Style Selector="components1|Button[Variant=Default]:pointerover">
         <Setter Property="Foreground" Value="{StaticResource Neutral300}" />
         <Setter Property="Background" Value="{StaticResource Neutral600}" />
     </Style>
-    <Style Selector="components1|Button.Default:pressed">
+    <Style Selector="components1|Button[Variant=Default]:pressed">
         <Setter Property="Foreground" Value="{StaticResource Neutral300}" />
         <Setter Property="Background" Value="{StaticResource Neutral500}" />
     </Style>
     
     <!-- DANGER -->
-    <Style Selector="components1|Button.Danger">
+    <Style Selector="components1|Button[Variant=Danger]">
         <Setter Property="Foreground" Value="{StaticResource Danger100}" />
         <Setter Property="Background" Value="{StaticResource Danger700}" />
     </Style>
-    <Style Selector="components1|Button.Danger:pointerover">
+    <Style Selector="components1|Button[Variant=Danger]:pointerover">
         <Setter Property="Foreground" Value="{StaticResource Danger50}" />
         <Setter Property="Background" Value="{StaticResource Danger600}" />
     </Style>
-    <Style Selector="components1|Button.Danger:pressed">
+    <Style Selector="components1|Button[Variant=Danger]:pressed">
         <Setter Property="Foreground" Value="{StaticResource Danger50}" />
         <Setter Property="Background" Value="{StaticResource Danger400}" />
     </Style>
     
     <!-- WARNING -->
-    <Style Selector="components1|Button.Warning">
+    <Style Selector="components1|Button[Variant=Warning]">
         <Setter Property="Foreground" Value="{StaticResource Warning100}" />
         <Setter Property="Background" Value="{StaticResource Warning700}" />
     </Style>
-    <Style Selector="components1|Button.Warning:pointerover">
+    <Style Selector="components1|Button[Variant=Warning]:pointerover">
         <Setter Property="Foreground" Value="{StaticResource Warning50}" />
         <Setter Property="Background" Value="{StaticResource Warning600}" />
     </Style>
-    <Style Selector="components1|Button.Warning:pressed">
+    <Style Selector="components1|Button[Variant=Warning]:pressed">
         <Setter Property="Foreground" Value="{StaticResource Warning50}" />
         <Setter Property="Background" Value="{StaticResource Warning500}" />
     </Style>
     
     <!-- PRIMARY -->
-    <Style Selector="components1|Button.Primary">
+    <Style Selector="components1|Button[Variant=Primary]">
         <Setter Property="Foreground" Value="{StaticResource Primary50}" />
         <Setter Property="Background" Value="{StaticResource Primary700}" />
     </Style>
-    <Style Selector="components1|Button.Primary:pointerover">
+    <Style Selector="components1|Button[Variant=Primary]:pointerover">
         <Setter Property="Foreground" Value="{StaticResource Primary50}" />
         <Setter Property="Background" Value="{StaticResource Primary600}" />
     </Style>
-    <Style Selector="components1|Button.Primary:pressed">
+    <Style Selector="components1|Button[Variant=Primary]:pressed">
         <Setter Property="Foreground" Value="{StaticResource Primary50}" />
         <Setter Property="Background" Value="{StaticResource Primary500}" />
     </Style>
     
-    <!-- UGLY LIGHT -->
-    <Style Selector="components1|Button.UglyLight">
+    <!-- LIGHT -->
+    <Style Selector="components1|Button[Variant=Light]">
         <Setter Property="Foreground" Value="{StaticResource Neutral200}" />
         <Setter Property="Background" Value="{StaticResource Neutral500}" />
     </Style>
-    <Style Selector="components1|Button.UglyLight:pointerover">
+    <Style Selector="components1|Button[Variant=Light]:pointerover">
         <Setter Property="Foreground" Value="{StaticResource Neutral200}" />
         <Setter Property="Background" Value="{StaticResource Neutral400}" />
     </Style>
-    <Style Selector="components1|Button.UglyLight:pressed">
+    <Style Selector="components1|Button[Variant=Light]:pressed">
         <Setter Property="Foreground" Value="{StaticResource Neutral200}" />
         <Setter Property="Background" Value="{StaticResource Neutral300}" />
     </Style>
         
-    <Style Selector="components1|Button:disabled /template/ Border">
+    <Style Selector="components1|Button:disabled">
         <Setter Property="Background" Value="{StaticResource Neutral800}" />
     </Style>
-    <Style Selector="components1|Button:disabled /template/ components1|IconLabel">
+    <Style Selector="components1|Button:disabled">
         <Setter Property="Foreground" Value="{StaticResource Neutral950}" />
     </Style>
 </Styles>
diff --git a/WheelWizard/Views/Components/Button.axaml.cs b/WheelWizard/Views/Components/Button.axaml.cs
index 2d55134dd..f32206fc2 100644
--- a/WheelWizard/Views/Components/Button.axaml.cs
+++ b/WheelWizard/Views/Components/Button.axaml.cs
@@ -1,108 +1,76 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Media;
 
 namespace WheelWizard.Views.Components;
 
-public class Button : Avalonia.Controls.Button // Change to TemplatedControl
+public enum ButtonVariant
 {
-    public static readonly StyledProperty<ButtonsVariantType> VariantProperty = AvaloniaProperty.Register<Button, ButtonsVariantType>(
-        nameof(Variant),
-        ButtonsVariantType.Default
-    );
-
-    public static readonly StyledProperty<ButtonsSizeType> ButtonSizeProperty = AvaloniaProperty.Register<Button, ButtonsSizeType>(
-        nameof(ButtonSize),
-        ButtonsSizeType.Regular
-    );
-
-    public static readonly StyledProperty<Geometry> IconDataProperty = AvaloniaProperty.Register<Button, Geometry>(nameof(IconData));
-
-    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<Button, double>(nameof(IconSize), 20.0);
-
-    public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<Button, string>(nameof(Text));
-
-    public enum ButtonsVariantType
-    {
-        Primary,
-        Warning,
-        Default,
-        Danger,
-        UglyLight,
-    }
+    Default,
+    Primary,
+    Warning,
+    Danger,
+    Light,
+}
 
-    public enum ButtonsSizeType
-    {
-        Regular,
-        Compact,
-    }
+public enum ButtonSize
+{
+    Regular,
+    Compact,
+}
 
-    // Constructor
-    public Button()
-    {
-        // No need for InitializeComponent() in code-behind for TemplatedControl
-        UpdateStyleClasses(Variant);
-        UpdateSizeClass(ButtonSize);
-    }
+public class Button : Avalonia.Controls.Button
+{
+    public static readonly StyledProperty<ButtonVariant> VariantProperty = AvaloniaProperty.Register<Button, ButtonVariant>(
+        nameof(Variant),
+        ButtonVariant.Default
+    );
 
-    // Properties remain the same
-    public ButtonsVariantType Variant
+    public ButtonVariant Variant
     {
         get => GetValue(VariantProperty);
         set => SetValue(VariantProperty, value);
     }
 
-    public ButtonsSizeType ButtonSize
+    public static readonly StyledProperty<ButtonSize> SizeProperty = AvaloniaProperty.Register<Button, ButtonSize>(
+        nameof(Size),
+        ButtonSize.Regular
+    );
+
+    public ButtonSize Size
     {
-        get => GetValue(ButtonSizeProperty);
-        set => SetValue(ButtonSizeProperty, value);
+        get => GetValue(SizeProperty);
+        set => SetValue(SizeProperty, value);
     }
 
-    public Geometry IconData
+    public static readonly StyledProperty<Geometry?> IconDataProperty = AvaloniaProperty.Register<Button, Geometry?>(nameof(IconData));
+
+    public Geometry? IconData
     {
         get => GetValue(IconDataProperty);
         set => SetValue(IconDataProperty, value);
     }
 
+    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<Button, double>(nameof(IconSize), 20);
+
     public double IconSize
     {
         get => GetValue(IconSizeProperty);
         set => SetValue(IconSizeProperty, value);
     }
 
-    public string Text
+    public static readonly StyledProperty<string?> TextProperty = AvaloniaProperty.Register<Button, string?>(nameof(Text));
+
+    public string? Text
     {
         get => GetValue(TextProperty);
         set => SetValue(TextProperty, value);
     }
 
-    // UpdateStyleClasses remains the same
-    private void UpdateStyleClasses(ButtonsVariantType variant)
-    {
-        var types = Enum.GetValues<ButtonsVariantType>();
-        foreach (var enumType in types)
-        {
-            Classes.Remove(enumType.ToString());
-        }
-        Classes.Add(variant.ToString());
-    }
+    public static readonly StyledProperty<bool> IsIconLeftProperty = AvaloniaProperty.Register<Button, bool>(nameof(IsIconLeft), true);
 
-    private void UpdateSizeClass(ButtonsSizeType size)
+    public bool IsIconLeft
     {
-        var sizes = Enum.GetValues<ButtonsSizeType>();
-        foreach (var enumSize in sizes)
-        {
-            Classes.Remove(enumSize.ToString());
-        }
-        Classes.Add(size.ToString());
-    }
-
-    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-    {
-        base.OnPropertyChanged(change);
-
-        if (change.Property == VariantProperty)
-            UpdateStyleClasses(change.GetNewValue<ButtonsVariantType>());
-        else if (change.Property == ButtonSizeProperty)
-            UpdateSizeClass(change.GetNewValue<ButtonsSizeType>());
+        get => GetValue(IsIconLeftProperty);
+        set => SetValue(IsIconLeftProperty, value);
     }
 }
diff --git a/WheelWizard/Views/Components/FormFieldLabel.axaml b/WheelWizard/Views/Components/FormFieldLabel.axaml
index 11afae4fd..eaff1055a 100644
--- a/WheelWizard/Views/Components/FormFieldLabel.axaml
+++ b/WheelWizard/Views/Components/FormFieldLabel.axaml
@@ -24,7 +24,7 @@
                     
                      <Border Background="Transparent" Width="14" Height="14" 
                              ToolTip.Tip="{TemplateBinding TipText}"
-                             ToolTip.Placement="{Binding (ToolTip.Placement), RelativeSource={RelativeSource TemplatedParent}}"
+                             ToolTip.Placement="{TemplateBinding TipPlacement}"
                              ToolTip.ShowDelay="50">
                          <Border.RenderTransform>
                              <!-- This 1 pixel difference improves it exactly 271 x times -->
diff --git a/WheelWizard/Views/Components/FormFieldLabel.axaml.cs b/WheelWizard/Views/Components/FormFieldLabel.axaml.cs
index 316d4d4ad..e53a7dc78 100644
--- a/WheelWizard/Views/Components/FormFieldLabel.axaml.cs
+++ b/WheelWizard/Views/Components/FormFieldLabel.axaml.cs
@@ -4,7 +4,7 @@
 
 namespace WheelWizard.Views.Components;
 
-public class FormFieldLabel : UserControl
+public class FormFieldLabel : TemplatedControl
 {
     public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<FormFieldLabel, string>(nameof(Text));
 
@@ -32,14 +32,4 @@ public PlacementMode TipPlacement
         get => GetValue(TipPlacementProperty);
         set => SetValue(TipPlacementProperty, value);
     }
-
-    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-    {
-        base.OnPropertyChanged(change);
-
-        if (change.Property != TipPlacementProperty)
-            return;
-
-        ToolTip.SetPlacement(this, TipPlacement);
-    }
 }
diff --git a/WheelWizard/Views/Components/HoverGlow.cs b/WheelWizard/Views/Components/HoverGlow.cs
new file mode 100644
index 000000000..e29868ca7
--- /dev/null
+++ b/WheelWizard/Views/Components/HoverGlow.cs
@@ -0,0 +1,50 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Input;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+
+namespace WheelWizard.Views.Components;
+
+// Pointer-following decoration; render transforms never participate in layout.
+public class HoverGlow : Border
+{
+    private readonly TranslateTransform _position = new();
+    private Control? _owner;
+
+    public HoverGlow()
+    {
+        IsHitTestVisible = false;
+        RenderTransform = _position;
+    }
+
+    protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        base.OnAttachedToVisualTree(e);
+        _owner = TemplatedParent as Control;
+        if (_owner is null)
+            return;
+        _owner.PointerMoved += UpdatePosition;
+        _owner.PointerEntered += UpdatePosition;
+    }
+
+    private void UpdatePosition(object? sender, PointerEventArgs e)
+    {
+        if (this.GetVisualParent() is not { } parent)
+            return;
+        var position = e.GetPosition(parent);
+        _position.X = position.X - Width / 2;
+        _position.Y = position.Y - Height / 2;
+    }
+
+    protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
+    {
+        if (_owner is not null)
+        {
+            _owner.PointerMoved -= UpdatePosition;
+            _owner.PointerEntered -= UpdatePosition;
+            _owner = null;
+        }
+        base.OnDetachedFromVisualTree(e);
+    }
+}
diff --git a/WheelWizard/Views/Components/IconLabel.axaml.cs b/WheelWizard/Views/Components/IconLabel.axaml.cs
index c2bcd4198..1c7958faa 100644
--- a/WheelWizard/Views/Components/IconLabel.axaml.cs
+++ b/WheelWizard/Views/Components/IconLabel.axaml.cs
@@ -14,7 +14,7 @@ public Geometry IconData
         set => SetValue(IconDataProperty, value);
     }
 
-    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<IconLabel, double>(nameof(IconSize), 20.0); // Add a default value here
+    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<IconLabel, double>(nameof(IconSize), 20.0);
 
     public double IconSize
     {
@@ -22,9 +22,9 @@ public double IconSize
         set => SetValue(IconSizeProperty, value);
     }
 
-    public static readonly StyledProperty<object> TextProperty = AvaloniaProperty.Register<IconLabel, object>(nameof(Text));
+    public static readonly StyledProperty<string?> TextProperty = AvaloniaProperty.Register<IconLabel, string?>(nameof(Text));
 
-    public object Text
+    public string? Text
     {
         get => GetValue(TextProperty);
         set => SetValue(TextProperty, value);
diff --git a/WheelWizard/Views/Components/IconLabelButton.axaml.cs b/WheelWizard/Views/Components/IconLabelButton.axaml.cs
deleted file mode 100644
index 95df85430..000000000
--- a/WheelWizard/Views/Components/IconLabelButton.axaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Avalonia;
-using Avalonia.Input;
-using Avalonia.Media;
-
-namespace WheelWizard.Views.Components;
-
-public class IconLabelButton : IconLabel
-{
-    public static readonly StyledProperty<IBrush> HoverForegroundProperty = AvaloniaProperty.Register<IconLabelButton, IBrush>(
-        nameof(HoverForeground)
-    );
-
-    public IBrush HoverForeground
-    {
-        get => GetValue(HoverForegroundProperty);
-        set => SetValue(HoverForegroundProperty, value);
-    }
-
-    public event EventHandler? Click;
-
-    protected override void OnPointerPressed(PointerPressedEventArgs e)
-    {
-        base.OnPointerPressed(e);
-        if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            Click?.Invoke(this, EventArgs.Empty);
-    }
-}
diff --git a/WheelWizard/Views/Components/IconLabelButton.axaml b/WheelWizard/Views/Components/LinkButton.axaml
similarity index 57%
rename from WheelWizard/Views/Components/IconLabelButton.axaml
rename to WheelWizard/Views/Components/LinkButton.axaml
index 12aee26d3..09ba1417a 100644
--- a/WheelWizard/Views/Components/IconLabelButton.axaml
+++ b/WheelWizard/Views/Components/LinkButton.axaml
@@ -2,20 +2,28 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:components="clr-namespace:WheelWizard.Views.Components">
     <Design.PreviewWith>
-        <components:IconLabelButton />
+        <components:LinkButton />
     </Design.PreviewWith>
 
-    <Style Selector="components|IconLabelButton">
+    <Style Selector="components|LinkButton">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand"/>
-        <!-- Setting it to transparent won't change the actual visual part. but ti does make the border react to :pointerover events -->
+        <Setter Property="HoverForeground" Value="{Binding Foreground, RelativeSource={RelativeSource Self}}" />
+
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Template">
             <ControlTemplate>
-                <Border Background="{TemplateBinding Background}"
+                <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}">
                     
-                    <components:IconLabel Text="{TemplateBinding Text}"
+                    <components:IconLabel HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Text="{TemplateBinding Text}"
                                         Foreground="{TemplateBinding Foreground}"
                                         FontSize="{TemplateBinding FontSize}"
                                         IconSize="{TemplateBinding IconSize}"
@@ -23,8 +31,8 @@
                                         IsUnderlined="{TemplateBinding IsUnderlined}"
                                         IsIconLeft="{TemplateBinding IsIconLeft}">
                         <components:IconLabel.Styles>
-                            <Style Selector="components|IconLabelButton:pointerover /template/ components|IconLabel">
-                                <Setter Property="Foreground" Value="{Binding HoverForeground, RelativeSource={RelativeSource AncestorType=components:IconLabelButton}}"/>
+                            <Style Selector="components|LinkButton:pointerover /template/ components|IconLabel">
+                                <Setter Property="Foreground" Value="{Binding HoverForeground, RelativeSource={RelativeSource AncestorType=components:LinkButton}}"/>
                                 <Setter Property="IsUnderlined" Value="True" />
                             </Style>
                         </components:IconLabel.Styles>
@@ -33,4 +41,7 @@
             </ControlTemplate>
         </Setter>
     </Style>
-</Styles>
\ No newline at end of file
+    <Style Selector="components|LinkButton:disabled">
+        <Setter Property="Opacity" Value="0.5" />
+    </Style>
+</Styles>
diff --git a/WheelWizard/Views/Components/LinkButton.axaml.cs b/WheelWizard/Views/Components/LinkButton.axaml.cs
new file mode 100644
index 000000000..4c0649da9
--- /dev/null
+++ b/WheelWizard/Views/Components/LinkButton.axaml.cs
@@ -0,0 +1,28 @@
+using Avalonia;
+using Avalonia.Media;
+
+namespace WheelWizard.Views.Components;
+
+public class LinkButton : Button
+{
+    public static readonly StyledProperty<IBrush?> HoverForegroundProperty = AvaloniaProperty.Register<LinkButton, IBrush?>(
+        nameof(HoverForeground)
+    );
+
+    public IBrush? HoverForeground
+    {
+        get => GetValue(HoverForegroundProperty);
+        set => SetValue(HoverForegroundProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> IsUnderlinedProperty = AvaloniaProperty.Register<LinkButton, bool>(
+        nameof(IsUnderlined),
+        false
+    );
+
+    public bool IsUnderlined
+    {
+        get => GetValue(IsUnderlinedProperty);
+        set => SetValue(IsUnderlinedProperty, value);
+    }
+}
diff --git a/WheelWizard/Views/Components/PopupListButton.axaml b/WheelWizard/Views/Components/ListActionButton.axaml
similarity index 50%
rename from WheelWizard/Views/Components/PopupListButton.axaml
rename to WheelWizard/Views/Components/ListActionButton.axaml
index de9accfdd..d66cb3c33 100644
--- a/WheelWizard/Views/Components/PopupListButton.axaml
+++ b/WheelWizard/Views/Components/ListActionButton.axaml
@@ -1,27 +1,23 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:loc="clr-namespace:WheelWizard.Localization"
-        xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
-        xmlns:components="clr-namespace:WheelWizard.Views.Components">
+        xmlns:components="clr-namespace:WheelWizard.Views.Components"
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views"
+        xmlns:shellViews="clr-namespace:WheelWizard.Views.Shell.Views">
   <Design.PreviewWith>
     <Border Padding="2" Width="300" Background="{StaticResource Neutral600}">
       <StackPanel>
-        <components:PopupListButton Text="{loc:T page_title.home}"
-                                     Type="{x:Type pages:HomePage}"/>
-        <components:PopupListButton Text="{loc:T page_title.settings}"
-                                    Type="{x:Type pages:HomePage}"/>
-        <components:PopupListButton Text="{loc:T page_title.friends}"
-                                    Type="{x:Type pages:HomePage}"/>  
-        <components:PopupListButton Text="{loc:T page_title.mods}"
-                                    Type="{x:Type pages:HomePage}"/>
-        <components:PopupListButton Text="{loc:T page_title.rooms}"
-                                    Type="{x:Type pages:RoomsPage}"/>
-                                  
+        <components:ListActionButton Text="{loc:T page_title.home}"/>
+        <components:ListActionButton Text="{loc:T page_title.settings}"/>
+        <components:ListActionButton Text="{loc:T page_title.friends}"/>
+        <components:ListActionButton Text="{loc:T page_title.mods}"/>
+        <components:ListActionButton Text="{loc:T page_title.rooms}"/>
+
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Style Selector="components|PopupListButton">
+  <Style Selector="components|ListActionButton">
     <Setter Property="Background" Value="{DynamicResource Neutral900}" />
     <Setter Property="Foreground" Value="{DynamicResource Neutral400}" />
     <Setter Property="Height" Value="48" />
@@ -31,36 +27,20 @@
         <Border Background="{TemplateBinding Background}"
                 BorderThickness="0" >
           <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ClipToBounds="True">
-            
-            <Border CornerRadius="99999" IsVisible="False" Opacity="0.3" Name="PART_HoverEffect"
-                    HorizontalAlignment="Left" VerticalAlignment="Top"
-                    Background="{StaticResource Primary200}" Height="50" Width="50" Effect="blur(150)">
-              
-              <Border.Styles>
-                <Style Selector="Border">
-                  <Style.Animations>
-                    <Animation Duration="0:0:5" IterationCount="INFINITE">
-                      <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="0"/>
-                      </KeyFrame>
-                      <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="360"/>
-                      </KeyFrame>
-                    </Animation>
-                  </Style.Animations>
-                </Style>
-              </Border.Styles>
-            </Border>
-              
-              <!-- Using icon lable since i am to bored to use the right component, just copied it over from the sidebar Radio button-->
+
+            <Canvas IsHitTestVisible="False">
+                <components:HoverGlow Name="PART_HoverEffect" CornerRadius="99999" IsVisible="False" Opacity="0.3" HorizontalAlignment="Left" VerticalAlignment="Top" Background="{StaticResource Primary200}" Height="50" Width="50" Effect="blur(150)" />
+            </Canvas>
+
+
             <components:IconLabel IconSize="0" FontSize="20"
                              Text="{TemplateBinding Text}"
                              Foreground="{TemplateBinding Foreground}"
                              HorizontalAlignment="Left" VerticalAlignment="Center"
                              Margin="10,0,10,0" />
-              
+
               <components:IconLabel x:Name="PART_ArrowIcon" IconSize="20"
-                                    IsVisible="False"
+                                    Opacity="0" IsHitTestVisible="False"
                                     IconData="{StaticResource ArrowRight}"
                                     Foreground="{TemplateBinding Foreground}"
                                     HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -70,24 +50,27 @@
       </ControlTemplate>
     </Setter>
   </Style>
-  
-  <Style Selector="components|PopupListButton:pointerover">
+
+  <Style Selector="components|ListActionButton:pointerover">
     <Setter Property="Cursor" Value="Hand" />
     <Setter Property="Background" Value="{StaticResource Neutral800}" />
     <Setter Property="Foreground" Value="{StaticResource Primary200}" />
-    <Style Selector="^ /template/ Border#PART_HoverEffect">
+    <Style Selector="^ /template/ components|HoverGlow#PART_HoverEffect">
       <Setter Property="IsVisible" Value="True"/>
     </Style>
     <Style Selector="^ /template/ components|IconLabel#PART_ArrowIcon">
-        <Setter Property="IsVisible" Value="True"/>
+        <Setter Property="Opacity" Value="1"/>
     </Style>
   </Style>
 
-  <Style Selector="components|PopupListButton:pressed">
+  <Style Selector="components|ListActionButton:pressed">
     <Setter Property="Background" Value="{StaticResource Neutral700}" />
     <Setter Property="Foreground" Value="{StaticResource Primary300}" />
     <Style Selector="^ /template/ components|IconLabel#PART_ArrowIcon">
-        <Setter Property="IsVisible" Value="True"/>
+        <Setter Property="Opacity" Value="1"/>
     </Style>
   </Style>
+  <Style Selector="components|ListActionButton:disabled">
+    <Setter Property="Opacity" Value="0.5" />
+  </Style>
 </Styles>
diff --git a/WheelWizard/Views/Components/ListActionButton.axaml.cs b/WheelWizard/Views/Components/ListActionButton.axaml.cs
new file mode 100644
index 000000000..0e307250c
--- /dev/null
+++ b/WheelWizard/Views/Components/ListActionButton.axaml.cs
@@ -0,0 +1,4 @@
+namespace WheelWizard.Views.Components;
+
+// A list-row appearance; navigation remains the caller's responsibility.
+public class ListActionButton : Button { }
diff --git a/WheelWizard/Views/Components/LoadingIcon.axaml b/WheelWizard/Views/Components/LoadingIcon.axaml
index f9e589a45..239de42dd 100644
--- a/WheelWizard/Views/Components/LoadingIcon.axaml
+++ b/WheelWizard/Views/Components/LoadingIcon.axaml
@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:components="clr-namespace:WheelWizard.Views.Components"
-        xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:components="clr-namespace:WheelWizard.Views.Components">
     <Design.PreviewWith >
         <StackPanel Orientation="Vertical" Spacing="5" Background="Black">
             <StackPanel Orientation="Horizontal" Spacing="5">
diff --git a/WheelWizard/Views/Components/MultiColoredIcon.axaml.cs b/WheelWizard/Views/Components/MultiColoredIcon.axaml.cs
index 015503fb7..eced9f37e 100644
--- a/WheelWizard/Views/Components/MultiColoredIcon.axaml.cs
+++ b/WheelWizard/Views/Components/MultiColoredIcon.axaml.cs
@@ -199,12 +199,11 @@ private IBrush GetFinalBrush(IBrush originalBrush)
                 continue;
 
             // From here we know that the color is indeed a template color
-            var newColorProperty = GetType().GetProperty($"Color{i}");
-            var propertyValue = newColorProperty?.GetValue(this);
+            var propertyValue = GetValue(PaletteProperties[i - 1]);
             if (propertyValue == null)
                 return UndefinedColorsTransparent ? Brushes.Transparent : originalBrush;
 
-            return (IBrush)propertyValue;
+            return propertyValue;
         }
         return originalBrush;
     }
@@ -213,7 +212,27 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
     {
         base.OnPropertyChanged(change);
 
-        if (change.Property != ProcessedIconDataProperty)
+        if (
+            change.Property == IconDataProperty
+            || change.Property == UndefinedColorsTransparentProperty
+            || PaletteProperties.Contains(change.Property)
+        )
             UpdateDrawingColors();
     }
+
+    private static readonly StyledProperty<IBrush?>[] PaletteProperties =
+    [
+        Color1Property,
+        Color2Property,
+        Color3Property,
+        Color4Property,
+        Color5Property,
+        Color6Property,
+        Color7Property,
+        Color8Property,
+        Color9Property,
+        Color10Property,
+        Color11Property,
+        Color12Property,
+    ];
 }
diff --git a/WheelWizard/Views/Components/MultiIconRadioButton.axaml b/WheelWizard/Views/Components/MultiIconRadioButton.axaml
index c902bb122..7ab923bba 100644
--- a/WheelWizard/Views/Components/MultiIconRadioButton.axaml
+++ b/WheelWizard/Views/Components/MultiIconRadioButton.axaml
@@ -43,6 +43,8 @@
     </Design.PreviewWith>
 
     <Style Selector="controls|MultiIconRadioButton">
+        <Setter Property="Width" Value="60" />
+        <Setter Property="Height" Value="60" />
         <!-- Set Defaults -->
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/WheelWizard/Views/Components/MultiIconRadioButton.axaml.cs b/WheelWizard/Views/Components/MultiIconRadioButton.axaml.cs
index 1b7336012..8d814700e 100644
--- a/WheelWizard/Views/Components/MultiIconRadioButton.axaml.cs
+++ b/WheelWizard/Views/Components/MultiIconRadioButton.axaml.cs
@@ -534,10 +534,4 @@ public IBrush? DisabledColor12
     }
 
     #endregion
-
-    public MultiIconRadioButton()
-    {
-        Width = 60;
-        Height = 60;
-    }
 }
diff --git a/WheelWizard/Views/Components/OptionButton.axaml.cs b/WheelWizard/Views/Components/OptionButton.axaml.cs
deleted file mode 100644
index 80fdad1e5..000000000
--- a/WheelWizard/Views/Components/OptionButton.axaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
-using Avalonia.Media;
-
-namespace WheelWizard.Views.Components;
-
-public class OptionButton : Avalonia.Controls.Button // Change to TemplatedControl
-{
-    private Border? _hoverEffect;
-    public static readonly StyledProperty<Geometry> IconDataProperty = AvaloniaProperty.Register<OptionButton, Geometry>(nameof(IconData));
-
-    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<OptionButton, double>(
-        nameof(IconSize),
-        20.0
-    );
-
-    public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<OptionButton, string>(nameof(Text));
-
-    public Geometry IconData
-    {
-        get => GetValue(IconDataProperty);
-        set => SetValue(IconDataProperty, value);
-    }
-
-    public double IconSize
-    {
-        get => GetValue(IconSizeProperty);
-        set => SetValue(IconSizeProperty, value);
-    }
-
-    public string Text
-    {
-        get => GetValue(TextProperty);
-        set => SetValue(TextProperty, value);
-    }
-
-    public OptionButton()
-    {
-        FontSize = 36;
-        Width = 150;
-        Height = 150;
-        IconSize = 70;
-        Margin = new(6);
-    }
-
-    protected override void OnPointerMoved(PointerEventArgs e)
-    {
-        base.OnPointerMoved(e);
-        if (_hoverEffect == null)
-            return;
-
-        var position = e.GetPosition(this);
-
-        var left = position.X - (_hoverEffect.Width / 2);
-        var top = position.Y - (_hoverEffect.Height / 2);
-
-        _hoverEffect.Margin = new(left, top, 0, 0);
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        _hoverEffect = e.NameScope.Find<Border>("PART_HoverEffect");
-    }
-}
diff --git a/WheelWizard/Views/Components/PopupListButton.axaml.cs b/WheelWizard/Views/Components/PopupListButton.axaml.cs
deleted file mode 100644
index b31023176..000000000
--- a/WheelWizard/Views/Components/PopupListButton.axaml.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
-
-namespace WheelWizard.Views.Components;
-
-public partial class PopupListButton : Button
-{
-    private Border? _hoverEffect;
-
-    // The Type is not used by itself, but will probably be used a lot when using this button
-    public static readonly StyledProperty<Type?> TypeProperty = AvaloniaProperty.Register<PopupListButton, Type?>(nameof(Type));
-    public Type? Type
-    {
-        get => GetValue(TypeProperty);
-        set => SetValue(TypeProperty, value);
-    }
-
-    protected override void OnPointerMoved(PointerEventArgs e)
-    {
-        base.OnPointerMoved(e);
-        if (_hoverEffect == null)
-            return;
-
-        var position = e.GetPosition(this);
-
-        var left = position.X - (_hoverEffect.Width / 2);
-        var top = position.Y - (_hoverEffect.Height / 2);
-
-        _hoverEffect.Margin = new(left, top, 0, 0);
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        _hoverEffect = e.NameScope.Find<Border>("PART_HoverEffect");
-    }
-}
diff --git a/WheelWizard/Views/Components/StateBox.axaml.cs b/WheelWizard/Views/Components/StateBox.axaml.cs
deleted file mode 100644
index 9e7d7e5a2..000000000
--- a/WheelWizard/Views/Components/StateBox.axaml.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Media;
-
-// Add this for PlacementMode
-
-namespace WheelWizard.Views.Components;
-
-public partial class StateBox : TemplatedControl // Change to TemplatedControl
-{
-    public enum StateBoxVariantType
-    {
-        Default,
-        Dark,
-        Success,
-        Warning,
-        Danger,
-    }
-
-    public StateBox()
-    {
-        FontSize = 14;
-
-        // TODO: make tooltip invisible if the TipText is empty
-    }
-
-    public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<StateBox, string>(nameof(Text), "0");
-
-    public string Text
-    {
-        get => GetValue(TextProperty);
-        set => SetValue(TextProperty, value);
-    }
-
-    public static readonly StyledProperty<Geometry> IconDataProperty = AvaloniaProperty.Register<StateBox, Geometry>(nameof(IconData));
-
-    public Geometry IconData
-    {
-        get => GetValue(IconDataProperty);
-        set => SetValue(IconDataProperty, value);
-    }
-
-    public static readonly StyledProperty<object?> ContentProperty = AvaloniaProperty.Register<StateBox, object?>(nameof(Content));
-
-    public object? Content
-    {
-        get => GetValue(ContentProperty);
-        set => SetValue(ContentProperty, value);
-    }
-
-    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<StateBox, double>(nameof(IconSize), 20);
-
-    public double IconSize
-    {
-        get => GetValue(IconSizeProperty);
-        set => SetValue(IconSizeProperty, value);
-    }
-
-    public static readonly StyledProperty<string> TipTextProperty = AvaloniaProperty.Register<StateBox, string>(nameof(TipText));
-
-    public string TipText
-    {
-        get => GetValue(TipTextProperty);
-        set => SetValue(TipTextProperty, value);
-    }
-
-    public static readonly StyledProperty<StateBoxVariantType> VariantProperty = AvaloniaProperty.Register<StateBox, StateBoxVariantType>(
-        nameof(Variant),
-        StateBoxVariantType.Default
-    );
-
-    public StateBoxVariantType Variant
-    {
-        get => GetValue(VariantProperty);
-        set => SetValue(VariantProperty, value);
-    }
-
-    public static readonly StyledProperty<PlacementMode> TipPlacementProperty = AvaloniaProperty.Register<StateBox, PlacementMode>(
-        nameof(TipPlacement),
-        PlacementMode.Top
-    );
-
-    public PlacementMode TipPlacement
-    {
-        get => GetValue(TipPlacementProperty);
-        set => SetValue(TipPlacementProperty, value);
-    }
-
-    private void UpdateStyleClasses(StateBoxVariantType variant)
-    {
-        var types = Enum.GetValues<StateBoxVariantType>();
-        foreach (var enumType in types)
-        {
-            Classes.Remove(enumType.ToString());
-        }
-        Classes.Add(variant.ToString());
-    }
-
-    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-    {
-        base.OnPropertyChanged(change);
-
-        if (change.Property == VariantProperty)
-            UpdateStyleClasses(change.GetNewValue<StateBoxVariantType>());
-    }
-}
diff --git a/WheelWizard/Views/Components/StateBox.axaml b/WheelWizard/Views/Components/StatusBadge.axaml
similarity index 69%
rename from WheelWizard/Views/Components/StateBox.axaml
rename to WheelWizard/Views/Components/StatusBadge.axaml
index 89a430183..2e8abbdf1 100644
--- a/WheelWizard/Views/Components/StateBox.axaml
+++ b/WheelWizard/Views/Components/StatusBadge.axaml
@@ -1,4 +1,4 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:conv="clr-namespace:WheelWizard.Views.Converters"
         xmlns:components1="clr-namespace:WheelWizard.Views.Components">
@@ -6,14 +6,14 @@
     <Design.PreviewWith>
         <Border Padding="20" Background="{StaticResource Neutral300}">
             <StackPanel Spacing="5">
-                <components1:StateBox Text="Active" IconSize="0"/>
-                <components1:StateBox Text="Dark" Variant="Dark" IconSize="0" />
-                <components1:StateBox Text="Success" Variant="Success" IconData="{StaticResource CheckMark}"/>
-                <components1:StateBox Text="Warning" Variant="Warning" IconData="{StaticResource WarningTip}"/>
-                <components1:StateBox Text="Danger" Variant="Danger" IconData="{StaticResource XMark}"/>
-                <components1:StateBox IconData="{StaticResource Hourglass}" 
+                <components1:StatusBadge Text="Active" IconSize="0"/>
+                <components1:StatusBadge Text="Dark" Variant="Dark" IconSize="0" />
+                <components1:StatusBadge Text="Success" Variant="Success" IconData="{StaticResource CheckMark}"/>
+                <components1:StatusBadge Text="Warning" Variant="Warning" IconData="{StaticResource WarningTip}"/>
+                <components1:StatusBadge Text="Danger" Variant="Danger" IconData="{StaticResource XMark}"/>
+                <components1:StatusBadge IconData="{StaticResource Hourglass}" 
                                      IconSize="14" Text="Cross"/>
-                <components1:StateBox x:Name="PlayerCountBox"  Text="0" IconSize="16"
+                <components1:StatusBadge x:Name="PlayerCountBox"  Text="0" IconSize="16"
                                      IconData="{StaticResource UserCouple}"
                                      TipText="Number of players in the game"
                                      HorizontalAlignment="Center"/>
@@ -21,7 +21,8 @@
         </Border>
     </Design.PreviewWith>
 
-    <Style Selector="components1|StateBox">
+    <Style Selector="components1|StatusBadge">
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Template">
             <ControlTemplate>
                 <Border x:Name="PART_StateBox_Root" 
@@ -55,6 +56,7 @@
                         <!-- Content (visible when Content is not null) -->
                         <ContentPresenter Grid.Column="2" x:Name="PART_ContentPresenter"
                                           Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
                                           IsVisible="{TemplateBinding Content, Converter={x:Static ObjectConverters.IsNotNull}}"
                                           VerticalAlignment="Center"/>
                     </Grid>
@@ -63,7 +65,7 @@
         </Setter>
     </Style>
 
-    <Style Selector="components1|StateBox">
+    <Style Selector="components1|StatusBadge">
         <Style Selector="^ /template/ Border#PART_StateBox_Root">
             <Setter Property="Background" Value="{StaticResource Neutral900}" />
         </Style>
@@ -82,70 +84,70 @@
 
 
 
-        <Style Selector="^.Dark /template/ Border#PART_StateBox_Root">
+        <Style Selector="^[Variant=Dark] /template/ Border#PART_StateBox_Root">
             <Setter Property="Background" Value="{StaticResource Neutral950}" />
         </Style>
-        <Style Selector="^.Dark /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Dark] /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Neutral200}" />
         </Style>
-        <Style Selector="^.Dark /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Dark] /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Neutral600}" />
         </Style>
-        <Style Selector="^.Dark:pointerover /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Dark]:pointerover /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Neutral50}" />
         </Style>
-        <Style Selector="^.Dark:pointerover /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Dark]:pointerover /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Neutral400}" />
         </Style>
 
 
 
-        <Style Selector="^.Success /template/ Border#PART_StateBox_Root">
+        <Style Selector="^[Variant=Success] /template/ Border#PART_StateBox_Root">
             <Setter Property="Background" Value="{StaticResource Primary700}" />
         </Style>
-        <Style Selector="^.Success /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Success] /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Primary200}" />
         </Style>
-        <Style Selector="^.Success /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Success] /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Primary200}" />
         </Style>
-        <Style Selector="^.Success:pointerover /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Success]:pointerover /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Primary100}" />
         </Style>
-        <Style Selector="^.Success:pointerover /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Success]:pointerover /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Primary100}" />
         </Style>
         
-        <Style Selector="^.Warning /template/ Border#PART_StateBox_Root">
+        <Style Selector="^[Variant=Warning] /template/ Border#PART_StateBox_Root">
             <Setter Property="Background" Value="{StaticResource Warning700}" />
         </Style>
-        <Style Selector="^.Warning /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Warning] /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Warning200}" />
         </Style>
-        <Style Selector="^.Warning /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Warning] /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Warning200}" />
         </Style>
-        <Style Selector="^.Warning:pointerover /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Warning]:pointerover /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Warning100}" />
         </Style>
-        <Style Selector="^.Warning:pointerover /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Warning]:pointerover /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Warning100}" />
         </Style>
         
-        <Style Selector="^.Danger /template/ Border#PART_StateBox_Root">
+        <Style Selector="^[Variant=Danger] /template/ Border#PART_StateBox_Root">
             <Setter Property="Background" Value="{StaticResource Danger700}" />
         </Style>
-        <Style Selector="^.Danger /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Danger] /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Danger200}" />
         </Style>
-        <Style Selector="^.Danger /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Danger] /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Danger200}" />
         </Style>
-        <Style Selector="^.Danger:pointerover /template/ TextBlock#PART_StateBox_Text">
+        <Style Selector="^[Variant=Danger]:pointerover /template/ TextBlock#PART_StateBox_Text">
             <Setter Property="Foreground" Value="{StaticResource Danger100}" />
         </Style>
-        <Style Selector="^.Danger:pointerover /template/ Path#PART_StateBox_IconPath">
+        <Style Selector="^[Variant=Danger]:pointerover /template/ Path#PART_StateBox_IconPath">
             <Setter Property="Fill" Value="{StaticResource Danger100}" />
         </Style>
     </Style>
-</Styles>
\ No newline at end of file
+</Styles>
diff --git a/WheelWizard/Views/Components/StatusBadge.axaml.cs b/WheelWizard/Views/Components/StatusBadge.axaml.cs
new file mode 100644
index 000000000..c0984220d
--- /dev/null
+++ b/WheelWizard/Views/Components/StatusBadge.axaml.cs
@@ -0,0 +1,72 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Media;
+
+namespace WheelWizard.Views.Components;
+
+public enum StatusVariant
+{
+    Default,
+    Dark,
+    Success,
+    Warning,
+    Danger,
+}
+
+public class StatusBadge : ContentControl
+{
+    public static readonly StyledProperty<string?> TextProperty = AvaloniaProperty.Register<StatusBadge, string?>(nameof(Text), "0");
+
+    public string? Text
+    {
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly StyledProperty<Geometry?> IconDataProperty = AvaloniaProperty.Register<StatusBadge, Geometry?>(nameof(IconData));
+
+    public Geometry? IconData
+    {
+        get => GetValue(IconDataProperty);
+        set => SetValue(IconDataProperty, value);
+    }
+
+    public static readonly StyledProperty<double> IconSizeProperty = AvaloniaProperty.Register<StatusBadge, double>(nameof(IconSize), 20);
+
+    public double IconSize
+    {
+        get => GetValue(IconSizeProperty);
+        set => SetValue(IconSizeProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> TipTextProperty = AvaloniaProperty.Register<StatusBadge, string?>(nameof(TipText));
+
+    public string? TipText
+    {
+        get => GetValue(TipTextProperty);
+        set => SetValue(TipTextProperty, value);
+    }
+
+    public static readonly StyledProperty<StatusVariant> VariantProperty = AvaloniaProperty.Register<StatusBadge, StatusVariant>(
+        nameof(Variant),
+        StatusVariant.Default
+    );
+
+    public StatusVariant Variant
+    {
+        get => GetValue(VariantProperty);
+        set => SetValue(VariantProperty, value);
+    }
+
+    public static readonly StyledProperty<PlacementMode> TipPlacementProperty = AvaloniaProperty.Register<StatusBadge, PlacementMode>(
+        nameof(TipPlacement),
+        PlacementMode.Top
+    );
+
+    public PlacementMode TipPlacement
+    {
+        get => GetValue(TipPlacementProperty);
+        set => SetValue(TipPlacementProperty, value);
+    }
+}
diff --git a/WheelWizard/Views/Components/TextField.axaml b/WheelWizard/Views/Components/TextField.axaml
new file mode 100644
index 000000000..593587c03
--- /dev/null
+++ b/WheelWizard/Views/Components/TextField.axaml
@@ -0,0 +1,20 @@
+<Styles xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:components="clr-namespace:WheelWizard.Views.Components">
+    <Style Selector="components|TextField">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <StackPanel>
+                    <components:FormFieldLabel Text="{TemplateBinding Label}" TipText="{TemplateBinding TipText}"
+                        IsVisible="{TemplateBinding Label, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
+                    <TextBox Name="PART_Input" Text="{TemplateBinding Text, Mode=TwoWay}"
+                             PlaceholderText="{TemplateBinding PlaceholderText}" IsReadOnly="{TemplateBinding IsReadOnly}"
+                             AutomationProperties.Name="{TemplateBinding Label}" />
+                    <components:IconLabel Text="{TemplateBinding ErrorText}" IsVisible="{TemplateBinding HasError}"
+                        Foreground="{StaticResource Danger600}" IconData="{StaticResource WarningTriangle}"
+                        IconSize="15" FontSize="13" Margin="4,4,0,0" />
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+</Styles>
diff --git a/WheelWizard/Views/Components/TextField.axaml.cs b/WheelWizard/Views/Components/TextField.axaml.cs
new file mode 100644
index 000000000..b70977048
--- /dev/null
+++ b/WheelWizard/Views/Components/TextField.axaml.cs
@@ -0,0 +1,128 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Data;
+using Avalonia.Interactivity;
+
+namespace WheelWizard.Views.Components;
+
+public enum TextFieldVariant
+{
+    Default,
+    Dark,
+}
+
+public class TextField : TemplatedControl
+{
+    private TextBox? _input;
+    private bool _hasError;
+
+    public static readonly StyledProperty<TextFieldVariant> VariantProperty = AvaloniaProperty.Register<TextField, TextFieldVariant>(
+        nameof(Variant),
+        TextFieldVariant.Default
+    );
+
+    public TextFieldVariant Variant
+    {
+        get => GetValue(VariantProperty);
+        set => SetValue(VariantProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> ErrorTextProperty = AvaloniaProperty.Register<TextField, string?>(nameof(ErrorText));
+
+    public string? ErrorText
+    {
+        get => GetValue(ErrorTextProperty);
+        set => SetValue(ErrorTextProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> TextProperty = AvaloniaProperty.Register<TextField, string?>(
+        nameof(Text),
+        defaultBindingMode: BindingMode.TwoWay
+    );
+
+    public string? Text
+    {
+        get => GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> PlaceholderTextProperty = AvaloniaProperty.Register<TextField, string?>(
+        nameof(PlaceholderText)
+    );
+
+    public string? PlaceholderText
+    {
+        get => GetValue(PlaceholderTextProperty);
+        set => SetValue(PlaceholderTextProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> LabelProperty = AvaloniaProperty.Register<TextField, string?>(nameof(Label));
+
+    public string? Label
+    {
+        get => GetValue(LabelProperty);
+        set => SetValue(LabelProperty, value);
+    }
+
+    public static readonly StyledProperty<string?> TipTextProperty = AvaloniaProperty.Register<TextField, string?>(nameof(TipText));
+
+    public string? TipText
+    {
+        get => GetValue(TipTextProperty);
+        set => SetValue(TipTextProperty, value);
+    }
+
+    public static readonly StyledProperty<bool> IsReadOnlyProperty = AvaloniaProperty.Register<TextField, bool>(nameof(IsReadOnly), false);
+
+    public bool IsReadOnly
+    {
+        get => GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, value);
+    }
+
+    public static readonly DirectProperty<TextField, bool> HasErrorProperty = AvaloniaProperty.RegisterDirect<TextField, bool>(
+        nameof(HasError),
+        field => field.HasError
+    );
+    public bool HasError => _hasError;
+
+    public static readonly RoutedEvent<TextChangedEventArgs> TextChangedEvent = RoutedEvent.Register<TextField, TextChangedEventArgs>(
+        nameof(TextChanged),
+        RoutingStrategies.Bubble
+    );
+
+    public event EventHandler<TextChangedEventArgs>? TextChanged
+    {
+        add => AddHandler(TextChangedEvent, value);
+        remove => RemoveHandler(TextChangedEvent, value);
+    }
+
+    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+    {
+        if (_input is not null)
+            _input.TextChanged -= InputTextChanged;
+        base.OnApplyTemplate(e);
+        _input = e.NameScope.Find<TextBox>("PART_Input");
+        if (_input is not null)
+            _input.TextChanged += InputTextChanged;
+        UpdateAppearance();
+    }
+
+    private void InputTextChanged(object? sender, TextChangedEventArgs e) => RaiseEvent(new TextChangedEventArgs(TextChangedEvent, this));
+
+    private void UpdateAppearance()
+    {
+        SetAndRaise(HasErrorProperty, ref _hasError, !string.IsNullOrWhiteSpace(ErrorText));
+        PseudoClasses.Set(":error", HasError);
+        _input?.Classes.Set("error", HasError);
+        _input?.Classes.Set("dark", Variant == TextFieldVariant.Dark);
+    }
+
+    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+    {
+        base.OnPropertyChanged(change);
+        if (change.Property == ErrorTextProperty || change.Property == VariantProperty)
+            UpdateAppearance();
+    }
+}
diff --git a/WheelWizard/Views/Components/OptionButton.axaml b/WheelWizard/Views/Components/TileButton.axaml
similarity index 66%
rename from WheelWizard/Views/Components/OptionButton.axaml
rename to WheelWizard/Views/Components/TileButton.axaml
index 9356747a8..f4ca3b9b0 100644
--- a/WheelWizard/Views/Components/OptionButton.axaml
+++ b/WheelWizard/Views/Components/TileButton.axaml
@@ -1,22 +1,25 @@
-<Styles xmlns="https://github.com/avaloniaui"
+<Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:components1="clr-namespace:WheelWizard.Views.Components"
-        xmlns:behavior="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:components1="clr-namespace:WheelWizard.Views.Components">
 
     <Design.PreviewWith>
         <Border Padding="20" Background="{StaticResource Neutral950}">
             <UniformGrid Columns="3">
-                <components1:OptionButton Text="Idk" IconData="{StaticResource Dice}"/>
-                <components1:OptionButton Text="Some option" IconData="{StaticResource Award}"/>
-                <components1:OptionButton Text="MORE"/>
-                <components1:OptionButton Text="Random Options"/>
-                <components1:OptionButton Text="not an option" IsEnabled="False"/>
+                <components1:TileButton Text="Idk" IconData="{StaticResource Dice}"/>
+                <components1:TileButton Text="Some option" IconData="{StaticResource Award}"/>
+                <components1:TileButton Text="MORE"/>
+                <components1:TileButton Text="Random Options"/>
+                <components1:TileButton Text="not an option" IsEnabled="False"/>
               </UniformGrid>
         </Border>
     </Design.PreviewWith>
 
-    <Style Selector="components1|OptionButton">
-        <!-- Set Defaults -->
+    <Style Selector="components1|TileButton">
+        <Setter Property="FontSize" Value="36" />
+        <Setter Property="Width" Value="150" />
+        <Setter Property="Height" Value="150" />
+        <Setter Property="IconSize" Value="70" />
+        <Setter Property="Margin" Value="6" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="CornerRadius" Value="{DynamicResource GlobalCornerRadius}" />
@@ -33,26 +36,10 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid>
-                            <Border CornerRadius="99999" IsVisible="False" Opacity="0.3" x:Name="PART_HoverEffect"
-                                    HorizontalAlignment="Left" VerticalAlignment="Top"
-                                    Background="{StaticResource Primary200}" Height="60" Width="60" Effect="blur(150)">
-              
-                                <Border.Styles>
-                                    <Style Selector="Border">
-                                        <Style.Animations>
-                                            <Animation Duration="0:0:5" IterationCount="INFINITE">
-                                                <KeyFrame Cue="0%">
-                                                    <Setter Property="RotateTransform.Angle" Value="0"/>
-                                                </KeyFrame>
-                                                <KeyFrame Cue="100%">
-                                                    <Setter Property="RotateTransform.Angle" Value="360"/>
-                                                </KeyFrame>
-                                            </Animation>
-                                        </Style.Animations>
-                                    </Style>
-                                </Border.Styles>
-                            </Border>
+                        <Grid ClipToBounds="True">
+                            <Canvas IsHitTestVisible="False">
+                <components1:HoverGlow Name="PART_HoverEffect" CornerRadius="99999" IsVisible="False" Opacity="0.3" HorizontalAlignment="Left" VerticalAlignment="Top" Background="{StaticResource Primary200}" Height="60" Width="60" Effect="blur(150)" />
+            </Canvas>
                             
                             <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                                 <Border Background="Transparent"
@@ -84,17 +71,17 @@
         </Setter>
     </Style>
     
-    <Style Selector="components1|OptionButton:pointerover">
+    <Style Selector="components1|TileButton:pointerover">
         <Setter Property="Foreground" Value="{StaticResource Primary300}" />
         <Setter Property="Background" Value="{StaticResource Neutral800}" />
-        <Style Selector="^ /template/ Border#PART_HoverEffect">
+        <Style Selector="^ /template/ components1|HoverGlow#PART_HoverEffect">
             <Setter Property="IsVisible" Value="True"/>
         </Style>
         <Style Selector="^ /template/ TextBlock#TitleText">
             <Setter Property="Foreground" Value="{StaticResource Primary200}" />
         </Style>
     </Style>
-    <Style Selector="components1|OptionButton:pressed">
+    <Style Selector="components1|TileButton:pressed">
         <Setter Property="Foreground" Value="{StaticResource Primary200}" />
         <Setter Property="Background" Value="{StaticResource Neutral700}" />
         <Style Selector="^ /template/ TextBlock#TitleText">
@@ -102,7 +89,7 @@
         </Style>
     </Style>
         
-    <Style Selector="components1|OptionButton:disabled">
+    <Style Selector="components1|TileButton:disabled">
         <Setter Property="Background" Value="{StaticResource Neutral950}" />
         <Setter Property="Foreground" Value="{StaticResource Neutral700}" />
         <Style Selector="^ /template/ Border#PART_DisabledBorder">
diff --git a/WheelWizard/Views/Components/TileButton.axaml.cs b/WheelWizard/Views/Components/TileButton.axaml.cs
new file mode 100644
index 000000000..70cc68bf9
--- /dev/null
+++ b/WheelWizard/Views/Components/TileButton.axaml.cs
@@ -0,0 +1,3 @@
+namespace WheelWizard.Views.Components;
+
+public class TileButton : Button { }
diff --git a/WheelWizard/Views/Styles/Util/IconExampleComponent.axaml b/WheelWizard/Views/DesignTime/Controls/IconExampleComponent.axaml
similarity index 79%
rename from WheelWizard/Views/Styles/Util/IconExampleComponent.axaml
rename to WheelWizard/Views/DesignTime/Controls/IconExampleComponent.axaml
index 019a31037..3d2645866 100644
--- a/WheelWizard/Views/Styles/Util/IconExampleComponent.axaml
+++ b/WheelWizard/Views/DesignTime/Controls/IconExampleComponent.axaml
@@ -2,11 +2,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    
-             xmlns:util="clr-namespace:WheelWizard.Styles.Util"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="WheelWizard.Styles.Util.IconExampleComponent"
-             x:DataType="util:IconExampleComponent">
+             x:Class="WheelWizard.Views.DesignTime.Controls.IconExampleComponent"
+             x:DataType="designControls:IconExampleComponent"
+        xmlns:designControls="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <StackPanel Spacing="5" Margin="5">
         <Border Width="150" Height="150" BorderThickness="1" BorderBrush="#EDEDF1">
diff --git a/WheelWizard/Views/Styles/Util/IconExampleComponent.axaml.cs b/WheelWizard/Views/DesignTime/Controls/IconExampleComponent.axaml.cs
similarity index 94%
rename from WheelWizard/Views/Styles/Util/IconExampleComponent.axaml.cs
rename to WheelWizard/Views/DesignTime/Controls/IconExampleComponent.axaml.cs
index 3d2b37991..ec6f2a241 100644
--- a/WheelWizard/Views/Styles/Util/IconExampleComponent.axaml.cs
+++ b/WheelWizard/Views/DesignTime/Controls/IconExampleComponent.axaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 
-namespace WheelWizard.Styles.Util;
+namespace WheelWizard.Views.DesignTime.Controls;
 
 public partial class IconExampleComponent : UserControl
 {
diff --git a/WheelWizard/Views/Styles/Util/MultiColorExampleComponent.axaml b/WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml
similarity index 91%
rename from WheelWizard/Views/Styles/Util/MultiColorExampleComponent.axaml
rename to WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml
index 46b643223..fb947f7fb 100644
--- a/WheelWizard/Views/Styles/Util/MultiColorExampleComponent.axaml
+++ b/WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml
@@ -1,17 +1,17 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:util="clr-namespace:WheelWizard.Styles.Util"
-        xmlns:comps="clr-namespace:WheelWizard.Views.Components">
+        xmlns:comps="clr-namespace:WheelWizard.Views.Components"
+        xmlns:designControls="clr-namespace:WheelWizard.Views.DesignTime.Controls">
     <Design.PreviewWith>
         <Border Padding="5" Background="#8B91A5">
             <UniformGrid Columns="5">
-                <util:MultiColorExampleComponent Color1="Aqua" IconData="{DynamicResource Hair35}" IconName="Hair35"/>
+                <designControls:MultiColorExampleComponent Color1="Aqua" IconData="{DynamicResource Hair35}" IconName="Hair35"/>
             </UniformGrid>
         </Border>
 
     </Design.PreviewWith>
 
-    <Style Selector="util|MultiColorExampleComponent">
+    <Style Selector="designControls|MultiColorExampleComponent">
         <Setter Property="Template">
             <ControlTemplate>
                 <StackPanel Spacing="5" Margin="5">
diff --git a/WheelWizard/Views/Styles/Util/MultiColorExampleComponent.axaml.cs b/WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml.cs
similarity index 89%
rename from WheelWizard/Views/Styles/Util/MultiColorExampleComponent.axaml.cs
rename to WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml.cs
index 13520611c..463782f30 100644
--- a/WheelWizard/Views/Styles/Util/MultiColorExampleComponent.axaml.cs
+++ b/WheelWizard/Views/DesignTime/Controls/MultiColorExampleComponent.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using WheelWizard.Views.Components;
 
-namespace WheelWizard.Styles.Util;
+namespace WheelWizard.Views.DesignTime.Controls;
 
 public class MultiColorExampleComponent : MultiColoredIcon
 {
diff --git a/WheelWizard/Views/Popups/DevToolWindow.axaml b/WheelWizard/Views/DesignTime/DevToolWindow.axaml
similarity index 91%
rename from WheelWizard/Views/Popups/DevToolWindow.axaml
rename to WheelWizard/Views/DesignTime/DevToolWindow.axaml
index f21251e8f..91eb2cfb7 100644
--- a/WheelWizard/Views/Popups/DevToolWindow.axaml
+++ b/WheelWizard/Views/DesignTime/DevToolWindow.axaml
@@ -1,22 +1,22 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                   x:Class="WheelWizard.Views.Popups.DevToolWindow">
+                   x:Class="WheelWizard.Views.DesignTime.DevToolWindow"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid Width="440" MaxHeight="600">
         <ScrollViewer>
             <StackPanel>
                 <!-- MONITORING BIT -->
                 <TextBlock Text="Monitoring" HorizontalAlignment="Left" VerticalAlignment="Top" Classes="PageTitleText" />
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
-                    <components:StateBox x:Name="MiiImagesCashed" Variant="Default" Text="0"
+                    <components:StatusBadge x:Name="MiiImagesCashed" Variant="Default" Text="0"
                                          TipPlacement="Top" Margin="10,0,0,0"
                                          IconData="{StaticResource UserCircle}"
                                          TipText="Amount of Mii-images cashed in memory" />
-                    <components:StateBox x:Name="RrRefreshTimeLeft" Variant="Default" Text="0"
+                    <components:StatusBadge x:Name="RrRefreshTimeLeft" Variant="Default" Text="0"
                                          TipPlacement="Top" Margin="10,0,0,0"
                                          IconData="{StaticResource Hourglass}"
                                          TipText="Time until the next RR rooms refresh" />
@@ -73,4 +73,4 @@
             </StackPanel>
         </ScrollViewer>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/DevToolWindow.axaml.cs b/WheelWizard/Views/DesignTime/DevToolWindow.axaml.cs
similarity index 92%
rename from WheelWizard/Views/Popups/DevToolWindow.axaml.cs
rename to WheelWizard/Views/DesignTime/DevToolWindow.axaml.cs
index 24d17961d..178e98226 100644
--- a/WheelWizard/Views/Popups/DevToolWindow.axaml.cs
+++ b/WheelWizard/Views/DesignTime/DevToolWindow.axaml.cs
@@ -2,19 +2,21 @@
 using Avalonia.Threading;
 using Microsoft.Extensions.Caching.Memory;
 using WheelWizard.Launching;
+using WheelWizard.Mods.Views;
 using WheelWizard.RrRooms;
 using WheelWizard.Shared;
 using WheelWizard.Shared.MessageTranslations;
 using WheelWizard.Shared.Polling;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Diagnostics;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages;
-using WheelWizard.Views.Popups.Base;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.DesignTime;
+using WheelWizard.Views.DesignTime.Diagnostics;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
 using WheelWizard.WheelWizardData;
 
-namespace WheelWizard.Views.Popups;
+namespace WheelWizard.Views.DesignTime;
 
 public partial class DevToolWindow : PopupContent, IPollingListener
 {
@@ -140,7 +142,7 @@ private async void YesNoPopup_OnClick(object sender, RoutedEventArgs e)
             .SetMainText("Do you click yes or no")
             .AwaitAnswer();
 
-        YesNoPopupButton.Variant = yesNoWindow ? Button.ButtonsVariantType.Primary : Button.ButtonsVariantType.Danger;
+        YesNoPopupButton.Variant = yesNoWindow ? ButtonVariant.Primary : ButtonVariant.Danger;
     }
 
     private async void OptionsPopup_OnClick(object sender, RoutedEventArgs e)
@@ -153,7 +155,7 @@ private async void OptionsPopup_OnClick(object sender, RoutedEventArgs e)
             .AddOption("Banana", "Not an Option", () => { }, false)
             .AwaitAnswer();
 
-        OptionsPopupButton.Variant = optionsWindow != null ? Button.ButtonsVariantType.Warning : Button.ButtonsVariantType.Danger;
+        OptionsPopupButton.Variant = optionsWindow != null ? ButtonVariant.Warning : ButtonVariant.Danger;
         OptionsPopupButton.Text = optionsWindow ?? "Clicked away";
     }
 
diff --git a/WheelWizard/Views/Diagnostics/DevelopmentRefreshService.cs b/WheelWizard/Views/DesignTime/Diagnostics/DevelopmentRefreshService.cs
similarity index 94%
rename from WheelWizard/Views/Diagnostics/DevelopmentRefreshService.cs
rename to WheelWizard/Views/DesignTime/Diagnostics/DevelopmentRefreshService.cs
index da48db62d..96ad9498b 100644
--- a/WheelWizard/Views/Diagnostics/DevelopmentRefreshService.cs
+++ b/WheelWizard/Views/DesignTime/Diagnostics/DevelopmentRefreshService.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using WheelWizard.Shared.Polling;
 
-namespace WheelWizard.Views.Diagnostics;
+namespace WheelWizard.Views.DesignTime.Diagnostics;
 
 public sealed class DevelopmentRefreshService(
     IPollingScheduler scheduler,
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkButtonsPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkButtonsPage.axaml
similarity index 96%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkButtonsPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkButtonsPage.axaml
index 717aa57ef..eee77ac94 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkButtonsPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkButtonsPage.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="680"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkButtonsPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkButtonsPage">
     <StackPanel Spacing="8">
         <Grid ColumnDefinitions="*,*"
           RowDefinitions="Auto,Auto,Auto">
@@ -82,8 +82,8 @@
             <components:Button Grid.Row="0"
                                Grid.Column="1"
                                Margin="0,0,5,5"
-                               Variant="UglyLight"
-                               Text="UglyLight" />
+                               Variant="Light"
+                               Text="Light" />
 
             <components:Button Grid.Row="1"
                                Grid.Column="0"
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkButtonsPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkButtonsPage.axaml.cs
similarity index 83%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkButtonsPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkButtonsPage.axaml.cs
index addf7ef74..9ad5ce708 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkButtonsPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkButtonsPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkButtonsPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkDropdownsPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkDropdownsPage.axaml
similarity index 94%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkDropdownsPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkDropdownsPage.axaml
index ea524faba..684c5624f 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkDropdownsPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkDropdownsPage.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="400"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkDropdownsPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkDropdownsPage">
     <StackPanel Spacing="12">
         <StackPanel Spacing="8">
             <TextBlock Classes="TinyText" Text="Standard Dropdown" />
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkDropdownsPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkDropdownsPage.axaml.cs
similarity index 83%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkDropdownsPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkDropdownsPage.axaml.cs
index ed2c866d8..ecac73207 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkDropdownsPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkDropdownsPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkDropdownsPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconLabelsPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconLabelsPage.axaml
similarity index 89%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconLabelsPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconLabelsPage.axaml
index cb1747afc..06fe40d66 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconLabelsPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconLabelsPage.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="420"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkIconLabelsPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkIconLabelsPage">
     <StackPanel Spacing="12">
         <StackPanel Spacing="8">
             <TextBlock Classes="TinyText" Text="IconLabel" />
@@ -28,22 +28,22 @@
         </StackPanel>
 
         <StackPanel Spacing="8">
-            <TextBlock Classes="TinyText" Text="IconLabelButton" />
+            <TextBlock Classes="TinyText" Text="LinkButton" />
             <StackPanel Orientation="Horizontal" Spacing="24">
-                <components:IconLabelButton Text="Open docs"
+                <components:LinkButton Text="Open docs"
                                             IconData="{StaticResource ExternalLink}"
                                             IconSize="16"
                                             FontSize="15"
                                             Foreground="{StaticResource Neutral300}"
                                             HoverForeground="{StaticResource Neutral200}" />
-                <components:IconLabelButton Text="Underlined action"
+                <components:LinkButton Text="Underlined action"
                                             IconData="{StaticResource ArrowRight}"
                                             IsUnderlined="True"
                                             IconSize="16"
                                             FontSize="15"
                                             Foreground="{StaticResource Neutral300}"
                                             HoverForeground="{StaticResource Primary300}" />
-                <components:IconLabelButton Text="Icon on right"
+                <components:LinkButton Text="Icon on right"
                                             IconData="{StaticResource ExternalLink}"
                                             IsIconLeft="False"
                                             IconSize="16"
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconLabelsPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconLabelsPage.axaml.cs
similarity index 84%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconLabelsPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconLabelsPage.axaml.cs
index ca8b3cf1e..22ddf3d82 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconLabelsPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconLabelsPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkIconLabelsPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconsPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconsPage.axaml
similarity index 97%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconsPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconsPage.axaml
index e22950676..838bb4670 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconsPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconsPage.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="430"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkIconsPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkIconsPage">
     <StackPanel Spacing="12">
         <TextBlock Classes="TinyText" Text="Normal Icons (PathIcon)" />
         <Grid ColumnDefinitions="*,*,*">
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconsPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconsPage.axaml.cs
similarity index 83%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconsPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconsPage.axaml.cs
index dc6562b37..f7e62b196 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkIconsPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkIconsPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkIconsPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkInputFieldsPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkInputFieldsPage.axaml
new file mode 100644
index 000000000..586e9fe44
--- /dev/null
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkInputFieldsPage.axaml
@@ -0,0 +1,39 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="520"
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkInputFieldsPage"
+        xmlns:components="clr-namespace:WheelWizard.Views.Components">
+    <StackPanel Spacing="12">
+        <StackPanel Spacing="8">
+            <TextBlock Classes="TinyText" Text="Standard Input Field" />
+            <TextBox Width="320" PlaceholderText="Enter text here..." />
+            <TextBox Width="320" Classes="dark" PlaceholderText="Enter text here... (dark)" />
+            <TextBox Width="320" Text="Read-only example" IsReadOnly="True" />
+            <TextBox Width="320" PlaceholderText="Disabled input field" IsEnabled="False" />
+            <TextBox Width="320" Classes="dark" PlaceholderText="Disabled dark input field" IsEnabled="False" />
+        </StackPanel>
+
+        <StackPanel Spacing="8">
+            <TextBlock Classes="TinyText" Text="Labeled Text Field" />
+            <components:TextField Width="320"
+                                          Label="Display Name"
+                                          TipText="This is the reusable labeled input with inline validation feedback."
+                                          PlaceholderText="Enter display name..."
+                                          Text="PlayerOne"
+                                          ErrorText="This name is already in use." />
+            <components:TextField Width="320"
+                                          Label="Display Name (Dark)"
+                                          Variant="Dark"
+                                          PlaceholderText="Enter display name..."
+                                          Text="PlayerOne"
+                                          ErrorText="This name is already in use." />
+            <components:TextField Width="320"
+                                          Label="Optional Note"
+                                          PlaceholderText="Optional..."
+                                          Text="Disabled text field"
+                                          IsEnabled="False" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkInputFieldsPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkInputFieldsPage.axaml.cs
similarity index 84%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkInputFieldsPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkInputFieldsPage.axaml.cs
index 0204f3d24..be66666e2 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkInputFieldsPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkInputFieldsPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkInputFieldsPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkSectionPageBase.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkSectionPageBase.cs
similarity index 86%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkSectionPageBase.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkSectionPageBase.cs
index 96f79864f..e7e54206d 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkSectionPageBase.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkSectionPageBase.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public interface IKitchenSinkSection
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkStateBoxesPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkStateBoxesPage.axaml
similarity index 80%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkStateBoxesPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkStateBoxesPage.axaml
index 7a2f58397..7dc90a140 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkStateBoxesPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkStateBoxesPage.axaml
@@ -4,26 +4,26 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="380"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkStateBoxesPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkStateBoxesPage">
     <StackPanel Spacing="12">
-        <TextBlock Classes="TinyText" Text="StateBox Variants" />
+        <TextBlock Classes="TinyText" Text="StatusBadge Variants" />
 
         <Grid ColumnDefinitions="Auto,Auto,Auto"
               RowDefinitions="Auto,Auto">
-            <components:StateBox Grid.Row="0"
+            <components:StatusBadge Grid.Row="0"
                                  Grid.Column="0"
                                  Margin="0,0,6,6"
                                  Text="Default"
                                  IconData="{StaticResource InfoTip}"
                                  IconSize="14" />
-            <components:StateBox Grid.Row="0"
+            <components:StatusBadge Grid.Row="0"
                                  Grid.Column="1"
                                  Margin="6,0,6,6"
                                  Text="Dark"
                                  Variant="Dark"
                                  IconData="{StaticResource Hourglass}"
                                  IconSize="14" />
-            <components:StateBox Grid.Row="0"
+            <components:StatusBadge Grid.Row="0"
                                  Grid.Column="2"
                                  Margin="6,0,0,6"
                                  Text="Success"
@@ -31,30 +31,30 @@
                                  IconData="{StaticResource CheckMark}"
                                  IconSize="12" />
 
-            <components:StateBox Grid.Row="1"
+            <components:StatusBadge Grid.Row="1"
                                  Grid.Column="0"
                                  Margin="0,6,6,0"
                                  Text="Warning"
                                  Variant="Warning"
                                  IconData="{StaticResource WarningTip}"
                                  IconSize="14" />
-            <components:StateBox Grid.Row="1"
+            <components:StatusBadge Grid.Row="1"
                                  Grid.Column="1"
                                  Margin="6,6,6,0"
                                  Text="Danger"
                                  Variant="Danger"
                                  IconData="{StaticResource XMark}"
                                  IconSize="12" />
-            <components:StateBox Grid.Row="1"
+            <components:StatusBadge Grid.Row="1"
                                  Grid.Column="2"
                                  Margin="6,6,0,0"
                                  IconData="{StaticResource UserCouple}"
                                  IconSize="14"
                                  TipText="Shows that content can replace text.">
-                <components:StateBox.Content>
+                <components:StatusBadge.Content>
                     <TextBlock Classes="TinyText" Text="Players: 12" />
-                </components:StateBox.Content>
-            </components:StateBox>
+                </components:StatusBadge.Content>
+            </components:StatusBadge>
         </Grid>
     </StackPanel>
 </UserControl>
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkStateBoxesPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkStateBoxesPage.axaml.cs
similarity index 84%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkStateBoxesPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkStateBoxesPage.axaml.cs
index 7b75436ff..e18cc96e9 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkStateBoxesPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkStateBoxesPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkStateBoxesPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkTextStylesPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkTextStylesPage.axaml
similarity index 96%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkTextStylesPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkTextStylesPage.axaml
index 3be42018b..6fb9ff262 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkTextStylesPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkTextStylesPage.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="640"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkTextStylesPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkTextStylesPage">
     <Grid RowDefinitions="Auto,*">
         <StackPanel Grid.Row="0" Spacing="8">
             <TextBlock Classes="TitleText" Text="TitleText: Section headline" />
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkTextStylesPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkTextStylesPage.axaml.cs
similarity index 84%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkTextStylesPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkTextStylesPage.axaml.cs
index 3f0b8f34e..ab9e6008e 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkTextStylesPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkTextStylesPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkTextStylesPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkToggleButtonsPage.axaml b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkToggleButtonsPage.axaml
similarity index 95%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkToggleButtonsPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkToggleButtonsPage.axaml
index ded942996..f114162e6 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkToggleButtonsPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkToggleButtonsPage.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="760"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkToggleButtonsPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSink.KitchenSinkToggleButtonsPage">
     <StackPanel Spacing="12">
         <StackPanel Spacing="8">
             <TextBlock Classes="TinyText" Text="CheckBoxes" />
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkToggleButtonsPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkToggleButtonsPage.axaml.cs
similarity index 84%
rename from WheelWizard/Views/Pages/kitchenSink/KitchenSinkToggleButtonsPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkToggleButtonsPage.axaml.cs
index 4cf640526..d4fe0dc8c 100644
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkToggleButtonsPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSink/KitchenSinkToggleButtonsPage.axaml.cs
@@ -1,4 +1,4 @@
-namespace WheelWizard.Views.Pages.KitchenSink;
+namespace WheelWizard.Views.DesignTime.KitchenSink;
 
 public partial class KitchenSinkToggleButtonsPage : KitchenSinkSectionPageBase
 {
diff --git a/WheelWizard/Views/Pages/KitchenSinkPage.axaml b/WheelWizard/Views/DesignTime/KitchenSinkPage.axaml
similarity index 98%
rename from WheelWizard/Views/Pages/KitchenSinkPage.axaml
rename to WheelWizard/Views/DesignTime/KitchenSinkPage.axaml
index d9d0743b1..c87f01692 100644
--- a/WheelWizard/Views/Pages/KitchenSinkPage.axaml
+++ b/WheelWizard/Views/DesignTime/KitchenSinkPage.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="656" d:DesignHeight="876"
-             x:Class="WheelWizard.Views.Pages.KitchenSinkPage">
+             x:Class="WheelWizard.Views.DesignTime.KitchenSinkPage">
     <UserControl.Styles>
         <Style Selector="Border.KitchenSinkSectionBlock">
             <Setter Property="CornerRadius" Value="{StaticResource GlobalCornerRadius}" />
diff --git a/WheelWizard/Views/Pages/KitchenSinkPage.axaml.cs b/WheelWizard/Views/DesignTime/KitchenSinkPage.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Pages/KitchenSinkPage.axaml.cs
rename to WheelWizard/Views/DesignTime/KitchenSinkPage.axaml.cs
index c3cef02a8..3761f6f52 100644
--- a/WheelWizard/Views/Pages/KitchenSinkPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/KitchenSinkPage.axaml.cs
@@ -3,9 +3,9 @@
 using Avalonia.Interactivity;
 using Avalonia.Layout;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Pages.KitchenSink;
+using WheelWizard.Views.DesignTime.KitchenSink;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Views.DesignTime;
 
 public partial class KitchenSinkPage : UserControl
 {
diff --git a/WheelWizard/Views/DesignTime/RrPlayerFactory.cs b/WheelWizard/Views/DesignTime/RrInfo/RrPlayerFactory.cs
similarity index 100%
rename from WheelWizard/Views/DesignTime/RrPlayerFactory.cs
rename to WheelWizard/Views/DesignTime/RrInfo/RrPlayerFactory.cs
diff --git a/WheelWizard/Views/Pages/TestingPage.axaml b/WheelWizard/Views/DesignTime/TestingPage.axaml
similarity index 99%
rename from WheelWizard/Views/Pages/TestingPage.axaml
rename to WheelWizard/Views/DesignTime/TestingPage.axaml
index 432087c15..0d929e706 100644
--- a/WheelWizard/Views/Pages/TestingPage.axaml
+++ b/WheelWizard/Views/DesignTime/TestingPage.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
              mc:Ignorable="d" d:DesignWidth="370" d:DesignHeight="520"
-             x:Class="WheelWizard.Views.Pages.TestingPage">
+             x:Class="WheelWizard.Views.DesignTime.TestingPage">
 
     <UserControl.Styles>
         <Style Selector="Border.ExclusivePanel">
diff --git a/WheelWizard/Views/Pages/TestingPage.axaml.cs b/WheelWizard/Views/DesignTime/TestingPage.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Pages/TestingPage.axaml.cs
rename to WheelWizard/Views/DesignTime/TestingPage.axaml.cs
index 2deb91153..419eaaf69 100644
--- a/WheelWizard/Views/Pages/TestingPage.axaml.cs
+++ b/WheelWizard/Views/DesignTime/TestingPage.axaml.cs
@@ -1,14 +1,14 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using WheelWizard.CustomDistributions;
+using WheelWizard.CustomDistributions.Presentation;
 using WheelWizard.Launching;
 using WheelWizard.Models.Enums;
 using WheelWizard.Settings;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Distributions;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Views.DesignTime;
 
 public partial class TestingPage : UserControl
 {
diff --git a/WheelWizard/Views/Popups/Base/PopupContent.cs b/WheelWizard/Views/Dialogs/Base/PopupContent.cs
similarity index 61%
rename from WheelWizard/Views/Popups/Base/PopupContent.cs
rename to WheelWizard/Views/Dialogs/Base/PopupContent.cs
index 3e73c1d8b..221037ca9 100644
--- a/WheelWizard/Views/Popups/Base/PopupContent.cs
+++ b/WheelWizard/Views/Dialogs/Base/PopupContent.cs
@@ -1,10 +1,13 @@
+using Avalonia;
 using Avalonia.Controls;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Popups.Base;
+namespace WheelWizard.Views.Dialogs.Base;
 
 public abstract class PopupContent : UserControl
 {
     protected PopupWindow Window { get; private set; }
+    private double? _preferredContentWidth;
 
     protected PopupContent(bool allowClose, bool allowParentInteraction, bool isTopMost, string title = "")
     {
@@ -16,6 +19,20 @@ protected PopupContent(bool allowClose, bool allowParentInteraction, bool isTopM
         };
     }
 
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        if (_preferredContentWidth == null && Content is Control root && double.IsFinite(root.Width))
+        {
+            // A defined root width remains the popup's preferred size, but does not limit arrangement.
+            _preferredContentWidth = root.Width;
+            root.MinWidth = Math.Max(root.MinWidth, root.Width);
+            root.ClearValue(WidthProperty);
+        }
+
+        var measureWidth = Math.Min(availableSize.Width, _preferredContentWidth ?? double.PositiveInfinity);
+        return base.MeasureOverride(new Size(measureWidth, availableSize.Height));
+    }
+
     protected virtual void BeforeClose() { } // Meant to be overwritten if needed
 
     protected virtual void BeforeOpen() { } // Meant to be overwritten if needed
diff --git a/WheelWizard/Views/Popups/Base/PopupWindow.axaml b/WheelWizard/Views/Dialogs/Base/PopupWindow.axaml
similarity index 81%
rename from WheelWizard/Views/Popups/Base/PopupWindow.axaml
rename to WheelWizard/Views/Dialogs/Base/PopupWindow.axaml
index a95450b65..ab4751e4b 100644
--- a/WheelWizard/Views/Popups/Base/PopupWindow.axaml
+++ b/WheelWizard/Views/Dialogs/Base/PopupWindow.axaml
@@ -2,31 +2,32 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
         xmlns:components="clr-namespace:WheelWizard.Views.Components"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="WheelWizard.Views.Popups.Base.PopupWindow"
+        x:Class="WheelWizard.Views.Dialogs.Base.PopupWindow"
         WindowDecorations="Full" SizeToContent="WidthAndHeight"
         WindowStartupLocation="CenterOwner"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaTitleBarHeightHint="30"
         CanResize='False' Background="Transparent"
-        x:DataType="base:PopupWindow"
-        Title="{Binding WindowTitle}">
+        x:DataType="dialogBase:PopupWindow"
+        Title="{Binding WindowTitle}"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid x:Name="WindowFrame" RowDefinitions="30,*">
         <Border Background="{StaticResource FrameColor}" PointerPressed="TopBar_PointerPressed"
                 WindowDecorationProperties.ElementRole="TitleBar">
             <StackPanel Orientation="Horizontal" Spacing="10" Margin="{OnPlatform Default='10,0,150,0', macOS='80,0,10,0'}" VerticalAlignment="Center">
-                <components:StateBox Text="Beta" Variant="Warning" IconSize="0" IsVisible="{Binding BetaFlag}" />
+                <components:StatusBadge Text="Beta" Variant="Warning" IconSize="0" IsVisible="{Binding BetaFlag}" />
                 <TextBlock FontSize="16" Text="{Binding WindowTitle}" Foreground="{StaticResource Neutral300}" />
             </StackPanel>
         </Border>
     <Grid Grid.Row="1" x:Name="CompleteGrid">
-        <Border Background="{StaticResource  BackgroundColor}" CornerRadius="4"
+        <Border Background="{StaticResource  BackgroundColor}" CornerRadius="0,0,4,4"
                 x:Name="CompleteBorder"
                 BorderThickness="1" BorderBrush="{StaticResource BackgroundLineColor}">
             <Grid>
                 <ContentPresenter x:Name="PopupContent" ClipToBounds="False"
+                                  HorizontalContentAlignment="Stretch"
                                   Margin="{StaticResource EdgeGap}" />
             </Grid>
         </Border>
diff --git a/WheelWizard/Views/Popups/Base/PopupWindow.axaml.cs b/WheelWizard/Views/Dialogs/Base/PopupWindow.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/Base/PopupWindow.axaml.cs
rename to WheelWizard/Views/Dialogs/Base/PopupWindow.axaml.cs
index 2cb0a5ce9..8a71126ff 100644
--- a/WheelWizard/Views/Popups/Base/PopupWindow.axaml.cs
+++ b/WheelWizard/Views/Dialogs/Base/PopupWindow.axaml.cs
@@ -6,8 +6,9 @@
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media;
+using WheelWizard.Views.Shell;
 
-namespace WheelWizard.Views.Popups.Base;
+namespace WheelWizard.Views.Dialogs.Base;
 
 public partial class PopupWindow : BaseWindow, INotifyPropertyChanged
 {
diff --git a/WheelWizard/Views/Popups/Generic/MessageBoxWindow.axaml b/WheelWizard/Views/Dialogs/MessageBoxWindow.axaml
similarity index 92%
rename from WheelWizard/Views/Popups/Generic/MessageBoxWindow.axaml
rename to WheelWizard/Views/Dialogs/MessageBoxWindow.axaml
index cfeb9fc6b..3451a8ff7 100644
--- a/WheelWizard/Views/Popups/Generic/MessageBoxWindow.axaml
+++ b/WheelWizard/Views/Dialogs/MessageBoxWindow.axaml
@@ -1,12 +1,12 @@
-<base:PopupContent x:Class="WheelWizard.Views.Popups.Generic.MessageBoxWindow"
+<dialogBase:PopupContent x:Class="WheelWizard.Views.Dialogs.MessageBoxWindow"
                    xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    ClipToBounds="False"
-                   mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450">
+                   mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid Width="400" MinHeight="150" MaxHeight="350" RowDefinitions="40,2*,1*">
 
         <!-- Message Title -->
@@ -32,7 +32,7 @@
             <StackPanel>
                 <SelectableTextBlock Classes="BodyText" x:Name="MessageInformationBlock" FontSize="14" TextWrapping="Wrap"
                                      HorizontalAlignment="Left" Margin="0,10,0,0" />
-                <components:IconLabelButton x:Name="MessageLink" IsVisible="False" IconSize="0" FontSize="14"
+                <components:LinkButton x:Name="MessageLink" IsVisible="False" IconSize="0" FontSize="14"
                                             Foreground="{StaticResource Primary300}" HoverForeground="{StaticResource Primary200}"
                                             HorizontalAlignment="Left" Click="MessageLink_OnClick" />
             </StackPanel>
@@ -72,4 +72,4 @@
             </Style>
         </Grid.Styles>
     </Grid>
-</base:PopupContent>
\ No newline at end of file
+</dialogBase:PopupContent>
\ No newline at end of file
diff --git a/WheelWizard/Views/Popups/Generic/MessageBoxWindow.axaml.cs b/WheelWizard/Views/Dialogs/MessageBoxWindow.axaml.cs
similarity index 87%
rename from WheelWizard/Views/Popups/Generic/MessageBoxWindow.axaml.cs
rename to WheelWizard/Views/Dialogs/MessageBoxWindow.axaml.cs
index eac5bb27c..7a616aaee 100644
--- a/WheelWizard/Views/Popups/Generic/MessageBoxWindow.axaml.cs
+++ b/WheelWizard/Views/Dialogs/MessageBoxWindow.axaml.cs
@@ -1,8 +1,10 @@
 using Avalonia.Interactivity;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs.Base;
+using WheelWizard.Views.Shell;
 using Button = WheelWizard.Views.Components.Button;
 
-namespace WheelWizard.Views.Popups.Generic;
+namespace WheelWizard.Views.Dialogs;
 
 public partial class MessageBoxWindow : PopupContent
 {
@@ -25,7 +27,7 @@ public MessageBoxWindow()
     public MessageBoxWindow SetMessageType(MessageType newType)
     {
         messageType = newType;
-        CancelButton.Variant = messageType == MessageType.Message ? Button.ButtonsVariantType.Primary : Button.ButtonsVariantType.Default;
+        CancelButton.Variant = messageType == MessageType.Message ? ButtonVariant.Primary : ButtonVariant.Default;
 
         Window.WindowTitle = messageType.ToString();
         TitleBorder.Classes.Add(messageType.ToString());
@@ -58,7 +60,7 @@ public MessageBoxWindow SetLink(string url)
         return this;
     }
 
-    private void MessageLink_OnClick(object? sender, EventArgs e) => ViewUtils.OpenLink((string)MessageLink.Tag!);
+    private void MessageLink_OnClick(object? sender, RoutedEventArgs e) => ViewUtils.OpenLink((string)MessageLink.Tag!);
 
     public MessageBoxWindow SetTag(string extraText)
     {
diff --git a/WheelWizard/Views/Popups/Generic/MiiRenderingSetupPopup.axaml b/WheelWizard/Views/Dialogs/MiiRenderingSetupPopup.axaml
similarity index 93%
rename from WheelWizard/Views/Popups/Generic/MiiRenderingSetupPopup.axaml
rename to WheelWizard/Views/Dialogs/MiiRenderingSetupPopup.axaml
index ce39fe888..801a43c89 100644
--- a/WheelWizard/Views/Popups/Generic/MiiRenderingSetupPopup.axaml
+++ b/WheelWizard/Views/Dialogs/MiiRenderingSetupPopup.axaml
@@ -1,11 +1,11 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    mc:Ignorable="d"
-                   x:Class="WheelWizard.Views.Popups.Generic.MiiRenderingSetupPopup">
+                   x:Class="WheelWizard.Views.Dialogs.MiiRenderingSetupPopup"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid Width="480" MinHeight="300" MaxHeight="420" RowDefinitions="Auto,Auto,Auto,*,Auto">
         <TextBlock Classes="TitleText"
                    Text="Mii Rendering Setup" />
@@ -72,4 +72,4 @@
                                Click="DownloadButton_OnClick" />
         </UniformGrid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/Generic/MiiRenderingSetupPopup.axaml.cs b/WheelWizard/Views/Dialogs/MiiRenderingSetupPopup.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Popups/Generic/MiiRenderingSetupPopup.axaml.cs
rename to WheelWizard/Views/Dialogs/MiiRenderingSetupPopup.axaml.cs
index 72e7f05f3..14566cbcb 100644
--- a/WheelWizard/Views/Popups/Generic/MiiRenderingSetupPopup.axaml.cs
+++ b/WheelWizard/Views/Dialogs/MiiRenderingSetupPopup.axaml.cs
@@ -1,9 +1,9 @@
 using Avalonia.Interactivity;
 using Microsoft.Extensions.Logging;
 using WheelWizard.MiiRendering.Services;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 
-namespace WheelWizard.Views.Popups.Generic;
+namespace WheelWizard.Views.Dialogs;
 
 public partial class MiiRenderingSetupPopup : PopupContent
 {
diff --git a/WheelWizard/Views/Popups/Generic/OptionsWindow.axaml b/WheelWizard/Views/Dialogs/OptionsWindow.axaml
similarity index 75%
rename from WheelWizard/Views/Popups/Generic/OptionsWindow.axaml
rename to WheelWizard/Views/Dialogs/OptionsWindow.axaml
index cb4e1456f..b5b6a5402 100644
--- a/WheelWizard/Views/Popups/Generic/OptionsWindow.axaml
+++ b/WheelWizard/Views/Dialogs/OptionsWindow.axaml
@@ -1,10 +1,10 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                   x:Class="WheelWizard.Views.Popups.Generic.OptionsWindow">
+                   x:Class="WheelWizard.Views.Dialogs.OptionsWindow"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <!-- Max Height is practically unreachable, no way that you have so many options -->
     <Grid MaxHeight="800">
         <ScrollViewer>
@@ -13,4 +13,4 @@
             </UniformGrid>
         </ScrollViewer>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/Generic/OptionsWindow.axaml.cs b/WheelWizard/Views/Dialogs/OptionsWindow.axaml.cs
similarity index 94%
rename from WheelWizard/Views/Popups/Generic/OptionsWindow.axaml.cs
rename to WheelWizard/Views/Dialogs/OptionsWindow.axaml.cs
index 3a5d41e60..8420c3f49 100644
--- a/WheelWizard/Views/Popups/Generic/OptionsWindow.axaml.cs
+++ b/WheelWizard/Views/Dialogs/OptionsWindow.axaml.cs
@@ -3,9 +3,9 @@
 using Avalonia.Media;
 using Avalonia.Threading;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 
-namespace WheelWizard.Views.Popups.Generic;
+namespace WheelWizard.Views.Dialogs;
 
 public partial class OptionsWindow : PopupContent
 {
@@ -26,7 +26,7 @@ public OptionsWindow SetWindowTitle(string title)
 
     public OptionsWindow AddOption(Geometry icon, string title, Action onClick, bool enabled = true)
     {
-        var button = new OptionButton()
+        var button = new TileButton()
         {
             IconData = icon,
             Text = title,
diff --git a/WheelWizard/Views/Popups/PopupFactory.cs b/WheelWizard/Views/Dialogs/PopupFactory.cs
similarity index 85%
rename from WheelWizard/Views/Popups/PopupFactory.cs
rename to WheelWizard/Views/Dialogs/PopupFactory.cs
index 8414bc18c..221e7ea7b 100644
--- a/WheelWizard/Views/Popups/PopupFactory.cs
+++ b/WheelWizard/Views/Dialogs/PopupFactory.cs
@@ -1,6 +1,6 @@
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 
-namespace WheelWizard.Views.Popups;
+namespace WheelWizard.Views.Dialogs;
 
 public interface IPopupFactory
 {
diff --git a/WheelWizard/Views/Popups/Generic/ProgressWindow.axaml b/WheelWizard/Views/Dialogs/ProgressWindow.axaml
similarity index 91%
rename from WheelWizard/Views/Popups/Generic/ProgressWindow.axaml
rename to WheelWizard/Views/Dialogs/ProgressWindow.axaml
index 4fc553d50..48754c645 100644
--- a/WheelWizard/Views/Popups/Generic/ProgressWindow.axaml
+++ b/WheelWizard/Views/Dialogs/ProgressWindow.axaml
@@ -1,14 +1,13 @@
-<base:PopupContent x:Class="WheelWizard.Views.Popups.Generic.ProgressWindow"
+<dialogBase:PopupContent x:Class="WheelWizard.Views.Dialogs.ProgressWindow"
                     xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:popups="clr-namespace:WheelWizard.Views.Popups"
-                    xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                     xmlns:components="clr-namespace:WheelWizard.Views.Components"
                     xmlns:loc="clr-namespace:WheelWizard.Localization"
                     ClipToBounds="False"
-                    mc:Ignorable="d" d:DesignHeight="170" d:DesignWidth="400">
+                    mc:Ignorable="d" d:DesignHeight="170" d:DesignWidth="400"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid Width="400" MinHeight="150" MaxHeight="500">
         <Grid.RowDefinitions>
             <RowDefinition Height="40"/>
@@ -51,4 +50,4 @@
                                Click="CancelButton_OnClick" />
         </Grid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/Generic/ProgressWindow.axaml.cs b/WheelWizard/Views/Dialogs/ProgressWindow.axaml.cs
similarity index 91%
rename from WheelWizard/Views/Popups/Generic/ProgressWindow.axaml.cs
rename to WheelWizard/Views/Dialogs/ProgressWindow.axaml.cs
index 940f08217..a1a4255ff 100644
--- a/WheelWizard/Views/Popups/Generic/ProgressWindow.axaml.cs
+++ b/WheelWizard/Views/Dialogs/ProgressWindow.axaml.cs
@@ -1,9 +1,10 @@
 using System.Diagnostics;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Threading;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 
-namespace WheelWizard.Views.Popups.Generic;
+namespace WheelWizard.Views.Dialogs;
 
 public partial class ProgressWindow : PopupContent
 {
@@ -30,6 +31,7 @@ public ProgressWindow(string windowTitle)
         : base(false, false, true, windowTitle)
     {
         InitializeComponent();
+        Window.Closing += OnWindowClosing;
         _updateTimer = new();
         _updateTimer.Interval = TimeSpan.FromMilliseconds(100); // Update every 100ms
         _updateTimer.Tick += UpdateTimer_Tick;
@@ -169,7 +171,19 @@ public ProgressWindow MarkCancellationRequested()
         return SetExtraText($"{t("action.cancel")}...");
     }
 
-    private void CancelButton_OnClick(object? sender, RoutedEventArgs e)
+    private void OnWindowClosing(object? sender, WindowClosingEventArgs e)
+    {
+        if (e.IsProgrammatic || e.CloseReason != WindowCloseReason.WindowClosing || _downloadCancellationTokenSource == null)
+            return;
+
+        // Match Cancel: keep the progress popup open until the operation finishes cleanup.
+        e.Cancel = true;
+        RequestCancellation();
+    }
+
+    private void CancelButton_OnClick(object? sender, RoutedEventArgs e) => RequestCancellation();
+
+    private void RequestCancellation()
     {
         if (_downloadCancellationTokenSource == null || _downloadCancellationTokenSource.IsCancellationRequested)
             return;
diff --git a/WheelWizard/Views/Popups/Generic/TextInputWindow.axaml b/WheelWizard/Views/Dialogs/TextInputWindow.axaml
similarity index 83%
rename from WheelWizard/Views/Popups/Generic/TextInputWindow.axaml
rename to WheelWizard/Views/Dialogs/TextInputWindow.axaml
index 32f8560d4..153788214 100644
--- a/WheelWizard/Views/Popups/Generic/TextInputWindow.axaml
+++ b/WheelWizard/Views/Dialogs/TextInputWindow.axaml
@@ -1,13 +1,12 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
-                   xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns"
                    xmlns:loc="clr-namespace:WheelWizard.Localization"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
-                   x:Class="WheelWizard.Views.Popups.Generic.TextInputWindow">
+                   x:Class="WheelWizard.Views.Dialogs.TextInputWindow"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid RowDefinitions="Auto,Auto,Auto" Width="400">
         <StackPanel Grid.Row="0" HorizontalAlignment="Stretch"
                     VerticalAlignment="Top" Margin="0,10">
@@ -20,12 +19,11 @@
                                  TextWrapping="Wrap"
                                  HorizontalAlignment="Left" Margin="0,10,0,0" />
 
-            <behaviorComp:FeedbackTextBox x:Name="InputField" Watermark="{loc:T placeholder.enter_text_here}"
-                                          ErrorMessage="hey hello"
+            <components:TextField x:Name="InputField" PlaceholderText="{loc:T placeholder.enter_text_here}"
                                           Margin="0,5,0,0" Variant="Default" />
         </StackPanel>
 
-        <components:IconLabelButton Grid.Row="1" x:Name="CustomCharsButton"
+        <components:LinkButton Grid.Row="1" x:Name="CustomCharsButton"
                                     Foreground="{StaticResource Primary300}"
                                     HoverForeground="{StaticResource Primary200}"
                                     IconData="{StaticResource ArrowDown}"
@@ -52,4 +50,4 @@
                                Click="SubmitButton_Click" Margin="5,0,0,0" />
         </UniformGrid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs b/WheelWizard/Views/Dialogs/TextInputWindow.axaml.cs
similarity index 81%
rename from WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs
rename to WheelWizard/Views/Dialogs/TextInputWindow.axaml.cs
index 12a99ea5f..1c9cade31 100644
--- a/WheelWizard/Views/Popups/Generic/TextInputWindow.axaml.cs
+++ b/WheelWizard/Views/Dialogs/TextInputWindow.axaml.cs
@@ -1,10 +1,11 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Layout;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Components;
+using WheelWizard.Views.Dialogs.Base;
 using Button = WheelWizard.Views.Components.Button;
 
-namespace WheelWizard.Views.Popups.Generic;
+namespace WheelWizard.Views.Dialogs;
 
 public partial class TextInputWindow : PopupContent
 {
@@ -12,7 +13,6 @@ public partial class TextInputWindow : PopupContent
     private TaskCompletionSource<string?>? _tcs;
     private string? _initialText;
     private Func<string?, string, OperationResult>? inputValidationFunc; // (oldText?, newText) => OperationResult
-    private Func<string?, string, string?>? warningValidationFunc; // (oldText?, newText) => warningMessage?
 
     // Constructor with dynamic label parameter
     public TextInputWindow()
@@ -31,7 +31,7 @@ public TextInputWindow SetMainText(string mainText)
 
     public TextInputWindow SetPlaceholderText(string placeholder)
     {
-        InputField.Watermark = placeholder;
+        InputField.PlaceholderText = placeholder;
         return this;
     }
 
@@ -62,20 +62,16 @@ public TextInputWindow SetButtonText(string cancelText, string submitText)
 
     public TextInputWindow SetInitialText(string text)
     {
-        InputField.Text = text;
         _initialText = text;
+        InputField.Text = text;
+        UpdateSubmitButtonState();
         return this;
     }
 
     public TextInputWindow SetValidation(Func<string?, string, OperationResult> validationFunction)
     {
         inputValidationFunc = validationFunction;
-        return this;
-    }
-
-    public TextInputWindow SetWarningValidation(Func<string?, string, string?> warningValidationFunction)
-    {
-        warningValidationFunc = warningValidationFunction;
+        UpdateSubmitButtonState();
         return this;
     }
 
@@ -116,17 +112,14 @@ private void UpdateSubmitButtonState()
     {
         var inputText = GetInputText() ?? string.Empty;
         var validationError = inputValidationFunc?.Invoke(_initialText, inputText).Error?.Message;
-        var warningMessage = warningValidationFunc?.Invoke(_initialText, inputText);
 
         var hasError = !string.IsNullOrWhiteSpace(validationError);
-        var hasWarning = !string.IsNullOrWhiteSpace(warningMessage);
 
-        SubmitButton.IsEnabled = !hasError && !hasWarning;
-        InputField.ErrorMessage = hasError ? validationError! : string.Empty;
-        InputField.WarningMessage = !hasError && hasWarning ? warningMessage! : string.Empty;
+        SubmitButton.IsEnabled = !hasError;
+        InputField.ErrorText = hasError ? validationError! : string.Empty;
     }
 
-    private void CustomCharsButton_Click(object sender, EventArgs e)
+    private void CustomCharsButton_Click(object sender, RoutedEventArgs e)
     {
         CustomChars.IsVisible = true;
         CustomCharsButton.IsVisible = false;
@@ -134,6 +127,9 @@ private void CustomCharsButton_Click(object sender, EventArgs e)
 
     private void SubmitButton_Click(object sender, RoutedEventArgs e)
     {
+        UpdateSubmitButtonState();
+        if (!SubmitButton.IsEnabled)
+            return;
         _result = GetInputText();
         _tcs?.TrySetResult(_result); // Set the result of the task
         Close();
diff --git a/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml b/WheelWizard/Views/Dialogs/YesNoWindow.axaml
similarity index 89%
rename from WheelWizard/Views/Popups/Generic/YesNoWindow.axaml
rename to WheelWizard/Views/Dialogs/YesNoWindow.axaml
index ba5af6b58..668f5b003 100644
--- a/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml
+++ b/WheelWizard/Views/Dialogs/YesNoWindow.axaml
@@ -1,12 +1,12 @@
-<base:PopupContent xmlns="https://github.com/avaloniaui"
+<dialogBase:PopupContent xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                    xmlns:components="clr-namespace:WheelWizard.Views.Components"
                    xmlns:loc="clr-namespace:WheelWizard.Localization"
-                   xmlns:base="clr-namespace:WheelWizard.Views.Popups.Base"
                    mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-                   x:Class="WheelWizard.Views.Popups.Generic.YesNoWindow">
+                   x:Class="WheelWizard.Views.Dialogs.YesNoWindow"
+        xmlns:dialogBase="clr-namespace:WheelWizard.Views.Dialogs.Base">
     <Grid Width="400" MinHeight="150" MaxHeight="350" RowDefinitions="*,Auto">
         <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0,10">
             
@@ -31,4 +31,4 @@
                                Click="yesButton_Click" Margin="5,0,0,0"/>
         </UniformGrid>
     </Grid>
-</base:PopupContent>
+</dialogBase:PopupContent>
diff --git a/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml.cs b/WheelWizard/Views/Dialogs/YesNoWindow.axaml.cs
similarity index 92%
rename from WheelWizard/Views/Popups/Generic/YesNoWindow.axaml.cs
rename to WheelWizard/Views/Dialogs/YesNoWindow.axaml.cs
index 04460b9ba..883205a3d 100644
--- a/WheelWizard/Views/Popups/Generic/YesNoWindow.axaml.cs
+++ b/WheelWizard/Views/Dialogs/YesNoWindow.axaml.cs
@@ -2,9 +2,9 @@
 using Avalonia.Layout;
 using Avalonia.Threading;
 using WheelWizard.Views.Components;
-using WheelWizard.Views.Popups.Base;
+using WheelWizard.Views.Dialogs.Base;
 
-namespace WheelWizard.Views.Popups.Generic;
+namespace WheelWizard.Views.Dialogs;
 
 public partial class YesNoWindow : PopupContent
 {
@@ -49,7 +49,7 @@ public YesNoWindow SetButtonText(string yesText, string noText)
         return this;
     }
 
-    public YesNoWindow SetButtonVariants(Button.ButtonsVariantType yesVariant, Button.ButtonsVariantType noVariant)
+    public YesNoWindow SetButtonVariants(ButtonVariant yesVariant, ButtonVariant noVariant)
     {
         YesButton.Variant = yesVariant;
         NoButton.Variant = noVariant;
diff --git a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkInputFieldsPage.axaml b/WheelWizard/Views/Pages/kitchenSink/KitchenSinkInputFieldsPage.axaml
deleted file mode 100644
index 17fbe1dbd..000000000
--- a/WheelWizard/Views/Pages/kitchenSink/KitchenSinkInputFieldsPage.axaml
+++ /dev/null
@@ -1,50 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns"
-             mc:Ignorable="d" d:DesignWidth="620" d:DesignHeight="520"
-             x:Class="WheelWizard.Views.Pages.KitchenSink.KitchenSinkInputFieldsPage">
-    <StackPanel Spacing="12">
-        <StackPanel Spacing="8">
-            <TextBlock Classes="TinyText" Text="Standard Input Field" />
-            <TextBox Width="320" PlaceholderText="Enter text here..." />
-            <TextBox Width="320" Classes="dark" PlaceholderText="Enter text here... (dark)" />
-            <TextBox Width="320" Text="Read-only example" IsReadOnly="True" />
-            <TextBox Width="320" PlaceholderText="Disabled input field" IsEnabled="False" />
-            <TextBox Width="320" Classes="dark" PlaceholderText="Disabled dark input field" IsEnabled="False" />
-        </StackPanel>
-
-        <StackPanel Spacing="8">
-            <TextBlock Classes="TinyText" Text="FeedbackTextBox Behavior Component" />
-            <behaviorComp:FeedbackTextBox Width="320"
-                                          Label="Display Name"
-                                          TipText="This is the reusable labeled input with inline validation feedback."
-                                          Watermark="Enter display name..."
-                                          Text="PlayerOne"
-                                          ErrorMessage="This name is already in use." />
-            <behaviorComp:FeedbackTextBox Width="320"
-                                          Label="Display Name (Dark)"
-                                          Variant="Dark"
-                                          Watermark="Enter display name..."
-                                          Text="PlayerOne"
-                                          ErrorMessage="This name is already in use." />
-            <behaviorComp:FeedbackTextBox Width="320"
-                                          Label="Password"
-                                          Watermark="Choose a strong password..."
-                                          Text="hello123"
-                                          WarningMessage="This password is weak." />
-            <behaviorComp:FeedbackTextBox Width="320"
-                                          Label="Password (Dark)"
-                                          Variant="Dark"
-                                          Watermark="Choose a strong password..."
-                                          Text="hello123"
-                                          WarningMessage="This password is weak." />
-            <behaviorComp:FeedbackTextBox Width="320"
-                                          Label="Optional Note"
-                                          Watermark="Optional..."
-                                          Text="Disabled behavior component"
-                                          IsEnabled="False" />
-        </StackPanel>
-    </StackPanel>
-</UserControl>
diff --git a/WheelWizard/Views/Patterns/FeedbackTextBox.axaml b/WheelWizard/Views/Patterns/FeedbackTextBox.axaml
deleted file mode 100644
index c0c608e1b..000000000
--- a/WheelWizard/Views/Patterns/FeedbackTextBox.axaml
+++ /dev/null
@@ -1,30 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="100"
-             x:Class="WheelWizard.Views.Patterns.FeedbackTextBox"
-             xmlns:behaviorComp="clr-namespace:WheelWizard.Views.Patterns"
-             xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             x:DataType="behaviorComp:FeedbackTextBox"
-             >
-    <StackPanel Orientation="Vertical">
-        <components:FormFieldLabel Text="{Binding Label}" TipText="{Binding TipText}"
-                                   IsVisible="{Binding Label, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
-        <TextBox x:Name="InputField" Text="{Binding Text}"
-                 PlaceholderText="{Binding Watermark}"/>
-        <components:IconLabel IsIconLeft="True" Text="{Binding ErrorMessage}"
-                              IsVisible="{Binding ErrorMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                              Foreground="{StaticResource Danger600}"
-                              IconData="{StaticResource WarningTriangle}"
-                              IconSize="15" FontSize="13" Margin="4,4,0,0"
-                              />
-        <components:IconLabel IsIconLeft="True" Text="{Binding WarningMessage}"
-                              IsVisible="{Binding WarningMessage, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                              Foreground="{StaticResource Warning600}"
-                              IconData="{StaticResource WarningTip}"
-                              IconSize="15" FontSize="13" Margin="4,4,0,0"
-                              />
-    </StackPanel>
-
-</UserControl>
diff --git a/WheelWizard/Views/Patterns/FeedbackTextBox.axaml.cs b/WheelWizard/Views/Patterns/FeedbackTextBox.axaml.cs
deleted file mode 100644
index 6bea09d2a..000000000
--- a/WheelWizard/Views/Patterns/FeedbackTextBox.axaml.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-
-namespace WheelWizard.Views.Patterns;
-
-public partial class FeedbackTextBox : UserControl
-{
-    #region Properties
-
-    public static readonly StyledProperty<TextBoxVariantType> VariantProperty = AvaloniaProperty.Register<
-        FeedbackTextBox,
-        TextBoxVariantType
-    >(nameof(Variant), TextBoxVariantType.Default);
-
-    public static readonly StyledProperty<string> ErrorMessageProperty = AvaloniaProperty.Register<FeedbackTextBox, string>(
-        nameof(ErrorMessage)
-    );
-
-    public static readonly StyledProperty<string> WarningMessageProperty = AvaloniaProperty.Register<FeedbackTextBox, string>(
-        nameof(WarningMessage)
-    );
-
-    public static readonly StyledProperty<string> TextProperty = AvaloniaProperty.Register<FeedbackTextBox, string>(nameof(Text));
-
-    public static readonly StyledProperty<string> WatermarkProperty = AvaloniaProperty.Register<FeedbackTextBox, string>(
-        nameof(Watermark),
-        "Enter text here..."
-    );
-
-    public static readonly StyledProperty<string> LabelProperty = AvaloniaProperty.Register<FeedbackTextBox, string>(nameof(Label));
-
-    public static readonly StyledProperty<string> TipTextProperty = AvaloniaProperty.Register<FeedbackTextBox, string>(nameof(TipText));
-
-    public static readonly RoutedEvent<TextChangedEventArgs> TextChangedEvent = RoutedEvent.Register<TextBox, TextChangedEventArgs>(
-        nameof(TextChanged),
-        RoutingStrategies.Bubble
-    );
-
-    public enum TextBoxVariantType
-    {
-        Default,
-        Dark,
-    }
-
-    public TextBoxVariantType Variant
-    {
-        get => GetValue(VariantProperty);
-        set => SetValue(VariantProperty, value);
-    }
-
-    public string ErrorMessage
-    {
-        get => GetValue(ErrorMessageProperty);
-        set => SetValue(ErrorMessageProperty, value);
-    }
-
-    public string WarningMessage
-    {
-        get => GetValue(WarningMessageProperty);
-        set => SetValue(WarningMessageProperty, value);
-    }
-
-    public string Text
-    {
-        get => GetValue(TextProperty);
-        set => SetValue(TextProperty, value);
-    }
-
-    public string Watermark
-    {
-        get => GetValue(WatermarkProperty);
-        set => SetValue(WatermarkProperty, value);
-    }
-
-    public string Label
-    {
-        get => GetValue(LabelProperty);
-        set => SetValue(LabelProperty, value);
-    }
-
-    public string TipText
-    {
-        get => GetValue(TipTextProperty);
-        set => SetValue(TipTextProperty, value);
-    }
-
-    public event EventHandler<TextChangedEventArgs>? TextChanged
-    {
-        add => AddHandler(TextChangedEvent, value);
-        remove => RemoveHandler(TextChangedEvent, value);
-    }
-
-    #endregion
-
-    public FeedbackTextBox()
-    {
-        InitializeComponent();
-        DataContext = this;
-
-        InputField.TextChanged += (_, _) => RaiseEvent(new TextChangedEventArgs(TextChangedEvent, this));
-        UpdateValidationState(hasError: !string.IsNullOrWhiteSpace(ErrorMessage), hasWarning: !string.IsNullOrWhiteSpace(WarningMessage));
-        // If there is uses for more other events, then we can always add them
-    }
-
-    private void UpdateStyleClasses(TextBoxVariantType variant)
-    {
-        if (variant == TextBoxVariantType.Dark)
-            InputField.Classes.Add("dark");
-        else
-            InputField.Classes.Remove("dark");
-    }
-
-    private void UpdateValidationState(bool hasError, bool hasWarning)
-    {
-        if (hasError)
-        {
-            if (!InputField.Classes.Contains("error"))
-                InputField.Classes.Add("error");
-            InputField.Classes.Remove("warning");
-            return;
-        }
-
-        InputField.Classes.Remove("error");
-
-        if (!hasWarning)
-        {
-            InputField.Classes.Remove("warning");
-            return;
-        }
-
-        if (!InputField.Classes.Contains("warning"))
-            InputField.Classes.Add("warning");
-    }
-
-    protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
-    {
-        base.OnPropertyChanged(change);
-
-        if (change.Property == VariantProperty)
-            UpdateStyleClasses(change.GetNewValue<TextBoxVariantType>());
-
-        if (change.Property == ErrorMessageProperty || change.Property == WarningMessageProperty)
-            UpdateValidationState(
-                hasError: !string.IsNullOrWhiteSpace(ErrorMessage),
-                hasWarning: !string.IsNullOrWhiteSpace(WarningMessage)
-            );
-    }
-}
diff --git a/WheelWizard/Views/Patterns/GridModPanel.axaml.cs b/WheelWizard/Views/Patterns/GridModPanel.axaml.cs
deleted file mode 100644
index 2ec53a9c5..000000000
--- a/WheelWizard/Views/Patterns/GridModPanel.axaml.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using WheelWizard.Views.Pages;
-
-namespace WheelWizard.Views.Patterns;
-
-public partial class GridModPanel : UserControl
-{
-    public GridModPanel()
-    {
-        InitializeComponent();
-        DataContextChanged += OnDataContextChanged;
-    }
-
-    private async void OnDataContextChanged(object? sender, EventArgs e)
-    {
-        if (DataContext is ModListItem item)
-            await item.Preview.LoadAsync();
-    }
-
-    private void PriorityText_OnLostFocus(object? sender, RoutedEventArgs e)
-    {
-        if (DataContext is not ModListItem item || e.Source is not TextBox textBox)
-            return;
-
-        textBox.Classes.Remove("error");
-        if (int.TryParse(textBox.Text, out var newPriority))
-            item.Mod.Priority = newPriority;
-        else
-            textBox.Text = item.Mod.Priority.ToString();
-    }
-
-    private void PriorityText_OnTextChanged(object? sender, TextChangedEventArgs e)
-    {
-        if (e.Source is not TextBox textBox)
-            return;
-
-        if (int.TryParse(textBox.Text, out _))
-            textBox.Classes.Remove("error");
-        else if (!textBox.Classes.Contains("error"))
-            textBox.Classes.Add("error");
-    }
-
-    private void PriorityText_OnKeyDown(object? sender, KeyEventArgs e)
-    {
-        if (e.Key != Key.Enter || sender is not TextBox)
-            return;
-
-        this.Focus();
-    }
-}
diff --git a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorStartPage.axaml b/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorStartPage.axaml
deleted file mode 100644
index 951801dc5..000000000
--- a/WheelWizard/Views/Popups/MiiManagement/MiiEditor/EditorStartPage.axaml
+++ /dev/null
@@ -1,74 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:editor="clr-namespace:WheelWizard.Views.Popups.MiiManagement.MiiEditor"
-             xmlns:loc="clr-namespace:WheelWizard.Localization"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
-             x:Class="WheelWizard.Views.Popups.MiiManagement.MiiEditor.EditorStartPage">
-    <Grid RowDefinitions="40,*,60">
-        <StackPanel Orientation="Horizontal"  Margin="10" Spacing="10">
-            <!-- EmptyStarIcon -->
-            <components:IconLabelButton Text="" VerticalAlignment="Center" x:Name="FavoriteButton" Click="FavoriteButton_OnClick">
-                
-                <components:IconLabelButton.Styles>
-                    <Style Selector="components|IconLabelButton">
-                        <Setter Property="IconData" Value="{StaticResource EmptyStarIcon}" />
-                        <Setter Property="Foreground" Value="{StaticResource TitleTextColor}" />
-                        <Setter Property="HoverForeground" Value="{StaticResource Warning300}" />
-                    </Style>
-                    
-                    <Style Selector="components|IconLabelButton.favorite">
-                        <Setter Property="IconData" Value="{StaticResource StarIcon}" />
-                        <Setter Property="Foreground" Value="{StaticResource Warning500}" />
-                        <Setter Property="HoverForeground" Value="{StaticResource Warning300}" />
-                    </Style>
-                </components:IconLabelButton.Styles>
-            </components:IconLabelButton>
-            <SelectableTextBlock Classes="BodyText" x:Name="MiiName" />
-        </StackPanel>
-        
-        <Border Grid.Row="0" Background="{StaticResource BackgroundLineColor}"
-                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="1" />
-        <Border Grid.Row="2" Background="{StaticResource BackgroundLineColor}"
-                HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="1" />
-        
-        <components:Button Variant="Default" Grid.Row="2" Margin="10"  VerticalAlignment="Top" 
-                           HorizontalAlignment="Left" Padding="12,6" IconSize="28"
-                           IconData="{StaticResource Dice}" Click="RandomizeMii_OnClick" />
-        <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="10"
-                    VerticalAlignment="Top" HorizontalAlignment="Right" Spacing="10">
-            <components:Button Text="{loc:T action.cancel}" Variant="Warning"
-                               IconData="{StaticResource XMark}" Click="CancelButton_OnClick" />
-            <components:Button Text="{loc:T action.save}" Variant="Primary"
-                               x:Name="SaveButton"
-                               IconData="{StaticResource CheckMark}" Click="SaveButton_OnClick" />
-        </StackPanel>
-        
-        <ScrollViewer Grid.Row="1">
-            <StackPanel>
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.general}"
-                                            Type="{x:Type editor:EditorGeneral}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.face}"
-                                            Type="{x:Type editor:EditorFace}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.hair}"
-                                            Type="{x:Type editor:EditorHair}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.eyebrows}"
-                                            Type="{x:Type editor:EditorEyebrows}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.eyes}"
-                                            Type="{x:Type editor:EditorEyes}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.nose}"
-                                            Type="{x:Type editor:EditorNose}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.lips}"
-                                            Type="{x:Type editor:EditorLips}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.glasses}"
-                                            Type="{x:Type editor:EditorGlasses}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.facial_hair}"
-                                            Type="{x:Type editor:EditorFacialHair}" />
-                <components:PopupListButton Click="PopupPageButton_OnClick" Text="{loc:T attribute.mii_section.mole}"
-                                            Type="{x:Type editor:EditorMole}" />
-            </StackPanel>
-        </ScrollViewer>
-    </Grid>
-</UserControl>
\ No newline at end of file
diff --git a/WheelWizard/Views/README.md b/WheelWizard/Views/README.md
new file mode 100644
index 000000000..fcf308605
--- /dev/null
+++ b/WheelWizard/Views/README.md
@@ -0,0 +1,21 @@
+# UI ownership
+
+- `Components/`: reusable rendering controls and ordinary UI state. No feature services, navigation, or workflows.
+- `Patterns/`: reusable interactions that coordinate controls and own a workflow. Composition alone does not make a pattern; create this folder when one is needed.
+- `Shell/`: application layout, navigation, startup, and controls specific to the shell.
+- `Dialogs/`: shared dialog workflows and their window infrastructure.
+- `Styles/`: shared resources and styles for native Avalonia controls.
+- `DesignTime/`: previews, development tools, and the component gallery.
+- `Features/<feature>/Views/`: feature pages and feature-specific rendering controls. Their presentation models belong alongside their feature, not in shared components.
+
+## Control contracts
+
+Prefer native Avalonia properties, events, commands, and flyouts. Add a custom property only for behavior or rendering the native control does not expose.
+
+- `Button`: native `Click`, `Command`, `CommandParameter`, `Content`, and `Flyout`; `Text` and `IconData` provide the common label shortcut. `Variant` and `Size` select appearance.
+- `LinkButton`, `TileButton`, and `ListActionButton`: button appearances with the same native activation contract. A list action does not know which page it opens; the caller owns that action.
+- `TextField`: labeled text entry with a two-way `Text` binding, `PlaceholderText`, and optional `ErrorText`. A nonblank error message displays the error state; null, empty, or whitespace clears it. The caller owns validation and submission rules. There is no warning validation state or separate error flag to synchronize.
+- `StatusBadge`: generic status rendering. Community roles and special community counts live in WheelWizardData's views.
+- `HoverGlow`: pointer-following decoration shared by button templates. Render transforms keep its movement out of layout.
+
+Use property selectors for appearance variants and pseudo-classes for interaction state. Preserve the caller's data context. Templates own presentation; callers own feature actions.
diff --git a/WheelWizard/Views/BaseWindow.cs b/WheelWizard/Views/Shell/BaseWindow.cs
similarity index 99%
rename from WheelWizard/Views/BaseWindow.cs
rename to WheelWizard/Views/Shell/BaseWindow.cs
index 7a489b092..a5d7dc2f7 100644
--- a/WheelWizard/Views/BaseWindow.cs
+++ b/WheelWizard/Views/Shell/BaseWindow.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public abstract class BaseWindow : Window
 {
diff --git a/WheelWizard/Views/Patterns/SidebarRadioButton.axaml b/WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml
similarity index 53%
rename from WheelWizard/Views/Patterns/SidebarRadioButton.axaml
rename to WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml
index e4de476ba..292c0a96d 100644
--- a/WheelWizard/Views/Patterns/SidebarRadioButton.axaml
+++ b/WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml
@@ -1,37 +1,38 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:loc="clr-namespace:WheelWizard.Localization"
-        xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
         xmlns:components="clr-namespace:WheelWizard.Views.Components"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns">
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views"
+        xmlns:shellViews="clr-namespace:WheelWizard.Views.Shell.Views"
+        xmlns:shellControls="clr-namespace:WheelWizard.Views.Shell.Controls">
   <Design.PreviewWith>
     <Border Padding="2" Width="300" Background="{StaticResource Neutral600}">
       <StackPanel>
-        <patterns:SidebarRadioButton IconData="{StaticResource Home}" 
+        <shellControls:SidebarRadioButton IconData="{StaticResource Home}" 
                                      Text="{loc:T page_title.home}"
-                                     PageType="{x:Type pages:HomePage}"/>
+                                     PageType="{x:Type shellViews:HomePage}"/>
         
-        <patterns:SidebarRadioButton  IsChecked="True"
+        <shellControls:SidebarRadioButton  IsChecked="True"
                                    IconData="{StaticResource Settings}" 
                                    Text="{loc:T page_title.settings}"
-                                   PageType="{x:Type pages:HomePage}"/>
+                                   PageType="{x:Type shellViews:HomePage}"/>
         
-        <patterns:SidebarRadioButton IconData="{StaticResource Friends}" 
+        <shellControls:SidebarRadioButton IconData="{StaticResource Friends}" 
                                   Text="{loc:T page_title.friends}"
-                                  PageType="{x:Type pages:HomePage}"
+                                  PageType="{x:Type shellViews:HomePage}"
                                   BoxText="0/0"/>  
-        <patterns:SidebarRadioButton IconData="{StaticResource CubesStacked}" 
+        <shellControls:SidebarRadioButton IconData="{StaticResource CubesStacked}" 
                                   Text="{loc:T page_title.mods}"
-                                  PageType="{x:Type pages:HomePage}"/>
-        <patterns:SidebarRadioButton IconData="{StaticResource RoomUsers}" 
+                                  PageType="{x:Type shellViews:HomePage}"/>
+        <shellControls:SidebarRadioButton IconData="{StaticResource RoomUsers}" 
                                   Text="{loc:T page_title.rooms}"
-                                  PageType="{x:Type pages:RoomsPage}"/>
+                                  PageType="{x:Type rooms:RoomsPage}"/>
                                   
       </StackPanel>
     </Border>
   </Design.PreviewWith>
 
-  <Style Selector="patterns|SidebarRadioButton">
+  <Style Selector="shellControls|SidebarRadioButton">
     <Setter Property="Background" Value="{DynamicResource Neutral900}" />
     <Setter Property="Foreground" Value="{DynamicResource Neutral400}" />
     <Setter Property="Height" Value="46" />
@@ -50,26 +51,10 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Stretch" />
             
-            <Border CornerRadius="99999" IsVisible="False" Opacity="0.3" Name="PART_HoverEffect"
-                    HorizontalAlignment="Left" VerticalAlignment="Top"
-                    Background="{StaticResource Primary200}" Height="46" Width="46" Effect="blur(150)">
-              
-              <Border.Styles>
-                <Style Selector="Border">
-                  <Style.Animations>
-                    <Animation Duration="0:0:5" IterationCount="INFINITE">
-                      <KeyFrame Cue="0%">
-                        <Setter Property="RotateTransform.Angle" Value="0"/>
-                      </KeyFrame>
-                      <KeyFrame Cue="100%">
-                        <Setter Property="RotateTransform.Angle" Value="360"/>
-                      </KeyFrame>
-                    </Animation>
-                  </Style.Animations>
-                </Style>
-              </Border.Styles>
-            </Border>
-            
+            <Canvas IsHitTestVisible="False">
+                <components:HoverGlow Name="PART_HoverEffect" CornerRadius="99999" IsVisible="False" Opacity="0.3" HorizontalAlignment="Left" VerticalAlignment="Top" Background="{StaticResource Primary200}" Height="46" Width="46" Effect="blur(150)" />
+            </Canvas>
+
             <components:IconLabel x:Name="RadioIcon" IconSize="25" FontSize="19"
                              IconData="{TemplateBinding IconData}"
                              Text="{TemplateBinding Text}"
@@ -77,8 +62,8 @@
                              HorizontalAlignment="Left" VerticalAlignment="Center"
                              Margin="{TemplateBinding Padding}" />
 
-            <components:StateBox IsVisible="{TemplateBinding BoxText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
-                            x:Name="StateBox" Classes="Dark"
+            <components:StatusBadge IsVisible="{TemplateBinding BoxText, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                            x:Name="StatusBadge" Variant="Dark"
                             Margin="0,0,10,0"
                             VerticalAlignment="Center" HorizontalAlignment="Right"
                             Text="{TemplateBinding BoxText}"
@@ -87,51 +72,40 @@
                             IconSize="{TemplateBinding BoxIconSize}"
                             TipText="{TemplateBinding BoxTip}"
             />
-            <!-- This will be added at a future date after patches is more stable this will turn on -->
-            <!-- <PathIcon Data="{StaticResource WarningTriangle}" -->
-            <!--           IsVisible="{TemplateBinding WarningVisible}" -->
-            <!--           ToolTip.Tip="{TemplateBinding WarningTip}" -->
-            <!--           ToolTip.Placement="Right" -->
-            <!--           Width="17" -->
-            <!--           Height="17" -->
-            <!--           Margin="0,0,12,0" -->
-            <!--           Foreground="{StaticResource Danger500}" -->
-            <!--           HorizontalAlignment="Right" -->
-            <!--           VerticalAlignment="Center" /> -->
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
   </Style>
   
-  <Style Selector="patterns|SidebarRadioButton:pointerover">
+  <Style Selector="shellControls|SidebarRadioButton:pointerover">
     <Setter Property="Cursor" Value="Hand" />
     <Setter Property="Background" Value="{StaticResource Neutral800}" />
     <Setter Property="Foreground" Value="{StaticResource Primary200}" />
-    <Style Selector="^ /template/ Border#PART_HoverEffect">
-      <Setter Property="IsVisible" Value="True"/>
+    <Style Selector="^ /template/ components|HoverGlow#PART_HoverEffect">
+      <Setter Property="IsVisible" Value="True" />
     </Style>
   </Style>
 
-  <Style Selector="patterns|SidebarRadioButton:checked">
+  <Style Selector="shellControls|SidebarRadioButton:checked">
     <Setter Property="Background" Value="{StaticResource Neutral950}" />
     <Setter Property="Foreground" Value="{StaticResource Primary300}" />
-    <Style Selector="^ /template/ Border#PART_HoverEffect">
-      <Setter Property="IsVisible" Value="False"/>
+    <Style Selector="^ /template/ components|HoverGlow#PART_HoverEffect">
+      <Setter Property="IsVisible" Value="False" />
     </Style>
     <Style Selector="^ /template/ Border#PART_SelectionIndicator">
       <Setter Property="Background" Value="{StaticResource Primary400}"/>
     </Style>
   </Style>
-  <Style Selector="patterns|SidebarRadioButton.compact">
+  <Style Selector="shellControls|SidebarRadioButton.compact">
     <Setter Property="ToolTip.Tip" Value="{Binding Text, RelativeSource={RelativeSource Self}}" />
     <Setter Property="ToolTip.ShowDelay" Value="100" />
     <Setter Property="ToolTip.Placement" Value="Right" />
   </Style>
-  <Style Selector="patterns|SidebarRadioButton.compact /template/ components|IconLabel#RadioIcon">
+  <Style Selector="shellControls|SidebarRadioButton.compact /template/ components|IconLabel#RadioIcon">
     <Setter Property="Text" Value="" />
   </Style>
-  <Style Selector="patterns|SidebarRadioButton.compact /template/ components|StateBox#StateBox">
+  <Style Selector="shellControls|SidebarRadioButton.compact /template/ components|StatusBadge#StatusBadge">
     <Setter Property="IsVisible" Value="False" />
   </Style>
 </Styles>
diff --git a/WheelWizard/Views/Patterns/SidebarRadioButton.axaml.cs b/WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml.cs
similarity index 53%
rename from WheelWizard/Views/Patterns/SidebarRadioButton.axaml.cs
rename to WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml.cs
index 5ff75ee17..aaaa11abd 100644
--- a/WheelWizard/Views/Patterns/SidebarRadioButton.axaml.cs
+++ b/WheelWizard/Views/Shell/Controls/SidebarRadioButton.axaml.cs
@@ -1,16 +1,12 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
 using Avalonia.Media;
-using WheelWizard.Views.Pages;
+using WheelWizard.Views.Shell.Views;
 
-namespace WheelWizard.Views.Patterns;
+namespace WheelWizard.Views.Shell.Controls;
 
-public partial class SidebarRadioButton : RadioButton
+public class SidebarRadioButton : RadioButton
 {
-    private Border? _hoverEffect;
-
     public static readonly StyledProperty<Geometry> IconDataProperty = AvaloniaProperty.Register<SidebarRadioButton, Geometry>(
         nameof(IconData)
     );
@@ -73,58 +69,11 @@ public double BoxIconSize
         set => SetValue(BoxIconSizeProperty, value);
     }
 
-    //todo: after patches is more stable, uncomment this
-
-    // public static readonly StyledProperty<bool> WarningVisibleProperty = AvaloniaProperty.Register<SidebarRadioButton, bool>(
-    //     nameof(WarningVisible)
-    // );
-    //
-    // public bool WarningVisible
-    // {
-    //     get => GetValue(WarningVisibleProperty);
-    //     set => SetValue(WarningVisibleProperty, value);
-    // }
-    //
-    // public static readonly StyledProperty<string> WarningTipProperty = AvaloniaProperty.Register<SidebarRadioButton, string>(
-    //     nameof(WarningTip)
-    // );
-    //
-    // public string WarningTip
-    // {
-    //     get => GetValue(WarningTipProperty);
-    //     set => SetValue(WarningTipProperty, value);
-    // }
-
-    protected override void OnPointerMoved(PointerEventArgs e)
-    {
-        base.OnPointerMoved(e);
-        if (_hoverEffect == null)
-            return;
-
-        var position = e.GetPosition(this);
-
-        var left = position.X - (_hoverEffect.Width / 2);
-        var top = position.Y - (_hoverEffect.Height / 2);
-
-        _hoverEffect.Margin = new(left, top, 0, 0);
-    }
-
-    protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
-    {
-        base.OnApplyTemplate(e);
-        _hoverEffect = e.NameScope.Find<Border>("PART_HoverEffect");
-    }
-
     public event EventHandler<Type>? NavigationRequested;
 
-    protected override void OnPointerPressed(PointerPressedEventArgs e)
+    protected override void OnClick()
     {
-        base.OnPointerPressed(e);
-        if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            return;
-
-        PageType ??= typeof(NotFoundPage);
-
-        NavigationRequested?.Invoke(this, PageType);
+        base.OnClick();
+        NavigationRequested?.Invoke(this, PageType ?? typeof(NotFoundPage));
     }
 }
diff --git a/WheelWizard/Views/Components/WheelTrail.axaml b/WheelWizard/Views/Shell/Controls/WheelTrail.axaml
similarity index 85%
rename from WheelWizard/Views/Components/WheelTrail.axaml
rename to WheelWizard/Views/Shell/Controls/WheelTrail.axaml
index 2225082a4..28beaf401 100644
--- a/WheelWizard/Views/Components/WheelTrail.axaml
+++ b/WheelWizard/Views/Shell/Controls/WheelTrail.axaml
@@ -1,7 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:conv="clr-namespace:WheelWizard.Views.Converters"
-        xmlns:controls="using:WheelWizard.Views.Components">
+        xmlns:controls="using:WheelWizard.Views.Components"
+        xmlns:shellControls="clr-namespace:WheelWizard.Views.Shell.Controls">
     <!-- 
     <Styles.Resources>
         <x:Double x:Key="HeightMultiplier">5.0</x:Double>
@@ -9,15 +10,15 @@
     <Design.PreviewWith>
         <Grid Background="{StaticResource Black}" Height="200" Width="180">
             <!-- Now you can set the Angle on each instance -->
-            <controls:WheelTrail Background="Green" Foreground="DarkGreen" Width="31" RelativeLength="4"
+            <shellControls:WheelTrail Background="Green" Foreground="DarkGreen" Width="31" RelativeLength="4"
                                  X="-70" Y="50" WheelRotation="25" Angle="3" />
-            <controls:WheelTrail Background="Red" Foreground="DarkRed" Width="11" RelativeLength="10"
+            <shellControls:WheelTrail Background="Red" Foreground="DarkRed" Width="11" RelativeLength="10"
                                  Angle="110" X="-50" Y="20" ExtendedHeight="-7" />
 
-            <controls:WheelTrail Background="Orange" Foreground="DarkOrange" Width="41" RelativeLength="1.5"
+            <shellControls:WheelTrail Background="Orange" Foreground="DarkOrange" Width="41" RelativeLength="1.5"
                                  Angle="210" X="10" Y="30" ExtendedHeight="-7">
-                <controls:WheelTrail.Styles>
-                    <Style Selector="controls|WheelTrail">
+                <shellControls:WheelTrail.Styles>
+                    <Style Selector="shellControls|WheelTrail">
                         <Style.Animations>
                             <Animation Duration="0:0:1.5" IterationCount="INFINITE">
                                 <KeyFrame Cue="0%">
@@ -29,7 +30,7 @@
                             </Animation>
                         </Style.Animations>
                     </Style>
-                    <Style Selector="controls|WheelTrail">
+                    <Style Selector="shellControls|WheelTrail">
                         <Style.Animations>
                             <Animation Duration="0:0:0.2" IterationCount="INFINITE" PlaybackDirection="Alternate">
                                 <KeyFrame Cue="0%">
@@ -41,13 +42,13 @@
                             </Animation>
                         </Style.Animations>
                     </Style>
-                </controls:WheelTrail.Styles>
-            </controls:WheelTrail>
+                </shellControls:WheelTrail.Styles>
+            </shellControls:WheelTrail>
 
-            <controls:WheelTrail Background="Cyan" Foreground="DarkCyan" Width="61"
+            <shellControls:WheelTrail Background="Cyan" Foreground="DarkCyan" Width="61"
                                  Angle="-20" X="10" Y="90">
-                <controls:WheelTrail.Styles>
-                    <Style Selector="controls|WheelTrail">
+                <shellControls:WheelTrail.Styles>
+                    <Style Selector="shellControls|WheelTrail">
                         <Style.Animations>
                             <Animation Duration="0:0:2.5" IterationCount="INFINITE"
                                        Easing="QuadraticEaseInOut">
@@ -66,12 +67,12 @@
                             </Animation>
                         </Style.Animations>
                     </Style>
-                </controls:WheelTrail.Styles>
-            </controls:WheelTrail>
+                </shellControls:WheelTrail.Styles>
+            </shellControls:WheelTrail>
         </Grid>
     </Design.PreviewWith>
 
-    <Style Selector="controls|WheelTrail" x:DataType="controls:WheelTrail">
+    <Style Selector="shellControls|WheelTrail" x:DataType="shellControls:WheelTrail">
         <Setter Property="ClipToBounds" Value="False"></Setter>
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
diff --git a/WheelWizard/Views/Components/WheelTrail.axaml.cs b/WheelWizard/Views/Shell/Controls/WheelTrail.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Components/WheelTrail.axaml.cs
rename to WheelWizard/Views/Shell/Controls/WheelTrail.axaml.cs
index a98b93a8d..ecd7824f0 100644
--- a/WheelWizard/Views/Components/WheelTrail.axaml.cs
+++ b/WheelWizard/Views/Shell/Controls/WheelTrail.axaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls.Primitives;
 using Avalonia.Media;
 
-namespace WheelWizard.Views.Components
+namespace WheelWizard.Views.Shell.Controls
 {
     public class WheelTrail : TemplatedControl
     {
diff --git a/WheelWizard/Views/Layout.MacProfiles.cs b/WheelWizard/Views/Shell/Layout.MacProfiles.cs
similarity index 96%
rename from WheelWizard/Views/Layout.MacProfiles.cs
rename to WheelWizard/Views/Shell/Layout.MacProfiles.cs
index b5c4ca35b..e125a9b17 100644
--- a/WheelWizard/Views/Layout.MacProfiles.cs
+++ b/WheelWizard/Views/Shell/Layout.MacProfiles.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using WheelWizard.Models.Enums;
-using WheelWizard.Views.Pages;
+using WheelWizard.WheelWizardData.Views;
 using WheelWizard.WiiManagement.GameLicense;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public partial class Layout
 {
diff --git a/WheelWizard/Views/Layout.Sidebar.cs b/WheelWizard/Views/Shell/Layout.Sidebar.cs
similarity index 98%
rename from WheelWizard/Views/Layout.Sidebar.cs
rename to WheelWizard/Views/Shell/Layout.Sidebar.cs
index ff7ef97c1..2c845cb7a 100644
--- a/WheelWizard/Views/Layout.Sidebar.cs
+++ b/WheelWizard/Views/Shell/Layout.Sidebar.cs
@@ -7,9 +7,9 @@
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
-using WheelWizard.Views.Patterns;
+using WheelWizard.Views.Shell.Controls;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public partial class Layout
 {
diff --git a/WheelWizard/Views/Layout.axaml b/WheelWizard/Views/Shell/Layout.axaml
similarity index 92%
rename from WheelWizard/Views/Layout.axaml
rename to WheelWizard/Views/Shell/Layout.axaml
index c1ee3a61a..2df0d9cd5 100644
--- a/WheelWizard/Views/Layout.axaml
+++ b/WheelWizard/Views/Shell/Layout.axaml
@@ -3,17 +3,23 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignHeight="876" d:DesignWidth="656"
-        x:Class="WheelWizard.Views.Layout"
+        x:Class="WheelWizard.Views.Shell.Layout"
         xmlns:loc="clr-namespace:WheelWizard.Localization"
-        xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
         xmlns:components="clr-namespace:WheelWizard.Views.Components"
-        xmlns:patterns="clr-namespace:WheelWizard.Views.Patterns"
         xmlns:miiVars="using:WheelWizard.MiiImages.Domain"
         Height="876" Width="656" WindowStartupLocation="CenterScreen"
         WindowDecorations="Full"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaTitleBarHeightHint="30"
-        CanResize='False' Background="Transparent">
+        CanResize='False' Background="Transparent"
+        xmlns:mods="clr-namespace:WheelWizard.Mods.Views"
+        xmlns:miis="clr-namespace:WheelWizard.WiiManagement.MiiManagement.Views"
+        xmlns:rooms="clr-namespace:WheelWizard.RrRooms.Views"
+        xmlns:community="clr-namespace:WheelWizard.WheelWizardData.Views"
+        xmlns:shellViews="clr-namespace:WheelWizard.Views.Shell.Views"
+        xmlns:design="clr-namespace:WheelWizard.Views.DesignTime"
+        xmlns:miiImages="clr-namespace:WheelWizard.MiiImages.Views"
+        xmlns:shellControls="clr-namespace:WheelWizard.Views.Shell.Controls">
     <Grid x:Name="WindowFrame" RowDefinitions="30,*"
           Background="{StaticResource FrameColor}">
         <Border Grid.Row="0" Background="Transparent"
@@ -88,14 +94,14 @@
                             HorizontalAlignment="Left" VerticalAlignment="Top"
                             Background="{StaticResource Primary200}" Height="46" Width="46" Effect="blur(150)" />
 
-                    <patterns:CurrentUserProfile x:Name="SidebarCurrentUserProfile"
+                    <community:CurrentUserProfile x:Name="SidebarCurrentUserProfile"
                                                  Margin="5,0"
                                                  VerticalAlignment="Center"
                                                  HorizontalAlignment="Stretch" />
                 </Grid>
             </Border>
 
-            <patterns:MiiImageLoader x:Name="SidebarMii" Width="80"
+            <miiImages:MiiImageLoader x:Name="SidebarMii" Width="80"
                                      Height="80"
                                      Margin="-7,0,0,1"
                                      HorizontalAlignment="Left"
@@ -110,45 +116,45 @@
         <TextBlock Text="{loc:T category.general}" Classes="SidebarSectionText"
                    VerticalAlignment="Bottom" Grid.Row="3" /> <!-- Repurposing this translation from settings -->
         <StackPanel x:Name="SidePanelButtons" Grid.Column="0" Grid.Row="4" VerticalAlignment="Top">
-            <patterns:SidebarRadioButton IconData="{StaticResource Home}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource Home}"
                                            Text="{loc:T page_title.home}"
-                                           PageType="{x:Type pages:HomePage}"
+                                           PageType="{x:Type shellViews:HomePage}"
                                            IsChecked="True" />
-            <patterns:SidebarRadioButton IconData="{StaticResource UserCircle}"
-                                           PageType="{x:Type pages:UserProfilePage}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource UserCircle}"
+                                           PageType="{x:Type community:UserProfilePage}"
                                            Text="{loc:T page_title.my_profiles}" x:Name="MyProfilesButton" />
-            <patterns:SidebarRadioButton IconData="{StaticResource CubesStacked}"
-                                           PageType="{x:Type pages:ModsPage}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource CubesStacked}"
+                                           PageType="{x:Type mods:ModsPage}"
                                            Text="{loc:T page_title.patches}" x:Name="ModsButton" />
-            <patterns:SidebarRadioButton IconData="{StaticResource Shirt}"
-                                           PageType="{x:Type pages:MiiListPage}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource Shirt}"
+                                           PageType="{x:Type miis:MiiListPage}"
                                            Text="{loc:T page_title.my_miis}" />
             <TextBlock Text="{loc:T attribute.status_online}" Classes="SidebarSectionText" />
             <!-- Repurposing this translation from values -->
-            <patterns:SidebarRadioButton IconData="{StaticResource RoomUsers}"
-                                           PageType="{x:Type pages:RoomsPage}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource RoomUsers}"
+                                           PageType="{x:Type rooms:RoomsPage}"
                                            Text="{loc:T page_title.rooms}" x:Name="RoomsButton"
                                            BoxText="0"
                                            BoxIconData="{StaticResource UserCouple}"
                                            BoxIconSize="14"
                                            BoxTip="{loc:T hover.players_online.none}" />
-            <patterns:SidebarRadioButton IconData="{StaticResource Award}"
-                                           PageType="{x:Type pages:LeaderboardPage}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource Award}"
+                                           PageType="{x:Type community:LeaderboardPage}"
                                            Text="{loc:T page_title.leaderboard}" />
-            <patterns:SidebarRadioButton IconData="{StaticResource Friends}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource Friends}"
                                            Text="{loc:T page_title.friends}" x:Name="FriendsButton"
-                                           PageType="{x:Type pages:FriendsPage}"
+                                           PageType="{x:Type community:FriendsPage}"
                                            BoxText="0/0" />
 
             <TextBlock Text="{loc:T category.other}" Classes="SidebarSectionText"
                        x:Name="OtherSectionText" IsVisible="False" />
             <!-- Repurposing this translation from settings -->
-            <patterns:SidebarRadioButton IconData="{StaticResource Code}"
-                                           PageType="{x:Type pages:TestingPage}"
+            <shellControls:SidebarRadioButton IconData="{StaticResource Code}"
+                                           PageType="{x:Type design:TestingPage}"
                                            Text="Testing Mode" x:Name="TestingButton" IsVisible="False" />
         </StackPanel>
 
-        <components:IconLabelButton Grid.Column="0" Grid.Row="5"
+        <components:LinkButton Grid.Column="0" Grid.Row="5"
                                     x:Name="SupportUsButton"
                                     IconData="{StaticResource CoffeeIcon}"
                                     Text="{loc:T action.link.support}"
@@ -411,7 +417,7 @@
                                x:Name="SnackbarText">
                         Example text
                     </TextBlock>
-                    <components:IconLabelButton Grid.Column="2" IconData="{StaticResource XMark}"
+                    <components:LinkButton Grid.Column="2" IconData="{StaticResource XMark}"
                                                 Foreground="{StaticResource Neutral400}"
                                                 Click="CloseSnackbar_OnClick" HorizontalAlignment="Center"
                                                 HoverForeground="{StaticResource Neutral100}"
diff --git a/WheelWizard/Views/Layout.axaml.cs b/WheelWizard/Views/Shell/Layout.axaml.cs
similarity index 97%
rename from WheelWizard/Views/Layout.axaml.cs
rename to WheelWizard/Views/Shell/Layout.axaml.cs
index c67c89664..3acbc19b8 100644
--- a/WheelWizard/Views/Layout.axaml.cs
+++ b/WheelWizard/Views/Shell/Layout.axaml.cs
@@ -10,22 +10,25 @@
 using WheelWizard.AutoUpdating;
 using WheelWizard.Branding;
 using WheelWizard.Localization;
+using WheelWizard.MiiImages.Views;
 using WheelWizard.Mods;
 using WheelWizard.RrRooms;
+using WheelWizard.RrRooms.Views;
 using WheelWizard.Settings;
 using WheelWizard.Settings.Types;
+using WheelWizard.Settings.Views;
 using WheelWizard.Shared.MessageTranslations;
 using WheelWizard.Shared.Polling;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages;
-using WheelWizard.Views.Pages.Settings;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell.Controls;
+using WheelWizard.Views.Shell.Navigation;
+using WheelWizard.Views.Shell.Views;
 using WheelWizard.WheelWizardData;
 using WheelWizard.WheelWizardData.Domain;
+using WheelWizard.WheelWizardData.Views;
 using WheelWizard.WiiManagement.GameLicense;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public partial class Layout : BaseWindow, IPollingListener
 {
@@ -510,7 +513,7 @@ private static IBrush GetResourceBrush(string resourceName) =>
 
     private void Support_Click(object? sender, RoutedEventArgs e) => ViewUtils.OpenLink(BrandingService.Branding.SupportUrl.ToString());
 
-    private void SupportUs_OnClick(object? sender, EventArgs e) => ViewUtils.OpenLink(BrandingService.Branding.SupportUrl.ToString());
+    private void SupportUs_OnClick(object? sender, RoutedEventArgs e) => ViewUtils.OpenLink(BrandingService.Branding.SupportUrl.ToString());
 
     public bool CompleteContentEnabled => InteractionContent.IsEnabled;
 
@@ -531,7 +534,7 @@ public void OpenCommunityLink(string link) =>
 
     private void About_Click(object? sender, RoutedEventArgs e) => Navigation.NavigateTo<SettingsPage>(typeof(AppInfo));
 
-    private void CloseSnackbar_OnClick(object? sender, EventArgs e)
+    private void CloseSnackbar_OnClick(object? sender, RoutedEventArgs e)
     {
         Snackbar.Classes.Remove("show");
         Snackbar.IsVisible = false;
diff --git a/WheelWizard/Views/MacWindowMenu.cs b/WheelWizard/Views/Shell/MacWindowMenu.cs
similarity index 99%
rename from WheelWizard/Views/MacWindowMenu.cs
rename to WheelWizard/Views/Shell/MacWindowMenu.cs
index c959423c7..4f856f5c0 100644
--- a/WheelWizard/Views/MacWindowMenu.cs
+++ b/WheelWizard/Views/Shell/MacWindowMenu.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 /// <summary>Registers an AppKit Window menu so macOS supplies its standard window actions and icons.</summary>
 internal static class MacWindowMenu
diff --git a/WheelWizard/Views/MainWindowService.cs b/WheelWizard/Views/Shell/MainWindowService.cs
similarity index 96%
rename from WheelWizard/Views/MainWindowService.cs
rename to WheelWizard/Views/Shell/MainWindowService.cs
index be05f2b03..d97f0c0bf 100644
--- a/WheelWizard/Views/MainWindowService.cs
+++ b/WheelWizard/Views/Shell/MainWindowService.cs
@@ -1,8 +1,9 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform;
+using WheelWizard.Views.Shell.Startup;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public interface IMainWindowService
 {
@@ -48,9 +49,10 @@ public async Task ShowAsync(IClassicDesktopStyleApplicationLifetime desktop, Can
         window.Opacity = 1;
         window.ShowInTaskbar = true;
         window.IsHitTestVisible = true;
-        window.Activate();
+        window.ShowActivated = true;
         desktop.ShutdownMode = ShutdownMode.OnMainWindowClose;
         splash?.Close();
+        window.Activate();
     }
 
     public void Refresh()
diff --git a/WheelWizard/Views/Navigation/NavigationService.cs b/WheelWizard/Views/Shell/Navigation/NavigationService.cs
similarity index 95%
rename from WheelWizard/Views/Navigation/NavigationService.cs
rename to WheelWizard/Views/Shell/Navigation/NavigationService.cs
index 4541a713f..1e64650b7 100644
--- a/WheelWizard/Views/Navigation/NavigationService.cs
+++ b/WheelWizard/Views/Shell/Navigation/NavigationService.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace WheelWizard.Views.Navigation;
+namespace WheelWizard.Views.Shell.Navigation;
 
 public interface INavigationService
 {
diff --git a/WheelWizard/Views/Navigation/PageFactory.cs b/WheelWizard/Views/Shell/Navigation/PageFactory.cs
similarity index 94%
rename from WheelWizard/Views/Navigation/PageFactory.cs
rename to WheelWizard/Views/Shell/Navigation/PageFactory.cs
index 59c82c938..c3dd6cdc8 100644
--- a/WheelWizard/Views/Navigation/PageFactory.cs
+++ b/WheelWizard/Views/Shell/Navigation/PageFactory.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 
-namespace WheelWizard.Views.Navigation;
+namespace WheelWizard.Views.Shell.Navigation;
 
 public interface IPageFactory
 {
diff --git a/WheelWizard/Views/Pages/HomePresentation.cs b/WheelWizard/Views/Shell/Presentation/HomePresentation.cs
similarity index 75%
rename from WheelWizard/Views/Pages/HomePresentation.cs
rename to WheelWizard/Views/Shell/Presentation/HomePresentation.cs
index 1380a2968..30b9ffd0c 100644
--- a/WheelWizard/Views/Pages/HomePresentation.cs
+++ b/WheelWizard/Views/Shell/Presentation/HomePresentation.cs
@@ -1,8 +1,11 @@
+using WheelWizard.Settings.Views;
 using WheelWizard.Shared.MessageTranslations;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
+using WheelWizard.Views.Shell.ViewModels;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Views.Shell.Presentation;
 
 public sealed class HomePresentation(INavigationService navigation) : IHomePresentation
 {
diff --git a/WheelWizard/Views/PresentationExtensions.cs b/WheelWizard/Views/Shell/PresentationExtensions.cs
similarity index 77%
rename from WheelWizard/Views/PresentationExtensions.cs
rename to WheelWizard/Views/Shell/PresentationExtensions.cs
index 6789ceade..9605ed88d 100644
--- a/WheelWizard/Views/PresentationExtensions.cs
+++ b/WheelWizard/Views/Shell/PresentationExtensions.cs
@@ -1,28 +1,33 @@
 using WheelWizard.AutoUpdating;
+using WheelWizard.AutoUpdating.Presentation;
 using WheelWizard.CustomDistributions;
+using WheelWizard.CustomDistributions.Presentation;
 using WheelWizard.GameBanana;
 using WheelWizard.GameBanana.InstallRequests;
 using WheelWizard.Launching;
+using WheelWizard.Launching.Presentation;
+using WheelWizard.MiiImages.Views;
 using WheelWizard.Mods;
+using WheelWizard.Mods.Presentation;
+using WheelWizard.Mods.ViewModels;
+using WheelWizard.Mods.Views.Dialogs;
 using WheelWizard.Recomp;
+using WheelWizard.Recomp.Presentation;
+using WheelWizard.Shared.Desktop.Polling;
+using WheelWizard.Shared.Desktop.Storage;
 using WheelWizard.Shared.Polling;
 using WheelWizard.Shared.Services;
-using WheelWizard.Views.Diagnostics;
-using WheelWizard.Views.Distributions;
-using WheelWizard.Views.Launching;
-using WheelWizard.Views.ModManagement;
-using WheelWizard.Views.Navigation;
-using WheelWizard.Views.Pages;
-using WheelWizard.Views.Patterns;
-using WheelWizard.Views.Polling;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.ModManagement;
-using WheelWizard.Views.Recomp;
-using WheelWizard.Views.Startup;
-using WheelWizard.Views.Storage;
-using WheelWizard.Views.Updating;
+using WheelWizard.Views.DesignTime.Diagnostics;
+using WheelWizard.Views.Dialogs;
+using WheelWizard.Views.Shell;
+using WheelWizard.Views.Shell.Navigation;
+using WheelWizard.Views.Shell.Presentation;
+using WheelWizard.Views.Shell.Startup;
+using WheelWizard.Views.Shell.ViewModels;
+using WheelWizard.WheelWizardData.ViewModels;
+using WheelWizard.WheelWizardData.Views;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public static class PresentationExtensions
 {
diff --git a/WheelWizard/Views/Startup/DesktopStartup.cs b/WheelWizard/Views/Shell/Startup/DesktopStartup.cs
similarity index 95%
rename from WheelWizard/Views/Startup/DesktopStartup.cs
rename to WheelWizard/Views/Shell/Startup/DesktopStartup.cs
index a04772ec4..71d9c2904 100644
--- a/WheelWizard/Views/Startup/DesktopStartup.cs
+++ b/WheelWizard/Views/Shell/Startup/DesktopStartup.cs
@@ -4,11 +4,10 @@
 using WheelWizard.ApplicationLifecycle;
 using WheelWizard.AutoUpdating;
 using WheelWizard.MiiRendering.Services;
-using WheelWizard.Views.Popups;
-using WheelWizard.Views.Popups.Generic;
+using WheelWizard.Views.Dialogs;
 using WheelWizard.WiiManagement.GameLicense;
 
-namespace WheelWizard.Views.Startup;
+namespace WheelWizard.Views.Shell.Startup;
 
 public interface IDesktopStartup
 {
diff --git a/WheelWizard/Views/Startup/SplashWindow.axaml b/WheelWizard/Views/Shell/Startup/SplashWindow.axaml
similarity index 93%
rename from WheelWizard/Views/Startup/SplashWindow.axaml
rename to WheelWizard/Views/Shell/Startup/SplashWindow.axaml
index 560457b51..3cb5a7f83 100644
--- a/WheelWizard/Views/Startup/SplashWindow.axaml
+++ b/WheelWizard/Views/Shell/Startup/SplashWindow.axaml
@@ -1,6 +1,6 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="WheelWizard.Views.Startup.SplashWindow"
+        x:Class="WheelWizard.Views.Shell.Startup.SplashWindow"
         Title="Wheel Wizard is starting" Width="280" Height="280"
         WindowStartupLocation="CenterScreen" WindowDecorations="None"
         CanResize="False" ShowInTaskbar="False"
diff --git a/WheelWizard/Views/Startup/SplashWindow.axaml.cs b/WheelWizard/Views/Shell/Startup/SplashWindow.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Startup/SplashWindow.axaml.cs
rename to WheelWizard/Views/Shell/Startup/SplashWindow.axaml.cs
index c5dd68515..ad234fc2f 100644
--- a/WheelWizard/Views/Startup/SplashWindow.axaml.cs
+++ b/WheelWizard/Views/Shell/Startup/SplashWindow.axaml.cs
@@ -6,7 +6,7 @@
 using Avalonia.Rendering.Composition;
 using Avalonia.Rendering.Composition.Animations;
 
-namespace WheelWizard.Views.Startup;
+namespace WheelWizard.Views.Shell.Startup;
 
 public partial class SplashWindow : Window
 {
diff --git a/WheelWizard/Views/Pages/HomeViewModel.cs b/WheelWizard/Views/Shell/ViewModels/HomeViewModel.cs
similarity index 95%
rename from WheelWizard/Views/Pages/HomeViewModel.cs
rename to WheelWizard/Views/Shell/ViewModels/HomeViewModel.cs
index c6c4fc80c..818fc8749 100644
--- a/WheelWizard/Views/Pages/HomeViewModel.cs
+++ b/WheelWizard/Views/Shell/ViewModels/HomeViewModel.cs
@@ -4,9 +4,10 @@
 using WheelWizard.Models.Enums;
 using WheelWizard.Settings;
 using WheelWizard.Shared.Calendar;
+using WheelWizard.Views.Components;
 using Button = WheelWizard.Views.Components.Button;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Views.Shell.ViewModels;
 
 public sealed record HomeLaunchPrompt(string MainText, string ExtraText, string YesText, string NoText);
 
@@ -90,15 +91,14 @@ or WheelWizardStatus.OutOfDate
             _ => t("state.loading"),
         };
 
-    public Button.ButtonsVariantType ButtonVariant =>
+    public ButtonVariant ButtonVariant =>
         _status switch
         {
-            WheelWizardStatus.NoServer or WheelWizardStatus.NoRecompExtension or WheelWizardStatus.NoDolphinExtension => Button
-                .ButtonsVariantType
-                .Danger,
-            WheelWizardStatus.Ready => Button.ButtonsVariantType.Primary,
-            WheelWizardStatus.Loading => Button.ButtonsVariantType.Default,
-            _ => Button.ButtonsVariantType.Warning,
+            WheelWizardStatus.NoServer or WheelWizardStatus.NoRecompExtension or WheelWizardStatus.NoDolphinExtension =>
+                ButtonVariant.Danger,
+            WheelWizardStatus.Ready => ButtonVariant.Primary,
+            WheelWizardStatus.Loading => ButtonVariant.Default,
+            _ => ButtonVariant.Warning,
         };
 
     public string IconName =>
diff --git a/WheelWizard/Views/ViewUtils.cs b/WheelWizard/Views/Shell/ViewUtils.cs
similarity index 98%
rename from WheelWizard/Views/ViewUtils.cs
rename to WheelWizard/Views/Shell/ViewUtils.cs
index b7d1c228d..a34410126 100644
--- a/WheelWizard/Views/ViewUtils.cs
+++ b/WheelWizard/Views/Shell/ViewUtils.cs
@@ -6,10 +6,10 @@
 using Avalonia.Media;
 using WheelWizard.RrRooms;
 using WheelWizard.Settings.Types;
-using WheelWizard.Shared.Polling;
+using WheelWizard.Views.Shell;
 using WheelWizard.WheelWizardData;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 public static class ViewUtils
 {
diff --git a/WheelWizard/Views/Pages/HomePage.axaml b/WheelWizard/Views/Shell/Views/HomePage.axaml
similarity index 88%
rename from WheelWizard/Views/Pages/HomePage.axaml
rename to WheelWizard/Views/Shell/Views/HomePage.axaml
index 4f601e71a..d9c1d3d5a 100644
--- a/WheelWizard/Views/Pages/HomePage.axaml
+++ b/WheelWizard/Views/Shell/Views/HomePage.axaml
@@ -4,14 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:loc="clr-namespace:WheelWizard.Localization"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             xmlns:behaviorComponent="clr-namespace:WheelWizard.Views.Patterns"
              mc:Ignorable="d" d:DesignWidth="490" d:DesignHeight="830"
              ClipToBounds="False"
-             xmlns:pages="clr-namespace:WheelWizard.Views.Pages"
-             x:DataType="pages:HomeViewModel"
-             x:Class="WheelWizard.Views.Pages.HomePage">
+             x:DataType="shellViewModels:HomeViewModel"
+             x:Class="WheelWizard.Views.Shell.Views.HomePage"
+        xmlns:shellViewModels="clr-namespace:WheelWizard.Views.Shell.ViewModels"
+        xmlns:shellControls="clr-namespace:WheelWizard.Views.Shell.Controls">
     <UserControl.Styles>
-        <Style Selector="components|WheelTrail.HoverEnterTrail">
+        <Style Selector="shellControls|WheelTrail.HoverEnterTrail">
             <Style.Animations>
                 <Animation Duration="0:0:0.3" FillMode="Forward" Easing="ExponentialEaseOut">
                     <KeyFrame Cue="0%">
@@ -31,7 +31,7 @@
                 </Animation>
             </Style.Animations>
         </Style>
-        <Style Selector="components|WheelTrail.HoverExitTrail">
+        <Style Selector="shellControls|WheelTrail.HoverExitTrail">
             <Style.Animations>
                 <Animation Duration="0:0:0.8" FillMode="Forward" Easing="BounceEaseOut">
                     <KeyFrame Cue="0%">
@@ -52,7 +52,7 @@
             </Style.Animations>
         </Style>
 
-        <Style Selector="components|WheelTrail.ActivateTrailFromHover">
+        <Style Selector="shellControls|WheelTrail.ActivateTrailFromHover">
             <Style.Animations>
                 <Animation Duration="0:0:0.6"
                            FillMode="Forward" Easing="CubicEaseIn">
@@ -69,7 +69,7 @@
             </Style.Animations>
         </Style>
         
-        <Style Selector="components|WheelTrail.ActivateTrailFromIdle">
+        <Style Selector="shellControls|WheelTrail.ActivateTrailFromIdle">
             <Style.Animations>
                 <Animation Duration="0:0:0.6"
                            FillMode="Forward" Easing="CubicEaseIn">
@@ -86,7 +86,7 @@
             </Style.Animations>
         </Style>
         
-        <Style Selector="components|WheelTrail.EntranceTrail">
+        <Style Selector="shellControls|WheelTrail.EntranceTrail">
             <Style.Animations>
                 <Animation Duration="0:0:0.6" Delay="0:0:0.3"
                            FillMode="Forward" Easing="CubicEaseOut">
@@ -123,13 +123,13 @@
 
         <!-- These are invisible by default, they will be set to visible once the button is turned to green 
             This way we don't have to take in account whether or not an animation can play, since if it plays but it is not allowed, it will be invisible anyways -->
-        <components:WheelTrail Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="HomeTrail1"
+        <shellControls:WheelTrail Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="HomeTrail1"
                                Width="137" Angle="45" Y="-60" X="-20" ExtendedHeight="1000" IsVisible="False"
                                Background="{StaticResource Primary400}" Foreground="{StaticResource Primary700}" />
-        <components:WheelTrail Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="HomeTrail2"
+        <shellControls:WheelTrail Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="HomeTrail2"
                                Width="137" Angle="45" Y="-40" X="170" ExtendedHeight="1000" IsVisible="False"
                                Background="{StaticResource Primary600}" Foreground="{StaticResource Primary800}" />
-        <components:WheelTrail Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="HomeTrail3"
+        <shellControls:WheelTrail Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="HomeTrail3"
                                Width="137" Angle="45" Y="165" X="175" ExtendedHeight="1000" IsVisible="False"
                                Background="{StaticResource Primary200}" Foreground="{StaticResource Primary600}" />
 
@@ -175,10 +175,10 @@
                                ToolTip.ShowDelay="50"  -->
         </StackPanel>
         
-        <components:WheelTrail Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" x:Name="HomeTrail4"
+        <shellControls:WheelTrail Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" x:Name="HomeTrail4"
                                Width="137" Angle="-35" X="-160" ExtendedHeight="1000" IsVisible="False"
                                Background="{StaticResource Primary400}" Foreground="{StaticResource Primary700}" />
-        <components:WheelTrail Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" x:Name="HomeTrail5"
+        <shellControls:WheelTrail Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" x:Name="HomeTrail5"
                                Width="137" Angle="-35" X="40" Y="30" ExtendedHeight="1000" IsVisible="False"
                                Background="{StaticResource Primary600}" Foreground="{StaticResource Primary800}" />
     </Grid>
diff --git a/WheelWizard/Views/Pages/HomePage.axaml.cs b/WheelWizard/Views/Shell/Views/HomePage.axaml.cs
similarity index 98%
rename from WheelWizard/Views/Pages/HomePage.axaml.cs
rename to WheelWizard/Views/Shell/Views/HomePage.axaml.cs
index 1c3165b27..d2daaf8da 100644
--- a/WheelWizard/Views/Pages/HomePage.axaml.cs
+++ b/WheelWizard/Views/Shell/Views/HomePage.axaml.cs
@@ -7,8 +7,10 @@
 using Testably.Abstractions;
 using WheelWizard.Models.Enums;
 using WheelWizard.Views.Components;
+using WheelWizard.Views.Shell.Controls;
+using WheelWizard.Views.Shell.ViewModels;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Views.Shell.Views;
 
 public partial class HomePage : UserControl
 {
diff --git a/WheelWizard/Views/Pages/NotFoundPage.axaml b/WheelWizard/Views/Shell/Views/NotFoundPage.axaml
similarity index 84%
rename from WheelWizard/Views/Pages/NotFoundPage.axaml
rename to WheelWizard/Views/Shell/Views/NotFoundPage.axaml
index 349837ddd..f629c785b 100644
--- a/WheelWizard/Views/Pages/NotFoundPage.axaml
+++ b/WheelWizard/Views/Shell/Views/NotFoundPage.axaml
@@ -1,10 +1,10 @@
-<UserControl xmlns="https://github.com/avaloniaui"
+<UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="656" d:DesignHeight="876"
              xmlns:components="clr-namespace:WheelWizard.Views.Components"
-             x:Class="WheelWizard.Views.Pages.NotFoundPage">
+             x:Class="WheelWizard.Views.Shell.Views.NotFoundPage">
    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
        <components:EmptyPageInfo Title="Page not found" BodyText="Whoops, The developers might have made an oopsie, The page you where trying to reach doesn't exist" />
    </Grid>
diff --git a/WheelWizard/Views/Pages/NotFoundPage.axaml.cs b/WheelWizard/Views/Shell/Views/NotFoundPage.axaml.cs
similarity index 65%
rename from WheelWizard/Views/Pages/NotFoundPage.axaml.cs
rename to WheelWizard/Views/Shell/Views/NotFoundPage.axaml.cs
index f05304c38..35eac5aff 100644
--- a/WheelWizard/Views/Pages/NotFoundPage.axaml.cs
+++ b/WheelWizard/Views/Shell/Views/NotFoundPage.axaml.cs
@@ -1,6 +1,6 @@
-using Avalonia.Controls;
+using Avalonia.Controls;
 
-namespace WheelWizard.Views.Pages;
+namespace WheelWizard.Views.Shell.Views;
 
 public partial class NotFoundPage : UserControl
 {
diff --git a/WheelWizard/Views/WindowAppearance.cs b/WheelWizard/Views/Shell/WindowAppearance.cs
similarity index 97%
rename from WheelWizard/Views/WindowAppearance.cs
rename to WheelWizard/Views/Shell/WindowAppearance.cs
index 15e134eba..66bea85c9 100644
--- a/WheelWizard/Views/WindowAppearance.cs
+++ b/WheelWizard/Views/Shell/WindowAppearance.cs
@@ -2,7 +2,7 @@
 using Avalonia.Threading;
 using WheelWizard.Settings;
 
-namespace WheelWizard.Views;
+namespace WheelWizard.Views.Shell;
 
 /// <summary>Publishes window appearance settings as normal Avalonia resources.</summary>
 public sealed class WindowAppearance(ISettingsManager settings, ISettingsSignalBus signals) : IDisposable
diff --git a/WheelWizard/Views/Styles/Resources/Icons.axaml b/WheelWizard/Views/Styles/Resources/Icons.axaml
index cab692d40..a3f00de46 100644
--- a/WheelWizard/Views/Styles/Resources/Icons.axaml
+++ b/WheelWizard/Views/Styles/Resources/Icons.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
     <Design.PreviewWith>
         <Border Padding="20" Background="#8B91A5">
             <UniformGrid Columns="7">
@@ -75,8 +75,6 @@
 
                 <util:IconExampleComponent IconData="{DynamicResource ChevronUp}" IconName="ChevronUp" />
                 <util:IconExampleComponent IconData="{DynamicResource ChevronDown}" IconName="ChevronDown" />
-                <util:IconExampleComponent IconData="{DynamicResource TableBars}" IconName="TableBars" />
-                <util:IconExampleComponent IconData="{DynamicResource TableBlocks}" IconName="TableBlocks" />
                 <util:IconExampleComponent IconData="{DynamicResource Scroll}" IconName="Scroll" />
 
                 <util:IconExampleComponent IconData="{DynamicResource ArrowSwap}" IconName="ArrowSwap" />
@@ -171,8 +169,8 @@
 
     <StreamGeometry x:Key="ChevronUp">M233.4 105.4c12.5-12.5 32.8-12.5 45.3 0l192 192c12.5 12.5 12.5 32.8 0 45.3s-32.8 12.5-45.3 0L256 173.3 86.6 342.6c-12.5 12.5-32.8 12.5-45.3 0s-12.5-32.8 0-45.3l192-192z</StreamGeometry>
     <StreamGeometry x:Key="ChevronDown">M233.4 406.6c12.5 12.5 32.8 12.5 45.3 0l192-192c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L256 338.7 86.6 169.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l192 192z</StreamGeometry>
-    <StreamGeometry x:Key="TableBars">M0 96C0 60.7 28.7 32 64 32l384 0c35.3 0 64 28.7 64 64l0 320c0 35.3-28.7 64-64 64L64 480c-35.3 0-64-28.7-64-64L0 96zm64 0l0 64 64 0 0-64L64 96zm384 0L192 96l0 64 256 0 0-64zM64 224l0 64 64 0 0-64-64 0zm384 0l-256 0 0 64 256 0 0-64zM64 352l0 64 64 0 0-64-64 0zm384 0l-256 0 0 64 256 0 0-64z</StreamGeometry>
-    <StreamGeometry x:Key="TableBlocks">M448 96l0 128-160 0 0-128 160 0zm0 192l0 128-160 0 0-128 160 0zM224 224L64 224 64 96l160 0 0 128zM64 288l160 0 0 128L64 416l0-128zM64 32C28.7 32 0 60.7 0 96L0 416c0 35.3 28.7 64 64 64l384 0c35.3 0 64-28.7 64-64l0-320c0-35.3-28.7-64-64-64L64 32z</StreamGeometry>
+    <StreamGeometry x:Key="Rows3">M5 3 H19 A2 2 0 0 1 21 5 V19 A2 2 0 0 1 19 21 H5 A2 2 0 0 1 3 19 V5 A2 2 0 0 1 5 3 Z M3 9 H21 M3 15 H21</StreamGeometry>
+    <StreamGeometry x:Key="Grid2x2">M5 3 H19 A2 2 0 0 1 21 5 V19 A2 2 0 0 1 19 21 H5 A2 2 0 0 1 3 19 V5 A2 2 0 0 1 5 3 Z M12 3 V21 M3 12 H21</StreamGeometry>
     <StreamGeometry x:Key="Scroll">M0 80l0 48c0 17.7 14.3 32 32 32l16 0 48 0 0-80c0-26.5-21.5-48-48-48S0 53.5 0 80zM112 32c10 13.4 16 30 16 48l0 304c0 35.3 28.7 64 64 64s64-28.7 64-64l0-5.3c0-32.4 26.3-58.7 58.7-58.7L480 320l0-192c0-53-43-96-96-96L112 32zM464 480c61.9 0 112-50.1 112-112c0-8.8-7.2-16-16-16l-245.3 0c-14.7 0-26.7 11.9-26.7 26.7l0 5.3c0 53-43 96-96 96l176 0 96 0z</StreamGeometry>
 
     <StreamGeometry x:Key="ArrowSwap">M438.6 150.6c12.5-12.5 12.5-32.8 0-45.3l-96-96c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L338.7 96 32 96C14.3 96 0 110.3 0 128s14.3 32 32 32l306.7 0-41.4 41.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0l96-96zm-333.3 352c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L109.3 416 416 416c17.7 0 32-14.3 32-32s-14.3-32-32-32l-306.7 0 41.4-41.4c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0l-96 96c-12.5 12.5-12.5 32.8 0 45.3l96 96z</StreamGeometry>
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEye.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEye.axaml
index 90d455b50..4ee15fec9 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEye.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEye.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiEye -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEyebrow.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEyebrow.axaml
index ba998104e..9486c7272 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEyebrow.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiEyebrow.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiEyebrow -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiFace.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiFace.axaml
index de2f3f66d..8109777cb 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiFace.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiFace.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiFace -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGlasses.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGlasses.axaml
index 62f1127a6..b47ac7263 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGlasses.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGlasses.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiGlasses -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGoatee.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGoatee.axaml
index 8d7f20cc5..6287eec6e 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGoatee.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiGoatee.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiGoatee -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiHair.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiHair.axaml
index fe328bd57..3c3955ad3 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiHair.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiHair.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiHair -->
 
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMouth.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMouth.axaml
index 1c77cee15..1939e2cef 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMouth.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMouth.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiMouth -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMustache.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMustache.axaml
index 14c8a5dbe..5442cf209 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMustache.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiMustache.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiMustache -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiNose.axaml b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiNose.axaml
index 644e89520..ad8a78e30 100644
--- a/WheelWizard/Views/Styles/Resources/MiiIcons/MiiNose.axaml
+++ b/WheelWizard/Views/Styles/Resources/MiiIcons/MiiNose.axaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
 
     <!-- Generated by svg_to_avalonia.py from folder: MiiNose -->
     <!-- Color mappings were defined interactively during script execution. -->
diff --git a/WheelWizard/Views/Styles/Resources/MultiIcons.axaml b/WheelWizard/Views/Styles/Resources/MultiIcons.axaml
index ce2a684ae..f12a3e607 100644
--- a/WheelWizard/Views/Styles/Resources/MultiIcons.axaml
+++ b/WheelWizard/Views/Styles/Resources/MultiIcons.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-                    xmlns:util="clr-namespace:WheelWizard.Styles.Util">
+                    xmlns:util="clr-namespace:WheelWizard.Views.DesignTime.Controls">
     
     <!-- You can toggle these to have a different designer view, Make sure to run the app after changing to apply it-->
     <sys:Boolean x:Key="ShowTemplateBaseColors">True</sys:Boolean>
diff --git a/WheelWizard/Views/Styles/Styles/TextBoxStyles.axaml b/WheelWizard/Views/Styles/Styles/TextBoxStyles.axaml
index e85fd9933..550759c7f 100644
--- a/WheelWizard/Views/Styles/Styles/TextBoxStyles.axaml
+++ b/WheelWizard/Views/Styles/Styles/TextBoxStyles.axaml
@@ -16,12 +16,6 @@
                 <TextBox Classes="error" Watermark="Enter text here..." Margin="0,2" IsEnabled="False" />
                 <TextBox Classes="dark error" Watermark="Enter text here..." Margin="0,2" IsEnabled="False" />
 
-                <Border Height="1" Background="{StaticResource Neutral900}" />
-
-                <TextBox Classes="warning" Watermark="Enter text here..." Margin="0,2" />
-                <TextBox Classes="dark warning" Watermark="Enter text here..." Margin="0,2" />
-                <TextBox Classes="warning" Watermark="Enter text here..." Margin="0,2" IsEnabled="False" />
-                <TextBox Classes="dark warning" Watermark="Enter text here..." Margin="0,2" IsEnabled="False" />
             </StackPanel>
         </Border>
     </Design.PreviewWith>
@@ -88,19 +82,6 @@
         <Setter Property="BorderBrush" Value="{StaticResource Danger500}" />
     </Style>
 
-    <Style Selector="TextBox.warning /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="{StaticResource Warning600}" />
-    </Style>
-    <Style Selector="TextBox.dark.warning /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="{StaticResource Warning700}" />
-    </Style>
-    <Style Selector="TextBox.warning:pointerover /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="{StaticResource Warning500}" />
-    </Style>
-    <Style Selector="TextBox.warning:focus /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="{StaticResource Warning500}" />
-    </Style>
-
     <Style Selector="TextBox:disabled /template/ Border#PART_BorderElement">
         <Setter Property="Background" Value="{StaticResource Neutral900}" />
         <Setter Property="BorderBrush" Value="{StaticResource Neutral900}" />
@@ -126,7 +107,4 @@
     <Style Selector="TextBox.error:disabled /template/ Border#PART_BorderElement">
         <Setter Property="BorderBrush" Value="{StaticResource Danger900}" />
     </Style>
-    <Style Selector="TextBox.warning:disabled /template/ Border#PART_BorderElement">
-        <Setter Property="BorderBrush" Value="{StaticResource Warning900}" />
-    </Style>
 </Styles>
diff --git a/WheelWizard/WheelWizard.csproj b/WheelWizard/WheelWizard.csproj
index e1bdb3798..781fb23bc 100644
--- a/WheelWizard/WheelWizard.csproj
+++ b/WheelWizard/WheelWizard.csproj
@@ -71,16 +71,16 @@
         <EmbeddedResource Include="Resources\Languages\*.yml" />
 
         <!-- Compile Items -->
-        <Compile Update="Views\Components\StandardLibrary\PopupListButton.axaml.cs">
-            <DependentUpon>PopupListButton.axaml</DependentUpon>
+        <Compile Update="Views\Components\ListActionButton.axaml.cs">
+            <DependentUpon>ListActionButton.axaml</DependentUpon>
             <SubType>Code</SubType>
         </Compile>
-        <Compile Update="Views\Popups\MiiManagement\MiiEditor\EditorEmpty.axaml.cs">
+        <Compile Update="Features\WiiManagement\MiiManagement\Views\Dialogs\MiiEditor\EditorEmpty.axaml.cs">
             <DependentUpon>EditorEmpty.axaml</DependentUpon>
             <SubType>Code</SubType>
         </Compile>
-        <Compile Update="Views\Components\StandardLibrary\MemeNumberState.axaml.cs">
-            <DependentUpon>MemeNumberState.axaml</DependentUpon>
+        <Compile Update="Features\WheelWizardData\Views\CommunityCountBadge.axaml.cs">
+            <DependentUpon>CommunityCountBadge.axaml</DependentUpon>
         </Compile>
     </ItemGroup>
 
@@ -89,7 +89,7 @@
         <AdditionalFiles Include="Views\Styles\Resources\Icons.axaml" />
         <AdditionalFiles Include="Views\Styles\Styles\ButtonStyles.axaml" />
         <AdditionalFiles Include="Views\Styles\Styles\TextStyles.axaml" />
-        <AdditionalFiles Include="Views\Styles\Util\IconExampleComponent.axaml" />
+        <AdditionalFiles Include="Views\DesignTime\Controls\IconExampleComponent.axaml" />
     </ItemGroup>
 
     <ItemGroup Label="Fonts">
@@ -109,8 +109,4 @@
         <EmbeddedResource Include="Features\Patches\Resources\*.json" />
     </ItemGroup>
 
-    <ItemGroup>
-        <UpToDateCheckInput Remove="Views\Popups\MiiCreatorTabs\MiiCreatorGeneralPage.axaml" />
-        <UpToDateCheckInput Remove="Views\Popups\MiiCreatorTabs\MiiCreatorWindow.axaml" />
-    </ItemGroup>
 </Project>