From 62057d657a9416be521d4ad24bc7902080787d61 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Fri, 12 Apr 2024 22:53:40 +0200
Subject: [PATCH] Workshop - Improve child navigation performance

---
 .../Routing/Routable/IRoutableHostScreen.cs   |   1 +
 .../Routable/RoutableHostScreenOfTScreen.cs   |   6 +
 .../RoutableHostScreenOfTScreenTParam.cs      |   6 +
 .../Routing/Router/Navigation.cs              |   7 +-
 src/Artemis.UI.Shared/Styles/Skeleton.axaml   |  10 ++
 .../Entries/Details/EntryInfoView.axaml       | 154 ++++++++++--------
 .../Entries/Details/EntryInfoViewModel.cs     |  30 +++-
 .../EntryReleases/EntryReleasesViewModel.cs   |  10 +-
 .../Workshop/Layout/LayoutDetailsView.axaml   |   3 +-
 .../Layout/LayoutDetailsView.axaml.cs         |   3 +-
 .../Workshop/Layout/LayoutDetailsViewModel.cs |  22 ++-
 .../Workshop/Layout/LayoutListView.axaml.cs   |   3 +-
 .../Workshop/Layout/LayoutListViewModel.cs    |   7 +-
 .../Library/SubmissionManagementView.axaml    | 119 +++++++-------
 .../Library/SubmissionManagementView.axaml.cs |   3 +-
 .../Library/SubmissionManagementViewModel.cs  |  13 +-
 .../Workshop/Plugins/PluginDetailsView.axaml  |  38 +++--
 .../Plugins/PluginDetailsView.axaml.cs        |   3 +-
 .../Plugins/PluginDetailsViewModel.cs         |  24 +--
 .../Workshop/Plugins/PluginListView.axaml.cs  |   3 +-
 .../Workshop/Plugins/PluginListViewModel.cs   |   7 +-
 .../Workshop/Profile/ProfileDetailsView.axaml |   5 +-
 .../Profile/ProfileDetailsView.axaml.cs       |   3 +-
 .../Profile/ProfileDetailsViewModel.cs        |  22 ++-
 .../Workshop/Profile/ProfileListView.axaml.cs |   3 +-
 .../Workshop/Profile/ProfileListViewModel.cs  |   7 +-
 .../Extensions/EntryExtensions.cs             |   9 +
 27 files changed, 309 insertions(+), 212 deletions(-)
 create mode 100644 src/Artemis.WebClient.Workshop/Extensions/EntryExtensions.cs

diff --git a/src/Artemis.UI.Shared/Routing/Routable/IRoutableHostScreen.cs b/src/Artemis.UI.Shared/Routing/Routable/IRoutableHostScreen.cs
index b09afb676..b524f739a 100644
--- a/src/Artemis.UI.Shared/Routing/Routable/IRoutableHostScreen.cs
+++ b/src/Artemis.UI.Shared/Routing/Routable/IRoutableHostScreen.cs
@@ -9,5 +9,6 @@ internal interface IRoutableHostScreen : IRoutableScreen
 {
     bool RecycleScreen { get; }
     IRoutableScreen? InternalScreen { get; }
+    IRoutableScreen? InternalDefaultScreen { get; }
     void InternalChangeScreen(IRoutableScreen? screen);
 }
\ No newline at end of file
diff --git a/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreen.cs b/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreen.cs
index c61c27820..ca5208f19 100644
--- a/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreen.cs
+++ b/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreen.cs
@@ -25,7 +25,13 @@ public abstract class RoutableHostScreen<TScreen> : RoutableScreen, IRoutableHos
         protected set => RaiseAndSetIfChanged(ref _recycleScreen, value);
     }
 
+    /// <summary>
+    ///     Gets the screen to show when no other screen is active.
+    /// </summary>
+    public virtual TScreen? DefaultScreen { get; }
+
     IRoutableScreen? IRoutableHostScreen.InternalScreen => Screen;
+    IRoutableScreen? IRoutableHostScreen.InternalDefaultScreen => DefaultScreen;
 
     void IRoutableHostScreen.InternalChangeScreen(IRoutableScreen? screen)
     {
diff --git a/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreenTParam.cs b/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreenTParam.cs
index 89773e8d4..1dfef6b76 100644
--- a/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreenTParam.cs
+++ b/src/Artemis.UI.Shared/Routing/Routable/RoutableHostScreenOfTScreenTParam.cs
@@ -27,7 +27,13 @@ public abstract class RoutableHostScreen<TScreen, TParam> : RoutableScreen<TPara
         protected set => RaiseAndSetIfChanged(ref _recycleScreen, value);
     }
 
+    /// <summary>
+    ///     Gets the screen to show when no other screen is active.
+    /// </summary>
+    public virtual TScreen? DefaultScreen { get; }
+
     IRoutableScreen? IRoutableHostScreen.InternalScreen => Screen;
+    IRoutableScreen? IRoutableHostScreen.InternalDefaultScreen => DefaultScreen;
 
     void IRoutableHostScreen.InternalChangeScreen(IRoutableScreen? screen)
     {
diff --git a/src/Artemis.UI.Shared/Routing/Router/Navigation.cs b/src/Artemis.UI.Shared/Routing/Router/Navigation.cs
index 0d0f6083c..1df871d34 100644
--- a/src/Artemis.UI.Shared/Routing/Router/Navigation.cs
+++ b/src/Artemis.UI.Shared/Routing/Router/Navigation.cs
@@ -109,12 +109,11 @@ internal class Navigation
             // Navigate the child too
             if (resolution.Child != null)
                 await NavigateResolution(resolution.Child, args, childScreen);
-            // Make sure there is no child
-            else if (childScreen.InternalScreen != null)
-                childScreen.InternalChangeScreen(null);
+            // Without a resolution, navigate to the default screen (which may be null)
+            else if (childScreen.InternalScreen != childScreen.InternalDefaultScreen)
+                childScreen.InternalChangeScreen(childScreen.InternalDefaultScreen);
         }
 
-
         Completed = true;
     }
 
diff --git a/src/Artemis.UI.Shared/Styles/Skeleton.axaml b/src/Artemis.UI.Shared/Styles/Skeleton.axaml
index 2596c3fe6..0483a9763 100644
--- a/src/Artemis.UI.Shared/Styles/Skeleton.axaml
+++ b/src/Artemis.UI.Shared/Styles/Skeleton.axaml
@@ -8,6 +8,7 @@
             </Grid.RowDefinitions>
             <Grid Margin="20" Grid.Column="0">
                 <StackPanel>
+                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}">TitleTextBlockStyle</TextBlock>
                     <TextBlock Classes="h1">This is heading 1</TextBlock>
                     <TextBlock Classes="h2">This is heading 2</TextBlock>
                     <TextBlock Classes="h3">This is heading 3</TextBlock>
@@ -22,6 +23,7 @@
             
             <Grid Margin="20" Grid.Column="1">
                 <StackPanel>
+                    <Border Width="400" Classes="skeleton-text title"></Border>
                     <Border Width="400" Classes="skeleton-text h1"></Border>
                     <Border Width="400" Classes="skeleton-text h2"></Border>
                     <Border Width="400" Classes="skeleton-text h3"></Border>
@@ -39,6 +41,7 @@
                             <Setter Property="Background" Value="#55ff0000"></Setter>
                         </Style>
                     </StackPanel.Styles>
+                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}">TitleTextBlockStyle</TextBlock>
                     <TextBlock Classes="h1">This is heading 1</TextBlock>
                     <TextBlock Classes="h2">This is heading 2</TextBlock>
                     <TextBlock Classes="h3">This is heading 3</TextBlock>
@@ -51,6 +54,7 @@
             
             <Grid Margin="20" Grid.Column="0" Row="1">
                 <StackPanel Spacing="2">
+                    <Border Width="400" Classes="skeleton-text title no-margin"></Border>
                     <Border Width="400" Classes="skeleton-text h1 no-margin"></Border>
                     <Border Width="400" Classes="skeleton-text h2 no-margin"></Border>
                     <Border Width="400" Classes="skeleton-text h3 no-margin"></Border>
@@ -68,6 +72,7 @@
                             <Setter Property="Background" Value="#55ff0000"></Setter>
                         </Style>
                     </StackPanel.Styles>
+                    <TextBlock Theme="{StaticResource TitleTextBlockStyle}">TitleTextBlockStyle</TextBlock>
                     <TextBlock Classes="h1 no-margin">This is heading 1</TextBlock>
                     <TextBlock Classes="h2 no-margin">This is heading 2</TextBlock>
                     <TextBlock Classes="h3 no-margin">This is heading 3</TextBlock>
@@ -125,6 +130,11 @@
         </Style.Animations>
     </Style>
     
+    <Style Selector="Border.skeleton-text.title">
+        <Setter Property="Height" Value="28" />
+        <Setter Property="Margin" Value="0 5 0 5" />
+        <Setter Property="CornerRadius" Value="8" />
+    </Style>
     <Style Selector="Border.skeleton-text.h1">
         <Setter Property="Height" Value="65" />
         <Setter Property="Margin" Value="0 10 0 20" />
diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml
index 52f1b8dd3..a105aa15e 100644
--- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoView.axaml
@@ -13,74 +13,90 @@
         <converters:EntryIconUriConverter x:Key="EntryIconUriConverter" />
         <converters:DateTimeConverter x:Key="DateTimeConverter" />
     </UserControl.Resources>
-    <StackPanel>
-        <Panel>
-            <Border CornerRadius="6"
-                    HorizontalAlignment="Left"
-                    Margin="0 0 10 0"
-                    Width="80"
-                    Height="80"
-                    ClipToBounds="True">
-                <Image Stretch="UniformToFill" il:ImageLoader.Source="{CompiledBinding Entry.Id, Converter={StaticResource EntryIconUriConverter}, Mode=OneWay}" />
-            </Border>
-            <Button Classes="icon-button"
-                    VerticalAlignment="Top"
-                    HorizontalAlignment="Right"
-                    Command="{CompiledBinding CopyShareLink}"
-                    ToolTip.Tip="Copy share link">
-                <avalonia:MaterialIcon Kind="ShareVariant" />
+    <Panel>
+        <StackPanel IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNull}}">
+            <Border Classes="skeleton-text" Margin="0 0 10 0" Width="80" Height="80"></Border>
+            <Border Classes="skeleton-text title" HorizontalAlignment="Stretch"/>
+            <Border Classes="skeleton-text" Width="120"/>
+            <Border Classes="skeleton-text" Width="140" Margin="0 8"/>
+            <Border Classes="skeleton-text" Width="80"/>
+            <Border Classes="card-separator" Margin="0 15 0 17"></Border>
+            <Border Classes="skeleton-text" Width="120"/>
+            <StackPanel Margin="0 10 0 0">
+                <Border Classes="skeleton-text" Width="160"/>
+                <Border Classes="skeleton-text" Width="160"/>    
+            </StackPanel>
+            <Border Classes="skeleton-button"></Border>
+        </StackPanel>
+        <StackPanel IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNotNull}}">
+            <Panel>
+                <Border CornerRadius="6"
+                        HorizontalAlignment="Left"
+                        Margin="0 0 10 0"
+                        Width="80"
+                        Height="80"
+                        ClipToBounds="True">
+                    <Image Stretch="UniformToFill" il:ImageLoader.Source="{CompiledBinding Entry.Id, Converter={StaticResource EntryIconUriConverter}, Mode=OneWay}" />
+                </Border>
+                <Button Classes="icon-button"
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Right"
+                        Command="{CompiledBinding CopyShareLink}"
+                        ToolTip.Tip="Copy share link">
+                    <avalonia:MaterialIcon Kind="ShareVariant" />
+                </Button>
+            </Panel>
+            
+            <TextBlock Theme="{StaticResource TitleTextBlockStyle}"
+                       MaxLines="3"
+                       TextTrimming="CharacterEllipsis"
+                       Text="{CompiledBinding Entry.Name, FallbackValue=Title}"/>
+
+            <TextBlock Classes="subtitle" TextTrimming="CharacterEllipsis" Text="{CompiledBinding Entry.Author, FallbackValue=Author}" />
+
+            <TextBlock Margin="0 8" TextWrapping="Wrap" Text="{CompiledBinding Entry.Summary, FallbackValue=Summary}" />
+
+            <!-- Categories -->
+            <ItemsControl ItemsSource="{CompiledBinding Entry.Categories}" Margin="0 0 -8 0">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <WrapPanel Orientation="Horizontal"></WrapPanel>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal" Margin="0 0 8 0">
+                            <avalonia:MaterialIcon Kind="{CompiledBinding Icon}" Margin="0 0 3 0"></avalonia:MaterialIcon>
+                            <TextBlock Text="{CompiledBinding Name}" TextTrimming="CharacterEllipsis" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+
+            <Border Classes="card-separator"></Border>
+
+            <TextBlock Margin="0 0 0 8">
+                <avalonia:MaterialIcon Kind="Downloads" />
+                <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
+                <Run>downloads</Run>
+            </TextBlock>
+
+            <TextBlock Classes="subtitle"
+                       ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
+                <avalonia:MaterialIcon Kind="Calendar" />
+                <Run>Created</Run>
+                <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+            </TextBlock>
+            <TextBlock Classes="subtitle"
+                       ToolTip.Tip="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}}">
+                <avalonia:MaterialIcon Kind="Update" />
+                <Run>Updated</Run>
+                <Run Text="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+            </TextBlock>
+
+            <Button IsVisible="{CompiledBinding CanBeManaged}" Command="{CompiledBinding GoToManage}" Margin="0 10 0 0" HorizontalAlignment="Stretch">
+                Manage installation
             </Button>
-        </Panel>
-
-        <TextBlock Theme="{StaticResource TitleTextBlockStyle}"
-                   MaxLines="3"
-                   TextTrimming="CharacterEllipsis"
-                   Text="{CompiledBinding Entry.Name, FallbackValue=Title }" />
-
-        <TextBlock Classes="subtitle" TextTrimming="CharacterEllipsis" Text="{CompiledBinding Entry.Author, FallbackValue=Author}" />
-
-        <TextBlock Margin="0 8" TextWrapping="Wrap" Text="{CompiledBinding Entry.Summary, FallbackValue=Summary}" />
-
-        <!-- Categories -->
-        <ItemsControl ItemsSource="{CompiledBinding Entry.Categories}" Margin="0 0 -8 0">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel Orientation="Horizontal"></WrapPanel>
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <StackPanel Orientation="Horizontal" Margin="0 0 8 0">
-                        <avalonia:MaterialIcon Kind="{CompiledBinding Icon}" Margin="0 0 3 0"></avalonia:MaterialIcon>
-                        <TextBlock Text="{CompiledBinding Name}" TextTrimming="CharacterEllipsis" />
-                    </StackPanel>
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-        
-        <Border Classes="card-separator"></Border>
-        
-        <TextBlock Margin="0 0 0 8">
-            <avalonia:MaterialIcon Kind="Downloads" />
-            <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
-            <Run>downloads</Run>
-        </TextBlock>
-        
-        <TextBlock Classes="subtitle"
-                   ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
-            <avalonia:MaterialIcon Kind="Calendar" />
-            <Run>Created</Run>
-            <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-        </TextBlock>
-        <TextBlock Classes="subtitle"
-                   ToolTip.Tip="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}}">
-            <avalonia:MaterialIcon Kind="Update" />
-            <Run>Updated</Run>
-            <Run Text="{CompiledBinding UpdatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-        </TextBlock>
-        
-        <Button IsVisible="{CompiledBinding CanBeManaged}" Command="{CompiledBinding GoToManage}" Margin="0 10 0 0" HorizontalAlignment="Stretch">
-            Manage installation
-        </Button>
-    </StackPanel>
+        </StackPanel>
+    </Panel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs
index 8fc0f1b33..6cf02efb1 100644
--- a/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Entries/Details/EntryInfoViewModel.cs
@@ -8,6 +8,7 @@ using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.UI.Shared.Services;
 using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Extensions;
 using Artemis.WebClient.Workshop.Models;
 using Artemis.WebClient.Workshop.Services;
 using PropertyChanged.SourceGenerator;
@@ -19,36 +20,47 @@ public partial class EntryInfoViewModel : ActivatableViewModelBase
 {
     private readonly IRouter _router;
     private readonly INotificationService _notificationService;
+    private readonly IWorkshopService _workshopService;
+    [Notify] private IEntryDetails? _entry;
+    [Notify] private DateTimeOffset? _updatedAt;
     [Notify] private bool _canBeManaged;
 
-    public EntryInfoViewModel(IEntryDetails entry, IRouter router, INotificationService notificationService, IWorkshopService workshopService)
+    public EntryInfoViewModel(IRouter router, INotificationService notificationService, IWorkshopService workshopService)
     {
         _router = router;
         _notificationService = notificationService;
-        Entry = entry;
-        UpdatedAt = Entry.Releases.Any() ? Entry.Releases.Max(r => r.CreatedAt) : Entry.CreatedAt;
-        CanBeManaged = Entry.EntryType != EntryType.Profile && workshopService.GetInstalledEntry(entry.Id) != null;
+        _workshopService = workshopService;
 
         this.WhenActivated(d =>
         {
             Observable.FromEventPattern<InstalledEntry>(x => workshopService.OnInstalledEntrySaved += x, x => workshopService.OnInstalledEntrySaved -= x)
                 .StartWith([])
-                .Subscribe(_ => CanBeManaged = Entry.EntryType != EntryType.Profile && workshopService.GetInstalledEntry(entry.Id) != null)
+                .Subscribe(_ => CanBeManaged = Entry != null && Entry.EntryType != EntryType.Profile && workshopService.GetInstalledEntry(Entry.Id) != null)
                 .DisposeWith(d);
         });
     }
-
-    public IEntryDetails Entry { get; }
-    public DateTimeOffset? UpdatedAt { get; }
+    
+    public void SetEntry(IEntryDetails? entry)
+    {
+        Entry = entry;
+        UpdatedAt = Entry != null && Entry.Releases.Any() ? Entry.Releases.Max(r => r.CreatedAt) : Entry?.CreatedAt;
+        CanBeManaged = Entry != null && Entry.EntryType != EntryType.Profile && _workshopService.GetInstalledEntry(Entry.Id) != null;
+    }
 
     public async Task CopyShareLink()
     {
+        if (Entry == null)
+            return;
+        
         await Shared.UI.Clipboard.SetTextAsync($"{WorkshopConstants.WORKSHOP_URL}/entries/{Entry.Id}/{StringUtilities.UrlFriendly(Entry.Name)}");
         _notificationService.CreateNotification().WithTitle("Copied share link to clipboard.").Show();
     }
 
     public async Task GoToManage()
     {
-        await _router.Navigate("/manage");
+        if (Entry == null)
+            return;
+        
+        await _router.Navigate($"{Entry.GetEntryPath()}/manage");
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs
index 3d92494f8..19eab58ea 100644
--- a/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/EntryReleases/EntryReleasesViewModel.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Artemis.UI.Shared;
 using Artemis.UI.Shared.Routing;
 using Artemis.WebClient.Workshop;
+using Artemis.WebClient.Workshop.Extensions;
 using PropertyChanged.SourceGenerator;
 using ReactiveUI;
 
@@ -25,14 +26,15 @@ public partial class EntryReleasesViewModel : ActivatableViewModelBase
 
         this.WhenActivated(d =>
         {
-            router.CurrentPath.Subscribe(p => SelectedRelease = p != null && p.Contains("releases") && float.TryParse(p.Split('/').Last(), out float releaseId)
-                    ? Releases.FirstOrDefault(r => r.Release.Id == releaseId)
-                    : null)
+            router.CurrentPath.Subscribe(p =>
+                    SelectedRelease = p != null && p.StartsWith(Entry.GetEntryPath()) && float.TryParse(p.Split('/').Last(), out float releaseId)
+                        ? Releases.FirstOrDefault(r => r.Release.Id == releaseId)
+                        : null)
                 .DisposeWith(d);
 
             this.WhenAnyValue(vm => vm.SelectedRelease)
                 .WhereNotNull()
-                .Subscribe(s => _router.Navigate($"/releases/{s.Release.Id}"))
+                .Subscribe(s => _router.Navigate($"{Entry.GetEntryPath()}/releases/{s.Release.Id}"))
                 .DisposeWith(d);
         });
     }
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml
index 6370121be..7f021d50f 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml
@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:layout="clr-namespace:Artemis.UI.Screens.Workshop.Layout"
-             xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:ui="clr-namespace:Artemis.UI"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
@@ -14,7 +13,7 @@
             <Border Classes="card" VerticalAlignment="Top">
                 <ContentControl Content="{CompiledBinding EntryInfoViewModel}" />
             </Border>
-            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.Releases.Count}">
+            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.Releases.Count, FallbackValue=False}">
                 <ContentControl Content="{CompiledBinding EntryReleasesViewModel}" />
             </Border>
         </StackPanel>
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs
index d8e9ff858..c97e73859 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsView.axaml.cs
@@ -11,7 +11,8 @@ public partial class LayoutDetailsView : ReactiveUserControl<LayoutDetailsViewMo
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.LayoutDescriptionViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
index f4d797310..7379c1217 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutDetailsViewModel.cs
@@ -14,31 +14,31 @@ namespace Artemis.UI.Screens.Workshop.Layout;
 public partial class LayoutDetailsViewModel : RoutableHostScreen<RoutableScreen, WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
-    private readonly Func<IEntryDetails, EntryInfoViewModel> _getEntryInfoViewModel;
+    private readonly LayoutDescriptionViewModel _layoutDescriptionViewModel;
     private readonly Func<IEntryDetails, EntryReleasesViewModel> _getEntryReleasesViewModel;
     private readonly Func<IEntryDetails, EntryImagesViewModel> _getEntryImagesViewModel;
     [Notify] private IEntryDetails? _entry;
-    [Notify] private EntryInfoViewModel? _entryInfoViewModel;
     [Notify] private EntryReleasesViewModel? _entryReleasesViewModel;
     [Notify] private EntryImagesViewModel? _entryImagesViewModel;
 
     public LayoutDetailsViewModel(IWorkshopClient client,
         LayoutDescriptionViewModel layoutDescriptionViewModel,
-        Func<IEntryDetails, EntryInfoViewModel> getEntryInfoViewModel,
+        EntryInfoViewModel entryInfoViewModel,
         Func<IEntryDetails, EntryReleasesViewModel> getEntryReleasesViewModel,
         Func<IEntryDetails, EntryImagesViewModel> getEntryImagesViewModel)
     {
         _client = client;
-        _getEntryInfoViewModel = getEntryInfoViewModel;
+        _layoutDescriptionViewModel = layoutDescriptionViewModel;
         _getEntryReleasesViewModel = getEntryReleasesViewModel;
         _getEntryImagesViewModel = getEntryImagesViewModel;
 
-        LayoutDescriptionViewModel = layoutDescriptionViewModel;
         RecycleScreen = false;
+        EntryInfoViewModel = entryInfoViewModel;
     }
 
-    public LayoutDescriptionViewModel LayoutDescriptionViewModel { get; }
-
+    public override RoutableScreen DefaultScreen => _layoutDescriptionViewModel;
+    public EntryInfoViewModel EntryInfoViewModel { get; }
+    
     public override async Task OnNavigating(WorkshopDetailParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
     {
         if (Entry?.Id != parameters.EntryId)
@@ -47,14 +47,18 @@ public partial class LayoutDetailsViewModel : RoutableHostScreen<RoutableScreen,
 
     private async Task GetEntry(long entryId, CancellationToken cancellationToken)
     {
+        Task grace = Task.Delay(300, cancellationToken);
         IOperationResult<IGetEntryByIdResult> result = await _client.GetEntryById.ExecuteAsync(entryId, cancellationToken);
         if (result.IsErrorResult())
             return;
+        
+        // Let the UI settle to avoid lag when deep linking
+        await grace;
 
         Entry = result.Data?.Entry;
-        EntryInfoViewModel = Entry != null ? _getEntryInfoViewModel(Entry) : null;
+        EntryInfoViewModel.SetEntry(Entry);
         EntryReleasesViewModel = Entry != null ? _getEntryReleasesViewModel(Entry) : null;
         EntryImagesViewModel = Entry != null ? _getEntryImagesViewModel(Entry) : null;
-        LayoutDescriptionViewModel.Entry = Entry;
+        _layoutDescriptionViewModel.Entry = Entry;
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs
index 8837fe32d..cb60c4707 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListView.axaml.cs
@@ -13,7 +13,8 @@ public partial class LayoutListView : ReactiveUserControl<LayoutListViewModel>
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.EntryListViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs
index 52806ca6a..a6165a585 100644
--- a/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Layout/LayoutListViewModel.cs
@@ -6,11 +6,12 @@ namespace Artemis.UI.Screens.Workshop.Layout;
 
 public class LayoutListViewModel : RoutableHostScreen<RoutableScreen>
 {
-    public EntryListViewModel EntryListViewModel { get; }
+    private readonly EntryListViewModel _entryListViewModel;
+    public override RoutableScreen DefaultScreen => _entryListViewModel;
 
     public LayoutListViewModel(EntryListViewModel entryListViewModel)
     {
-        EntryListViewModel = entryListViewModel;
-        EntryListViewModel.EntryType = EntryType.Layout;
+        _entryListViewModel = entryListViewModel;
+        _entryListViewModel.EntryType = EntryType.Layout;
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml
index a3f9ca5f0..8c7710dc1 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml
@@ -13,68 +13,73 @@
     <UserControl.Resources>
         <converters:DateTimeConverter x:Key="DateTimeConverter" />
     </UserControl.Resources>
-    <Grid ColumnDefinitions="300,*" RowDefinitions="*, Auto">
-        <StackPanel Grid.Column="0" Grid.Row="0" Spacing="10" Margin="0 0 10 0">
-            <Border Classes="card" VerticalAlignment="Top">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Management</TextBlock>
-                    <Border Classes="card-separator" />
+    <Panel>
+        <ProgressBar HorizontalAlignment="Stretch"
+                     VerticalAlignment="Top"
+                     IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNull}}"
+                     IsIndeterminate="True" />
+        <Grid ColumnDefinitions="300,*" RowDefinitions="*, Auto" IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNotNull}}">
+            <StackPanel Grid.Column="0" Grid.Row="0" Spacing="10" Margin="0 0 10 0">
+                <Border Classes="card" VerticalAlignment="Top">
+                    <StackPanel>
+                        <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Management</TextBlock>
+                        <Border Classes="card-separator" />
 
-                    <TextBlock Margin="0 0 0 8">
-                        <avalonia:MaterialIcon Kind="Downloads" />
-                        <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
-                        <Run>downloads</Run>
-                    </TextBlock>
+                        <TextBlock Margin="0 0 0 8">
+                            <avalonia:MaterialIcon Kind="Downloads" />
+                            <Run Classes="h5" Text="{CompiledBinding Entry.Downloads, FallbackValue=0}" />
+                            <Run>downloads</Run>
+                        </TextBlock>
 
-                    <TextBlock Classes="subtitle" ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
-                        <avalonia:MaterialIcon Kind="Calendar" />
-                        <Run>Created</Run>
-                        <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                    </TextBlock>
+                        <TextBlock Classes="subtitle" ToolTip.Tip="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}}">
+                            <avalonia:MaterialIcon Kind="Calendar" />
+                            <Run>Created</Run>
+                            <Run Text="{CompiledBinding Entry.CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+                        </TextBlock>
 
-                    <Border Classes="card-separator" />
+                        <Border Classes="card-separator" />
 
-                    <StackPanel Spacing="5">
-                        <Button HorizontalAlignment="Stretch" Command="{CompiledBinding CreateRelease}">
-                            Create new release
-                        </Button>
-                        <Button Classes="danger" HorizontalAlignment="Stretch" Command="{CompiledBinding DeleteSubmission}">
-                            Delete submission
-                        </Button>
+                        <StackPanel Spacing="5">
+                            <Button HorizontalAlignment="Stretch" Command="{CompiledBinding CreateRelease}">
+                                Create new release
+                            </Button>
+                            <Button Classes="danger" HorizontalAlignment="Stretch" Command="{CompiledBinding DeleteSubmission}">
+                                Delete submission
+                            </Button>
+                        </StackPanel>
                     </StackPanel>
-                </StackPanel>
-            </Border>
-            <Border Classes="card" IsVisible="{CompiledBinding Releases.Count}">
-                <StackPanel>
-                    <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Releases</TextBlock>
-                    <Border Classes="card-separator" />
+                </Border>
+                <Border Classes="card" IsVisible="{CompiledBinding Releases.Count}">
+                    <StackPanel>
+                        <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Releases</TextBlock>
+                        <Border Classes="card-separator" />
 
-                    <ListBox ItemsSource="{CompiledBinding Releases}" SelectedItem="{CompiledBinding SelectedRelease}">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Margin="0 5">
-                                    <TextBlock Text="{CompiledBinding Version}"></TextBlock>
-                                    <TextBlock Classes="subtitle" ToolTip.Tip="{CompiledBinding CreatedAt, Converter={StaticResource DateTimeConverter}}">
-                                        <avalonia:MaterialIcon Kind="Calendar" />
-                                        <Run>Created</Run>
-                                        <Run Text="{CompiledBinding CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
-                                    </TextBlock>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </StackPanel>
-            </Border>
-            <controls:HyperlinkButton Command="{CompiledBinding ViewWorkshopPage}" HorizontalAlignment="Center">
-                View workshop page
-            </controls:HyperlinkButton>
-        </StackPanel>
-
-        <controls:Frame Grid.Column="1" Grid.Row="0" Name="RouterFrame" IsNavigationStackEnabled="False" CacheSize="0">
-            <controls:Frame.NavigationPageFactory>
-                <ui:PageFactory />
-            </controls:Frame.NavigationPageFactory>
-        </controls:Frame>
-    </Grid>
+                        <ListBox ItemsSource="{CompiledBinding Releases}" SelectedItem="{CompiledBinding SelectedRelease}">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Margin="0 5">
+                                        <TextBlock Text="{CompiledBinding Version}"></TextBlock>
+                                        <TextBlock Classes="subtitle" ToolTip.Tip="{CompiledBinding CreatedAt, Converter={StaticResource DateTimeConverter}}">
+                                            <avalonia:MaterialIcon Kind="Calendar" />
+                                            <Run>Created</Run>
+                                            <Run Text="{CompiledBinding CreatedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter='humanize'}"></Run>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </StackPanel>
+                </Border>
+                <controls:HyperlinkButton Command="{CompiledBinding ViewWorkshopPage}" HorizontalAlignment="Center">
+                    View workshop page
+                </controls:HyperlinkButton>
+            </StackPanel>
 
+            <controls:Frame Grid.Column="1" Grid.Row="0" Name="RouterFrame" IsNavigationStackEnabled="False" CacheSize="0">
+                <controls:Frame.NavigationPageFactory>
+                    <ui:PageFactory />
+                </controls:Frame.NavigationPageFactory>
+            </controls:Frame>
+        </Grid>
+    </Panel>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs
index 2c5493d7a..3e14dacb8 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementView.axaml.cs
@@ -11,7 +11,8 @@ public partial class SubmissionManagementView : ReactiveUserControl<SubmissionMa
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.DetailsViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs
index af7fd558b..3b1feb76a 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Library/SubmissionManagementViewModel.cs
@@ -22,6 +22,7 @@ public partial class SubmissionManagementViewModel : RoutableHostScreen<Routable
     private readonly IWindowService _windowService;
     private readonly IRouter _router;
     private readonly IWorkshopService _workshopService;
+    private readonly SubmissionDetailsViewModel _detailsViewModel;
 
     [Notify] private IGetSubmittedEntryById_Entry? _entry;
     [Notify] private List<IGetSubmittedEntryById_Entry_Releases>? _releases;
@@ -29,7 +30,7 @@ public partial class SubmissionManagementViewModel : RoutableHostScreen<Routable
 
     public SubmissionManagementViewModel(IWorkshopClient client, IRouter router, IWindowService windowService, IWorkshopService workshopService, SubmissionDetailsViewModel detailsViewModel)
     {
-        DetailsViewModel = detailsViewModel;
+        _detailsViewModel = detailsViewModel;
         _client = client;
         _router = router;
         _windowService = windowService;
@@ -39,12 +40,12 @@ public partial class SubmissionManagementViewModel : RoutableHostScreen<Routable
         {
             this.WhenAnyValue(vm => vm.SelectedRelease)
                 .WhereNotNull()
-                .Subscribe(r => _router.Navigate($"/releases/{r.Id}"))
+                .Subscribe(r => _router.Navigate($"workshop/library/submissions/{Entry?.Id}/releases/{r.Id}"))
                 .DisposeWith(d);
         });
     }
 
-    public SubmissionDetailsViewModel DetailsViewModel { get; }
+    public override RoutableScreen DefaultScreen => _detailsViewModel;
 
     public async Task ViewWorkshopPage()
     {
@@ -79,7 +80,7 @@ public partial class SubmissionManagementViewModel : RoutableHostScreen<Routable
     {
         // If there is a 2nd parameter, it's a release ID
         SelectedRelease = args.RouteParameters.Length > 1 ? Releases?.FirstOrDefault(r => r.Id == (long) args.RouteParameters[1]) : null;
-        
+       
         IOperationResult<IGetSubmittedEntryByIdResult> result = await _client.GetSubmittedEntryById.ExecuteAsync(parameters.EntryId, cancellationToken);
         if (result.IsErrorResult())
             return;
@@ -87,11 +88,11 @@ public partial class SubmissionManagementViewModel : RoutableHostScreen<Routable
         Entry = result.Data?.Entry;
         Releases = Entry?.Releases.OrderByDescending(r => r.CreatedAt).ToList();
 
-        await DetailsViewModel.SetEntry(Entry, cancellationToken);
+        await _detailsViewModel.SetEntry(Entry, cancellationToken);
     }
 
     public override async Task OnClosing(NavigationArguments args)
     {
-        await DetailsViewModel.OnClosing(args);
+        await _detailsViewModel.OnClosing(args);
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml
index 565898da6..9b99c42c3 100644
--- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml
@@ -2,7 +2,6 @@
              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:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
              xmlns:plugins="clr-namespace:Artemis.UI.Screens.Workshop.Plugins"
              xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
@@ -17,21 +16,32 @@
             </Border>
 
             <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.PluginInfo, Converter={x:Static ObjectConverters.IsNotNull}}">
-                <StackPanel>
-                    <TextBlock>Admin required</TextBlock>
-                    <TextBlock Text="Yes" IsVisible="{CompiledBinding Entry.PluginInfo.RequiresAdmin}" />
-                    <TextBlock Text="No" IsVisible="{CompiledBinding !Entry.PluginInfo.RequiresAdmin}" />
-
-                    <TextBlock Margin="0 15 0 5">Supported platforms</TextBlock>
-                    <StackPanel Orientation="Horizontal" Spacing="10">
-                        <avalonia:MaterialIcon Kind="MicrosoftWindows" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsWindows}" />
-                        <avalonia:MaterialIcon Kind="Linux" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsLinux}" />
-                        <avalonia:MaterialIcon Kind="Apple" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsOSX}" />
+                <Panel>
+                    <StackPanel IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNull}}">
+                        <Border Width="110" Classes="skeleton-text"></Border>
+                        <Border Width="35" Classes="skeleton-text"></Border>
+                        
+                        <Border Margin="0 16 0 3" Width="130" Classes="skeleton-text"></Border>
+                        <Border Width="60" Classes="skeleton-text"></Border>
                     </StackPanel>
-                </StackPanel>
+                    
+                    <StackPanel IsVisible="{CompiledBinding Entry, Converter={x:Static ObjectConverters.IsNotNull}}">
+                        <TextBlock>Admin required</TextBlock>
+                        <TextBlock Text="Yes" IsVisible="{CompiledBinding Entry.PluginInfo.RequiresAdmin}" />
+                        <TextBlock Text="No" IsVisible="{CompiledBinding !Entry.PluginInfo.RequiresAdmin}" />
+
+                        <TextBlock Margin="0 15 0 5">Supported platforms</TextBlock>
+                        <StackPanel Orientation="Horizontal" Spacing="10">
+                            <avalonia:MaterialIcon Kind="MicrosoftWindows" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsWindows}" />
+                            <avalonia:MaterialIcon Kind="Linux" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsLinux}" />
+                            <avalonia:MaterialIcon Kind="Apple" IsVisible="{CompiledBinding Entry.PluginInfo.SupportsOSX}" />
+                        </StackPanel>
+                    </StackPanel>
+                </Panel>
+               
             </Border>
 
-            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.Releases.Count}">
+            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.Releases.Count, FallbackValue=False}">
                 <ContentControl Content="{CompiledBinding EntryReleasesViewModel}" />
             </Border>
         </StackPanel>
@@ -44,6 +54,6 @@
             </controls:Frame>
         </ScrollViewer>
 
-        <ContentControl Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count}" Content="{CompiledBinding EntryImagesViewModel}" />
+        <ContentControl Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count, FallbackValue=False}" Content="{CompiledBinding EntryImagesViewModel}" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs
index d4461a4b9..fe248c549 100644
--- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsView.axaml.cs
@@ -11,7 +11,8 @@ public partial class PluginDetailsView : ReactiveUserControl<PluginDetailsViewMo
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.PluginDescriptionViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsViewModel.cs
index cfab9166c..802698aab 100644
--- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginDetailsViewModel.cs
@@ -16,32 +16,32 @@ namespace Artemis.UI.Screens.Workshop.Plugins;
 public partial class PluginDetailsViewModel : RoutableHostScreen<RoutableScreen, WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
-    private readonly Func<IEntryDetails, EntryInfoViewModel> _getEntryInfoViewModel;
+    private readonly PluginDescriptionViewModel _pluginDescriptionViewModel;
     private readonly Func<IEntryDetails, EntryReleasesViewModel> _getEntryReleasesViewModel;
     private readonly Func<IEntryDetails, EntryImagesViewModel> _getEntryImagesViewModel;
     [Notify] private IGetPluginEntryById_Entry? _entry;
-    [Notify] private EntryInfoViewModel? _entryInfoViewModel;
     [Notify] private EntryReleasesViewModel? _entryReleasesViewModel;
     [Notify] private EntryImagesViewModel? _entryImagesViewModel;
     [Notify] private ReadOnlyObservableCollection<EntryListItemViewModel>? _dependants;
 
     public PluginDetailsViewModel(IWorkshopClient client,
         PluginDescriptionViewModel pluginDescriptionViewModel,
-        Func<IEntryDetails, EntryInfoViewModel> getEntryInfoViewModel,
+        EntryInfoViewModel entryInfoViewModel,
         Func<IEntryDetails, EntryReleasesViewModel> getEntryReleasesViewModel,
         Func<IEntryDetails, EntryImagesViewModel> getEntryImagesViewModel)
     {
         _client = client;
-        _getEntryInfoViewModel = getEntryInfoViewModel;
+        _pluginDescriptionViewModel = pluginDescriptionViewModel;
         _getEntryReleasesViewModel = getEntryReleasesViewModel;
         _getEntryImagesViewModel = getEntryImagesViewModel;
-        
-        PluginDescriptionViewModel = pluginDescriptionViewModel;
+
+        EntryInfoViewModel = entryInfoViewModel;
         RecycleScreen = false;
     }
 
-    public PluginDescriptionViewModel PluginDescriptionViewModel { get; }
-    
+    public override RoutableScreen DefaultScreen => _pluginDescriptionViewModel;
+    public EntryInfoViewModel EntryInfoViewModel { get; }
+
     public override async Task OnNavigating(WorkshopDetailParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
     {
         if (Entry?.Id != parameters.EntryId)
@@ -50,15 +50,19 @@ public partial class PluginDetailsViewModel : RoutableHostScreen<RoutableScreen,
 
     private async Task GetEntry(long entryId, CancellationToken cancellationToken)
     {
+        Task grace = Task.Delay(300, cancellationToken);
         IOperationResult<IGetPluginEntryByIdResult> result = await _client.GetPluginEntryById.ExecuteAsync(entryId, cancellationToken);
         if (result.IsErrorResult())
             return;
 
+        // Let the UI settle to avoid lag when deep linking
+        await grace;
+        
         Entry = result.Data?.Entry;
-        EntryInfoViewModel = Entry != null ? _getEntryInfoViewModel(Entry) : null;
+        EntryInfoViewModel.SetEntry(Entry);
         EntryReleasesViewModel = Entry != null ? _getEntryReleasesViewModel(Entry) : null;
         EntryImagesViewModel = Entry != null ? _getEntryImagesViewModel(Entry) : null;
 
-        await PluginDescriptionViewModel.SetEntry(Entry, cancellationToken);
+        await _pluginDescriptionViewModel.SetEntry(Entry, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs
index ac248f205..f5d9d54c1 100644
--- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginListView.axaml.cs
@@ -11,7 +11,8 @@ public partial class PluginListView : ReactiveUserControl<PluginListViewModel>
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.EntryListViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Plugins/PluginListViewModel.cs b/src/Artemis.UI/Screens/Workshop/Plugins/PluginListViewModel.cs
index a5e1216ec..7401c2659 100644
--- a/src/Artemis.UI/Screens/Workshop/Plugins/PluginListViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Plugins/PluginListViewModel.cs
@@ -6,11 +6,12 @@ namespace Artemis.UI.Screens.Workshop.Plugins;
 
 public class PluginListViewModel : RoutableHostScreen<RoutableScreen>
 {
-    public EntryListViewModel EntryListViewModel { get; }
+    private readonly EntryListViewModel _entryListViewModel;
+    public override RoutableScreen DefaultScreen => _entryListViewModel;
 
     public PluginListViewModel(EntryListViewModel entryListViewModel)
     {
-        EntryListViewModel = entryListViewModel;
-        EntryListViewModel.EntryType = EntryType.Plugin;
+        _entryListViewModel = entryListViewModel;
+        _entryListViewModel.EntryType = EntryType.Plugin;
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml
index 9e5c41be6..b6d9a52b0 100644
--- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml
@@ -3,7 +3,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:profile="clr-namespace:Artemis.UI.Screens.Workshop.Profile"
-             xmlns:mdxaml="https://github.com/whistyun/Markdown.Avalonia.Tight"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:ui="clr-namespace:Artemis.UI"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="800"
@@ -14,7 +13,7 @@
             <Border Classes="card" VerticalAlignment="Top">
                 <ContentControl Content="{CompiledBinding EntryInfoViewModel}" />
             </Border>
-            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.Releases.Count}">
+            <Border Classes="card" VerticalAlignment="Top" IsVisible="{CompiledBinding Entry.Releases.Count, FallbackValue=False}">
                 <ContentControl Content="{CompiledBinding EntryReleasesViewModel}" />
             </Border>
         </StackPanel>
@@ -27,6 +26,6 @@
             </controls:Frame>
         </ScrollViewer>
 
-        <ContentControl Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count}" Content="{CompiledBinding EntryImagesViewModel}" />
+        <ContentControl Grid.Row="1" Grid.Column="2" IsVisible="{CompiledBinding Entry.Images.Count, FallbackValue=False}" Content="{CompiledBinding EntryImagesViewModel}" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs
index 7a1898ac4..38b60575c 100644
--- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml.cs
@@ -11,7 +11,8 @@ public partial class ProfileDetailsView : ReactiveUserControl<ProfileDetailsView
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.ProfileDescriptionViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs
index bd08e49d9..e9b8480a2 100644
--- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsViewModel.cs
@@ -17,32 +17,32 @@ namespace Artemis.UI.Screens.Workshop.Profile;
 public partial class ProfileDetailsViewModel : RoutableHostScreen<RoutableScreen, WorkshopDetailParameters>
 {
     private readonly IWorkshopClient _client;
-    private readonly Func<IEntryDetails, EntryInfoViewModel> _getEntryInfoViewModel;
+    private readonly ProfileDescriptionViewModel _profileDescriptionViewModel;
     private readonly Func<IEntryDetails, EntryReleasesViewModel> _getEntryReleasesViewModel;
     private readonly Func<IEntryDetails, EntryImagesViewModel> _getEntryImagesViewModel;
 
     [Notify] private IEntryDetails? _entry;
-    [Notify] private EntryInfoViewModel? _entryInfoViewModel;
     [Notify] private EntryReleasesViewModel? _entryReleasesViewModel;
     [Notify] private EntryImagesViewModel? _entryImagesViewModel;
 
     public ProfileDetailsViewModel(IWorkshopClient client,
         ProfileDescriptionViewModel profileDescriptionViewModel,
-        Func<IEntryDetails, EntryInfoViewModel> getEntryInfoViewModel,
+        EntryInfoViewModel entryInfoViewModel,
         Func<IEntryDetails, EntryReleasesViewModel> getEntryReleasesViewModel,
         Func<IEntryDetails, EntryImagesViewModel> getEntryImagesViewModel)
     {
         _client = client;
-        _getEntryInfoViewModel = getEntryInfoViewModel;
+        _profileDescriptionViewModel = profileDescriptionViewModel;
         _getEntryReleasesViewModel = getEntryReleasesViewModel;
         _getEntryImagesViewModel = getEntryImagesViewModel;
 
-        ProfileDescriptionViewModel = profileDescriptionViewModel;
+        EntryInfoViewModel = entryInfoViewModel;
         RecycleScreen = false;
     }
 
-    public ProfileDescriptionViewModel ProfileDescriptionViewModel { get; }
-
+    public override RoutableScreen DefaultScreen => _profileDescriptionViewModel;
+    public EntryInfoViewModel EntryInfoViewModel { get; }
+    
     public override async Task OnNavigating(WorkshopDetailParameters parameters, NavigationArguments args, CancellationToken cancellationToken)
     {
         if (Entry?.Id != parameters.EntryId)
@@ -51,15 +51,19 @@ public partial class ProfileDetailsViewModel : RoutableHostScreen<RoutableScreen
 
     private async Task GetEntry(long entryId, CancellationToken cancellationToken)
     {
+        Task grace = Task.Delay(300, cancellationToken);
         IOperationResult<IGetEntryByIdResult> result = await _client.GetEntryById.ExecuteAsync(entryId, cancellationToken);
         if (result.IsErrorResult())
             return;
 
+        // Let the UI settle to avoid lag when deep linking
+        await grace;
+        
         Entry = result.Data?.Entry;
-        EntryInfoViewModel = Entry != null ? _getEntryInfoViewModel(Entry) : null;
+        EntryInfoViewModel.SetEntry(Entry);
         EntryReleasesViewModel = Entry != null ? _getEntryReleasesViewModel(Entry) : null;
         EntryImagesViewModel = Entry != null ? _getEntryImagesViewModel(Entry) : null;
 
-        await ProfileDescriptionViewModel.SetEntry(Entry, cancellationToken);
+        await _profileDescriptionViewModel.SetEntry(Entry, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs
index 637a255a6..1d7abe1ce 100644
--- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs
+++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileListView.axaml.cs
@@ -11,7 +11,8 @@ public partial class ProfileListView : ReactiveUserControl<ProfileListViewModel>
     {
         InitializeComponent();
         this.WhenActivated(d => ViewModel.WhenAnyValue(vm => vm.Screen)
-            .Subscribe(screen => RouterFrame.NavigateFromObject(screen ?? ViewModel?.EntryListViewModel))
+            .WhereNotNull()
+            .Subscribe(screen => RouterFrame.NavigateFromObject(screen))
             .DisposeWith(d));
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileListViewModel.cs b/src/Artemis.UI/Screens/Workshop/Profile/ProfileListViewModel.cs
index f012bf65c..75faa19a1 100644
--- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileListViewModel.cs
+++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileListViewModel.cs
@@ -6,11 +6,12 @@ namespace Artemis.UI.Screens.Workshop.Profile;
 
 public class ProfileListViewModel : RoutableHostScreen<RoutableScreen>
 {
-    public EntryListViewModel EntryListViewModel { get; }
+    private readonly EntryListViewModel _entryListViewModel;
+    public override RoutableScreen DefaultScreen => _entryListViewModel;
 
     public ProfileListViewModel(EntryListViewModel entryListViewModel)
     {
-        EntryListViewModel = entryListViewModel;
-        EntryListViewModel.EntryType = EntryType.Profile;
+        _entryListViewModel = entryListViewModel;
+        _entryListViewModel.EntryType = EntryType.Profile;
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.WebClient.Workshop/Extensions/EntryExtensions.cs b/src/Artemis.WebClient.Workshop/Extensions/EntryExtensions.cs
new file mode 100644
index 000000000..d901b1865
--- /dev/null
+++ b/src/Artemis.WebClient.Workshop/Extensions/EntryExtensions.cs
@@ -0,0 +1,9 @@
+namespace Artemis.WebClient.Workshop.Extensions;
+
+public static class EntryExtensions
+{
+    public static string GetEntryPath(this IEntryDetails entry)
+    {
+        return $"workshop/entries/{entry.EntryType.ToString().ToLower()}s/details/{entry.Id}";
+    }
+}
\ No newline at end of file