diff --git a/Aurora.gtk/Aurora.gtk.csproj b/Aurora.gtk/Aurora.gtk.csproj
index d3f021b..756b750 100644
--- a/Aurora.gtk/Aurora.gtk.csproj
+++ b/Aurora.gtk/Aurora.gtk.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props')" />
   <Import Project="..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.props')" />
   <Import Project="..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.props')" />
   <PropertyGroup>
@@ -48,22 +49,22 @@
     </Reference>
     <Reference Include="Mono.Posix" />
     <Reference Include="Xamarin.Forms.Core">
-      <HintPath>..\packages\Xamarin.Forms.3.6.0.344457\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform">
-      <HintPath>..\packages\Xamarin.Forms.3.6.0.344457\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml">
-      <HintPath>..\packages\Xamarin.Forms.3.6.0.344457\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK">
-      <HintPath>..\packages\Xamarin.Forms.Platform.GTK.3.6.0.344457\lib\net45\OpenTK.dll</HintPath>
+      <HintPath>..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="webkit-sharp">
-      <HintPath>..\packages\Xamarin.Forms.Platform.GTK.3.6.0.344457\lib\net45\webkit-sharp.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.Platform.GTK.4.1.0.581479\lib\net45\webkit-sharp.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.GTK">
-      <HintPath>..\packages\Xamarin.Forms.Platform.GTK.3.6.0.344457\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Forms.Platform.GTK.4.1.0.581479\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection">
       <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
@@ -492,4 +493,5 @@
   <Import Project="..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" />
   <Import Project="..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.targets')" />
   <Import Project="..\packages\Grpc.Core.1.21.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.1.21.0\build\net45\Grpc.Core.targets')" />
+  <Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Aurora.gtk/OpenTK.dll.config b/Aurora.gtk/OpenTK.dll.config
index ca5c33c..7098d39 100644
--- a/Aurora.gtk/OpenTK.dll.config
+++ b/Aurora.gtk/OpenTK.dll.config
@@ -1,91 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <dllmap
-         os="linux"
-         dll="opengl32.dll"
-         target="libGL.so.1"/>
-    <dllmap
-         os="linux"
-         dll="glu32.dll"
-         target="libGLU.so.1"/>
-    <dllmap
-         os="linux"
-         dll="openal32.dll"
-         target="libopenal.so.1"/>
-    <dllmap
-         os="linux"
-         dll="alut.dll"
-         target="libalut.so.0"/>
-    <dllmap
-         os="linux"
-         dll="opencl.dll"
-         target="libOpenCL.so"/>
-    <dllmap
-         os="linux"
-         dll="libX11"
-         target="libX11.so.6"/>
-    <dllmap
-         os="linux"
-         dll="libXi"
-         target="libXi.so.6"/>
-    <dllmap
-         os="linux"
-         dll="SDL2.dll"
-         target="libSDL2-2.0.so.0"/>
-    <dllmap
-         os="osx"
-         dll="opengl32.dll"
-         target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
-    <dllmap
-         os="osx"
-         dll="openal32.dll"
-         target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
-    <dllmap
-         os="osx"
-         dll="alut.dll"
-         target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
-    <dllmap
-         os="osx"
-         dll="libGLES.dll"
-         target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES"/>
-    <dllmap
-         os="osx"
-         dll="libGLESv1_CM.dll"
-         target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES"/>
-    <dllmap
-         os="osx"
-         dll="libGLESv2.dll"
-         target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES"/>
-    <dllmap
-         os="osx"
-         dll="opencl.dll"
-         target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
-    <dllmap
-         os="osx"
-         dll="SDL2.dll"
-         target="libSDL2.dylib"/><!-- XQuartz compatibility (X11 on Mac) -->
-    <dllmap
-         os="osx"
-         dll="libGL.so.1"
-         target="/usr/X11/lib/libGL.dylib"/>
-    <dllmap
-         os="osx"
-         dll="libX11"
-         target="/usr/X11R6/lib/libX11.dylib"/>
-    <dllmap
-         os="osx"
-         dll="libXcursor.so.1"
-         target="/usr/X11/lib/libXcursor.dylib"/>
-    <dllmap
-         os="osx"
-         dll="libXi"
-         target="/usr/X11/lib/libXi.dylib"/>
-    <dllmap
-         os="osx"
-         dll="libXinerama"
-         target="/usr/X11/lib/libXinerama.dylib"/>
-    <dllmap
-         os="osx"
-         dll="libXrandr.so.2"
-         target="/usr/X11/lib/libXrandr.dylib"/>
-</configuration>
\ No newline at end of file
+  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>
diff --git a/Aurora.gtk/packages.config b/Aurora.gtk/packages.config
index 66daeeb..955ca6a 100644
--- a/Aurora.gtk/packages.config
+++ b/Aurora.gtk/packages.config
@@ -12,6 +12,7 @@
   <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net47" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net47" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net47" />
+  <package id="OpenTK" version="3.0.1" targetFramework="net47" />
   <package id="Sharpnado.Forms.HorizontalListView" version="1.2.0" targetFramework="net47" />
   <package id="System.Interactive.Async" version="3.2.0" targetFramework="net47" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net47" />
@@ -22,7 +23,7 @@
   <package id="taglib-sharp-netstandard2.0" version="2.1.0" targetFramework="net47" />
   <package id="VideoLAN.LibVLC.Mac" version="3.1.2" targetFramework="net47" />
   <package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="net47" />
-  <package id="Xamarin.Forms" version="3.6.0.344457" targetFramework="net47" />
+  <package id="Xamarin.Forms" version="4.1.0.581479" targetFramework="net47" />
   <package id="Xamarin.Forms.DataGrid" version="3.1.0" targetFramework="net47" />
-  <package id="Xamarin.Forms.Platform.GTK" version="3.6.0.344457" targetFramework="net47" />
+  <package id="Xamarin.Forms.Platform.GTK" version="4.1.0.581479" targetFramework="net47" />
 </packages>
\ No newline at end of file
diff --git a/Aurora/Aurora.csproj b/Aurora/Aurora.csproj
index 8c29adf..9d512ee 100644
--- a/Aurora/Aurora.csproj
+++ b/Aurora/Aurora.csproj
@@ -1,104 +1,55 @@
-<Project
-     Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <ProduceAssemblyReference>true</ProduceAssemblyReference>
     </PropertyGroup>
-    <PropertyGroup
-         Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
         <DebugType>pdbonly</DebugType>
         <DebugSymbols>true</DebugSymbols>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference
-             Include="Xamarin.Forms"
-             Version="3.6.0.264807"/>
-        <PackageReference
-             Include="Xamarin.Essentials"
-             Version="1.0.1"/>
-        <PackageReference
-             Include="Xamarin.Forms.DataGrid"
-             Version="3.1.0"/>
-        <PackageReference
-             Include="taglib-sharp-netstandard2.0"
-             Version="2.1.0"/>
-        <PackageReference
-             Include="LibVLCSharp.Forms"
-             Version="3.0.0"/>
-        <PackageReference
-             Include="VideoLAN.LibVLC.Mac"
-             Version="3.1.3"/>
-        <PackageReference
-             Include="Grpc"
-             Version="1.21.0"/>
-        <PackageReference
-             Include="Grpc.Tools"
-             Version="1.21.0"
-             PrivateAssests="All"/>
-        <PackageReference
-             Include="Google.Protobuf"
-             Version="3.8.0"/>
-        <PackageReference
-             Include="Xam.Plugins.Settings"
-             Version="3.1.1"/>
-        <PackageReference
-             Include="Sharpnado.Forms.HorizontalListView"
-             Version="1.2.0"/>
+        <PackageReference Include="Xamarin.Forms" Version="4.1.0.581479" />
+        <PackageReference Include="Xamarin.Essentials" Version="1.0.1" />
+        <PackageReference Include="Xamarin.Forms.DataGrid" Version="3.1.0" />
+        <PackageReference Include="taglib-sharp-netstandard2.0" Version="2.1.0" />
+        <PackageReference Include="LibVLCSharp.Forms" Version="3.0.0" />
+        <PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3" />
+        <PackageReference Include="Grpc" Version="1.21.0" />
+        <PackageReference Include="Grpc.Tools" Version="1.21.0" PrivateAssests="All" />
+        <PackageReference Include="Google.Protobuf" Version="3.8.0" />
+        <PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
+        <PackageReference Include="Sharpnado.Forms.HorizontalListView" Version="1.2.0" />
     </ItemGroup>
     <ItemGroup>
-        <Folder
-             Include="Design\"/>
-        <Folder
-             Include="Design\Components\"/>
-        <Folder
-             Include="Design\Views\"/>
-        <Folder
-             Include="Design\Views\Songs\"/>
-        <Folder
-             Include="Design\Views\MainView\"/>
-        <Folder
-             Include="Design\Behaviors\"/>
-        <Folder
-             Include="Design\Components\NavigationMenu\"/>
-        <Folder
-             Include="Design\Views\Albums\"/>
-        <Folder
-             Include="Design\Views\Artists\"/>
-        <Folder
-             Include="Design\Views\Stations\"/>
-        <Folder
-             Include="Utils\"/>
-        <Folder
-             Include="Models\"/>
-        <Folder
-             Include="Services\"/>
-        <Folder
-             Include="Design\Views\Party\"/>
-        <Folder
-             Include="Design\Components\HostSelector\"/>
-        <Folder
-             Include="Design\Components\MemberList\"/>
-        <Folder
-             Include="Design\Components\Queue\"/>
-        <Folder
-             Include="Design\Views\Profile\"/>
+        <Folder Include="Design\" />
+        <Folder Include="Design\Components\" />
+        <Folder Include="Design\Views\" />
+        <Folder Include="Design\Views\Songs\" />
+        <Folder Include="Design\Views\MainView\" />
+        <Folder Include="Design\Behaviors\" />
+        <Folder Include="Design\Components\NavigationMenu\" />
+        <Folder Include="Design\Views\Albums\" />
+        <Folder Include="Design\Views\Artists\" />
+        <Folder Include="Design\Views\Stations\" />
+        <Folder Include="Utils\" />
+        <Folder Include="Models\" />
+        <Folder Include="Services\" />
+        <Folder Include="Design\Views\Party\" />
+        <Folder Include="Design\Components\HostSelector\" />
+        <Folder Include="Design\Components\MemberList\" />
+        <Folder Include="Design\Components\Queue\" />
+        <Folder Include="Design\Views\Profile\" />
     </ItemGroup>
     <ItemGroup>
-        <Compile
-             Update="Design\Components\MusicPlayer\Player.xaml.cs">
+        <Compile Update="Design\Components\MusicPlayer\Player.xaml.cs">
             <DependentUpon>Player.xaml</DependentUpon>
         </Compile>
     </ItemGroup>
     <ItemGroup>
-        <Protobuf
-             Include="Proto\general.proto"/>
-        <Protobuf
-             Include="Proto\party.proto"/>
-        <Protobuf
-             Include="Proto\events.proto"/>
-        <Protobuf
-             Include="Proto\playback.proto"/>
-        <Protobuf
-             Include="Proto\sync.proto"/>
+        <Protobuf Include="Proto\general.proto" />
+        <Protobuf Include="Proto\party.proto" />
+        <Protobuf Include="Proto\events.proto" />
+        <Protobuf Include="Proto\playback.proto" />
+        <Protobuf Include="Proto\sync.proto" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
index 99798d5..3a42064 100644
--- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
+++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentPage
+<ContentView
      xmlns="http://xamarin.com/schemas/2014/forms"
      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-     x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu"
-     Title="Navigation">
+     x:Class="Aurora.Design.Components.NavigationMenu.NavigationMenu">
     <ContentView.Content>
         <StackLayout>
             <ListView
@@ -71,4 +70,4 @@
             </ListView>
         </StackLayout>
     </ContentView.Content>
-</ContentPage>
\ No newline at end of file
+</ContentView>
\ No newline at end of file
diff --git a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
index eb950a0..8371106 100644
--- a/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
+++ b/Aurora/Design/Components/NavigationMenu/NavigationMenu.xaml.cs
@@ -5,7 +5,7 @@ using Xamarin.Forms;
 
 namespace Aurora.Design.Components.NavigationMenu
 {
-    public partial class NavigationMenu : ContentPage
+    public partial class NavigationMenu : ContentView
     {
         public NavigationMenu()
         {
diff --git a/Aurora/Design/Views/MainView/MainView.xaml b/Aurora/Design/Views/MainView/MainView.xaml
index 3e88e21..87bad21 100644
--- a/Aurora/Design/Views/MainView/MainView.xaml
+++ b/Aurora/Design/Views/MainView/MainView.xaml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<MasterDetailPage
+<ContentPage
      xmlns="http://xamarin.com/schemas/2014/forms"
      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
      xmlns:views="clr-namespace:Aurora.Design.Views.MainView"
      xmlns:navigation="clr-namespace:Aurora.Design.Components.NavigationMenu"
-     x:Class="Aurora.Design.Views.Main.MainView"
-     MasterBehavior="Split">
-    <MasterDetailPage.Master>
+     x:Class="Aurora.Design.Views.Main.MainView">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="150"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
         <navigation:NavigationMenu
+             Grid.Column="0"
              x:Name="MasterPage"
              Items="{Binding Pages}"/>
-    </MasterDetailPage.Master>
-    <MasterDetailPage.Detail>
-        <NavigationPage>
-            <x:Arguments>
-                <views:PageContainer
-                     x:Name="ContentPage"/>
-            </x:Arguments>
-        </NavigationPage>
-    </MasterDetailPage.Detail>
-</MasterDetailPage>
\ No newline at end of file
+
+        <views:PageContainer
+             Grid.Column="1"
+             x:Name="ContentPage"/>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/Aurora/Design/Views/MainView/MainView.xaml.cs b/Aurora/Design/Views/MainView/MainView.xaml.cs
index 9db6227..4137065 100644
--- a/Aurora/Design/Views/MainView/MainView.xaml.cs
+++ b/Aurora/Design/Views/MainView/MainView.xaml.cs
@@ -20,7 +20,7 @@ namespace Aurora.Design.Views.Main
     public delegate void SetPlayerVisibleDelegate(Boolean visible);
 
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class MainView : MasterDetailPage, IDisposable
+    public partial class MainView : ContentPage//, IDisposable
     {
         private Dictionary<int, BaseViewModel> _viewModels;
         private BaseViewModel _lastViewModel;
diff --git a/Aurora/Design/Views/MainView/PageContainer.xaml b/Aurora/Design/Views/MainView/PageContainer.xaml
index c4ff153..652881d 100644
--- a/Aurora/Design/Views/MainView/PageContainer.xaml
+++ b/Aurora/Design/Views/MainView/PageContainer.xaml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentPage
+<ContentView
      xmlns="http://xamarin.com/schemas/2014/forms"
      xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
      xmlns:components="clr-namespace:Aurora.Design.Components"
      xmlns:mp="clr-namespace:Aurora.Design.Components.MediaPlayer"
      x:Class="Aurora.Design.Views.MainView.PageContainer">
-    <ContentPage.Content>
+    <ContentView.Content>
         <Grid
              x:Name="Grid">
             <Grid.RowDefinitions>
@@ -24,5 +24,5 @@
                  VerticalOptions="End"
                  HeightRequest="200"/>
         </Grid>
-    </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+    </ContentView.Content>
+</ContentView>
\ No newline at end of file
diff --git a/Aurora/Design/Views/MainView/PageContainer.xaml.cs b/Aurora/Design/Views/MainView/PageContainer.xaml.cs
index f810e60..e0e9f81 100644
--- a/Aurora/Design/Views/MainView/PageContainer.xaml.cs
+++ b/Aurora/Design/Views/MainView/PageContainer.xaml.cs
@@ -5,7 +5,7 @@ using Xamarin.Forms;
 
 namespace Aurora.Design.Views.MainView
 {
-    public partial class PageContainer : ContentPage
+    public partial class PageContainer : ContentView
     {
         public PageContainer()
         {