diff --git a/Borepin/Borepin.Android/Properties/AndroidManifest.xml b/Borepin/Borepin.Android/Properties/AndroidManifest.xml
index 47d8e1c..7cffd52 100644
--- a/Borepin/Borepin.Android/Properties/AndroidManifest.xml
+++ b/Borepin/Borepin.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabinfra.fabaccess" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
 	<application android:theme="@style/MainTheme" android:label="FabAccess"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
diff --git a/Borepin/Borepin.UWP/Borepin.UWP.csproj b/Borepin/Borepin.UWP/Borepin.UWP.csproj
index 3be887e..eed95aa 100644
--- a/Borepin/Borepin.UWP/Borepin.UWP.csproj
+++ b/Borepin/Borepin.UWP/Borepin.UWP.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Borepin.UWP</RootNamespace>
     <AssemblyName>Borepin.UWP</AssemblyName>
-    <DefaultLanguage>en</DefaultLanguage>
+    <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
@@ -18,6 +18,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Borepin/Borepin.UWP/Properties/AssemblyInfo.cs b/Borepin/Borepin.UWP/Properties/AssemblyInfo.cs
index 2fedb2d..5a55a00 100644
--- a/Borepin/Borepin.UWP/Properties/AssemblyInfo.cs
+++ b/Borepin/Borepin.UWP/Properties/AssemblyInfo.cs
@@ -27,4 +27,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: ComVisible(false)]
-[assembly: NeutralResourcesLanguage("")]
+[assembly: NeutralResourcesLanguage("en-US")]
diff --git a/Borepin/Borepin/Page/MainPage.xaml b/Borepin/Borepin/Page/MainPage.xaml
index 238c9ad..9d32bc4 100644
--- a/Borepin/Borepin/Page/MainPage.xaml
+++ b/Borepin/Borepin/Page/MainPage.xaml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<MasterDetailPage xmlns="http://xamarin.com/schemas/2014/forms"
+<FlyoutPage xmlns="http://xamarin.com/schemas/2014/forms"
                   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                   x:Class="Borepin.Page.MainPage"
-                  MasterBehavior="Popover"
                   x:Name="page">
-    <MasterDetailPage.Master>
+    <FlyoutPage.Flyout>
         <ContentPage Title="FabAccess">
             <StackLayout>
                 <Button Text="Machines" Command="{Binding NavigateCommand}" CommandParameter="MachineListPage" />
@@ -12,5 +11,5 @@
                 <Button Text="Servers" Command="{Binding NavigateCommand}" CommandParameter="ServerListPage" />
             </StackLayout>
         </ContentPage>
-    </MasterDetailPage.Master>
-</MasterDetailPage>
+    </FlyoutPage.Flyout>
+</FlyoutPage>
diff --git a/Borepin/Borepin/Page/MainPage.xaml.cs b/Borepin/Borepin/Page/MainPage.xaml.cs
index dec7f50..bedc968 100644
--- a/Borepin/Borepin/Page/MainPage.xaml.cs
+++ b/Borepin/Borepin/Page/MainPage.xaml.cs
@@ -3,7 +3,7 @@ using Xamarin.Forms;
 
 namespace Borepin.Page
 {
-    public partial class MainPage : IMasterDetailPageOptions
+    public partial class MainPage : IFlyoutPageOptions
     {
         public static readonly BindableProperty IsPresentedAfterNavigationProperty =
             BindableProperty.Create(nameof(IsPresentedAfterNavigation), typeof(bool), typeof(MainPage), false);