diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml
index 3521662..ed6808d 100644
--- a/TheGameExtreme.Android/Properties/AndroidManifest.xml
+++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="17" android:versionName="5.3" package="com.uca.thegameextreme" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="18" android:versionName="5.4" package="com.uca.thegameextreme" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
 	<application android:icon="@drawable/TrierImageB" android:label="OrderStacks"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml
index 03571d3..78d8e13 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml
+++ b/TheGameExtreme/view/GamePreparationPage.xaml
@@ -71,13 +71,6 @@
                     FontSize="16"
                     VerticalTextAlignment="Center"
                     HorizontalTextAlignment="Center"/>
-
-                <Label
-                    TextColor="{DynamicResource WhiteColor}"
-                    FontSize="16"
-                    x:Name="nbPlayersChoose"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"/>
                 
                 
                 <Slider
@@ -90,17 +83,27 @@
                     VerticalOptions="Center"
                     WidthRequest="150"
                     Value="1"/>
+
+                <Label
+                    TextColor="{DynamicResource WhiteColor}"
+                    FontSize="16"
+                    x:Name="nbPlayersChoose"
+                    VerticalTextAlignment="Center"
+                    HorizontalTextAlignment="Center"/>
+
             </StackLayout>
 
             <StackLayout
                 Grid.Row="3"
                 Orientation="Horizontal">
+
                 <Label
                     Text="{x:Static resources:AppResources.StrValueType}"
                     TextColor="{DynamicResource WhiteColor}"
                     FontSize="16"
                     VerticalTextAlignment="Center"
                     HorizontalTextAlignment="Center"/>
+
                 <Picker
                     x:Name="SelectMode"
                     BackgroundColor="{DynamicResource SkyBlueColor}"
@@ -108,20 +111,15 @@
                     VerticalOptions="Center"
                     MinimumWidthRequest="30"
                     WidthRequest="150"/>
+
             </StackLayout>
 
             <StackLayout
                 Grid.Row="1"
                 Orientation="Horizontal">
-                <Label
-                    Text="{x:Static resources:AppResources.StrNbStacksInGame}"
-                    TextColor="{DynamicResource WhiteColor}"
-                    FontSize="16"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"/>
 
                 <Label
-                    x:Name="nbstacks"
+                    Text="{x:Static resources:AppResources.StrNbStacksInGame}"
                     TextColor="{DynamicResource WhiteColor}"
                     FontSize="16"
                     VerticalTextAlignment="Center"
@@ -137,6 +135,14 @@
                     VerticalOptions="Center"
                     WidthRequest="150"
                     Value="4"/>
+                
+                <Label
+                    x:Name="nbstacks"
+                    TextColor="{DynamicResource WhiteColor}"
+                    FontSize="16"
+                    VerticalTextAlignment="Center"
+                    HorizontalTextAlignment="Center"/>
+
             </StackLayout>
 
             <StackLayout
@@ -149,12 +155,6 @@
                     VerticalTextAlignment="Center"
                     HorizontalTextAlignment="Center"/>
 
-                <Label                    
-                    TextColor="{DynamicResource WhiteColor}"
-                    FontSize="16"
-                    x:Name="nbCard"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"/>
                 <Slider
                     x:Name="SelectNbCard"
                     Maximum="100"
@@ -165,6 +165,14 @@
                     VerticalOptions="Center"
                     WidthRequest="150"
                     Value="100"/>
+
+                <Label                    
+                    TextColor="{DynamicResource WhiteColor}"
+                    FontSize="16"
+                    x:Name="nbCard"
+                    VerticalTextAlignment="Center"
+                    HorizontalTextAlignment="Center"/>
+
             </StackLayout>
 
         </Grid>
@@ -189,7 +197,7 @@
                     Placeholder="Pseudo"
                     HorizontalOptions="Center"
                     MinimumWidthRequest="50"
-                    WidthRequest="150"
+                    WidthRequest="200"
                     MaxLength="18"
                     x:Name="FirstEntry"
                     IsTextPredictionEnabled="False"/>
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs
index 09d9ed0..3ed9da0 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml.cs
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs
@@ -9,10 +9,7 @@ namespace TheGameExtreme.view
     public partial class GamePreparationPage : ContentPage
     {
 
-        public List<string> listGameMode = new List<string> { AppResources.TypeValueWhole, AppResources.TypeValueRelative, AppResources.TypeValueTenth, AppResources.TypeValueHundredth, AppResources.TypeValueThousandthFract, AppResources.TypeValuefractionated };
-        //public List<int> listNbStack = new List<int> { 4, 6, 8 };
-        public List<int> listNbCard = new List<int> { 100, 80, 60, 40 };
-
+        public List<string> listGameMode = new List<string> { AppResources.TypeValueWhole, AppResources.TypeValueRelative, AppResources.TypeValueTenthFract, AppResources.TypeValueHundredthFract, AppResources.TypeValueThousandthFract, AppResources.TypeValuefractionated, AppResources.TypeValueTenth, AppResources.TypeValueHundredth };
 
         public GamePreparationPage()
         {
diff --git a/com.uca.thegameextreme-Signed.apk b/com.uca.thegameextreme-Signed.apk
index abadf7e..02a79f9 100644
Binary files a/com.uca.thegameextreme-Signed.apk and b/com.uca.thegameextreme-Signed.apk differ
diff --git a/com.uca.thegameextreme.apk b/com.uca.thegameextreme.apk
index 33a9967..02a79f9 100644
Binary files a/com.uca.thegameextreme.apk and b/com.uca.thegameextreme.apk differ