diff --git a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo
index d066e3be0500fedbccb416aede4fe402cd1c0586..dc42953e7e13c2e65f366e36ff4990726171c4eb 100644
Binary files a/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo and b/InnoLabProjektDektopApp/.vs/InnoLabProjektDektopApp/v17/.suo differ
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml
index c0236af680b5fc486c8eafe4bb2b669121b6a9c6..244eb5d768db93aedf6c1405522b1d40151bb3d2 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:InnoLabProjektDektopApp"
-             StartupUri="Screens\FirstLaunch\04Settings.xaml">
+             StartupUri="Screens\Regulaer\03End.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
index ef936276665f0828240052ec3de7d513ab972d5c..ef3099fe2184deb4447690e987854383c9acfe4e 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="InnoLabProjektDektopApp.Startscreen"
+<Page x:Class="InnoLabProjektDektopApp.Startscreen"
         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"
@@ -6,7 +6,8 @@
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
         mc:Ignorable="d"
-        Height="550"  Width="900">
+     >
+    <ScrollViewer>
     <Grid>
        
         <Label Content="Are you ready to&#xA;work focused?" HorizontalAlignment="Left" Margin="76,102,0,0" VerticalAlignment="Top" Height="143" Width="432" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
@@ -14,5 +15,8 @@
         <TextBlock HorizontalAlignment="Left" Height="121" Margin="117,250,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="350"><Run Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"/><LineBreak/><Run/><LineBreak/><Run Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"/></TextBlock>
         <Rectangle HorizontalAlignment="Left" Height="269" Margin="587,0,0,0" Stroke="Black" VerticalAlignment="Center" Width="313" Fill="#FF828080"/>
         <Image HorizontalAlignment="Left" Height="197" Margin="668,174,0,0" VerticalAlignment="Top" Width="213" Source="/Screens/FirstLaunch/Mascott_InnoLab.jpg"/>
-    </Grid>
-</Window>
+            <TextBlock HorizontalAlignment="Left" Height="121" Margin="117,500,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="350"><Run Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"/><LineBreak/><Run/><LineBreak/><Run Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation"/></TextBlock>
+
+        </Grid>
+    </ScrollViewer>
+</Page>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
index df4a42a5ed224e1a1d3417c76ba755f76f8fd386..9a9e02ed86b5354d504823288dee5b1a00fbdfa0 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs
@@ -14,12 +14,11 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class Startscreen : Window
+    public partial class Startscreen : Page
     {
         public Startscreen()
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
         }
         private void Option1_Click(object sender, RoutedEventArgs e)
         {
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml
index 386854e6b4278f7bced3edf1d2495d74d4210de0..dbc6617668806d2fc00b4962353a3ccb0216cc0b 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Progress"
+<Page x:Class="InnoLabProjektDektopApp.Progress"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
-        mc:Ignorable="d"
-        Height="550"  Width="900">
+        mc:Ignorable="d">
     <Grid>
        
         <Label Content="Your way to working more focused" HorizontalAlignment="Center" Margin="0,119,0,0" VerticalAlignment="Top" Height="108" Width="780" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
@@ -21,4 +20,4 @@
         <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="388,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
         <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="695,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
     </Grid>
-</Window>
+</Page>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
index fed90d7f460371a8afb20fdb2919d571d714c62c..d34a07d1f38b6df13e3b19a54ecf67595b50d119 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs
@@ -14,26 +14,12 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class Progress : Window
+    public partial class Progress : Page
     {
         public Progress()
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
         }
-        private void Option1_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option2_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option3_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
-
         private void Button_Click1(object sender, RoutedEventArgs e)
         {
             //this.Content = new AnotherWindow().Content;
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
index 14c450758bcb87e0784154260a4007b09a857e5d..5a06954c9a5def8ca2ba89ed4fe4b09784207c57 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Distractions"
+<Page x:Class="InnoLabProjektDektopApp.Distractions"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
-        mc:Ignorable="d"
-        Height="550"  Width="900">
+        mc:Ignorable="d">
     <Grid>
  
         <StackPanel Margin="20,0,20,20">
@@ -271,5 +270,5 @@
         </StackPanel>
     </Grid>
 
-</Window>
+</Page>
 
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs
index c056f90fc132ff764744f9e9dd81152ca334558c..87142798f082f98d2f62705954b230f8a20e4dae 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs
@@ -19,7 +19,7 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class Distractions : Window
+    public partial class Distractions : Page
     {
 
         private string jsonFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "distractingWebsites.json");
@@ -27,7 +27,6 @@ namespace InnoLabProjektDektopApp
         public Distractions()
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
             LoadJsonData();
         }
 
@@ -229,10 +228,9 @@ namespace InnoLabProjektDektopApp
 
                 if (!string.IsNullOrEmpty(category))
                 {
-                    // Navigiere zur entsprechenden Seite (DistractionsList)
-                    var distractionListScreen = new DistractionsList(category);
-                    distractionListScreen.Show(); // Zeige neue Seite
-                    this.Close(); // Schließe aktuelle Seite
+
+                    this.NavigationService.Navigate(new DistractionsList(category));
+
                 }
             }
         }
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml
index a7623b7a0d38a8b06b0eee98e35b8a2a3138f6c1..9f5fde8481198b5b72ab8a7fe1d91f003387995d 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.DistractionsList"
+<Page x:Class="InnoLabProjektDektopApp.DistractionsList"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
-        mc:Ignorable="d"
-        Height="550" Width="900">
+        mc:Ignorable="d">
     <Grid>
         <StackPanel Margin="20,20,20,20">
             <Grid>
@@ -160,4 +159,4 @@ Text="CATEGORY" RenderTransformOrigin="0.548,1.689" Margin="10,0,0,0"/>
 
 
     </Grid>
-</Window>
\ No newline at end of file
+</Page>
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
index 8f17528511ab5de44b7942ef84247d87f663ea91..8543d0eba7e811f724912ee3a26fc0b945bb947b 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_1DistractionsList.xaml.cs
@@ -17,7 +17,7 @@ using System.Text.Json.Serialization;
 
 namespace InnoLabProjektDektopApp
 {
-    public partial class DistractionsList : Window
+    public partial class DistractionsList : Page
     {
         private string _category;
         private Dictionary<string, List<WebsiteEntry>> _data;
@@ -26,7 +26,6 @@ namespace InnoLabProjektDektopApp
         public DistractionsList(string category)
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
             _category = category;
             _jsonFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Assets", "distractingWebsites.json");
             LoadCategoryItems();
@@ -223,9 +222,7 @@ namespace InnoLabProjektDektopApp
 
         private void BackButton_Click(object sender, RoutedEventArgs e)
         {
-            var distractionsScreen = new Distractions();
-            distractionsScreen.Show();
-            this.Close();
+            this.NavigationService.Navigate(new Distractions());
         }
 
         public class WebsiteEntry
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
index 4af139e3031e4c63dce9f102f57b1455f0c83c01..8312b3b94031b30fbc6c80fed79ee00b77a4bdae 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Settings"
+<Page x:Class="InnoLabProjektDektopApp.Settings"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
-        mc:Ignorable="d"
-        Height="550" Width="900">
+        mc:Ignorable="d">
     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
     <Grid>
 
@@ -178,4 +177,4 @@ ToolTip="You can decide how long the focus and break period should be. The focus
     </Grid>
         
     </ScrollViewer>
-</Window>
+</Page>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
index 0847605ade723e1c0e74a0c9746d5b8fd2211a94..c236c92689e8da7e76a4fcafccf525140f894269 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs
@@ -17,12 +17,11 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class Settings : Window
+    public partial class Settings : Page
     {
         public Settings()
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
             MascotVisibilityChanged(null, null);
         }
         private void MascotVisibilityChanged(object sender, RoutedEventArgs e)
@@ -123,14 +122,9 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
 
         private void NavigateToOverviewButton_Click(object sender, RoutedEventArgs e)
         {
-            // Erstelle eine Instanz des OverviewScreen
-            var overviewScreen = new Overview();
 
-            // Zeige den OverviewScreen
-            overviewScreen.Show();
+            this.NavigationService.Navigate(new Overview());
 
-            // Schließe den aktuellen Screen
-            this.Close();
         }
 
 
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
index f079877b6a56d28f2d66c58d1ab817e29028f710..04a0e4155efa4d8cb333c443c2766ef4fe5735a2 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
@@ -1,12 +1,12 @@
-<Window x:Class="InnoLabProjektDektopApp.Overview"
+<Page x:Class="InnoLabProjektDektopApp.Overview"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
-        mc:Ignorable="d"
-        Height="550"  Width="900">
+        mc:Ignorable="d">
+    <ScrollViewer>
     <Grid>
         <StackPanel Margin="20,0,20,20">
 
@@ -15,6 +15,8 @@
                        Text="Selection and editing of your saved profiles" 
                        HorizontalAlignment="Left" 
                        Margin="0,10,0,10" />
+            
+            
 
             <!-- Profiles and Add Button Section -->
             <Border Background="#333333" CornerRadius="10" Padding="15" >
@@ -194,4 +196,5 @@ TextChanged="FocusTopicInputBox_TextChanged" />
         </StackPanel>
 
     </Grid>
-</Window>
+    </ScrollViewer>
+</Page>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
index a3d93ab2c30a6982b573edf0b7cc9058ab8205d7..50efb6f3cce4000bf07e602deaa677d0527a8d56 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
@@ -9,7 +9,7 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for Overview.xaml
     /// </summary>
-    public partial class Overview : Window
+    public partial class Overview : Page
     {
         // Aktuelles Profil, für das Einstellungen geladen werden sollen
         private string profile = "profile1";
@@ -20,7 +20,6 @@ namespace InnoLabProjektDektopApp
         public Overview()
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
 
             // Definieren des Pfads zur JSON-Datei
             this.SettingsFilePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "settings.json");
@@ -172,9 +171,7 @@ namespace InnoLabProjektDektopApp
                             MessageBoxButton.OK,
                             MessageBoxImage.Information);
 
-            var sessionScreen = new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords);
-            sessionScreen.Show();
-            this.Close();
+            this.NavigationService.Navigate(new Session(focusPeriod, breakPeriod, cycles, distractionMode, mascotVisible, wordsOfAffirmation, insultingWords));
         }
 
     }
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
index bf4829f5fbbe7c81f20793480993219261da71bc..d3fa551ef6882644539744c6fef7dc191a276ded 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
@@ -1,12 +1,11 @@
-<Window x:Class="InnoLabProjektDektopApp.Session"
+<Page x:Class="InnoLabProjektDektopApp.Session"
         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
-        mc:Ignorable="d"
-        Height="550"  Width="900">
+        mc:Ignorable="d">
     <Grid>
         <Button Margin="0,100,150,10" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Background="Transparent" BorderBrush="Transparent" Click="discardSession_Click">
             <Grid >
@@ -21,4 +20,4 @@
         </StackPanel>
         <Button Content="Pause" Name="PlayPauseButton" Style="{StaticResource PlayPauseButton}" HorizontalAlignment="Center" Margin="0,320,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" Click="PlayPause_Click"/>
     </Grid>
-</Window>
\ No newline at end of file
+</Page>
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
index 3cc526863f4bdd89b1427376d2cb5def00fc1aa2..52251c48528c2671f84376cbf9054c93072e9013 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml.cs
@@ -16,7 +16,7 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class Session : Window
+    public partial class Session : Page
     {
         private int focusPeriod;
         private int breakPeriod;
@@ -53,7 +53,6 @@ namespace InnoLabProjektDektopApp
             this.mascotVisible = mascotVisible;
             this.wordsOfAffirmation = wordsOfAffirmation;
             this.insultingWords = insultingWords;
-            GlobalSettings.setDefaults(this);
 
             this.maxTime = focusPeriod * 60; //todo: multiply with 60 later
             this.seconds = this.maxTime;
@@ -262,12 +261,9 @@ namespace InnoLabProjektDektopApp
                                           "Kein Grund ausgewählt";
 
                 MessageBox.Show($"Abbruchgrund: {selectedReason}", "Sitzung beendet", MessageBoxButton.OK, MessageBoxImage.Information);
-
-                // Zum OverviewScreen navigieren
-                var overviewScreen = new Overview();
-                overviewScreen.Show();
-                reasonWindow.Close(); // Fenster schließen
-                this.Close(); // Aktuelles Fenster schließen
+                reasonWindow.Close();
+                this.NavigationService.Navigate(new Overview());
+               
             };
 
             // Radiobuttons und Button zum StackPanel hinzufügen
@@ -280,7 +276,7 @@ namespace InnoLabProjektDektopApp
             reasonWindow.Content = stackPanel;
 
             // Fenster anzeigen
-            reasonWindow.ShowDialog();
+            reasonWindow.Show();
         }
 
 
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml
index 161057bd8cfe821669ca4d3ca69f8af91b35f764..272dba2997fe60bdc7e6d5f3de0b17df0e3dd105 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="InnoLabProjektDektopApp.End"
+<NavigationWindow x:Class="InnoLabProjektDektopApp.End"
         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"
@@ -6,14 +6,6 @@
         xmlns:local="clr-namespace:InnoLabProjektDektopApp"
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
         mc:Ignorable="d"
-        Height="550"  Width="900">
-    <Grid>
-        <header:HeaderTemplate VerticalAlignment="Top"/>
- 
-        <Button Content="Subscription" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,100,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option2_Click"/>
-        <Button Content="Contract" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,20,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option3_Click"/>
+        Height="550"  Width="900" ShowsNavigationUI="False">
 
-        <!-- DELETE -->
-        <Label Content="End Page" HorizontalAlignment="Center" Margin="0,234,0,0" VerticalAlignment="Top" Height="108" Width="439" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
-    </Grid>
-</Window>
+</NavigationWindow>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs
index 31b03826d76c2e2b3a1d325ab97f9f2585e3eadf..0a6a64229b8caca0ea5911636e9cf007b38c2363 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/03End.xaml.cs
@@ -14,24 +14,15 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class End : Window
+    public partial class End : NavigationWindow
     {
         public End()
         {
             InitializeComponent();
             GlobalSettings.setDefaults(this);
+
+            this.Navigate(new Settings());
         }
-        private void Option1_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option2_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option3_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
+
     }
 }
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml
index 7d68674fc539ffdbd650bd1f4bb3c9df1ce1a512..fc31cd547bda997e680ae006e222021d6efe36d4 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="InnoLabProjektDektopApp.Statistics"
+<Page x:Class="InnoLabProjektDektopApp.Statistics"
         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"
@@ -7,13 +7,8 @@
         xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
         mc:Ignorable="d"
         Height="550"  Width="900">
-    <Grid>
-        <header:HeaderTemplate VerticalAlignment="top"/>
-
-        <Button Content="Subscription" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,100,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option2_Click"/>
-        <Button Content="Contract" Style="{StaticResource TopMenuButon}" HorizontalAlignment="Right" Margin="0,4,20,0" VerticalAlignment="Top" Height="26" Width="80" Click="Option3_Click"/>
-
-        <!-- DELETE -->
-        <Label Content="Statistics Page" HorizontalAlignment="Center" Margin="0,234,0,0" VerticalAlignment="Top" Height="108" Width="439" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+    <Grid Background="Red">
+        <TextBlock Text="Statistics Page" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24" />
+        <Button Content="Go to Overview" HorizontalAlignment="Center"  Click="NavigateToOverview_Click" />
     </Grid>
-</Window>
+</Page>
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs
index 94c9dcef6c23d2e47d69061a90b53fa9ad050848..021aa77c2b080e4de714b8eec12d11718ea9c8bd 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/04Statistics.xaml.cs
@@ -14,24 +14,16 @@ namespace InnoLabProjektDektopApp
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class Statistics : Window
+    public partial class Statistics : Page
     {
         public Statistics()
         {
             InitializeComponent();
-            GlobalSettings.setDefaults(this);
         }
-        private void Option1_Click(object sender, RoutedEventArgs e)
+        private void NavigateToOverview_Click(object sender, RoutedEventArgs e)
         {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option2_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
-        }
-        private void Option3_Click(object sender, RoutedEventArgs e)
-        {
-            //this.Content = new AnotherWindow().Content;
+            // Navigiere zur Overview-Seite
+            this.NavigationService.Navigate(new Startscreen());
         }
     }
 }
\ No newline at end of file
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs
index bf37896f80081b6c222bccb81ae1a12d8ddaac5b..543037f33b79012c6fca81b457dcc7d7ef7d6aa0 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/App.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "2DEDC9624A7085F1363F3F7BDB3110EA433383A8"
+#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7D74CC56137BF813041AB27EB36F34CDC24CEC07"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -55,7 +55,7 @@ namespace InnoLabProjektDektopApp {
             _contentLoaded = true;
             
             #line 5 "..\..\..\App.xaml"
-            this.StartupUri = new System.Uri("Screens\\FirstLaunch\\04Settings.xaml", System.UriKind.Relative);
+            this.StartupUri = new System.Uri("Screens\\Regulaer\\03End.xaml", System.UriKind.Relative);
             
             #line default
             #line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/GeneratedInternalTypeHelper.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/GeneratedInternalTypeHelper.g.cs
deleted file mode 100644
index 7ea3d5e9b67b3bf54bddd22f9c61b40400b0dc20..0000000000000000000000000000000000000000
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/GeneratedInternalTypeHelper.g.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace XamlGeneratedNamespace {
-    
-    
-    /// <summary>
-    /// GeneratedInternalTypeHelper
-    /// </summary>
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
-        
-        /// <summary>
-        /// CreateInstance
-        /// </summary>
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
-            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
-                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
-        }
-        
-        /// <summary>
-        /// GetPropertyValue
-        /// </summary>
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
-            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// SetPropertyValue
-        /// </summary>
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
-            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
-        }
-        
-        /// <summary>
-        /// CreateDelegate
-        /// </summary>
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
-            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
-                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
-                        delegateType,
-                        handler}, null)));
-        }
-        
-        /// <summary>
-        /// AddEventHandler
-        /// </summary>
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
-            eventInfo.AddEventHandler(target, handler);
-        }
-    }
-}
-
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs
index e5c7e7b1b385bf193c28b846cd0687b45e8f95cc..17255fa93987d485fe92f666db2f33ed30f512f7 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("CoFlow")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+93d144893d8dadca6f285ef4a5529527314cd24b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c9b946b3346a901f02ac1a59efe2d304d269d6df")]
 [assembly: System.Reflection.AssemblyProductAttribute("CoFlow")]
 [assembly: System.Reflection.AssemblyTitleAttribute("CoFlow")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache
index a73bfa9218c40705042df231c5b58e6b78434206..0a23d7ed543fdfdfc6804272625d11c832395c09 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.AssemblyInfoInputs.cache
@@ -1 +1 @@
-81fe44d744b1d9f6bc5c21f59489eb8a1ce8533d6aa9ebb2bad659cbb6cd413b
+b7d380ae506091cf46ecb3e50bb6cc8fd2d969c30cb9e882f33b68be45a03700
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.CoreCompileInputs.cache b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.CoreCompileInputs.cache
index 0f7af66e5dff8c4bdcf10b400695c0f9f759f221..47c40a3c0e0ebd358efb874e76931fe320233318 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.CoreCompileInputs.cache
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-45bcda73df751191f61c7d6ed6b1c8da6d8c244e1660806596a2ebc10aa84c2f
+cd11af8fd3e4bdd4a64b2f26dbbf918699fc6753590d3e7a9432bff4f3ea24de
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.FileListAbsolute.txt b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.FileListAbsolute.txt
index a87d34c99ef7c4f5b0cda6725f049f13c00c13a8..ac981fd1557adbbc67081f29eacd7ada3f1c9aa4 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.FileListAbsolute.txt
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/InnoLabProjektDektopApp.csproj.FileListAbsolute.txt
@@ -364,7 +364,6 @@ D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\Inno
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\Screens\Templates\HeaderTemplate.g.cs
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\App.g.cs
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\CoFlow_Content.g.cs
-D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\GeneratedInternalTypeHelper.g.cs
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\CoFlow_MarkupCompile.cache
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\CoFlow_MarkupCompile.lref
 D:\Studium\7. Semester\InnoLab\CoFlowCURRENT\CoFlow\InnoLabProjektDektopApp\InnoLabProjektDektopApp\obj\Debug\net8.0-windows\App.baml
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs
index d3041d41cdc5c424538b4549a967c54f946e6b27..77c8460e9468c98cbf926d622005a5df4392cc94 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/01Startscreen.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "36C0AE432AB2B51E75A5CC1B4D3A3625806DE022"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52D38387AE7C10AE2B702C18286866184F19398F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Startscreen
     /// </summary>
-    public partial class Startscreen : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Startscreen : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         private bool _contentLoaded;
         
@@ -74,7 +74,7 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 13 "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml"
+            #line 14 "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs
index a8f843b725137402aaf0917279b0f28ec4762daa..c1686d9c95a735de9a928ab580f6934a4c9dadfb 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/02Progress.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "178E95093EF485EDF590E8871B8E4E6D3DC7E167"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "900BD8C5B70D63CD5FCB9C1D1918F74C16010069"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Progress
     /// </summary>
-    public partial class Progress : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Progress : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         private bool _contentLoaded;
         
@@ -74,7 +74,7 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 20 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
+            #line 19 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click1);
             
             #line default
@@ -82,7 +82,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 2:
             
-            #line 21 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
+            #line 20 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click2);
             
             #line default
@@ -90,7 +90,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 3:
             
-            #line 22 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
+            #line 21 "..\..\..\..\..\Screens\FirstLaunch\02Progress.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click2);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs
index b57efa7813c7ff3248d3260df328039c2f03a6bc..a83481097509abefa573b860202fb38707613a20 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_0Distractions.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "AD375DC9D639CF1B001DB990B29EE5D4D495D019"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "F7A27CAD47B9A1471DDE22716C07F66AAF02ED67"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Distractions
     /// </summary>
-    public partial class Distractions : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Distractions : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 32 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 31 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox SearchBox;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 44 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 43 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock SearchPlaceholder;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 73 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 72 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel SearchResultsPanel;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 100 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 99 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox UrlInputBox;
         
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 109 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 108 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock UrlPlaceholder;
         
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 129 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 128 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CategoryComboBox;
         
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 175 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 174 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox SocialMediaCheckBox;
         
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 191 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 190 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox ShoppingCheckBox;
         
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 207 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 206 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox GamesCheckBox;
         
@@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 224 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 223 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox PornCheckBox;
         
@@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 240 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 239 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox OtherWebsitesCheckBox;
         
@@ -131,7 +131,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 256 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+        #line 255 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox OtherProgramsCheckBox;
         
@@ -171,7 +171,7 @@ namespace InnoLabProjektDektopApp {
             case 1:
             this.SearchBox = ((System.Windows.Controls.TextBox)(target));
             
-            #line 43 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 42 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             this.SearchBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.SearchBox_TextChanged);
             
             #line default
@@ -182,7 +182,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 3:
             
-            #line 61 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 60 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SearchButton_Click);
             
             #line default
@@ -194,7 +194,7 @@ namespace InnoLabProjektDektopApp {
             case 5:
             this.UrlInputBox = ((System.Windows.Controls.TextBox)(target));
             
-            #line 108 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 107 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             this.UrlInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.UrlInputBox_TextChanged);
             
             #line default
@@ -208,7 +208,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 8:
             
-            #line 154 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 153 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddButton_Click);
             
             #line default
@@ -216,7 +216,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 9:
             
-            #line 173 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 172 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
             
             #line default
@@ -227,7 +227,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 11:
             
-            #line 178 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 177 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -235,7 +235,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 12:
             
-            #line 181 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 180 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -243,7 +243,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 13:
             
-            #line 189 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 188 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
             
             #line default
@@ -254,7 +254,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 15:
             
-            #line 194 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 193 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -262,7 +262,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 16:
             
-            #line 197 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 196 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -270,7 +270,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 17:
             
-            #line 205 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 204 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
             
             #line default
@@ -281,7 +281,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 19:
             
-            #line 210 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 209 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -289,7 +289,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 20:
             
-            #line 213 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 212 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -297,7 +297,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 21:
             
-            #line 222 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 221 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
             
             #line default
@@ -308,7 +308,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 23:
             
-            #line 227 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 226 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -316,7 +316,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 24:
             
-            #line 230 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 229 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -324,7 +324,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 25:
             
-            #line 238 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 237 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
             
             #line default
@@ -335,7 +335,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 27:
             
-            #line 243 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 242 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -343,7 +343,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 28:
             
-            #line 246 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 245 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -351,7 +351,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 29:
             
-            #line 254 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 253 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Grid)(target)).MouseDown += new System.Windows.Input.MouseButtonEventHandler(this.Grid_MouseDown);
             
             #line default
@@ -362,7 +362,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 31:
             
-            #line 259 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 258 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
@@ -370,7 +370,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 32:
             
-            #line 262 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
+            #line 261 "..\..\..\..\..\Screens\FirstLaunch\03_0Distractions.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToDistractionList);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_1DistractionsList.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_1DistractionsList.g.i.cs
index 01c3e47e2497b8b12af0526439c2b83b0ab84e8e..bd799aed75b1fa64f0d913792170b385ddd6b651 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_1DistractionsList.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/03_1DistractionsList.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6427519979F3F202CA8F5EEC078F8D3C47D55C21"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6FB8719C167CB0D4E9BDCA03028F63807217B979"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// DistractionsList
     /// </summary>
-    public partial class DistractionsList : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class DistractionsList : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 50 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 49 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox SearchBox;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 63 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 62 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock SearchPlaceholder;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 110 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 109 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox UrlInputBox;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 119 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 118 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock UrlPlaceholder;
         
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 151 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 150 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox OtherProgramsCheckBox;
         
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 152 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 151 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock HeaderTextBlock;
         
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 158 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+        #line 157 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel ItemsPanel;
         
@@ -130,7 +130,7 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 25 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+            #line 24 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.BackButton_Click);
             
             #line default
@@ -139,7 +139,7 @@ namespace InnoLabProjektDektopApp {
             case 2:
             this.SearchBox = ((System.Windows.Controls.TextBox)(target));
             
-            #line 61 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+            #line 60 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
             this.SearchBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.SearchBox_TextChanged);
             
             #line default
@@ -151,7 +151,7 @@ namespace InnoLabProjektDektopApp {
             case 4:
             this.UrlInputBox = ((System.Windows.Controls.TextBox)(target));
             
-            #line 118 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+            #line 117 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
             this.UrlInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.UrlInputBox_TextChanged);
             
             #line default
@@ -162,7 +162,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 6:
             
-            #line 138 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
+            #line 137 "..\..\..\..\..\Screens\FirstLaunch\03_1DistractionsList.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddButton_Click);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs
index 311ba9c9145037177c6faadbaedc0f86d6986c91..90b0e3d40c00dcf4f7bff1530a114dbf53d46ebd 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1F10F7816B98A4217B59F374663F778C8C3E559E"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3091AF73E4DCD404239266588D489CB937D8EFD9"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Settings
     /// </summary>
-    public partial class Settings : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Settings : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 31 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton DistractionModeFullBlocking;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 33 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton DistractionModeMascotFeedback;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 40 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 39 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox SecondsComboBox;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton MascotVisibleYes;
         
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton MascotVisibleNo;
         
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 71 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 70 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel MotivationSection;
         
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 85 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 84 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
         
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 91 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 90 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
         
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
         
@@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 141 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 140 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
         
@@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 156 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CyclesComboBox;
         
@@ -172,7 +172,7 @@ namespace InnoLabProjektDektopApp {
             case 4:
             this.MascotVisibleYes = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             this.MascotVisibleYes.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
             
             #line default
@@ -181,7 +181,7 @@ namespace InnoLabProjektDektopApp {
             case 5:
             this.MascotVisibleNo = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             this.MascotVisibleNo.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
             
             #line default
@@ -199,7 +199,7 @@ namespace InnoLabProjektDektopApp {
             case 9:
             this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
             
             #line default
@@ -213,7 +213,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 12:
             
-            #line 169 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click);
             
             #line default
@@ -221,7 +221,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 13:
             
-            #line 172 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 171 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverviewButton_Click);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs
index 311ba9c9145037177c6faadbaedc0f86d6986c91..90b0e3d40c00dcf4f7bff1530a114dbf53d46ebd 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/FirstLaunch/04Settings.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1F10F7816B98A4217B59F374663F778C8C3E559E"
+#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3091AF73E4DCD404239266588D489CB937D8EFD9"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Settings
     /// </summary>
-    public partial class Settings : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Settings : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 31 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton DistractionModeFullBlocking;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 33 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 32 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton DistractionModeMascotFeedback;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 40 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 39 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox SecondsComboBox;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton MascotVisibleYes;
         
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton MascotVisibleNo;
         
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 71 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 70 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel MotivationSection;
         
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 85 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 84 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
         
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 91 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 90 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
         
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
         
@@ -115,7 +115,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 141 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 140 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
         
@@ -123,7 +123,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 156 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+        #line 155 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CyclesComboBox;
         
@@ -172,7 +172,7 @@ namespace InnoLabProjektDektopApp {
             case 4:
             this.MascotVisibleYes = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 66 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             this.MascotVisibleYes.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
             
             #line default
@@ -181,7 +181,7 @@ namespace InnoLabProjektDektopApp {
             case 5:
             this.MascotVisibleNo = ((System.Windows.Controls.RadioButton)(target));
             
-            #line 68 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 67 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             this.MascotVisibleNo.Checked += new System.Windows.RoutedEventHandler(this.MascotVisibilityChanged);
             
             #line default
@@ -199,7 +199,7 @@ namespace InnoLabProjektDektopApp {
             case 9:
             this.FocusPeriodComboBox = ((System.Windows.Controls.ComboBox)(target));
             
-            #line 125 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 124 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             this.FocusPeriodComboBox.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(this.ComboBox_SelectionChanged);
             
             #line default
@@ -213,7 +213,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 12:
             
-            #line 169 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 168 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.SaveSettingsButton_Click);
             
             #line default
@@ -221,7 +221,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 13:
             
-            #line 172 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
+            #line 171 "..\..\..\..\..\Screens\FirstLaunch\04Settings.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverviewButton_Click);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs
index afc8725aad2913d025091e0c27d15c83044a2be9..6f863d363050778c912f8dafd3c1bcf9bb866168 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1EFCB88867CB021DF28247EC6D36F821FD4A0742"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "27EFD47612E883094FA6DDB67E9E552CC96BCE5B"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Overview
     /// </summary>
-    public partial class Overview : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Overview : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 83 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 99 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 101 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 114 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 116 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CyclesComboBox;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 127 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 129 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox DistractionModeComboBox;
         
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 137 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 139 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox MascotVisibilityComboBox;
         
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 147 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 149 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
         
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 153 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 155 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
         
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 167 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 169 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox FocusTopicInputBox;
         
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 176 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock FocusTopicPlaceholder;
         
@@ -146,7 +146,7 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 34 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 36 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.EditProfile_Click);
             
             #line default
@@ -154,7 +154,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 2:
             
-            #line 49 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 51 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddProfile_Click);
             
             #line default
@@ -184,7 +184,7 @@ namespace InnoLabProjektDektopApp {
             case 10:
             this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target));
             
-            #line 175 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged);
             
             #line default
@@ -195,7 +195,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 12:
             
-            #line 188 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 190 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StartButton_Click);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs
index afc8725aad2913d025091e0c27d15c83044a2be9..6f863d363050778c912f8dafd3c1bcf9bb866168 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/01Overview.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1EFCB88867CB021DF28247EC6D36F821FD4A0742"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\01Overview.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "27EFD47612E883094FA6DDB67E9E552CC96BCE5B"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Overview
     /// </summary>
-    public partial class Overview : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Overview : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 83 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 85 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox FocusPeriodComboBox;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 99 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 101 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox BreakPeriodComboBox;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 114 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 116 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox CyclesComboBox;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 127 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 129 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox DistractionModeComboBox;
         
@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 137 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 139 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ComboBox MascotVisibilityComboBox;
         
@@ -83,7 +83,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 147 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 149 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox WordsOfAffirmationCheckBox;
         
@@ -91,7 +91,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 153 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 155 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.CheckBox InsultingWordsCheckBox;
         
@@ -99,7 +99,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 167 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 169 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBox FocusTopicInputBox;
         
@@ -107,7 +107,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 176 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+        #line 178 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock FocusTopicPlaceholder;
         
@@ -146,7 +146,7 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 34 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 36 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.EditProfile_Click);
             
             #line default
@@ -154,7 +154,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 2:
             
-            #line 49 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 51 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.AddProfile_Click);
             
             #line default
@@ -184,7 +184,7 @@ namespace InnoLabProjektDektopApp {
             case 10:
             this.FocusTopicInputBox = ((System.Windows.Controls.TextBox)(target));
             
-            #line 175 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 177 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             this.FocusTopicInputBox.TextChanged += new System.Windows.Controls.TextChangedEventHandler(this.FocusTopicInputBox_TextChanged);
             
             #line default
@@ -195,7 +195,7 @@ namespace InnoLabProjektDektopApp {
             return;
             case 12:
             
-            #line 188 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
+            #line 190 "..\..\..\..\..\Screens\Regulaer\01Overview.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.StartButton_Click);
             
             #line default
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs
index 589d8a350064841dadabca6c19db677494002c5c..74ccdd9304f72c6aaca14818eea754f57cdc2364 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4D171F84F09119FFF5927E5550B6D53DBDAC090D"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "08D362CD8378FED364AC9B223A8651CCFB7B94C8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Session
     /// </summary>
-    public partial class Session : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Session : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 15 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock Title;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 17 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock Clock;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 18 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 19 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel CyclesIndicatorPanel;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button PlayPauseButton;
         
@@ -95,13 +95,6 @@ namespace InnoLabProjektDektopApp {
             #line hidden
         }
         
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -112,19 +105,27 @@ namespace InnoLabProjektDektopApp {
             switch (connectionId)
             {
             case 1:
-            this.Title = ((System.Windows.Controls.TextBlock)(target));
+            
+            #line 10 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.discardSession_Click);
+            
+            #line default
+            #line hidden
             return;
             case 2:
-            this.Clock = ((System.Windows.Controls.TextBlock)(target));
+            this.Title = ((System.Windows.Controls.TextBlock)(target));
             return;
             case 3:
-            this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+            this.Clock = ((System.Windows.Controls.TextBlock)(target));
             return;
             case 4:
+            this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 5:
             this.PlayPauseButton = ((System.Windows.Controls.Button)(target));
             
-            #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
-            this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+            #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+            this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.PlayPause_Click);
             
             #line default
             #line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs
index 589d8a350064841dadabca6c19db677494002c5c..74ccdd9304f72c6aaca14818eea754f57cdc2364 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/02Session.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4D171F84F09119FFF5927E5550B6D53DBDAC090D"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\02Session.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "08D362CD8378FED364AC9B223A8651CCFB7B94C8"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,10 +40,10 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Session
     /// </summary>
-    public partial class Session : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Session : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         
-        #line 15 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock Title;
         
@@ -51,7 +51,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 16 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 17 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock Clock;
         
@@ -59,7 +59,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 18 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 19 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.StackPanel CyclesIndicatorPanel;
         
@@ -67,7 +67,7 @@ namespace InnoLabProjektDektopApp {
         #line hidden
         
         
-        #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+        #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button PlayPauseButton;
         
@@ -95,13 +95,6 @@ namespace InnoLabProjektDektopApp {
             #line hidden
         }
         
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -112,19 +105,27 @@ namespace InnoLabProjektDektopApp {
             switch (connectionId)
             {
             case 1:
-            this.Title = ((System.Windows.Controls.TextBlock)(target));
+            
+            #line 10 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.discardSession_Click);
+            
+            #line default
+            #line hidden
             return;
             case 2:
-            this.Clock = ((System.Windows.Controls.TextBlock)(target));
+            this.Title = ((System.Windows.Controls.TextBlock)(target));
             return;
             case 3:
-            this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+            this.Clock = ((System.Windows.Controls.TextBlock)(target));
             return;
             case 4:
+            this.CyclesIndicatorPanel = ((System.Windows.Controls.StackPanel)(target));
+            return;
+            case 5:
             this.PlayPauseButton = ((System.Windows.Controls.Button)(target));
             
-            #line 20 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
-            this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.Button_Click);
+            #line 21 "..\..\..\..\..\Screens\Regulaer\02Session.xaml"
+            this.PlayPauseButton.Click += new System.Windows.RoutedEventHandler(this.PlayPause_Click);
             
             #line default
             #line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs
index 4d8e07868dced88e79d96ec12334d2c17c97bd65..05b719a988b4783dde33332d257c6a327a4ac120 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "16A774735AFFF594D835EF08249963B0FE20FF84"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C99F67108FD04036B98DA69729D4719C05443A7F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// End
     /// </summary>
-    public partial class End : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class End : System.Windows.Navigation.NavigationWindow, System.Windows.Markup.IComponentConnector {
         
         private bool _contentLoaded;
         
@@ -63,13 +63,6 @@ namespace InnoLabProjektDektopApp {
             #line hidden
         }
         
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -77,25 +70,6 @@ namespace InnoLabProjektDektopApp {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 13 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 14 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
             this._contentLoaded = true;
         }
     }
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs
index 4d8e07868dced88e79d96ec12334d2c17c97bd65..05b719a988b4783dde33332d257c6a327a4ac120 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/03End.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "16A774735AFFF594D835EF08249963B0FE20FF84"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\03End.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "C99F67108FD04036B98DA69729D4719C05443A7F"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// End
     /// </summary>
-    public partial class End : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class End : System.Windows.Navigation.NavigationWindow, System.Windows.Markup.IComponentConnector {
         
         private bool _contentLoaded;
         
@@ -63,13 +63,6 @@ namespace InnoLabProjektDektopApp {
             #line hidden
         }
         
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -77,25 +70,6 @@ namespace InnoLabProjektDektopApp {
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
         void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
-            switch (connectionId)
-            {
-            case 1:
-            
-            #line 13 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 14 "..\..\..\..\..\Screens\Regulaer\03End.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
-            
-            #line default
-            #line hidden
-            return;
-            }
             this._contentLoaded = true;
         }
     }
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs
index 434de39bc59e6a3deb2732572d3491af2d7c1bfd..1ad8c263004c8d92e2be784efdc0bb18af385767 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "090ECFC8E77AFD0E3E7CDB280240AC2AEA811D91"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7879C038C97A981468360F56AAAC9CA70CFB68E"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Statistics
     /// </summary>
-    public partial class Statistics : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Statistics : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         private bool _contentLoaded;
         
@@ -63,13 +63,6 @@ namespace InnoLabProjektDektopApp {
             #line hidden
         }
         
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -81,16 +74,8 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 13 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 14 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
+            #line 12 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverview_Click);
             
             #line default
             #line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs
index 434de39bc59e6a3deb2732572d3491af2d7c1bfd..1ad8c263004c8d92e2be784efdc0bb18af385767 100644
--- a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs
+++ b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/Screens/Regulaer/04Statistics.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "090ECFC8E77AFD0E3E7CDB280240AC2AEA811D91"
+#pragma checksum "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "B7879C038C97A981468360F56AAAC9CA70CFB68E"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -40,7 +40,7 @@ namespace InnoLabProjektDektopApp {
     /// <summary>
     /// Statistics
     /// </summary>
-    public partial class Statistics : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+    public partial class Statistics : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector {
         
         private bool _contentLoaded;
         
@@ -63,13 +63,6 @@ namespace InnoLabProjektDektopApp {
             #line hidden
         }
         
-        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal System.Delegate _CreateDelegate(System.Type delegateType, string handler) {
-            return System.Delegate.CreateDelegate(delegateType, this, handler);
-        }
-        
         [System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.4.0")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
@@ -81,16 +74,8 @@ namespace InnoLabProjektDektopApp {
             {
             case 1:
             
-            #line 13 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option2_Click);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
-            
-            #line 14 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
-            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Option3_Click);
+            #line 12 "..\..\..\..\..\Screens\Regulaer\04Statistics.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.NavigateToOverview_Click);
             
             #line default
             #line hidden
diff --git a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe
index e0a257ebe93b4c1e0f06695666311ce3fa01b6f4..67a1df483690a2a8ff56a0e6a72586aa21796bd1 100644
Binary files a/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe and b/InnoLabProjektDektopApp/InnoLabProjektDektopApp/obj/Debug/net8.0-windows/apphost.exe differ