diff --git a/LRReader.Shared/ApiConnection.cs b/LRReader.Shared/ApiConnection.cs
index cd340501..f94db9ad 100644
--- a/LRReader.Shared/ApiConnection.cs
+++ b/LRReader.Shared/ApiConnection.cs
@@ -202,7 +202,7 @@ public static async Task<GenericApiResult> GetError(this RestResponse restRespon
 			}
 		}*/
 
-		private static void ShowNotification(string title, string? content) => WeakReferenceMessenger.Default.Send(new ShowNotification(title, content));
+		private static void ShowNotification(string title, string? content) => WeakReferenceMessenger.Default.Send(new ShowNotification(title, content, severity: NotificationSeverity.Error));
 	}
 
 }
diff --git a/LRReader.Shared/Messages/Events.cs b/LRReader.Shared/Messages/Events.cs
index d547b23e..843e4a5f 100644
--- a/LRReader.Shared/Messages/Events.cs
+++ b/LRReader.Shared/Messages/Events.cs
@@ -20,16 +20,24 @@ public struct Notification
 		public string? Content { get; }
 		public int Duration { get; }
 
-		public Notification(string title, string? content, int duration)
+		public NotificationSeverity Severity { get; }
+
+		public Notification(string title, string? content, int duration, NotificationSeverity severity = NotificationSeverity.Informational)
 		{
 			Title = title;
 			Content = content;
 			Duration = duration;
+			Severity = severity;
 		}
 	}
 
+	public enum NotificationSeverity
+	{
+		Informational, Success, Warning, Error
+	}
+
 	public class ShowNotification : ValueChangedMessage<Notification>
 	{
-		public ShowNotification(string title, string? content, int duration = 5000) : base(new Notification(title, content, duration)) { }
+		public ShowNotification(string title, string? content, int duration = 5000, NotificationSeverity severity = NotificationSeverity.Informational) : base(new Notification(title, content, duration, severity)) { }
 	}
 }
diff --git a/LRReader.Shared/Models/Main/Archive.cs b/LRReader.Shared/Models/Main/Archive.cs
index 8ad28efe..ffa08f2c 100644
--- a/LRReader.Shared/Models/Main/Archive.cs
+++ b/LRReader.Shared/Models/Main/Archive.cs
@@ -22,6 +22,7 @@ public class Archive : IEquatable<Archive>
 		public string title { get; set; } = null!;
 		public int pagecount { get; set; }
 		public int progress { get; set; }
+		public  int? lastreadtime { get; set; }
 		[JsonIgnore]
 		public string TagsClean { get; set; } = null!;
 		[JsonIgnore]
diff --git a/LRReader.Shared/Providers/ArchivesProvider.cs b/LRReader.Shared/Providers/ArchivesProvider.cs
index 2894e36a..3fedc1b1 100644
--- a/LRReader.Shared/Providers/ArchivesProvider.cs
+++ b/LRReader.Shared/Providers/ArchivesProvider.cs
@@ -110,7 +110,7 @@ public static async Task<bool> Validate()
 
 			if (!string.IsNullOrEmpty(r.ErrorMessage))
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification("Network Error", r.ErrorMessage));
+				WeakReferenceMessenger.Default.Send(new ShowNotification("Network Error", r.ErrorMessage, severity: NotificationSeverity.Error));
 				return null;
 			}
 			switch (r.StatusCode)
@@ -128,7 +128,7 @@ public static async Task<bool> Validate()
 					return download;
 				default:
 					var error = await r.GetError();
-					WeakReferenceMessenger.Default.Send(new ShowNotification(error.operation, error.error));
+					WeakReferenceMessenger.Default.Send(new ShowNotification(error.operation, error.error, severity: NotificationSeverity.Error));
 					return null;
 			}
 		}
diff --git a/LRReader.Shared/Providers/CategoriesProvider.cs b/LRReader.Shared/Providers/CategoriesProvider.cs
index 6777bca9..87c72e6f 100644
--- a/LRReader.Shared/Providers/CategoriesProvider.cs
+++ b/LRReader.Shared/Providers/CategoriesProvider.cs
@@ -54,7 +54,7 @@ public static async Task<bool> Validate()
 
 			if (!string.IsNullOrEmpty(r.ErrorMessage))
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification("Network Error", r.ErrorMessage));
+				WeakReferenceMessenger.Default.Send(new ShowNotification("Network Error", r.ErrorMessage, severity: NotificationSeverity.Error));
 				return null;
 			}
 			if (result.OK)
@@ -63,7 +63,7 @@ public static async Task<bool> Validate()
 			}
 			else
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification(result?.Error?.operation ?? "", result?.Error?.error));
+				WeakReferenceMessenger.Default.Send(new ShowNotification(result?.Error?.operation ?? "", result?.Error?.error, severity: NotificationSeverity.Error));
 				return null;
 			}
 		}
diff --git a/LRReader.Shared/Providers/DatabaseProvider.cs b/LRReader.Shared/Providers/DatabaseProvider.cs
index 6a7e6dd0..1f7700d3 100644
--- a/LRReader.Shared/Providers/DatabaseProvider.cs
+++ b/LRReader.Shared/Providers/DatabaseProvider.cs
@@ -72,7 +72,7 @@ public static async Task<bool> DropDatabase()
 
 			if (!string.IsNullOrEmpty(r.ErrorMessage))
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification("Network Error", r.ErrorMessage));
+				WeakReferenceMessenger.Default.Send(new ShowNotification("Network Error", r.ErrorMessage, severity: NotificationSeverity.Error));
 				return null;
 			}
 			switch (r.StatusCode)
@@ -85,7 +85,7 @@ public static async Task<bool> DropDatabase()
 					return download;
 				default:
 					var error = await r.GetError();
-					WeakReferenceMessenger.Default.Send(new ShowNotification(error.operation, error.error));
+					WeakReferenceMessenger.Default.Send(new ShowNotification(error.operation, error.error, severity: NotificationSeverity.Error));
 					return null;
 			}
 		}
diff --git a/LRReader.Shared/Services/Archives.cs b/LRReader.Shared/Services/Archives.cs
index 2af79cb7..c7231a7c 100644
--- a/LRReader.Shared/Services/Archives.cs
+++ b/LRReader.Shared/Services/Archives.cs
@@ -140,7 +140,7 @@ public async Task<bool> DeleteArchive(string id)
 			var result = await ArchivesProvider.DeleteArchive(id);
 			if (result == null)
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification("Unable to delete archive", "", 0));
+				WeakReferenceMessenger.Default.Send(new ShowNotification("Unable to delete archive", "", 0, NotificationSeverity.Error));
 				return false;
 			}
 			if (result.success)
@@ -154,7 +154,7 @@ public async Task<bool> DeleteArchive(string id)
 			}
 			else
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification("An error ocurred while deleting archive", "Metadata has been deleted, remove file manually.", 0));
+				WeakReferenceMessenger.Default.Send(new ShowNotification("An error ocurred while deleting archive", "Metadata has been deleted, remove file manually.", 0, NotificationSeverity.Warning));
 			}
 			return true;
 		}
diff --git a/LRReader.Shared/ViewModels/ArchiveEditViewModel.cs b/LRReader.Shared/ViewModels/ArchiveEditViewModel.cs
index 20de108d..84998d82 100644
--- a/LRReader.Shared/ViewModels/ArchiveEditViewModel.cs
+++ b/LRReader.Shared/ViewModels/ArchiveEditViewModel.cs
@@ -195,7 +195,7 @@ private async Task UsePlugin()
 					}
 					else
 					{
-						WeakReferenceMessenger.Default.Send(new ShowNotification("Error while fetching tags", result.error, 0));
+						WeakReferenceMessenger.Default.Send(new ShowNotification("Error while fetching tags", result.error, 0, NotificationSeverity.Error));
 					}
 				}
 				Saving = false;
diff --git a/LRReader.Shared/ViewModels/ArchivesPageViewModel.cs b/LRReader.Shared/ViewModels/ArchivesPageViewModel.cs
index e764fb7d..12fbf178 100644
--- a/LRReader.Shared/ViewModels/ArchivesPageViewModel.cs
+++ b/LRReader.Shared/ViewModels/ArchivesPageViewModel.cs
@@ -55,7 +55,7 @@ public void LoadBookmarks()
 					if (archive != null)
 						Archives.OpenTab(archive, false);
 					else
-						WeakReferenceMessenger.Default.Send(new ShowNotification("Bookmarked Archive with ID[" + b.archiveID + "] not found.", ""));
+						WeakReferenceMessenger.Default.Send(new ShowNotification("Bookmarked Archive with ID[" + b.archiveID + "] not found.", "", severity: NotificationSeverity.Warning));
 				}
 			Settings.Profile.MarkedAsNonDuplicated.RemoveAll(hit => !(Archives.HasArchive(hit.Left) && Archives.HasArchive(hit.Right)));
 		}
diff --git a/LRReader.Shared/ViewModels/SettingsPageViewModel.cs b/LRReader.Shared/ViewModels/SettingsPageViewModel.cs
index 918bb756..4038a038 100644
--- a/LRReader.Shared/ViewModels/SettingsPageViewModel.cs
+++ b/LRReader.Shared/ViewModels/SettingsPageViewModel.cs
@@ -272,7 +272,7 @@ public async Task CheckThumbnailJob()
 			}
 			if (status.state!.Equals("finished"))
 			{
-				WeakReferenceMessenger.Default.Send(new ShowNotification("Thumbnail generation completed", ""));
+				WeakReferenceMessenger.Default.Send(new ShowNotification("Thumbnail generation completed", "", severity: NotificationSeverity.Informational));
 				thumbnailJob = null;
 			}
 		}
diff --git a/LRReader.UWP.Installer/LRReader.UWP.Installer.csproj b/LRReader.UWP.Installer/LRReader.UWP.Installer.csproj
index 4179d967..fbb6cd50 100644
--- a/LRReader.UWP.Installer/LRReader.UWP.Installer.csproj
+++ b/LRReader.UWP.Installer/LRReader.UWP.Installer.csproj
@@ -31,7 +31,7 @@
       <Version>5.7.0</Version>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.755" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.2428" />
     <PackageReference Include="WPF-UI">
       <Version>3.0.0-preview.8</Version>
     </PackageReference>
diff --git a/LRReader.UWP/App.xaml b/LRReader.UWP/App.xaml
index 221978b4..8554039b 100644
--- a/LRReader.UWP/App.xaml
+++ b/LRReader.UWP/App.xaml
@@ -11,7 +11,6 @@
 					<controls:XamlControlsResources.MergedDictionaries>
 						<ResourceDictionary Source="ms-appx:///Resources/ThemeDictionary.xaml" />
 						<ResourceDictionary Source="ms-appx:///Resources/Converters.xaml" />
-						<ResourceDictionary Source="ms-appx:///Resources/NotificationStyle.xaml" />
 						<ResourceDictionary Source="ms-appx:///Resources/WinUITemplates.xaml" />
 						<Templates xmlns="using:LRReader.UWP.Resources" />
 					</controls:XamlControlsResources.MergedDictionaries>
diff --git a/LRReader.UWP/LRReader.UWP.csproj b/LRReader.UWP/LRReader.UWP.csproj
index 16131f5d..671313a6 100644
--- a/LRReader.UWP/LRReader.UWP.csproj
+++ b/LRReader.UWP/LRReader.UWP.csproj
@@ -30,7 +30,7 @@
     <AppxPackageSigningTimestampServerUrl>http://timestamp.digicert.com</AppxPackageSigningTimestampServerUrl>
     <Win32Resource>Resources\MiddleClickScrolling-CursorType.res</Win32Resource>
     <Nullable>enable</Nullable>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -161,6 +161,9 @@
     <Compile Include="Services\Dispatcher.cs" />
     <Compile Include="Services\Updates.cs" />
     <Compile Include="Util\IgnoreFocusKeyboardAccelerator.cs" />
+    <Compile Include="Views\Content\Empty.xaml.cs">
+      <DependentUpon>Empty.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Content\Settings\Feedback.xaml.cs">
       <DependentUpon>Feedback.xaml</DependentUpon>
     </Compile>
@@ -182,6 +185,9 @@
     <Compile Include="Views\Content\Tools\Main.xaml.cs">
       <DependentUpon>Main.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Content\WebContent.xaml.cs">
+      <DependentUpon>WebContent.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Controls\ArchiveTags.xaml.cs">
       <DependentUpon>ArchiveTags.xaml</DependentUpon>
     </Compile>
@@ -229,9 +235,6 @@
       <DependentUpon>CategoryItem.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Items\GenericArchiveItem.cs" />
-    <Compile Include="Views\Items\NotificationItem.xaml.cs">
-      <DependentUpon>NotificationItem.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\Items\ReaderImage.xaml.cs">
       <DependentUpon>ReaderImage.xaml</DependentUpon>
     </Compile>
@@ -416,6 +419,9 @@
     <PackageReference Include="CommunityToolkit.Uwp.Animations">
       <Version>8.0.230907</Version>
     </PackageReference>
+    <PackageReference Include="CommunityToolkit.Uwp.Behaviors">
+      <Version>8.0.230907</Version>
+    </PackageReference>
     <PackageReference Include="CommunityToolkit.Uwp.Controls.Primitives">
       <Version>8.0.230907</Version>
     </PackageReference>
@@ -437,12 +443,6 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Core">
-      <Version>7.1.3</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Layout">
-      <Version>7.1.3</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown">
       <Version>7.1.3</Version>
     </PackageReference>
@@ -472,10 +472,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Resources\NotificationStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Resources\Templates.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -488,6 +484,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Content\Empty.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Content\Settings\Feedback.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -516,6 +516,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Content\WebContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Controls\ArchiveTags.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -568,10 +572,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\Items\NotificationItem.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\Items\ReaderImage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/LRReader.UWP/Resources/NotificationStyle.xaml b/LRReader.UWP/Resources/NotificationStyle.xaml
deleted file mode 100644
index bf207a93..00000000
--- a/LRReader.UWP/Resources/NotificationStyle.xaml
+++ /dev/null
@@ -1,206 +0,0 @@
-<ResourceDictionary
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls">
-
-	<ResourceDictionary.ThemeDictionaries>
-		<!--
-			Default is a fallback if a more precise theme isn't called
-			out below
-		-->
-		<ResourceDictionary x:Key="Default">
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush" Color="Transparent" />
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush" Color="{ThemeResource SystemBaseMediumColor}" />
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerPressedForegroundBrush" Color="{ThemeResource SystemBaseHighColor}" />
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush" Color="Transparent" />
-		</ResourceDictionary>
-
-		<!--  HighContrast is used in all high contrast themes  -->
-		<ResourceDictionary x:Key="HighContrast">
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverChromeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerOverForegroundBrush" Color="{ThemeResource SystemBaseHighColor}" />
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationPointerPressedForegroundBrush" Color="{ThemeResource SystemBaseHighColor}" />
-			<SolidColorBrush x:Key="SystemControlMSEdgeNotificationButtonBorderBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
-		</ResourceDictionary>
-	</ResourceDictionary.ThemeDictionaries>
-
-	<Thickness x:Key="SystemControlMSEdgeNotificationDismissButtonMargin">24,0,0,0</Thickness>
-	<x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonSize">32</x:Double>
-	<x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonTranslate">18</x:Double>
-	<Thickness x:Key="SystemControlMSEdgeNotificationButtonBorderThickness">2</Thickness>
-
-	<Style x:Key="DismissTextBlockButtonStyle" TargetType="ButtonBase">
-		<Setter Property="Background" Value="{ThemeResource HyperlinkButtonBackground}" />
-		<Setter Property="Foreground" Value="{ThemeResource ApplicationForegroundThemeBrush}" />
-		<Setter Property="Width" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
-		<Setter Property="Height" Value="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" />
-		<Setter Property="UseSystemFocusVisuals" Value="True" />
-		<Setter Property="HighContrastAdjustment" Value="None" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ButtonBase">
-					<Grid
-						x:Name="RootGrid"
-						Width="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}"
-						Height="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}"
-						Margin="{TemplateBinding Margin}"
-						CornerRadius="2">
-						<Border x:Name="TextBorder" BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}" BorderThickness="{StaticResource SystemControlMSEdgeNotificationButtonBorderThickness}">
-							<ContentPresenter
-								x:Name="Text"
-								HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-								VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-								AutomationProperties.AccessibilityView="Raw"
-								Content="{TemplateBinding Content}" />
-						</Border>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="PointerOver">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPointerOverBackgroundThemeBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Pressed">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverChromeBrush}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Disabled">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonForegroundDisabled}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Background">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBackgroundDisabled}" />
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="BorderBrush">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource HyperlinkButtonBorderBrushDisabled}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-	<ControlTemplate x:Key="CustomNotificationTemplate" TargetType="local:InAppNotification">
-		<Grid>
-			<Grid
-				x:Name="RootGrid"
-				MaxWidth="{TemplateBinding MaxWidth}"
-				Margin="{TemplateBinding Margin}"
-				Padding="{TemplateBinding Padding}"
-				Background="{TemplateBinding Background}"
-				BorderBrush="{TemplateBinding BorderBrush}"
-				BorderThickness="{TemplateBinding BorderThickness}"
-				CornerRadius="{TemplateBinding CornerRadius}"
-				RenderTransformOrigin="{TemplateBinding RenderTransformOrigin}"
-				Visibility="{TemplateBinding Visibility}">
-
-				<Grid.RenderTransform>
-					<CompositeTransform />
-				</Grid.RenderTransform>
-
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="40" />
-				</Grid.ColumnDefinitions>
-
-				<ContentPresenter
-					x:Name="PART_Presenter" Grid.Column="0"
-					HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-					VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-					HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center"
-					ContentTransitions="{TemplateBinding ContentTransitions}"
-					FontWeight="SemiBold" TextWrapping="WrapWholeWords" />
-
-				<Button
-					x:Name="PART_DismissButton" Grid.Column="1" Margin="0"
-					VerticalAlignment="Center" AutomationProperties.Name="Dismiss" Content="&#xE894;"
-					CornerRadius="2" FontFamily="{StaticResource SymbolThemeFontFamily}" FontSize="12"
-					Style="{StaticResource DismissTextBlockButtonStyle}">
-					<Button.RenderTransform>
-						<TranslateTransform x:Name="DismissButtonTransform" X="25" Y="0" />
-					</Button.RenderTransform>
-				</Button>
-			</Grid>
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="State">
-					<VisualState x:Name="Collapsed">
-						<Storyboard>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
-								<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-								<EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" Value="{Binding HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-							</DoubleAnimationUsingKeyFrames>
-
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-								<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-								<EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" Value="{Binding VerticalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-							</DoubleAnimationUsingKeyFrames>
-
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="(UIElement.Visibility)">
-								<DiscreteObjectKeyFrame KeyTime="0">
-									<DiscreteObjectKeyFrame.Value>
-										<Visibility>Visible</Visibility>
-									</DiscreteObjectKeyFrame.Value>
-								</DiscreteObjectKeyFrame>
-								<DiscreteObjectKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}">
-									<DiscreteObjectKeyFrame.Value>
-										<Visibility>Collapsed</Visibility>
-									</DiscreteObjectKeyFrame.Value>
-								</DiscreteObjectKeyFrame>
-							</ObjectAnimationUsingKeyFrames>
-						</Storyboard>
-					</VisualState>
-
-					<VisualState x:Name="Visible">
-						<Storyboard>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateX)">
-								<EasingDoubleKeyFrame KeyTime="0" Value="{Binding HorizontalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-								<EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="(UIElement.RenderTransform).(CompositeTransform.TranslateY)">
-								<EasingDoubleKeyFrame KeyTime="0" Value="{Binding VerticalOffset, RelativeSource={RelativeSource TemplatedParent}}" />
-								<EasingDoubleKeyFrame local:InAppNotification.KeyFrameDuration="{Binding AnimationDuration, RelativeSource={RelativeSource TemplatedParent}}" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</VisualState>
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-		</Grid>
-	</ControlTemplate>
-
-	<Style x:Key="CustomNotificationStyle" TargetType="local:InAppNotification">
-		<Setter Property="Background" Value="{ThemeResource AcrylicInAppFillColorDefaultBrush}" />
-		<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-		<Setter Property="BorderBrush" Value="{ThemeResource SurfaceStrokeColorFlyoutBrush}" />
-		<Setter Property="Visibility" Value="Collapsed" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Bottom" />
-		<Setter Property="MinHeight" Value="55" />
-		<Setter Property="FontSize" Value="14" />
-		<Setter Property="RenderTransformOrigin" Value="0.5,1" />
-		<Setter Property="Margin" Value="24,12" />
-		<Setter Property="Padding" Value="24,12" />
-		<Setter Property="MaxWidth" Value="960" />
-		<Setter Property="MinWidth" Value="132" />
-		<Setter Property="AnimationDuration" Value="0:0:0.100" />
-		<Setter Property="VerticalOffset" Value="100" />
-		<Setter Property="HorizontalOffset" Value="0" />
-		<Setter Property="CornerRadius" Value="4" />
-		<Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
-		<Setter x:Uid="WCT_InAppNotification_LandmarkProperty" Property="AutomationProperties.LocalizedLandmarkType" Value="Notification" />
-		<Setter Property="AutomationProperties.LiveSetting" Value="Assertive" />
-		<Setter Property="Template" Value="{StaticResource CustomNotificationTemplate}" />
-	</Style>
-</ResourceDictionary>
diff --git a/LRReader.UWP/Resources/ThemeDictionary.xaml b/LRReader.UWP/Resources/ThemeDictionary.xaml
index b225ef3d..0eb77a27 100644
--- a/LRReader.UWP/Resources/ThemeDictionary.xaml
+++ b/LRReader.UWP/Resources/ThemeDictionary.xaml
@@ -10,10 +10,11 @@
 		<ResourceDictionary x:Key="Light">
 			<Color x:Key="MicaFallback">White</Color>
 			<Color x:Key="BrushDeepBackgroundColor">White</Color>
-			<muxcm:AcrylicBrush
+			<SolidColorBrush x:Key="GridOverGridBackground" Color="#E5E5E5" />
+			<!--<muxcm:AcrylicBrush
 				x:Key="GridOverGridBackground" BackgroundSource="Backdrop" FallbackColor="#E5E5E5"
 				TintColor="{StaticResource BrushDeepBackgroundColor}"
-				TintOpacity="0.6" />
+				TintOpacity="0.6" />-->
 			<Color x:Key="ColorNavTop">#D0D0D0</Color>
 			<Color x:Key="BrushItemGridBackgroundColor">#B3FFFFFF</Color>
 			<SolidColorBrush x:Key="BrushItemGridBackground" Color="{ThemeResource ControlFillColorDefault}" />
@@ -30,10 +31,11 @@
 		<ResourceDictionary x:Key="Dark">
 			<Color x:Key="MicaFallback">Black</Color>
 			<Color x:Key="BrushDeepBackgroundColor">#0a0a0a</Color>
-			<muxcm:AcrylicBrush
+			<SolidColorBrush x:Key="GridOverGridBackground" Color="#1f1f1f" />
+			<!--<muxcm:AcrylicBrush
 				x:Key="GridOverGridBackground" BackgroundSource="Backdrop" FallbackColor="#1f1f1f"
 				TintColor="{StaticResource BrushDeepBackgroundColor}"
-				TintOpacity="0.6" />
+				TintOpacity="0.6" />-->
 			<Color x:Key="ColorNavTop">#151515</Color>
 			<Color x:Key="BrushItemGridBackgroundColor">#0FFFFFFF</Color>
 			<SolidColorBrush x:Key="BrushItemGridBackground" Color="{ThemeResource ControlFillColorDefault}" />
diff --git a/LRReader.UWP/Resources/WinUITemplates.xaml b/LRReader.UWP/Resources/WinUITemplates.xaml
index 04941845..9d7dcef9 100644
--- a/LRReader.UWP/Resources/WinUITemplates.xaml
+++ b/LRReader.UWP/Resources/WinUITemplates.xaml
@@ -9,6 +9,8 @@
 	<!--  https://github.com/microsoft/microsoft-ui-xaml/blob/main/dev/CommonStyles/GridViewItem_themeresources_21h1.xaml  -->
 	<ResourceDictionary.ThemeDictionaries>
 		<ResourceDictionary x:Key="Default">
+			<SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#2B2B2B"/>
+
 			<CornerRadius x:Key="GridViewItemCornerRadius">4</CornerRadius>
 			<CornerRadius x:Key="GridViewItemCheckBoxCornerRadius">3</CornerRadius>
 			<Thickness x:Key="GridViewItemSelectedBorderThickness">2</Thickness>
@@ -125,6 +127,8 @@
 			-->
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="HighContrast">
+			<SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="{ThemeResource SystemColorWindowColor}"/>
+
 			<CornerRadius x:Key="GridViewItemCornerRadius">4</CornerRadius>
 			<CornerRadius x:Key="GridViewItemCheckBoxCornerRadius">3</CornerRadius>
 			<Thickness x:Key="GridViewItemSelectedBorderThickness">2</Thickness>
@@ -241,6 +245,8 @@
 			-->
 		</ResourceDictionary>
 		<ResourceDictionary x:Key="Light">
+			<SolidColorBrush x:Key="InfoBarInformationalSeverityBackgroundBrush" Color="#F2F2F2"/>
+
 			<CornerRadius x:Key="GridViewItemCornerRadius">4</CornerRadius>
 			<CornerRadius x:Key="GridViewItemCheckBoxCornerRadius">3</CornerRadius>
 			<Thickness x:Key="GridViewItemSelectedBorderThickness">2</Thickness>
diff --git a/LRReader.UWP/Services/Updates.cs b/LRReader.UWP/Services/Updates.cs
index 1f17fc13..447a0732 100644
--- a/LRReader.UWP/Services/Updates.cs
+++ b/LRReader.UWP/Services/Updates.cs
@@ -136,9 +136,9 @@ public override async Task<UpdateResult> DownloadAndInstall(IProgress<double> pr
 			Logger.LogInformation("Download and install");
 			try
 			{
-				Logger.LogInformation("Source: {0}", check?.Link);
+				Logger.LogInformation("Source: {0}", check.Link);
 				var pm = new PackageManager();
-				var downloadTask = pm.AddPackageByAppInstallerFileAsync(new Uri(check?.Link), AddPackageByAppInstallerOptions.ForceTargetAppShutdown, pm.GetDefaultPackageVolume());
+				var downloadTask = pm.AddPackageByAppInstallerFileAsync(new Uri(check.Link), AddPackageByAppInstallerOptions.ForceTargetAppShutdown, pm.GetDefaultPackageVolume());
 				downloadTask.Progress = (info, prog) => progress?.Report(prog.percentage / 100d);
 				var result = await downloadTask.AsTask();
 				if (result.IsRegistered)
diff --git a/LRReader.UWP/Views/Content/Empty.xaml b/LRReader.UWP/Views/Content/Empty.xaml
new file mode 100644
index 00000000..3e428c50
--- /dev/null
+++ b/LRReader.UWP/Views/Content/Empty.xaml
@@ -0,0 +1,8 @@
+<Page
+	x:Class="LRReader.UWP.Views.Content.Empty"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="using:LRReader.UWP.Views.Content"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d" />
diff --git a/LRReader.UWP/Views/Content/Empty.xaml.cs b/LRReader.UWP/Views/Content/Empty.xaml.cs
new file mode 100644
index 00000000..73f3bd82
--- /dev/null
+++ b/LRReader.UWP/Views/Content/Empty.xaml.cs
@@ -0,0 +1,12 @@
+using Windows.UI.Xaml.Controls;
+
+namespace LRReader.UWP.Views.Content
+{
+	public sealed partial class Empty : Page
+	{
+		public Empty()
+		{
+			this.InitializeComponent();
+		}
+	}
+}
diff --git a/LRReader.UWP/Views/Content/Settings/Server.xaml b/LRReader.UWP/Views/Content/Settings/Server.xaml
index 6aa23a12..adc10248 100644
--- a/LRReader.UWP/Views/Content/Settings/Server.xaml
+++ b/LRReader.UWP/Views/Content/Settings/Server.xaml
@@ -8,6 +8,7 @@
 	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 	xmlns:services="using:LRReader.Shared.Services"
 	xmlns:tools="using:LRReader.UWP.Views.Content.Tools"
+	xmlns:content="using:LRReader.UWP.Views.Content"
 	DataContext="{Binding SettingsPageInstance, Source={StaticResource Locator}}"
 	mc:Ignorable="d">
 
@@ -42,6 +43,7 @@
 							IsHitTestVisible="False" IsTabStop="False" />
 					</StackPanel>
 				</controls:ModernExpander>
+				<!--
 				<controls:ModernInput
 					x:Uid="/Settings/Server/Upload"
 					Command="{x:Bind Data.OpenWebTabCommand}"
@@ -67,6 +69,42 @@
 					Command="{x:Bind Data.OpenWebTabCommand}"
 					CommandParameter="/logs" Glyph="&#xeE94;" IsButton="True"
 					RightGlyph="&#xE8A7;" />
+				-->
+				<controls:ModernInput
+					x:Uid="/Settings/Server/Upload" Click="PageButton_Click" Glyph="&#xE898;"
+					IsButton="True" RightGlyph="&#xE76C;">
+					<controls:ModernInput.Tag>
+						<controls:ModernPageTabItem x:Uid="/Settings/Server/Upload" Page="content:WebContent" Parameter="/upload" />
+					</controls:ModernInput.Tag>
+				</controls:ModernInput>
+				<controls:ModernInput
+					x:Uid="/Settings/Server/Batch" Click="PageButton_Click" Glyph="&#xE9f5;"
+					IsButton="True" RightGlyph="&#xE76C;">
+					<controls:ModernInput.Tag>
+						<controls:ModernPageTabItem x:Uid="/Settings/Server/Batch" Page="content:WebContent" Parameter="/batch" />
+					</controls:ModernInput.Tag>
+				</controls:ModernInput>
+				<controls:ModernInput
+					x:Uid="/Settings/Server/Settings" Click="PageButton_Click" Glyph="&#xE713;"
+					IsButton="True" RightGlyph="&#xE76C;">
+					<controls:ModernInput.Tag>
+						<controls:ModernPageTabItem x:Uid="/Settings/Server/Settings" Page="content:WebContent" Parameter="/config" />
+					</controls:ModernInput.Tag>
+				</controls:ModernInput>
+				<controls:ModernInput
+					x:Uid="/Settings/Server/PluginSettings" Click="PageButton_Click" Glyph="&#xEA86;"
+					IsButton="True" RightGlyph="&#xE76C;">
+					<controls:ModernInput.Tag>
+						<controls:ModernPageTabItem x:Uid="/Settings/Server/PluginSettings" Page="content:WebContent" Parameter="/config/plugins" />
+					</controls:ModernInput.Tag>
+				</controls:ModernInput>
+				<controls:ModernInput
+					x:Uid="/Settings/Server/Logs" Click="PageButton_Click" Glyph="&#xeE94;"
+					IsButton="True" RightGlyph="&#xE76C;">
+					<controls:ModernInput.Tag>
+						<controls:ModernPageTabItem x:Uid="/Settings/Server/Logs" Page="content:WebContent" Parameter="/logs" />
+					</controls:ModernInput.Tag>
+				</controls:ModernInput>
 				<!--
 				<controls:ModernInput
 					x:Uid="/Tools/MainPage" Click="PageButton_Click" Glyph="&#xEC7A;"
diff --git a/LRReader.UWP/Views/Content/WebContent.xaml b/LRReader.UWP/Views/Content/WebContent.xaml
new file mode 100644
index 00000000..0ccff5ff
--- /dev/null
+++ b/LRReader.UWP/Views/Content/WebContent.xaml
@@ -0,0 +1,12 @@
+<controls:ModernBasePage
+	x:Class="LRReader.UWP.Views.Content.WebContent"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="using:LRReader.UWP.Views.Controls"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="using:LRReader.UWP.Views.Content"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	mc:Ignorable="d">
+
+	<controls:ModernWebView x:Name="WebView" />
+</controls:ModernBasePage>
diff --git a/LRReader.UWP/Views/Content/WebContent.xaml.cs b/LRReader.UWP/Views/Content/WebContent.xaml.cs
new file mode 100644
index 00000000..872122c2
--- /dev/null
+++ b/LRReader.UWP/Views/Content/WebContent.xaml.cs
@@ -0,0 +1,29 @@
+#nullable enable
+using LRReader.Shared.Services;
+using LRReader.UWP.Views.Controls;
+using Windows.UI.Xaml.Navigation;
+
+namespace LRReader.UWP.Views.Content
+{
+
+	public sealed partial class WebContent : ModernBasePage
+	{
+		public WebContent()
+		{
+			this.InitializeComponent();
+		}
+
+		protected override void OnNavigatedTo(NavigationEventArgs e)
+		{
+			base.OnNavigatedTo(e);
+			// Maybe make this more generic instead
+			WebView.Navigate(Service.Settings.Profile.ServerAddressBrowser + (string)Wrapper.Parameter!, "");
+		}
+
+		protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+		{
+			WebView.Close();
+			base.OnNavigatingFrom(e);
+		}
+	}
+}
diff --git a/LRReader.UWP/Views/Controls/ModernBasePage.cs b/LRReader.UWP/Views/Controls/ModernBasePage.cs
index af74d708..6342f6f5 100644
--- a/LRReader.UWP/Views/Controls/ModernBasePage.cs
+++ b/LRReader.UWP/Views/Controls/ModernBasePage.cs
@@ -7,18 +7,18 @@ namespace LRReader.UWP.Views.Controls
 	public class ModernBasePage : Page
 	{
 
-		protected ModernPageTab Page = null!;
+		protected ModernPageTabWrapper Wrapper = null!;
 
 		protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
 			base.OnNavigatedTo(e);
-			if (e.Parameter is ModernPageTab page && Page == null)
-				Page = page;
+			if (e.Parameter is ModernPageTabWrapper wrapper && Wrapper == null)
+				Wrapper = wrapper;
 		}
 
 		protected void PageButton_Click(object sender, RoutedEventArgs e)
 		{
-			Page.Navigate((ModernPageTabItem)((ModernInput)sender).Tag);
+			Wrapper.ModernPageTab.Navigate((ModernPageTabItem)((ModernInput)sender).Tag, (int)((Frame)Parent).Tag);
 		}
 	}
 }
diff --git a/LRReader.UWP/Views/Controls/ModernPageTab.xaml b/LRReader.UWP/Views/Controls/ModernPageTab.xaml
index 0b9d5728..8177132f 100644
--- a/LRReader.UWP/Views/Controls/ModernPageTab.xaml
+++ b/LRReader.UWP/Views/Controls/ModernPageTab.xaml
@@ -4,11 +4,11 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:converters="using:CommunityToolkit.WinUI.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:ext="using:LRReader.UWP.Extensions"
 	xmlns:local="using:LRReader.UWP.Views.Controls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 	xmlns:services="using:LRReader.Shared.Services"
-	xmlns:ext="using:LRReader.UWP.Extensions"
 	Loaded="UserControl_Loaded"
 	mc:Ignorable="d">
 
@@ -19,8 +19,10 @@
 	</UserControl.Resources>
 
 	<muxc:TwoPaneView
-		ext:TwoPaneViewExt.EnableDualScreen="{x:Bind services:Service.Platform.DualScreen}" Pane1Length="1*"
-		PanePriority="Pane1" TallModeConfiguration="SinglePane" WideModeConfiguration="RightLeft">
+		x:Name="TwoPane"
+		ext:TwoPaneViewExt.EnableDualScreen="{x:Bind services:Service.Platform.DualScreen}"
+		ModeChanged="TwoPane_ModeChanged" Pane1Length="1*" Pane2Length="1*"
+		PanePriority="Pane1" TallModeConfiguration="SinglePane" WideModeConfiguration="LeftRight">
 		<muxc:TwoPaneView.Pane1>
 			<Grid>
 				<Grid.RowDefinitions>
@@ -32,11 +34,11 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition />
 					</Grid.ColumnDefinitions>
-					<Button Click="{x:Bind GoBack}" IsEnabled="{x:Bind BreadcrumbItems.Count, Mode=OneWay, Converter={StaticResource DoubleToObjectConverter}}" Style="{ThemeResource WinUINavigationBackButtonNormalStyle}" />
+					<Button Click="{x:Bind GoBackMain}" IsEnabled="{x:Bind MainBreadcrumbItems.Count, Mode=OneWay, Converter={StaticResource DoubleToObjectConverter}}" Style="{ThemeResource WinUINavigationBackButtonNormalStyle}" />
 					<muxc:BreadcrumbBar
-						x:Name="Breadcrumb" Grid.Column="1" Margin="0,-3,0,0"
-						VerticalAlignment="Center" ItemClicked="Breadcrumb_ItemClicked"
-						ItemsSource="{x:Bind BreadcrumbItems}">
+						x:Name="MainBreadcrumb" Grid.Column="1" Margin="0,-3,0,0"
+						VerticalAlignment="Center" ItemClicked="MainBreadcrumb_ItemClicked"
+						ItemsSource="{x:Bind MainBreadcrumbItems}">
 						<muxc:BreadcrumbBar.ItemTemplate>
 							<DataTemplate x:DataType="local:ModernPageTabItem">
 								<TextBlock Margin="10,0" Text="{x:Bind Title}" />
@@ -44,7 +46,10 @@
 						</muxc:BreadcrumbBar.ItemTemplate>
 					</muxc:BreadcrumbBar>
 				</Grid>
-				<Frame x:Name="ContentFrame" Grid.Row="1" IsNavigationStackEnabled="False">
+				<Frame x:Name="ContentMain" Grid.Row="1" IsNavigationStackEnabled="False">
+					<Frame.Tag>
+						<x:Int32>0</x:Int32>
+					</Frame.Tag>
 					<Frame.ContentTransitions>
 						<TransitionCollection>
 							<PopupThemeTransition FromVerticalOffset="200" />
@@ -53,5 +58,40 @@
 				</Frame>
 			</Grid>
 		</muxc:TwoPaneView.Pane1>
+		<muxc:TwoPaneView.Pane2>
+			<Grid>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<Grid MaxWidth="1000" Margin="10">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition />
+					</Grid.ColumnDefinitions>
+					<Button Click="{x:Bind GoBackExtra}" IsEnabled="{x:Bind ExtraBreadcrumbItems.Count, Mode=OneWay, Converter={StaticResource DoubleToObjectConverter}}" Style="{ThemeResource WinUINavigationBackButtonNormalStyle}" />
+					<muxc:BreadcrumbBar
+					x:Name="ExtraBreadcrumb" Grid.Column="1" Margin="0,-3,0,0"
+					VerticalAlignment="Center" ItemClicked="ExtraBreadcrumb_ItemClicked"
+					ItemsSource="{x:Bind ExtraBreadcrumbItems}">
+						<muxc:BreadcrumbBar.ItemTemplate>
+							<DataTemplate x:DataType="local:ModernPageTabItem">
+								<TextBlock Margin="10,0" Text="{x:Bind Title}" />
+							</DataTemplate>
+						</muxc:BreadcrumbBar.ItemTemplate>
+					</muxc:BreadcrumbBar>
+				</Grid>
+				<Frame x:Name="ContentExtra" Grid.Row="1" IsNavigationStackEnabled="False">
+					<Frame.Tag>
+						<x:Int32>1</x:Int32>
+					</Frame.Tag>
+					<Frame.ContentTransitions>
+						<TransitionCollection>
+							<PopupThemeTransition FromVerticalOffset="200" />
+						</TransitionCollection>
+					</Frame.ContentTransitions>
+				</Frame>
+			</Grid>
+		</muxc:TwoPaneView.Pane2>
 	</muxc:TwoPaneView>
 </UserControl>
diff --git a/LRReader.UWP/Views/Controls/ModernPageTab.xaml.cs b/LRReader.UWP/Views/Controls/ModernPageTab.xaml.cs
index 1a81dcc4..7a61fdf6 100644
--- a/LRReader.UWP/Views/Controls/ModernPageTab.xaml.cs
+++ b/LRReader.UWP/Views/Controls/ModernPageTab.xaml.cs
@@ -2,16 +2,22 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using LRReader.UWP.Views.Content;
 using Microsoft.UI.Xaml.Controls;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using TwoPaneView = Microsoft.UI.Xaml.Controls.TwoPaneView;
+using TwoPaneViewMode = Microsoft.UI.Xaml.Controls.TwoPaneViewMode;
 
 namespace LRReader.UWP.Views.Controls
 {
 	public sealed partial class ModernPageTab : UserControl
 	{
 
-		private ObservableCollection<ModernPageTabItem> BreadcrumbItems = new ObservableCollection<ModernPageTabItem>();
+		private ObservableCollection<ModernPageTabItem> MainBreadcrumbItems = new ObservableCollection<ModernPageTabItem>();
+		private ObservableCollection<ModernPageTabItem> ExtraBreadcrumbItems = new ObservableCollection<ModernPageTabItem>();
+		private ModernPageTabItem? CurrentExtraPage;
+		private ModernPageTabItem? CurrentMainPage;
 
 		private bool _loaded;
 
@@ -38,36 +44,117 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
 				return;
 			_loaded = true;
 			if (Initial != null)
-				Navigate(new ModernPageTabItem { Title = Title, Page = Initial });
+				Navigate(new ModernPageTabItem { Title = Title, Page = Initial }, 0);
 		}
 
 		public bool GoBack()
 		{
-			if (BreadcrumbItems.Count > 1)
+			return GoBackExtra() || GoBackMain();
+		}
+
+		public bool GoBackMain()
+		{
+			if (MainBreadcrumbItems.Count > 1)
+			{
+				MainBreadcrumbItems.Remove(MainBreadcrumbItems.Last());
+				CurrentMainPage = MainBreadcrumbItems.Last();
+				ContentMain.Navigate(MainBreadcrumbItems.Last().Page, new ModernPageTabWrapper(this, CurrentMainPage.Parameter));
+				return true;
+			}
+			return false;
+		}
+
+		public bool GoBackExtra()
+		{
+			if (ExtraBreadcrumbItems.Count > 1)
 			{
-				BreadcrumbItems.Remove(BreadcrumbItems.Last());
-				ContentFrame.Navigate(BreadcrumbItems.Last().Page, this);
+				ExtraBreadcrumbItems.Remove(ExtraBreadcrumbItems.Last());
+				CurrentExtraPage = ExtraBreadcrumbItems.Last();
+				ContentExtra.Navigate(ExtraBreadcrumbItems.Last().Page, new ModernPageTabWrapper(this, CurrentExtraPage.Parameter));
 				return true;
 			}
 			return false;
 		}
 
-		public void Navigate(ModernPageTabItem item)
+		public void Navigate(ModernPageTabItem item, int framesource)
+		{
+			// 0 main
+			// 1 extra
+			// check origin frame and prevent stacking when main opens an extra page, replace it
+			if (CurrentMainPage == null || TwoPane.Mode == TwoPaneViewMode.SinglePane)
+			{
+				CurrentMainPage = item;
+				MainBreadcrumbItems.Add(item);
+				ContentMain.Navigate(item.Page, new ModernPageTabWrapper(this, item.Parameter));
+			}
+			else if (TwoPane.Mode == TwoPaneViewMode.Wide && !item.Equals(CurrentExtraPage))
+			{
+				CurrentExtraPage = item;
+				if (framesource == 0)
+					ExtraBreadcrumbItems.Clear();
+				ExtraBreadcrumbItems.Add(item);
+				ContentExtra.Navigate(item.Page, new ModernPageTabWrapper(this, item.Parameter));
+			}
+			//, new SlideNavigationTransitionInfo { Effect = SlideNavigationTransitionEffect.FromRight }
+		}
+
+		private void TwoPane_ModeChanged(TwoPaneView sender, object args)
+		{
+			if (TwoPane.Mode == TwoPaneViewMode.SinglePane && CurrentExtraPage != null)
+			{
+				ExtraBreadcrumbItems.Remove(CurrentExtraPage);
+				foreach (var i in ExtraBreadcrumbItems)
+					MainBreadcrumbItems.Add(i);
+				ExtraBreadcrumbItems.Clear();
+
+				Navigate(CurrentExtraPage, 0);
+				CurrentExtraPage = null;
+				ContentExtra.Navigate(typeof(Empty));
+			}
+			else
+			{
+				if (MainBreadcrumbItems.Count > 1)
+				{
+					var main = MainBreadcrumbItems.First();
+					var extra = MainBreadcrumbItems.Skip(1).ToList();
+
+					MainBreadcrumbItems.Clear();
+
+					CurrentMainPage = main;
+					MainBreadcrumbItems.Add(main);
+					ContentMain.Navigate(CurrentMainPage.Page, new ModernPageTabWrapper(this, main.Parameter));
+
+					foreach (var i in extra)
+						ExtraBreadcrumbItems.Add(i);
+					CurrentExtraPage = ExtraBreadcrumbItems.Last();
+					ContentExtra.Navigate(CurrentExtraPage.Page, new ModernPageTabWrapper(this, CurrentExtraPage.Parameter));
+				}
+			}
+		}
+
+		private void MainBreadcrumb_ItemClicked(BreadcrumbBar sender, BreadcrumbBarItemClickedEventArgs args)
 		{
-			BreadcrumbItems.Add(item);
-			ContentFrame.Navigate(item.Page, this);
+			if (args.Index < MainBreadcrumbItems.Count - 1)
+			{
+				for (int i = MainBreadcrumbItems.Count - 1; i > args.Index; i--)
+				{
+					MainBreadcrumbItems.RemoveAt(i);
+				}
+				var item = (ModernPageTabItem)args.Item;
+				ContentMain.Navigate(item.Page, new ModernPageTabWrapper(this, item.Parameter));
+			}
 		}
 
-		private void Breadcrumb_ItemClicked(BreadcrumbBar sender, BreadcrumbBarItemClickedEventArgs args)
+		private void ExtraBreadcrumb_ItemClicked(BreadcrumbBar sender, BreadcrumbBarItemClickedEventArgs args)
 		{
-			if (args.Index < BreadcrumbItems.Count - 1)
+			if (args.Index < ExtraBreadcrumbItems.Count - 1)
 			{
-				for (int i = BreadcrumbItems.Count - 1; i > args.Index; i--)
+				for (int i = ExtraBreadcrumbItems.Count - 1; i > args.Index; i--)
 				{
-					BreadcrumbItems.RemoveAt(i);
+					ExtraBreadcrumbItems.RemoveAt(i);
 				}
 				var item = (ModernPageTabItem)args.Item;
-				ContentFrame.Navigate(item.Page, this);
+				ContentExtra.Navigate(item.Page, new ModernPageTabWrapper(this, item.Parameter));
 			}
 		}
 
@@ -80,5 +167,29 @@ public class ModernPageTabItem
 		public string Title { get; set; } = null!;
 		public string Description { get; set; } = null!;
 		public Type Page { get; set; } = null!;
+
+		public object? Parameter { get; set; }
+
+		public override bool Equals(object? obj)
+		{
+			return obj is ModernPageTabItem item && Page.Equals(item.Page);
+		}
+
+		public override int GetHashCode()
+		{
+			return Page.GetHashCode();
+		}
+	}
+
+	public class ModernPageTabWrapper
+	{
+		public ModernPageTab ModernPageTab { get; } = null!;
+		public object? Parameter { get; }
+
+		public ModernPageTabWrapper(ModernPageTab modernPageTab, object? parameter)
+		{
+			ModernPageTab = modernPageTab;
+			Parameter = parameter;
+		}
 	}
 }
diff --git a/LRReader.UWP/Views/Items/NotificationItem.xaml b/LRReader.UWP/Views/Items/NotificationItem.xaml
deleted file mode 100644
index 62292c53..00000000
--- a/LRReader.UWP/Views/Items/NotificationItem.xaml
+++ /dev/null
@@ -1,24 +0,0 @@
-<UserControl
-	x:Class="LRReader.UWP.Views.Items.NotificationItem"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:local="using:LRReader.UWP.Views.Items"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	d:DesignHeight="100"
-	d:DesignWidth="800"
-	mc:Ignorable="d">
-
-	<Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="*" />
-		</Grid.RowDefinitions>
-		<TextBlock Text="{x:Bind title}" TextTrimming="WordEllipsis" TextWrapping="WrapWholeWords" />
-		<TextBlock
-			Grid.Row="1"
-			Text="{x:Bind content}"
-			TextTrimming="WordEllipsis" TextWrapping="WrapWholeWords"
-			Visibility="{x:Bind showContent}" />
-	</Grid>
-</UserControl>
diff --git a/LRReader.UWP/Views/Items/NotificationItem.xaml.cs b/LRReader.UWP/Views/Items/NotificationItem.xaml.cs
deleted file mode 100644
index 0787cf91..00000000
--- a/LRReader.UWP/Views/Items/NotificationItem.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-#nullable enable
-using Windows.UI.Xaml.Controls;
-
-namespace LRReader.UWP.Views.Items
-{
-	public sealed partial class NotificationItem : UserControl
-	{
-
-		private string title;
-		private string content;
-		private bool showContent;
-
-		public NotificationItem(string title, string? content)
-		{
-			this.title = title;
-			this.content = content ?? "";
-			this.showContent = !string.IsNullOrEmpty(content);
-			this.InitializeComponent();
-		}
-	}
-}
diff --git a/LRReader.UWP/Views/Main/HostTabPage.xaml b/LRReader.UWP/Views/Main/HostTabPage.xaml
index 2ffd24c7..a2a4e423 100644
--- a/LRReader.UWP/Views/Main/HostTabPage.xaml
+++ b/LRReader.UWP/Views/Main/HostTabPage.xaml
@@ -2,12 +2,13 @@
 	x:Class="LRReader.UWP.Views.Main.HostTabPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:comcontrols="using:Microsoft.Toolkit.Uwp.UI.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:LRReader.UWP.Views.Main"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 	xmlns:util="using:LRReader.UWP.Util"
+	xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
+	xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
 	DataContext="{Binding HostTabPageInstance, Source={StaticResource Locator}}"
 	KeyboardAcceleratorPlacementMode="Hidden"
 	NavigationCacheMode="Required"
@@ -115,11 +116,16 @@
 				</Grid>
 			</muxc:TabView.TabStripFooter>
 		</muxc:TabView>
-		<comcontrols:InAppNotification
-			x:Name="Notifications"
-			Background="{ThemeResource GridOverGridBackground}"
-			ShowDismissButton="True" StackMode="QueueBehind"
-			Style="{StaticResource CustomNotificationStyle}" />
+		<muxc:InfoBar HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="32">
+			<muxc:InfoBar.Transitions>
+				<TransitionCollection>
+					<EdgeUIThemeTransition Edge="Bottom" />
+				</TransitionCollection>
+			</muxc:InfoBar.Transitions>
+			<interactivity:Interaction.Behaviors>
+				<behaviors:StackedNotificationsBehavior x:Name="Notifications" />
+			</interactivity:Interaction.Behaviors>
+		</muxc:InfoBar>
 		<VisualStateManager.VisualStateGroups>
 			<VisualStateGroup>
 				<VisualState x:Name="Default" />
diff --git a/LRReader.UWP/Views/Main/HostTabPage.xaml.cs b/LRReader.UWP/Views/Main/HostTabPage.xaml.cs
index 2790947c..58eb6c82 100644
--- a/LRReader.UWP/Views/Main/HostTabPage.xaml.cs
+++ b/LRReader.UWP/Views/Main/HostTabPage.xaml.cs
@@ -7,7 +7,6 @@
 using LRReader.Shared.Services;
 using LRReader.UWP.Views.Controls;
 using LRReader.UWP.Views.Dialogs;
-using LRReader.UWP.Views.Items;
 using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel.Core;
 using Windows.ApplicationModel.Resources;
@@ -75,7 +74,7 @@ await Service.Dispatcher.RunAsync(() =>
 			var info = await Updates.CheckForUpdates();
 
 			if (info.Result)
-				ShowNotification(lang.GetString("HostTab/Update1").AsFormat(info.Target?.ToString() ?? "Nightly"), lang.GetString("HostTab/Update2"), 0);
+				ShowNotification(lang.GetString("HostTab/Update1").AsFormat(info.Target?.ToString() ?? "Nightly"), lang.GetString("HostTab/Update2"), 0, NotificationSeverity.Informational);
 
 			await ShowWhatsNew();
 		}
@@ -122,9 +121,12 @@ private void TitleBar_IsVisibleChanged(CoreApplicationViewTitleBar sender, objec
 				TabViewControl.Margin = new Thickness(0, Service.Settings.UseVerticalTabs ? 0 : -48, 0, 0);
 		}
 
-		public void Receive(ShowNotification message) => ShowNotification(message.Value.Title, message.Value.Content, message.Value.Duration);
+		public void Receive(ShowNotification message) => ShowNotification(message.Value.Title, message.Value.Content, message.Value.Duration, message.Value.Severity);
 
-		private void ShowNotification(string title, string? content, int duration) => Service.Dispatcher.Run(() => Notifications.Show(new NotificationItem(title, content), duration), 0);
+		private void ShowNotification(string title, string? content, int duration, NotificationSeverity severity = NotificationSeverity.Informational)
+		{
+			Service.Dispatcher.Run(() => Notifications.Show(new CommunityToolkit.WinUI.Behaviors.Notification { Title = title, Message = content, Duration = duration <= 0 ? null : TimeSpan.FromMilliseconds(duration), Severity = (InfoBarSeverity)(int)severity }), 0);
+		}
 
 		// Move all of this to the ViewModel
 		private void SettingsButton_Click(object sender, RoutedEventArgs e) => Data.OpenTab(Tab.Settings);
diff --git a/LRReader.UWP/Views/Tabs/Content/Bookmarks.xaml.cs b/LRReader.UWP/Views/Tabs/Content/Bookmarks.xaml.cs
index 5a551ffd..b36fa6eb 100644
--- a/LRReader.UWP/Views/Tabs/Content/Bookmarks.xaml.cs
+++ b/LRReader.UWP/Views/Tabs/Content/Bookmarks.xaml.cs
@@ -78,11 +78,11 @@ public async void ExportBookmarks()
 				FileUpdateStatus status = await CachedFileManager.CompleteUpdatesAsync(file);
 				if (status == FileUpdateStatus.Complete)
 				{
-					WeakReferenceMessenger.Default.Send(new ShowNotification(lang.GetString("Bookmarks/ExportComplete"), lang.GetString("Bookmarks/ExportCompleteFile").AsFormat(file.Path), 8000));
+					WeakReferenceMessenger.Default.Send(new ShowNotification(lang.GetString("Bookmarks/ExportComplete"), lang.GetString("Bookmarks/ExportCompleteFile").AsFormat(file.Path), 8000, NotificationSeverity.Informational));
 				}
 				else
 				{
-					WeakReferenceMessenger.Default.Send(new ShowNotification(lang.GetString("Bookmarks/ExportError"), lang.GetString("Bookmarks/ExportErrorFile").AsFormat(file.Path), 8000));
+					WeakReferenceMessenger.Default.Send(new ShowNotification(lang.GetString("Bookmarks/ExportError"), lang.GetString("Bookmarks/ExportErrorFile").AsFormat(file.Path), 8000, NotificationSeverity.Informational));
 				}
 			}
 			else
@@ -107,7 +107,7 @@ public async void ImportBookmarks()
 				}
 				catch (Exception e)
 				{
-					WeakReferenceMessenger.Default.Send(new ShowNotification(lang.GetString("Bookmarks/ImportError"), e.Message, 0));
+					WeakReferenceMessenger.Default.Send(new ShowNotification(lang.GetString("Bookmarks/ImportError"), e.Message, 0, NotificationSeverity.Error));
 					return;
 				}
 				var dialog = new ContentDialog()
diff --git a/LRReader.UWP/Views/Tabs/Content/CategoryEdit.xaml b/LRReader.UWP/Views/Tabs/Content/CategoryEdit.xaml
index 7114fc52..35fd239c 100644
--- a/LRReader.UWP/Views/Tabs/Content/CategoryEdit.xaml
+++ b/LRReader.UWP/Views/Tabs/Content/CategoryEdit.xaml
@@ -3,7 +3,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:contract13NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,13)"
-	xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
+	xmlns:controls="using:CommunityToolkit.WinUI.Controls"
 	xmlns:controls1="using:LRReader.UWP.Views.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:ext="using:LRReader.UWP.Extensions"
@@ -83,16 +83,7 @@
 				x:Uid="/Tabs/CategoriesEdit/Empty" HorizontalAlignment="Center" VerticalAlignment="Center"
 				FontSize="22" IsHitTestVisible="False"
 				Visibility="{x:Bind ViewModel.Empty, Mode=OneWay}" />
-			<controls:GridSplitter Grid.Column="1" Background="{ThemeResource ControlFillColorDefaultBrush}">
-				<controls:GridSplitter.Element>
-					<Grid>
-						<TextBlock
-							HorizontalAlignment="Center" VerticalAlignment="Center"
-							FontFamily="{StaticResource SymbolThemeFontFamily}"
-							FontSize="16" IsHitTestVisible="False" Text="&#xE784;" />
-					</Grid>
-				</controls:GridSplitter.Element>
-			</controls:GridSplitter>
+			<controls:GridSplitter Grid.Column="1" Background="{ThemeResource ControlFillColorDefaultBrush}" />
 			<controls1:ArchiveList
 				x:Name="ArchiveList" Grid.Column="2" AllowDrop="True"
 				CanDragItems="True" DragItemsStarting="ArchivesGrid_DragItemsStarting" DragOver="ArchivesGrid_DragOver"