diff --git a/TheGameExtreme/model/gameActions/classic/GameMode.cs b/TheGameExtreme/model/gameActions/classic/GameMode.cs
index c0dcc4d..d04ff3b 100644
--- a/TheGameExtreme/model/gameActions/classic/GameMode.cs
+++ b/TheGameExtreme/model/gameActions/classic/GameMode.cs
@@ -46,25 +46,11 @@ namespace TheGameExtreme.model.gameActions.classic
             gameActions.Add(new JouerUneCarte(piles));
             gameActions.Add(new TerminerSonTour(piles));
 
-            createDeck();
+            deck = new ClassicDeck();
             defineNbMaxCard(nbPlayer);
             distribueCard(players);
         }
 
-        protected void createDeck()
-        {
-            switch (true)
-            {
-                case false:
-                    deck = new ClassicDeck();
-                    break;
-
-                default:
-                    deck = new ExtremeDeck();
-                    break;
-            }
-        }
-
         protected void defineNbMaxCard(int nbPlayer)
         {
             switch (nbPlayer)
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml
index 29c0ef1..55fee3b 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml
+++ b/TheGameExtreme/view/GamePreparationPage.xaml
@@ -11,8 +11,8 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="10*" />
             <RowDefinition Height="25*" />
-            <RowDefinition Height="55*" />
-            <RowDefinition Height="10*" />
+            <RowDefinition Height="35*" />
+            <RowDefinition Height="30*" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="50*" />
@@ -38,6 +38,7 @@
             Grid.ColumnSpan="2">
             <Label
                 HorizontalTextAlignment="Center"
+                VerticalTextAlignment="Center"
                 x:Name="Instruction"
                 TextColor="{DynamicResource WhiteColor}"/>
         </StackLayout>
@@ -53,13 +54,19 @@
                 Margin="50,0,50,0"/>
         </StackLayout>
 
-        <StackLayout
+        <ScrollView
             Grid.Row="2"
             Grid.Column="1"
-            Margin="50,0,50,0"
-            x:Name="NameList">
+            Margin="50,20,50,0">
 
-        </StackLayout>
+            <StackLayout
+                x:Name="NameList">
+                <Entry
+                    BackgroundColor="{DynamicResource SkyBlueColor}"
+                    Placeholder="Enter your pseudo"/>
+            </StackLayout>
+
+        </ScrollView>
 
         <StackLayout
             Grid.Row="3"
diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs
index 7eba6ee..ffddac3 100644
--- a/TheGameExtreme/view/GamePreparationPage.xaml.cs
+++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs
@@ -18,7 +18,7 @@ namespace TheGameExtreme.view
                 OnPropertyChanged("InstructionText");
             }
         }
-        public List<string> listNbPlayer = new List<string> { "1", "2", "3", "4", "5" };
+        public List<int> listNbPlayer = new List<int> { 1, 2, 3, 4, 5 };
 
 
         public GamePreparationPage()
@@ -28,6 +28,7 @@ namespace TheGameExtreme.view
             Instruction.SetBinding(Label.TextProperty, new Binding("InstructionText", source: this));
             InstructionText = AppRessource.StrPlayerSelection;
             PlayerSelecter.ItemsSource = listNbPlayer;
+            PlayerSelecter.SelectedIndex = 0;
         }
 
         private async void Back(object sender, EventArgs e)
@@ -37,22 +38,33 @@ namespace TheGameExtreme.view
 
         private async void Play(object sender, EventArgs args)
         {
-            await Navigation.PushAsync(new MainPage());
+            List<string> playersNames = new List<string>();
+
+            for (int i = 0; i < NameList.Children.Count; i++)
+            {
+                playersNames.Add(((Entry)NameList.Children[i]).Text);
+            }
+            
+            await Navigation.PushAsync(new MainPage(playersNames));
         }
 
         private void ChangedPseudo(object sender, EventArgs args)
         {
             while (NameList.Children.Count != (int)PlayerSelecter.SelectedItem)
-            if (NameList.Children.Count < (int)PlayerSelecter.SelectedItem)
             {
-                    Editor e = new Editor();
-                    e.Placeholder = "Enter your pseudo";
-
-                NameList.Children.Add(e);
-            }
-            else
-            {
-
+                if (NameList.Children.Count < (int)PlayerSelecter.SelectedItem)
+                {
+                    Entry e = new Entry
+                    {
+                        Placeholder = "Enter your pseudo",
+                        BackgroundColor = (Color)Application.Current.Resources["SkyBlueColor"]
+                    };
+                    NameList.Children.Add(e);
+                }
+                else
+                {
+                    NameList.Children.RemoveAt(NameList.Children.Count-1);
+                }
             }
         }
     }
diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs
index 3a2efdc..71c0c87 100644
--- a/TheGameExtreme/view/MainPage.xaml.cs
+++ b/TheGameExtreme/view/MainPage.xaml.cs
@@ -16,10 +16,13 @@ namespace TheGameExtreme.view
         private Main viewmodel;
         private List<CheckBox> stacks = new List<CheckBox>();
         Button button = new Button();
+        List<string> playersNames;
         
 
-        public MainPage()
+        public MainPage(List<string> playersNames)
         {
+            this.playersNames = playersNames;
+
             InitializeComponent();
             NavigationPage.SetHasNavigationBar(this, false);
 
@@ -30,7 +33,7 @@ namespace TheGameExtreme.view
             button.Text = "Retry";
             button.Clicked += retry;
 
-            viewmodel = new Main();
+            viewmodel = new Main(playersNames);
 
             viewmodel.BindingChanged += OnBindingChanged;
 
@@ -134,7 +137,7 @@ namespace TheGameExtreme.view
 
         private void retry(object sender, EventArgs args)
         {
-            viewmodel = new Main();
+            viewmodel = new Main(playersNames);
 
             viewmodel.BindingChanged += OnBindingChanged;
 
diff --git a/TheGameExtreme/viewmodel/Main.cs b/TheGameExtreme/viewmodel/Main.cs
index 10a7c02..1a229a6 100644
--- a/TheGameExtreme/viewmodel/Main.cs
+++ b/TheGameExtreme/viewmodel/Main.cs
@@ -47,9 +47,8 @@ namespace TheGameExtreme.viewmodel
         //private ObservableCollection<Stack<Card>> ListOrderedStacks;
 
 
-        public Main()
+        public Main(List<string> playersNames)
         {
-            List<string> playersNames = new List<string> { "Clément", "Baptiste" };
             playersNames.ForEach(name => players.Add(new PlayerVM(new Player(name))));
             Parametreur parametreur = new Parametreur(new GameMode());
             players.ForEach(player => parametreur.AddPlayer(player.View));