diff --git a/src/Artemis.UI.Linux/App.axaml b/src/Artemis.UI.Linux/App.axaml
index a63d617b9..d2109667a 100644
--- a/src/Artemis.UI.Linux/App.axaml
+++ b/src/Artemis.UI.Linux/App.axaml
@@ -18,7 +18,7 @@
                 <TrayIcon.Menu>
                     <NativeMenu>
                         <NativeMenuItem Header="Home" Command="{CompiledBinding OpenScreen}" CommandParameter="home" />
-                        <!-- <NativeMenuItem Header="Workshop" Command="{CompiledBinding OpenScreen}" CommandParameter="workshop" /> -->
+                        <NativeMenuItem Header="Workshop" Command="{CompiledBinding OpenScreen}" CommandParameter="workshop" />
                         <NativeMenuItem Header="Surface Editor" Command="{CompiledBinding OpenScreen}" CommandParameter="surface-editor" />
                         <NativeMenuItem Header="Settings" Command="{CompiledBinding OpenScreen}" CommandParameter="settings" />
                         <NativeMenuItemSeparator />
diff --git a/src/Artemis.UI.MacOS/App.axaml b/src/Artemis.UI.MacOS/App.axaml
index 6ef3efd97..5a000915e 100644
--- a/src/Artemis.UI.MacOS/App.axaml
+++ b/src/Artemis.UI.MacOS/App.axaml
@@ -18,7 +18,7 @@
                 <TrayIcon.Menu>
                     <NativeMenu>
                         <NativeMenuItem Header="Home" Command="{CompiledBinding OpenScreen}" CommandParameter="home" />
-                        <!-- <NativeMenuItem Header="Workshop" Command="{CompiledBinding OpenScreen}" CommandParameter="workshop" /> -->
+                        <NativeMenuItem Header="Workshop" Command="{CompiledBinding OpenScreen}" CommandParameter="workshop" />
                         <NativeMenuItem Header="Surface Editor" Command="{CompiledBinding OpenScreen}" CommandParameter="surface-editor" />
                         <NativeMenuItem Header="Settings" Command="{CompiledBinding OpenScreen}" CommandParameter="settings" />
                         <NativeMenuItemSeparator />
diff --git a/src/Artemis.UI.Windows/App.axaml b/src/Artemis.UI.Windows/App.axaml
index 836d6a11f..63ff0b8a1 100644
--- a/src/Artemis.UI.Windows/App.axaml
+++ b/src/Artemis.UI.Windows/App.axaml
@@ -18,7 +18,7 @@
                 <TrayIcon.Menu>
                     <NativeMenu>
                         <NativeMenuItem Header="Home" Command="{CompiledBinding OpenScreen}" CommandParameter="home" />
-                        <!-- <NativeMenuItem Header="Workshop" Command="{CompiledBinding OpenScreen}" CommandParameter="workshop" /> -->
+                        <NativeMenuItem Header="Workshop" Command="{CompiledBinding OpenScreen}" CommandParameter="workshop" />
                         <NativeMenuItem Header="Surface Editor" Command="{CompiledBinding OpenScreen}" CommandParameter="surface-editor" />
                         <NativeMenuItem Header="Settings" Command="{CompiledBinding OpenScreen}" CommandParameter="settings" />
                         <NativeMenuItemSeparator />
diff --git a/src/Artemis.UI/Routing/Routes.cs b/src/Artemis.UI/Routing/Routes.cs
index 7e04219ee..209c89dea 100644
--- a/src/Artemis.UI/Routing/Routes.cs
+++ b/src/Artemis.UI/Routing/Routes.cs
@@ -23,7 +23,6 @@ public static class Routes
     {
         new RouteRegistration<BlankViewModel>("blank"),
         new RouteRegistration<HomeViewModel>("home"),
-#if DEBUG
         new RouteRegistration<WorkshopViewModel>("workshop")
         {
             Children = new List<IRouterRegistration>
@@ -35,8 +34,10 @@ public static class Routes
                     {
                         new RouteRegistration<ProfileListViewModel>("profiles/{page:int}"),
                         new RouteRegistration<ProfileDetailsViewModel>("profiles/details/{entryId:guid}"),
+#if DEBUG
                         new RouteRegistration<LayoutListViewModel>("layouts/{page:int}"),
                         new RouteRegistration<LayoutDetailsViewModel>("layouts/details/{entryId:guid}"),
+#endif
                     }
                 },
                 new RouteRegistration<WorkshopLibraryViewModel>("library")
@@ -50,7 +51,6 @@ public static class Routes
                 }
             }
         },
-#endif
         new RouteRegistration<SurfaceEditorViewModel>("surface-editor"),
         new RouteRegistration<SettingsViewModel>("settings")
         {
diff --git a/src/Artemis.UI/Screens/Settings/SettingsView.axaml b/src/Artemis.UI/Screens/Settings/SettingsView.axaml
index 0d50ad12b..47a6e7384 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsView.axaml
+++ b/src/Artemis.UI/Screens/Settings/SettingsView.axaml
@@ -8,20 +8,25 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.Settings.SettingsView"
              x:DataType="settings:SettingsViewModel">
-    <Border Classes="router-container">
-        <Grid RowDefinitions="Auto,*">
-            <TabStrip Grid.Row="0" Margin="12" ItemsSource="{CompiledBinding SettingTabs}" SelectedItem="{CompiledBinding SelectedTab}">
-                <TabStrip.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{CompiledBinding Name}" />
-                    </DataTemplate>
-                </TabStrip.ItemTemplate>
-            </TabStrip>
-            <controls:Frame Grid.Row="1" Name="TabFrame" IsNavigationStackEnabled="False" CacheSize="0">
-                <controls:Frame.NavigationPageFactory>
-                    <ui:PageFactory/>
-                </controls:Frame.NavigationPageFactory>
-            </controls:Frame>
-        </Grid>
-    </Border>
+    <controls:NavigationView PaneDisplayMode="Top" 
+                             MenuItemsSource="{CompiledBinding SettingTabs}" 
+                             SelectedItem="{CompiledBinding SelectedTab}"
+                             IsBackEnabled="True"
+                             IsBackButtonVisible="True"
+                             IsSettingsVisible="False"
+                             BackRequested="NavigationView_OnBackRequested">
+        <controls:NavigationView.Styles>
+            <Styles>
+                <Style Selector="controls|NavigationView:topnavminimal /template/ SplitView Border#ContentGridBorder">
+                    <Setter Property="CornerRadius" Value="8 0 0 0" />
+                </Style>
+            </Styles>
+        </controls:NavigationView.Styles>
+        
+        <controls:Frame Name="TabFrame" IsNavigationStackEnabled="False" CacheSize="0" Padding="20">
+            <controls:Frame.NavigationPageFactory>
+                <ui:PageFactory/>
+            </controls:Frame.NavigationPageFactory>
+        </controls:Frame>
+    </controls:NavigationView>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs b/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs
index 75d3d5b12..6e04c8c28 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs
+++ b/src/Artemis.UI/Screens/Settings/SettingsView.axaml.cs
@@ -3,8 +3,7 @@ using System.Reactive.Disposables;
 using Artemis.UI.Shared;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
-using FluentAvalonia.UI.Media.Animation;
-using FluentAvalonia.UI.Navigation;
+using FluentAvalonia.UI.Controls;
 using ReactiveUI;
 
 namespace Artemis.UI.Screens.Settings;
@@ -19,6 +18,11 @@ public partial class SettingsView : ReactiveUserControl<SettingsViewModel>
 
     private void Navigate(ViewModelBase viewModel)
     {
-        Dispatcher.UIThread.Invoke(() => TabFrame.NavigateFromObject(viewModel, new FrameNavigationOptions {TransitionInfoOverride = new SlideNavigationTransitionInfo()}));
+        Dispatcher.UIThread.Invoke(() => TabFrame.NavigateFromObject(viewModel));
+    }
+ 
+    private void NavigationView_OnBackRequested(object? sender, NavigationViewBackRequestedEventArgs e)
+    {
+        ViewModel?.GoBack();
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
index 26e8edcd2..3391aeab8 100644
--- a/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
+++ b/src/Artemis.UI/Screens/Settings/SettingsViewModel.cs
@@ -55,4 +55,9 @@ public class SettingsViewModel : RoutableHostScreen<RoutableScreen>, IMainScreen
         if (SelectedTab == null)
             await _router.Navigate(SettingTabs.First().Path);
     }
+
+    public void GoBack()
+    {
+        _router.Navigate("workshop");
+    }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
index 5e1b9c246..b9f28f4a6 100644
--- a/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
+++ b/src/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
@@ -25,14 +25,19 @@
         </Grid>
 
         <ScrollViewer Grid.Row="1" Grid.Column="0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" VerticalAlignment="Top">
-            <ItemsRepeater ItemsSource="{CompiledBinding Plugins}" MaxWidth="1000" VerticalAlignment="Center">
-                <ItemsRepeater.ItemTemplate>
+            <ItemsControl ItemsSource="{CompiledBinding Plugins}" MaxWidth="1000" VerticalAlignment="Center">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <VirtualizingStackPanel />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
                     <DataTemplate x:DataType="plugins:PluginSettingsViewModel">
-                        <ContentControl Content="{CompiledBinding}" Height="200"/>
+                        <ContentControl Content="{CompiledBinding}" Height="200" />
                     </DataTemplate>
-                </ItemsRepeater.ItemTemplate>
-            </ItemsRepeater>
-            
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
         </ScrollViewer>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
index 0210d557f..f49cc0ec3 100644
--- a/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
+++ b/src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs
@@ -38,14 +38,15 @@ public class SidebarViewModel : ActivatableViewModelBase
         SidebarScreen = new SidebarScreenViewModel(MaterialIconKind.Abacus, ROOT_SCREEN, "", null, new ObservableCollection<SidebarScreenViewModel>()
         {
             new(MaterialIconKind.HomeOutline, "Home", "home"),
-            #if DEBUG
             new(MaterialIconKind.TestTube, "Workshop", "workshop", null, new ObservableCollection<SidebarScreenViewModel>
             {
                 new(MaterialIconKind.FolderVideo, "Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
+#if DEBUG
                 new(MaterialIconKind.KeyboardVariant, "Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts"),
+#endif
                 new(MaterialIconKind.Bookshelf, "Library", "workshop/library"),
             }),
-            #endif
+
             new(MaterialIconKind.Devices, "Surface Editor", "surface-editor"),
             new(MaterialIconKind.SettingsOutline, "Settings", "settings")
         });
@@ -120,7 +121,7 @@ public class SidebarViewModel : ActivatableViewModelBase
     {
         if (_updating)
             return;
-        
+
         Dispatcher.UIThread.Invoke(async () =>
         {
             try
diff --git a/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs
index 0d966ba89..4ebd77ecc 100644
--- a/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Entries/EntriesViewModel.cs
@@ -24,7 +24,9 @@ public class EntriesViewModel : RoutableHostScreen<RoutableScreen>
         Tabs = new ObservableCollection<RouteViewModel>
         {
             new("Profiles", "workshop/entries/profiles/1", "workshop/entries/profiles"),
+#if DEBUG
             new("Layouts", "workshop/entries/layouts/1", "workshop/entries/layouts")
+#endif
         };
 
         this.WhenActivated(d =>
diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml
index 433f87c50..c97d51ee0 100644
--- a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeView.axaml
@@ -49,7 +49,7 @@
                         </StackPanel>
                     </Button>
 
-                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/layouts/1" VerticalContentAlignment="Top">
+                    <Button Width="150" Height="180" Command="{CompiledBinding Navigate}" CommandParameter="workshop/entries/layouts/1" VerticalContentAlignment="Top" IsVisible="{CompiledBinding ShowLayouts}">
                         <StackPanel>
                             <avalonia:MaterialIcon Kind="KeyboardVariant" HorizontalAlignment="Left" Width="60" Height="60" Margin="0 5" />
                             <TextBlock TextWrapping="Wrap" FontSize="16" Margin="0 5">Layouts</TextBlock>
diff --git a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs
index a0f82de17..e32a16f74 100644
--- a/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Home/WorkshopHomeViewModel.cs
@@ -25,6 +25,12 @@ public class WorkshopHomeViewModel : RoutableScreen
         this.WhenActivatedAsync(async d => WorkshopReachable = await workshopService.ValidateWorkshopStatus(d.AsCancellationToken()));
     }
 
+#if DEBUG
+    public bool ShowLayouts => true;
+# else
+    public bool ShowLayouts => false;
+#endif
+    
     public ReactiveCommand<Unit, Unit> AddSubmission { get; }
     public ReactiveCommand<string, Unit> Navigate { get; }
 
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml
index c1720ccfa..3f4063665 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepView.axaml
@@ -36,7 +36,8 @@
             </RadioButton.Content>
         </RadioButton>
         <RadioButton GroupName="EntryType" 
-                     IsChecked="{CompiledBinding SelectedEntryType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static workshop:EntryType.Layout}}">
+                     IsChecked="{CompiledBinding SelectedEntryType, Converter={StaticResource EnumBoolConverter}, ConverterParameter={x:Static workshop:EntryType.Layout}}"
+                     IsVisible="{CompiledBinding ShowLayouts}">
             <RadioButton.Content>
                 <StackPanel>
                     <TextBlock>Layout</TextBlock>
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs
index ee420891c..e378e27a3 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/EntryTypeStepViewModel.cs
@@ -14,6 +14,12 @@ public class EntryTypeStepViewModel : SubmissionViewModel
         GoBack = ReactiveCommand.Create(() => State.ChangeScreen<WelcomeStepViewModel>());
         Continue = ReactiveCommand.Create(ExecuteContinue, this.WhenAnyValue(vm => vm.SelectedEntryType).Select(e => e != null));
     }
+    
+#if DEBUG
+    public bool ShowLayouts => true;
+# else
+    public bool ShowLayouts => false;
+#endif
 
     public EntryType? SelectedEntryType
     {