diff --git a/TheGameExtreme.Android/MainActivity.cs b/TheGameExtreme.Android/MainActivity.cs
index 820c3d1..8a6d4ef 100644
--- a/TheGameExtreme.Android/MainActivity.cs
+++ b/TheGameExtreme.Android/MainActivity.cs
@@ -10,7 +10,7 @@ using Xamarin.Forms;
 
 namespace TheGameExtreme.Droid
 {
-    [Activity(Label = "OrderStacks", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)]
+    [Activity(Label = "OrderStacks", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation, ScreenOrientation = ScreenOrientation.Landscape)] // ConfigChanges.Navigation
 
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
@@ -18,22 +18,16 @@ namespace TheGameExtreme.Droid
         {
             TabLayoutResource = Resource.Layout.Tabbar;
             ToolbarResource = Resource.Layout.Toolbar;
-
-            /*int uiOptions = (int)Window.DecorView.SystemUiVisibility;
-            uiOptions |= (int)SystemUiFlags.LowProfile;
-            uiOptions |= (int)SystemUiFlags.Fullscreen;
-            uiOptions |= (int)SystemUiFlags.HideNavigation;
-            uiOptions |= (int)SystemUiFlags.ImmersiveSticky;            
-            Window.DecorView.SystemUiVisibility = (StatusBarVisibility)uiOptions;*/
             
             base.OnCreate(savedInstanceState);
             Rg.Plugins.Popup.Popup.Init(this, savedInstanceState);
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
+            this.Window.DecorView.SystemUiVisibility = (StatusBarVisibility)SystemUiFlags.HideNavigation;
             LoadApplication(new App());
             Window.SetStatusBarColor(Android.Graphics.Color.Argb(255, 0, 0, 0));
             this.Window.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.TurnScreenOn);
-            
+
         }
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
         {
diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml
index 84a14d8..8895c42 100644
--- a/TheGameExtreme.Android/Properties/AndroidManifest.xml
+++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="13" android:versionName="5.0" package="com.uca.thegameextreme" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
 	<application android:icon="@drawable/TrierImageB" android:label="OrderStacks"></application>
diff --git a/TheGameExtreme/view/App.xaml.cs b/TheGameExtreme/view/App.xaml.cs
index b77a7be..5a94e3d 100644
--- a/TheGameExtreme/view/App.xaml.cs
+++ b/TheGameExtreme/view/App.xaml.cs
@@ -10,7 +10,8 @@ namespace TheGameExtreme
         public App()
         {
             InitializeComponent();
-
+            
+            NavigationPage.SetHasNavigationBar(this, false);
             MainPage = new NavigationPage(new HomePage());
 
         }
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs
index 2db9fef..4aa390f 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml.cs
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs
@@ -17,7 +17,9 @@ namespace TheGameExtreme.view
         public GamePreparationPage()
         {
             InitializeComponent();
+
             NavigationPage.SetHasNavigationBar(this, false);
+
             LoadParameterName();
 
             PlayerSelecter.ItemsSource = listNbPlayer;
@@ -42,7 +44,10 @@ namespace TheGameExtreme.view
             IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
-            IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            }
             await Navigation.PopAsync();
         }
 
@@ -52,7 +57,10 @@ namespace TheGameExtreme.view
             IOGamePreparation.SaveParameterGamePreparationGameModeValue(SelectMode.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbStacks(SelectNbStack.SelectedIndex);
             IOGamePreparation.SaveParameterGamePreparationNbCards(SelectNbCard.SelectedIndex);
-            IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                IOGamePreparation.SaveParameterGamePreparationName(FirstEntry.Text);
+            }
             return base.OnBackButtonPressed();
         }
 
@@ -80,6 +88,14 @@ namespace TheGameExtreme.view
 
         private void ChangedPseudo(object sender, EventArgs args)
         {
+            if ((int)PlayerSelecter.SelectedItem == 1)
+            {
+                LoadParameterName();
+            }
+            else
+            {
+                FirstEntry.Text = "";
+            }
             while (NameList.Children.Count - 1 != (int)PlayerSelecter.SelectedItem)
             {
                 if (NameList.Children.Count - 1 < (int)PlayerSelecter.SelectedItem)
diff --git a/TheGameExtreme/view/HomePage.xaml b/TheGameExtreme/view/HomePage.xaml
index ab791b6..f1f5811 100644
--- a/TheGameExtreme/view/HomePage.xaml
+++ b/TheGameExtreme/view/HomePage.xaml
@@ -8,112 +8,110 @@
     x:Class="TheGameExtreme.view.HomePage"
     x:Name="homepageT">
 
-    <StackLayout BackgroundColor="Transparent">
-
-        <Grid x:Name="MainGrid">
-
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="70*"/>
-                <ColumnDefinition Width="15*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="19*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-            </Grid.RowDefinitions>
-
-            <ImageButton Source="PointI.png"
-                         Grid.Column="0"
-                         Grid.Row="0"
-                         Clicked="ImageButton_Clicked"
-                         BackgroundColor="Transparent"
-                         WidthRequest="40"
-                         HeightRequest="40"
-                         VerticalOptions="End"
-                         HorizontalOptions="Center"/>
-
-            <Label
+    <Grid x:Name="MainGrid">
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="15*"/>
+            <ColumnDefinition Width="70*"/>
+            <ColumnDefinition Width="15*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+            <RowDefinition Height="27*"/>
+        </Grid.RowDefinitions>
+
+        <ImageButton
+            Source="PointI.png"
+            Grid.Column="0"
+            Grid.Row="0"
+            Clicked="ImageButton_Clicked"
+            BackgroundColor="Transparent"
+            WidthRequest="40"
+            HeightRequest="40"
+            VerticalOptions="Center"
+            HorizontalOptions="Center"/>
+
+        <Label
             Text="{x:Static resources:AppResources.StrTitle}"
             TextColor="{DynamicResource WhiteColor}"
             Grid.Row="0"
             Grid.Column="1" 
             HorizontalTextAlignment="Center"  
             FontSize="45"
-            VerticalTextAlignment="Start"
+            VerticalTextAlignment="Center"
             FontFamily=""/>
 
 
 
-            <Button
-                Text="{x:Static resources:AppResources.StrLocalGame}"
+        <Button
+            Text="{x:Static resources:AppResources.StrLocalGame}"
+            FontSize="18"
+            Grid.Row="2"
+            Grid.Column="1" 
+            HorizontalOptions="Center" 
+            WidthRequest="230" 
+            HeightRequest="57" 
+            VerticalOptions="Center"
+            Clicked="OpenGame"
+            CornerRadius="10"                
+            BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+
+        <Button
+            Text="{x:Static resources:AppResources.StrMultiplayer}"
+            FontSize="18"
+            Grid.Row="3"
+            Grid.Column="1" 
+            HorizontalOptions="Center" 
+            VerticalOptions="Center"
+            HeightRequest="57" 
+            WidthRequest="230"
+            Clicked="OpenMultiPlayerMode"
+            CornerRadius="10"                                    
+            BackgroundColor="{DynamicResource SkyBlueColor}"/>
+
+        <Button Text="{x:Static resources:AppResources.StrTitleRules}"
                 FontSize="18"
-                Grid.Row="2"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
-                WidthRequest="230" 
-                HeightRequest="57" 
+                Grid.Row="4"
+                Grid.Column="1"
+                HorizontalOptions="Center"
                 VerticalOptions="Center"
-                Clicked="OpenGame"
-                CornerRadius="10"                
+                HeightRequest="57"
+                WidthRequest="230"
+                Clicked="Rules_Clicked"
+                CornerRadius="10"                    
                 BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
+        <Image
+            Source="TrierImageB.png"
+            Grid.Column="1"
+            Grid.Row="1"/>
 
-            <Button
-                Text="{x:Static resources:AppResources.StrMultiplayer}"
-                FontSize="18"
-                Grid.Row="3"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
-                VerticalOptions="Center"
-                HeightRequest="57" 
-                WidthRequest="230"
-                Clicked="OpenMultiPlayerMode"
-                CornerRadius="10"                                    
-                BackgroundColor="{DynamicResource SkyBlueColor}"/>
 
-            <Button Text="{x:Static resources:AppResources.StrTitleRules}"
-                    FontSize="18"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    HorizontalOptions="Center"
-                    VerticalOptions="Center"
-                    HeightRequest="57"
-                    WidthRequest="230"
-                    Clicked="Rules_Clicked"
-                    CornerRadius="10"                    
-                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-            <Image Source="TrierImageB.png"
-                         Grid.Column="1"
-                         Grid.Row="1"/>
-
-
-            <Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="6*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*" />
-                    <ColumnDefinition Width="6*" />
-                </Grid.ColumnDefinitions>
-
-                <ImageButton
-                    x:Name="imageButton"                                
-                    Grid.Column="1"
-                    Grid.Row="1"                
-                    VerticalOptions="End"
-                    HorizontalOptions="Center"                
-                    Clicked="Theme_Clicked"
-                    BorderColor="{DynamicResource SkyBlueColor}"
-                    BackgroundColor="Transparent"/>
-            </Grid>
+        <Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="2*"/>
+                <RowDefinition Height="6*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2*" />
+                <ColumnDefinition Width="6*" />
+            </Grid.ColumnDefinitions>
 
+            <ImageButton
+                x:Name="imageButton"                                
+                Grid.Column="1"
+                Grid.Row="1"                
+                VerticalOptions="Center"
+                HorizontalOptions="Center"                
+                Clicked="Theme_Clicked"
+                BorderColor="{DynamicResource SkyBlueColor}"
+                BackgroundColor="Transparent"/>
         </Grid>
 
-    </StackLayout>
+    </Grid>
 
 </ContentPage>
diff --git a/TheGameExtreme/view/HomePage.xaml.cs b/TheGameExtreme/view/HomePage.xaml.cs
index e46f0ab..bdc0f94 100644
--- a/TheGameExtreme/view/HomePage.xaml.cs
+++ b/TheGameExtreme/view/HomePage.xaml.cs
@@ -11,7 +11,7 @@ namespace TheGameExtreme.view
         public HomePage()
         {
             InitializeComponent();
-            NavigationPage.SetHasNavigationBar(this, false);            
+            NavigationPage.SetHasNavigationBar(this, false);
             LoadParameterOptionOnHomepage();
 
         }        
diff --git a/TheGameExtreme/view/HomePage.xaml.cs.orig b/TheGameExtreme/view/HomePage.xaml.cs.orig
deleted file mode 100644
index 1875e68..0000000
--- a/TheGameExtreme/view/HomePage.xaml.cs.orig
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using Xamarin.Forms;
-using TheGameExtreme.IO;
-<<<<<<< HEAD
-=======
-using TheGameExtreme.Resx;
->>>>>>> bluetoothtest
-
-namespace TheGameExtreme.view
-{
-    public partial class HomePage : ContentPage
-    {
-        
-        public HomePage()
-        {
-            InitializeComponent();
-            NavigationPage.SetHasNavigationBar(this, false);            
-            LoadParameterOptionOnHomepage();
-
-        }        
-        private async void OpenGame(object sender, EventArgs args)
-        {
-            await Navigation.PushAsync(new GamePreparationPage());
-        }
-
-        private async void OpenMultiPlayerMode(object sender, EventArgs args)
-        {
-            await DisplayAlert("Mode en cours de développement", null, "Fermer");
-            //await Navigation.PushAsync(new MultiPlayerMode());            
-        }       
-
-        private async void Rules_Clicked(object sender, EventArgs args)
-        {
-            await Navigation.PushAsync(new RulesGame());
-        }
-        
-
-        public void LoadParameterOptionOnHomepage()
-        {
-            bool b = IOOptions.LoadOptionsParameter();
-            if (!b)
-            {
-                Application.Current.Resources["BlackColor"] = Color.Black;
-                Application.Current.Resources["WhiteColor"] = Color.White;
-                imageButton.Source = "SoleilThemes.png";
-            }
-            else
-            {
-                Application.Current.Resources["BlackColor"] = Color.White;
-                Application.Current.Resources["WhiteColor"] = Color.Black;
-                imageButton.Source = "LuneSombreTheme.png";
-            }
-        }
-
-        private void Theme_Clicked(object sender, EventArgs e)
-        {
-            bool b;
-            ButtonGrid.Children.Remove(imageButton);
-            
-            if(homepageT.BackgroundColor == Color.Black)
-            {
-                b = true;
-                Application.Current.Resources["BlackColor"] = Color.White;
-                Application.Current.Resources["WhiteColor"] = Color.Black;
-                imageButton = new ImageButton()
-                {
-                    BackgroundColor = Color.Transparent,
-                    BorderColor = (Color)Application.Current.Resources["SkyBlueColor"]
-                };
-                imageButton.Source = "LuneSombreTheme.png";
-            }
-            else
-            {
-                b = false;
-                Application.Current.Resources["BlackColor"] = Color.Black;
-                Application.Current.Resources["WhiteColor"] = Color.White;
-                imageButton = new ImageButton()
-                {
-                    BackgroundColor = Color.Transparent,
-                    BorderColor = (Color)Application.Current.Resources["SkyBlueColor"]
-                };
-                imageButton.Source = "SoleilThemes.png";
-            }
-            ButtonGrid.Children.Add(imageButton, 1, 1);
-            imageButton.Clicked += Theme_Clicked;
-            imageButton.HorizontalOptions = LayoutOptions.Center;
-            imageButton.VerticalOptions = LayoutOptions.End;
-            IOOptions.SaveOptionParameter(b);
-            
-            
-        }
-
-        private async void ImageButton_Clicked(object sender, EventArgs e)
-        {
-            await DisplayAlert(AppResources.StrInfo,AppResources.StrAbout, AppResources.StrCloseWind );
-        }
-    }
-}
diff --git a/TheGameExtreme/view/HomePage.xaml.orig b/TheGameExtreme/view/HomePage.xaml.orig
deleted file mode 100644
index 064e1ab..0000000
--- a/TheGameExtreme/view/HomePage.xaml.orig
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage
-    Title="THEGAME"
-    BackgroundColor="{DynamicResource BlackColor}"        
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:resources="clr-namespace:TheGameExtreme.Resx"
-    x:Class="TheGameExtreme.view.HomePage"
-    x:Name="homepageT">
-
-<<<<<<< HEAD
-    <StackLayout BackgroundColor="Transparent">
-
-        <Grid x:Name="MainGrid">
-            
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="15*"/>
-                <ColumnDefinition Width="70*"/>
-                <ColumnDefinition Width="15*"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="19*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-                <RowDefinition Height="27*"/>
-            </Grid.RowDefinitions>
-=======
-    <Grid
-        Margin="5,5,5,5">
-            
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="15*"/>
-            <ColumnDefinition Width="70*"/>
-            <ColumnDefinition Width="15*"/>
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="31*"/>
-            <RowDefinition Height="23*"/>
-            <RowDefinition Height="23*"/>
-            <RowDefinition Height="23*"/>
-        </Grid.RowDefinitions>
->>>>>>> 3badad823975148fed6467984295274bc7006685
-
-        <Label
-            Text="{x:Static resources:AppResources.StrTitle}"
-            TextColor="{DynamicResource WhiteColor}"
-            Grid.Row="0"
-            Grid.Column="1" 
-            HorizontalTextAlignment="Center"  
-            FontSize="45"
-            VerticalTextAlignment="Start"
-            FontFamily=""/>
-
-<<<<<<< HEAD
-            
-            
-            <Button
-                Text="{x:Static resources:AppResources.StrLocalGame}"
-                FontSize="18"
-                Grid.Row="2"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
-                WidthRequest="230" 
-                HeightRequest="57" 
-                VerticalOptions="Center"
-                Clicked="OpenGame"
-                CornerRadius="10"                
-                BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-
-            <Button
-                Text="{x:Static resources:AppResources.StrMultiplayer}"
-                FontSize="18"
-                Grid.Row="3"
-                Grid.Column="1" 
-                HorizontalOptions="Center" 
-                VerticalOptions="Center"
-                HeightRequest="57" 
-                WidthRequest="230"
-                Clicked="OpenMultiPlayerMode"
-                CornerRadius="10"                                    
-                BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-            <Button Text="{x:Static resources:AppResources.StrTitleRules}"
-                    FontSize="18"
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    HorizontalOptions="Center"
-                    VerticalOptions="Center"
-                    HeightRequest="57"
-                    WidthRequest="230"
-                    Clicked="Rules_Clicked"
-                    CornerRadius="10"                    
-                    BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-            <Image Source="TrierImageB.png"
-                         Grid.Column="1"
-                         Grid.Row="1"/>
-
-
-            <Grid Grid.Row="0" Grid.Column="2" x:Name="ButtonGrid">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="2*"/>
-                    <RowDefinition Height="6*"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="2*" />
-                    <ColumnDefinition Width="6*" />
-                </Grid.ColumnDefinitions>
-            
-                <ImageButton
-                    x:Name="imageButton"                                
-                    Grid.Column="1"
-                    Grid.Row="1"                
-                    VerticalOptions="End"
-                    HorizontalOptions="Center"                
-                    Clicked="Theme_Clicked"
-                    BorderColor="{DynamicResource SkyBlueColor}"
-                    BackgroundColor="Transparent"/>
-            </Grid>
-=======
-        <ImageButton
-            Source="EngrenageV1.png"
-            Grid.Row="0"
-            Grid.Column="2" 
-            VerticalOptions="StartAndExpand" 
-            HorizontalOptions="End" 
-            HeightRequest="60" 
-            WidthRequest="68"                         
-            Clicked="OpenSetting"
-            BackgroundColor="{DynamicResource BlackColor}"/>
-            
-        <Button
-            Text="{x:Static resources:AppResources.StrLocalGame}"
-            FontSize="18"
-            Grid.Row="1"
-            Grid.Column="1" 
-            HorizontalOptions="Center" 
-            WidthRequest="230" 
-            HeightRequest="57" 
-            VerticalOptions="Center"
-            Clicked="OpenGame"
-            CornerRadius="10"
-            BackgroundColor="{DynamicResource SkyBlueColor}"/>
-
-
-        <Button
-            Text="{x:Static resources:AppResources.StrMultiplayer}"
-            FontSize="18"
-            Grid.Row="2"
-            Grid.Column="1" 
-            HorizontalOptions="Center" 
-            VerticalOptions="Center"
-            HeightRequest="57" 
-            WidthRequest="230"
-            Clicked="OpenMultiPlayerMode"
-            CornerRadius="10"
-            BackgroundColor="{DynamicResource SkyBlueColor}"/>
->>>>>>> 3badad823975148fed6467984295274bc7006685
-
-        <ImageButton
-            Source="imagesRules.png"
-            Grid.Column="0"
-            Grid.Row="0"
-            HeightRequest="50"
-            WidthRequest="35"
-            VerticalOptions="StartAndExpand"
-            HorizontalOptions="Start"
-            Clicked="Rules_Clicked"
-            BackgroundColor="{DynamicResource BlackColor}"/>
-
-    </Grid>
-
-</ContentPage>
diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs
index 2d3d754..5f9d13e 100644
--- a/TheGameExtreme/view/MainPage.xaml.cs
+++ b/TheGameExtreme/view/MainPage.xaml.cs
@@ -20,7 +20,7 @@ namespace TheGameExtreme.view
     public partial class MainPage : ContentPage
     {
         private Main viewmodel;
-        private List<string> playersNames;
+        private List<string> playersNames = new List<string>();
         private int nbPile;
         private int nbCard;
         private int indexMode;
@@ -37,17 +37,27 @@ namespace TheGameExtreme.view
          */
         public MainPage(List<string> playersNames, int nbPile, int indexMode, int nbCard)
         {
-            this.playersNames = playersNames;
             this.nbPile = nbPile;
             this.nbCard = nbCard;
             this.indexMode = indexMode;
 
+            Random random = new Random();
+            int r = random.Next(0, playersNames.Count);
+            int size = playersNames.Count;
+            for (int i = 0; i < size; i++)
+            {
+                this.playersNames.Add(playersNames[r]);
+                playersNames.RemoveAt(r);
+                r = random.Next(0, playersNames.Count);
+            }
+
             InitializeComponent();
+
             NavigationPage.SetHasNavigationBar(this, false);
 
             EndTurnButton.Text = AppResources.StrEndTurn;   // Trouver le moyen d'avoir du binding
 
-            viewmodel = new Main(playersNames, nbPile, nbCard, indexMode);
+            viewmodel = new Main(this.playersNames, nbPile, nbCard, indexMode);
 
             viewmodel.EndGame += OnEndGame;
 
@@ -89,17 +99,17 @@ namespace TheGameExtreme.view
             {
                 if (i < (stackCollection.Count * 0.5))
                 {
-                    stackCollection[i].Paint(canvas, new SKColor(33, 255, 40));
+                    stackCollection[i].Paint(canvas);
                 }
                 else
                 {
-                    stackCollection[i].Paint(canvas, SKColors.Red);
+                    stackCollection[i].Paint(canvas);
                 }
             }
 
             foreach (TouchManipulationCard textPaint in textCollection)
             {
-                textPaint.Paint(canvas, SKColors.SkyBlue);
+                textPaint.Paint(canvas);
             }
         }
 
@@ -142,9 +152,24 @@ namespace TheGameExtreme.view
                 case TouchActionType.Moved:
                     if (textDictionary.ContainsKey(args.Id))
                     {
+                        bool isStackable = false;
+
                         TouchManipulationCard card = textDictionary[args.Id];
                         point.Y -= 120;
                         point.X -= 50;
+                        foreach (TouchManipulationCard stack in stackCollection)
+                        {
+                            SKPoint pointVisuCard = new SKPoint(point.X, point.Y - 120);
+                            if (stack.HitTest(point) || stack.HitTest(pointVisuCard))
+                            {
+                                card.Color = stack.Color;
+                                isStackable = true;
+                            }
+                        }
+                        if (!isStackable)
+                        {
+                            card.Color = SKColors.SkyBlue;
+                        }
                         card.ProcessTouchEvent(args.Id, args.Type, point);
                         canvasView.InvalidateSurface();
                     }
@@ -168,6 +193,7 @@ namespace TheGameExtreme.view
                                 {
                                     card.ProcessTouchEvent(args.Id, TouchActionType.Moved, stack.InitialPoint);
                                     card.InitialPoint = stackCollection[stackCollection.IndexOf(stack)].InitialPoint;
+                                    card.Color = stack.Color;
                                     stackCollection[stackCollection.IndexOf(stack)] = card;
                                     textCollection.RemoveAt(textCollection.Count - 1);
                                     find = true;
@@ -178,6 +204,7 @@ namespace TheGameExtreme.view
                         if (!find)
                         {
                             card.ProcessTouchEvent(args.Id, TouchActionType.Moved, card.InitialPoint);
+                            card.Color = SKColors.SkyBlue;
                         }
                         card.ProcessTouchEvent(args.Id, args.Type, point);
                         textDictionary.Remove(args.Id);
@@ -199,7 +226,7 @@ namespace TheGameExtreme.view
 
             float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20);
 
-            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / (viewmodel.getListOrderedStacks().Count * 2)) + 10f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.1) + (DeviceDisplay.MainDisplayInfo.Height * 0.9) * 0.01 + 2 * (0.05f * (float)DeviceDisplay.MainDisplayInfo.Width * textPaint.TextSize / textPaint.MeasureText("001"))));
+            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / (viewmodel.getListOrderedStacks().Count * 2)) + 10f + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.1) + (DeviceDisplay.MainDisplayInfo.Height * 0.9) * 0.01 + 2 * (0.05f * (float)DeviceDisplay.MainDisplayInfo.Width * textPaint.TextSize / textPaint.MeasureText("001"))));
 
             position.X -= inflateWidth;
 
@@ -220,14 +247,25 @@ namespace TheGameExtreme.view
                 textPaint.TextSize = 0.03f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("00");
                 position.X -= textWidth * 0.5f;
 
+                SKColor color;
+                if (i < (viewmodel.getListOrderedStacks().Count * 0.5))
+                {
+                    color = new SKColor(33, 255, 40);
+                }
+                else
+                {
+                    color = SKColors.Red;
+                }
+
                 stackCollection.Add(new TouchManipulationCard(textPaint, viewmodel.getListOrderedStacks()[i].Peek(), inflateWidth)
                 {
                     Matrix = SKMatrix.MakeTranslation(position.X, position.Y),
                     InitialMatrix = SKMatrix.MakeTranslation(position.X, position.Y),
-                    InitialPoint = position
+                    InitialPoint = position,
+                    Color = color
                 });
 
-                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / viewmodel.getListOrderedStacks().Count) + textWidth * 0.5f;
+                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / viewmodel.getListOrderedStacks().Count) + textWidth * 0.5f;
             }
         }
 
@@ -241,7 +279,7 @@ namespace TheGameExtreme.view
 
             float inflateWidth = 0.024f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20);
 
-            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / (viewmodel.CurrentHand.Count * 2)) + 10f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.9) - (DeviceDisplay.MainDisplayInfo.Height * 0.9) * 0.1 - 2 * (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001"))));
+            SKPoint position = new SKPoint((float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / (viewmodel.CurrentHand.Count * 2)) + 10f + (float)DeviceDisplay.MainDisplayInfo.Width * 0.04f, (float)((DeviceDisplay.MainDisplayInfo.Height * 0.9) - (DeviceDisplay.MainDisplayInfo.Height * 0.9) * 0.1 - 2 * (0.05f * (float)(DeviceDisplay.MainDisplayInfo.Width - 20) * textPaint.TextSize / textPaint.MeasureText("001"))));
 
             position.X -= inflateWidth;
 
@@ -266,10 +304,11 @@ namespace TheGameExtreme.view
                 {
                     Matrix = SKMatrix.MakeTranslation(position.X, position.Y),
                     InitialMatrix = SKMatrix.MakeTranslation(position.X, position.Y),
-                    InitialPoint = position
+                    InitialPoint = position,
+                    Color = SKColors.SkyBlue
                 });
 
-                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width - 20 - inflateWidth) / viewmodel.CurrentHand.Count) + textWidth * 0.5f;
+                position.X += (float)((DeviceDisplay.MainDisplayInfo.Width * 0.92f - 20 - inflateWidth) / viewmodel.CurrentHand.Count) + textWidth * 0.5f;
             }
         }
 
diff --git a/TheGameExtreme/view/TouchManipulationCard.cs b/TheGameExtreme/view/TouchManipulationCard.cs
index 3777b78..2fce881 100644
--- a/TheGameExtreme/view/TouchManipulationCard.cs
+++ b/TheGameExtreme/view/TouchManipulationCard.cs
@@ -22,6 +22,7 @@ namespace TheGameExtreme.view
         public string display;
         private float width;
         private float height;
+        public SKColor Color;
 
 
         /**
@@ -75,14 +76,14 @@ namespace TheGameExtreme.view
          * <param name="canvas">Canvas où l'on souhaite dessiner l'objet contenu dans l'instance</param>
          * <param name="color">Couleur qui sera prise par l'objet</param>
          */
-        public void Paint(SKCanvas canvas, SKColor color)
+        public void Paint(SKCanvas canvas)
         {
             canvas.Save();
 
             SKMatrix matrix = Matrix;
             canvas.Concat(ref matrix);
 
-            textPaint.Color = color;
+            textPaint.Color = Color;
             textPaint.StrokeWidth = 5;
             textPaint.Style = SKPaintStyle.Stroke;
 
@@ -91,10 +92,10 @@ namespace TheGameExtreme.view
             if (Value.View.GetType() == typeof(FractionCard))
             {
                 card = new SKRect(-width, -height - textPaint.TextSize, width + textPaint.MeasureText(Math.Pow(10, ((FractionCard)(Value.View)).Fraction.SizeMax-1).ToString()), height);
-                textPaint1.Color = color;
+                textPaint1.Color = Color;
                 textPaint1.StrokeWidth = 5;
                 textPaint1.Style = SKPaintStyle.Stroke;
-                textPaint2.Color = color;
+                textPaint2.Color = Color;
                 textPaint2.StrokeWidth = 5;
                 textPaint2.Style = SKPaintStyle.Stroke;
             }