diff --git a/ClientApp/Views/LoginView.xaml b/ClientApp/Views/LoginView.xaml
index 6db392f..e8ad651 100644
--- a/ClientApp/Views/LoginView.xaml
+++ b/ClientApp/Views/LoginView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ClientApp.Views.LoginView"
+<Page x:Class="ClientApp.Views.LoginView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -19,4 +19,4 @@
             </Popup>
         </StackPanel>
     </DockPanel>
-</UserControl>
+</Page>
diff --git a/ClientApp/Views/LoginView.xaml.cs b/ClientApp/Views/LoginView.xaml.cs
index f48d9de..a971aad 100644
--- a/ClientApp/Views/LoginView.xaml.cs
+++ b/ClientApp/Views/LoginView.xaml.cs
@@ -16,7 +16,7 @@ namespace ClientApp.Views
     /// <summary>
     /// Interaction logic for LoginView.xaml
     /// </summary>
-    public partial class LoginView : UserControl
+    public partial class LoginView : Page
     {
         public LoginView()
         {
diff --git a/ClientApp/Views/MainView.xaml b/ClientApp/Views/MainView.xaml
index 72a0ff2..27203b8 100644
--- a/ClientApp/Views/MainView.xaml
+++ b/ClientApp/Views/MainView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="ClientApp.Views.MainView"
+<Page x:Class="ClientApp.Views.MainView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -49,4 +49,4 @@
         </Grid>
 
     </DockPanel>
-</UserControl>
+</Page>
diff --git a/ClientApp/Views/MainView.xaml.cs b/ClientApp/Views/MainView.xaml.cs
index 94161b9..1b84ff5 100644
--- a/ClientApp/Views/MainView.xaml.cs
+++ b/ClientApp/Views/MainView.xaml.cs
@@ -17,7 +17,7 @@ namespace ClientApp.Views
     /// <summary>
     /// Interaction logic for MainView.xaml
     /// </summary>
-    public partial class MainView : UserControl
+    public partial class MainView : Page
     {
         public MainView()
         {
diff --git a/ClientApp/Views/MainWindow.xaml b/ClientApp/Views/MainWindow.xaml
index 436c2a9..f6719e4 100644
--- a/ClientApp/Views/MainWindow.xaml
+++ b/ClientApp/Views/MainWindow.xaml
@@ -11,6 +11,6 @@
 
     <DockPanel>
         <Label Content="gemaakt door: mensen" DockPanel.Dock="Bottom" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontStyle="Italic" Foreground="Gray"/>
-        <ContentControl  HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" Focusable="False" />
+        <Frame  HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding SelectedViewModel}" Focusable="False"/>
     </DockPanel>
 </Window>