diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index e8fdba4d0..21137e159 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -5,15 +5,17 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Name="FlowWelcomeWindow"
     Title="Welcome to Flow Launcher"
     Width="550"
     Height="650"
-    Background="{DynamicResource PopuBGColor}"
+    Background="{DynamicResource Color00B}"
     Foreground="{DynamicResource PopupTextColor}"
     ResizeMode="NoResize"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
+    <!--#region TitleBar-->
     <WindowChrome.WindowChrome>
         <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
     </WindowChrome.WindowChrome>
@@ -70,14 +72,45 @@
                     </Button>
                 </Grid>
             </StackPanel>
-            <StackPanel Margin="26,12,26,0" />
+            <!--#endregion-->
+            <StackPanel Margin="26,12,26,0">
+                <ui:Frame
+                    x:Name="ContentFrame"
+                    MinHeight="600"
+                    HorizontalAlignment="Stretch">
+                    <ui:Frame.ContentTransitions>
+                        <ui:TransitionCollection>
+                            <ui:NavigationThemeTransition />
+                        </ui:TransitionCollection>
+                    </ui:Frame.ContentTransitions>
+                </ui:Frame>
+            </StackPanel>
         </StackPanel>
         <Border
             Grid.Row="1"
-            Background="{DynamicResource PopupButtonAreaBGColor}"
+            Background="{DynamicResource Color00B}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
             BorderThickness="0,1,0,0">
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" />
+            <DockPanel>
+                <Button
+                    Width="50"
+                    Height="50"
+                    Margin="10,5,28,5"
+                    Click="BackwardButton_Click"
+                    Content="&#xe76c;"
+                    DockPanel.Dock="Right"
+                    FontFamily="/Resources/#Segoe Fluent Icons"
+                    FontSize="22" />
+                <Button
+                    Width="50"
+                    Height="50"
+                    Click="ForwardButton_Click"
+                    Content="&#xe76b;"
+                    DockPanel.Dock="Right"
+                    FontFamily="/Resources/#Segoe Fluent Icons"
+                    FontSize="22" />
+                <StackPanel />
+            </DockPanel>
         </Border>
     </Grid>
 </Window>
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
index e150afce6..885503b31 100644
--- a/Flow.Launcher/WelcomeWindow.xaml.cs
+++ b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -11,6 +11,8 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using ModernWpf.Media.Animation;
+using Page = ModernWpf.Controls.Page;
 
 namespace Flow.Launcher
 {
@@ -24,6 +26,32 @@ namespace Flow.Launcher
             InitializeComponent();
         }
 
+        private void ForwardButton_Click(object sender, RoutedEventArgs e)
+        {
+            /*
+            var pageToNavigateTo = ContentFrame.BackStackDepth % 2 == 1 ? typeof(SamplePages.SamplePage1) : typeof(SamplePages.SamplePage2);
+
+            if (_transitionInfo == null)
+            {
+                // Default behavior, no transition set or used.
+                ContentFrame.Navigate(pageToNavigateTo, null);
+            }
+            else
+            {
+                // Explicit transition info used.
+                ContentFrame.Navigate(pageToNavigateTo, null, _transitionInfo);
+            }
+            */
+        }
+
+        private void BackwardButton_Click(object sender, RoutedEventArgs e)
+        {/*
+            if (ContentFrame.BackStackDepth > 0)
+            {
+                ContentFrame.GoBack();
+            }
+            */
+        }
         private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
         {
             Close();