diff --git a/Qwirkle/QwirkleClassLibrary/Games/Game.cs b/Qwirkle/QwirkleClassLibrary/Games/Game.cs
index ad12627..464bee2 100644
--- a/Qwirkle/QwirkleClassLibrary/Games/Game.cs
+++ b/Qwirkle/QwirkleClassLibrary/Games/Game.cs
@@ -396,14 +396,6 @@ namespace QwirkleClassLibrary.Games
                 return false;
             }
 
-            foreach (var t in tilesToSwap)
-            {
-                if (!player.RemoveTileToPlayer(t))
-                {
-                    return false;
-                }
-            }
-
             if (!DrawTiles(player))
             {
                 return false;
diff --git a/Qwirkle/QwirkleConsoleApp/Program.cs b/Qwirkle/QwirkleConsoleApp/Program.cs
index a6224bb..a55e702 100644
--- a/Qwirkle/QwirkleConsoleApp/Program.cs
+++ b/Qwirkle/QwirkleConsoleApp/Program.cs
@@ -155,6 +155,7 @@ static void SwapTile(Game game)
         else
         {
             tilesToSwap.Add(game.TileOfPlayerWithPos(no - 1));
+            game.PlayerList[game.GetPlayingPlayerPosition()].RemoveTileToPlayer(game.TileOfPlayerWithPos(no - 1));
         }
 
         Write("Do you want to swap another tile ? (y/n) : ");
diff --git a/Qwirkle/QwirkleViews/AppShell.xaml b/Qwirkle/QwirkleViews/AppShell.xaml
index 714eaaf..c75f2a2 100644
--- a/Qwirkle/QwirkleViews/AppShell.xaml
+++ b/Qwirkle/QwirkleViews/AppShell.xaml
@@ -5,7 +5,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:Qwirkle"
     xmlns:localPages="clr-namespace:Qwirkle.Pages"
-    Shell.FlyoutBehavior="Flyout"
+    Shell.FlyoutBehavior="Disabled"
     Title="Qwirkle"
     FlyoutBackgroundColor="White">
     
@@ -27,10 +27,6 @@
         Title="Leaderboard"
         ContentTemplate="{DataTemplate localPages:Leaderboard}"
         Route="Leaderboard" />
-    <ShellContent
-        Title="Scoreboard"
-        ContentTemplate="{DataTemplate localPages:Scoreboard}"
-        Route="Scoreboard" />
     <ShellContent
         Title="Settings"
         ContentTemplate="{DataTemplate localPages:Settings}"
diff --git a/Qwirkle/QwirkleViews/Pages/GameBoard.xaml.cs b/Qwirkle/QwirkleViews/Pages/GameBoard.xaml.cs
index 9e9260d..6f4035a 100644
--- a/Qwirkle/QwirkleViews/Pages/GameBoard.xaml.cs
+++ b/Qwirkle/QwirkleViews/Pages/GameBoard.xaml.cs
@@ -149,7 +149,7 @@ public partial class Gameboard : ContentPage
         game.PlaceTileNotified += Game_PlaceTileNotified;
         game.SwapTilesNotified += Game_SwapTilesNotified;
 
-        if(game.CellsUsed.Count == 0 && game.PlayerSwapping==false)
+        if (game.CellsUsed.Count == 0 && !game.PlayerSwapping)
         {
             DisplayAlert("Swap system", "\r\nWelcome to the swap system! To use the system, take the tiles you wish to swap and place them in the bag (you will not see the tiles disappear). Then, click on the skip button. /!\\ Attention, during the swap phase, you cannot play /!\\", "Copy !");
             game.PlayerSwapping = true;
@@ -168,6 +168,7 @@ public partial class Gameboard : ContentPage
     {
         if (game.PlayerSwapping)
         {
+            game.PlayerList[game.GetPlayingPlayerPosition()].RemoveTileToPlayer(tiledrag);
             tilesSwap.Add(tiledrag!);
         }
     }
diff --git a/Qwirkle/QwirkleViews/Pages/Gameboard.xaml b/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
index 44e1155..057cd6f 100644
--- a/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
+++ b/Qwirkle/QwirkleViews/Pages/Gameboard.xaml
@@ -3,7 +3,18 @@
              x:Class="Qwirkle.Pages.Gameboard"
              xmlns:controls="clr-namespace:Qwirkle.Views"
              Title="Gameboard"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Name="root">
+
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <x:Double x:Key="CellWidth">75</x:Double>
+            <x:Double x:Key="CellHeight">75</x:Double>
+            <x:Double x:Key="VerticalSpacing">1</x:Double>
+            <x:Double x:Key="HorizontalSpacing">1</x:Double>
+            <toolkit:MultiMathExpressionConverter x:Key="multiMathExpressionConverter" />
+        </ResourceDictionary>
+    </ContentPage.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -119,16 +130,40 @@
         <ScrollView Grid.Row="1" Grid.Column="1" VerticalOptions="FillAndExpand">
             <CollectionView ItemsSource="{Binding Board.ReadCells}"
                             HorizontalOptions="Center"
-                            VerticalOptions="Center">
+                            VerticalOptions="Center" HorizontalScrollBarVisibility="Never" VerticalScrollBarVisibility="Never">
+
+                <CollectionView.HeightRequest>
+
+                    <MultiBinding Converter="{StaticResource multiMathExpressionConverter}" ConverterParameter="x0 * x1 +(x0 - 1) * x2 ">
+                        <Binding Path="Board.Rows" />
+                        <Binding Source="{StaticResource CellHeight}" />
+                        <Binding Source="{StaticResource VerticalSpacing}" />
+                    </MultiBinding>
+
+                </CollectionView.HeightRequest>
+                
+                
+                <CollectionView.WidthRequest>
+                    
+                    <MultiBinding Converter="{StaticResource multiMathExpressionConverter}" ConverterParameter="x0 * x1 +(x0 - 1) * x2 ">
+                        <Binding Path="Board.Columns" />
+                        <Binding Source="{StaticResource CellWidth}" />
+                        <Binding Source="{StaticResource HorizontalSpacing}" />
+                    </MultiBinding>
+                    
+                </CollectionView.WidthRequest>
+
                 <CollectionView.ItemsLayout>
                     <GridItemsLayout Orientation="Vertical"
-                                    Span="{Binding Board.Columns}"/>
+                                    Span="{Binding Board.Columns}"
+                                    HorizontalItemSpacing="{StaticResource HorizontalSpacing}"
+                                    VerticalItemSpacing="{StaticResource VerticalSpacing}"/>
                 </CollectionView.ItemsLayout>
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-                        <Border WidthRequest="80" HeightRequest="80"
-                                BackgroundColor="WhiteSmoke"
-                                Margin="0" >
+                        <Border WidthRequest="{StaticResource CellWidth}"
+                    HeightRequest="{StaticResource CellHeight}"
+                                BackgroundColor="WhiteSmoke">
                             <Border.GestureRecognizers >
                                 <DropGestureRecognizer DragOver="OnDragOver"
                                                        DropCommand="{Binding OnDrop, Source={x:Reference root}}"
@@ -141,7 +176,9 @@
             </CollectionView>
         </ScrollView>
 
+        <controls:Scoreboard  HorizontalOptions="End" Grid.Row="1" Grid.Column="1" ></controls:Scoreboard>
+
 
 
-        </Grid>
+    </Grid>
 </ContentPage>
diff --git a/Qwirkle/QwirkleViews/Pages/Scoreboard.xaml b/Qwirkle/QwirkleViews/Pages/Scoreboard.xaml
deleted file mode 100644
index 6651f91..0000000
--- a/Qwirkle/QwirkleViews/Pages/Scoreboard.xaml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Qwirkle.Pages.Scoreboard"
-             xmlns:controls="clr-namespace:Qwirkle.Views"
-             Title="Scoreboard">
-    <ScrollView>
-        <VerticalStackLayout Spacing="25" Padding="5, 5, 5, 10">
-            
-            <Grid Style="{StaticResource GridMain}">
-                <controls:GoBack></controls:GoBack>
-                <Label Text="Scoreboard"
-                       Style="{StaticResource Title}"
-                 />
-            </Grid>
-
-            <Border Style="{StaticResource TabBorder}">
-
-                <Border.Shadow>
-                    <Shadow/>
-                </Border.Shadow>
-                <Border.StrokeShape>
-                    <RoundRectangle CornerRadius="3"/>
-                </Border.StrokeShape>
-
-                <VerticalStackLayout>
-                    <controls:ScoreboardLine></controls:ScoreboardLine>
-                    <Rectangle/>
-
-                    <controls:ScoreboardLine></controls:ScoreboardLine>
-                    <Rectangle/>
-
-                    <controls:ScoreboardLine></controls:ScoreboardLine>
-                    <Rectangle/>
-
-                    <controls:ScoreboardLine></controls:ScoreboardLine>
-                    <Rectangle/>
-
-                    <controls:ScoreboardLine></controls:ScoreboardLine>
-                    <Rectangle/>
-
-                </VerticalStackLayout>
-            </Border>
-
-        </VerticalStackLayout>
-
-
-    </ScrollView>
-
-</ContentPage>
\ No newline at end of file
diff --git a/Qwirkle/QwirkleViews/Pages/Scoreboard.xaml.cs b/Qwirkle/QwirkleViews/Pages/Scoreboard.xaml.cs
deleted file mode 100644
index 7846686..0000000
--- a/Qwirkle/QwirkleViews/Pages/Scoreboard.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Qwirkle.Pages;
-
-public partial class Scoreboard : ContentPage
-{
-	public Scoreboard()
-	{
-		InitializeComponent();
-	}
-}
\ No newline at end of file
diff --git a/Qwirkle/QwirkleViews/QwirkleViews.csproj b/Qwirkle/QwirkleViews/QwirkleViews.csproj
index 54ad304..6d75889 100644
--- a/Qwirkle/QwirkleViews/QwirkleViews.csproj
+++ b/Qwirkle/QwirkleViews/QwirkleViews.csproj
@@ -87,15 +87,15 @@
 	  <Compile Update="Pages\SetPlayers.xaml.cs">
 	    <DependentUpon>SetPlayers.xaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="Pages\Scoreboard.xaml.cs">
-	    <DependentUpon>Scoreboard.xaml</DependentUpon>
-	  </Compile>
 	  <Compile Update="Pages\Settings.xaml.cs">
 	    <DependentUpon>Settings.xaml</DependentUpon>
 	  </Compile>
 	  <Compile Update="Views\GoBack.xaml.cs">
 	    <DependentUpon>GoBack.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Views\Scoreboard.xaml.cs">
+	    <DependentUpon>Scoreboard.xaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Views\ScoreboardLine.xaml.cs">
 	    <DependentUpon>ScoreboardLine.xaml</DependentUpon>
 	  </Compile>
@@ -117,9 +117,6 @@
 	  <MauiXaml Update="Pages\SetPlayers.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Pages\Scoreboard.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="Pages\Settings.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -132,6 +129,9 @@
 	  <MauiXaml Update="Views\GoBack.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\Scoreboard.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\ScoreboardLine.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
new file mode 100644
index 0000000..1982d53
--- /dev/null
+++ b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Qwirkle.Views.Scoreboard"
+             xmlns:controls="clr-namespace:Qwirkle.Views"
+             x:Name="root">
+
+
+    <VerticalStackLayout MaximumWidthRequest="200" Background="Transparent">
+
+        <CollectionView ItemsSource="{Binding NamesPlayers}">
+            <CollectionView.ItemsLayout>
+                <GridItemsLayout Orientation="Vertical"/>
+            </CollectionView.ItemsLayout>
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <controls:ScoreboardLine Nameplayer="{Binding NameTag}"></controls:ScoreboardLine>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+
+    </VerticalStackLayout>
+
+</ContentView>
diff --git a/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs
new file mode 100644
index 0000000..7aa9b84
--- /dev/null
+++ b/Qwirkle/QwirkleViews/Views/Scoreboard.xaml.cs
@@ -0,0 +1,57 @@
+using QwirkleClassLibrary.Players;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+
+namespace Qwirkle.Views;
+
+public partial class Scoreboard : ContentView, INotifyPropertyChanged
+{
+    private IOrderedEnumerable<KeyValuePair<Player, int>> scoreboard;
+    private Dictionary<Player, int> currentScoreBoard;
+
+    private List<Player> namesPlayers;
+    public List<Player> NamesPlayers
+    {
+        get => namesPlayers;
+        set
+        {
+            if (namesPlayers != value)
+            {
+                namesPlayers = value;
+                OnPropertyChanged(nameof(NamesPlayers));
+            }
+        }
+    }
+    public Scoreboard()
+	{
+		InitializeComponent();
+        BindingContext = this;
+
+        scoreboard = ((App)Application.Current!).Game.ScoreBoard.OrderByDescending(x => x.Value).ThenBy(x => x.Key.NameTag);
+        currentScoreBoard = scoreboard.ToDictionary<Player, int>();
+
+        NamesPlayers = currentScoreBoard.Keys.ToList();
+
+        ((App)Application.Current!).Game.Board.PropertyChanged += Board_PropertyChanged;
+    }
+
+    private void Board_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+
+        scoreboard = ((App)Application.Current!).Game.ScoreBoard.OrderByDescending(x => x.Value).ThenBy(x => x.Key.NameTag);
+        currentScoreBoard = scoreboard.ToDictionary<Player, int>();
+
+        NamesPlayers = currentScoreBoard.Keys.ToList();
+
+    }
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    protected void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml b/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml
index 9c743bb..f67d9ec 100644
--- a/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml
+++ b/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml
@@ -2,13 +2,15 @@
 
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Qwirkle.Views.ScoreboardLine">
-    <Grid ColumnDefinitions="4*, auto, 2*"
+             x:Class="Qwirkle.Views.ScoreboardLine"
+             x:Name="root">
+    <StackLayout>
+        <Grid ColumnDefinitions="4*, auto, 2*"
           RowDefinitions="50">
 
         <Label
             Grid.Column="0"
-            Text="{Binding playerName}"
+            Text="{Binding Nameplayer, Source={x:Reference root}}"
             Style="{StaticResource ContentTab}"/>
 
         <Rectangle
@@ -17,8 +19,10 @@
 
         <Label
             Grid.Column="2"
-            Text="{Binding nbPoints}"
+            Text="0"
             Style="{StaticResource ContentTab}"/>
 
     </Grid>
+    <Rectangle/>
+    </StackLayout>
 </ContentView>
\ No newline at end of file
diff --git a/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml.cs b/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml.cs
index cae2e7a..0313198 100644
--- a/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml.cs
+++ b/Qwirkle/QwirkleViews/Views/ScoreboardLine.xaml.cs
@@ -11,22 +11,27 @@ namespace Qwirkle.Views;
 
 public partial class ScoreboardLine : ContentView
 {
-    public ReadOnlyDictionary<Player, int> scoreboard = ((App)App.Current!).Game.ScoreBoard;
 
-    List<string> nameTags = scoreboard.Keys.ToList();
-
-    List<int> nbPoints = scoreboard.Values.ToList();
-
-    Dictionary<Player, int> modifiableDictionary = new Dictionary<Player, int>(scoreboard);
+    public ScoreboardLine()
+    {
+        InitializeComponent();
+        BindingContext = this;
+    }
 
+    public static readonly BindableProperty NameplayerProperty =
+            BindableProperty.Create(nameof(Nameplayer), typeof(string), typeof(ScoreboardLine), default(string), propertyChanged: OnPlayerChanged);
 
 
-    public static readonly BindableProperty ScoreboardLineProperty = BindableProperty.Create("ScoreBLine", typeof(ScoreboardLine), typeof(object));
+    public string Nameplayer
+    {
+        get => (string)GetValue(NameplayerProperty);
+        set => SetValue(NameplayerProperty, value);
+    }
 
-    public ScoreboardLine()
+    private static void OnPlayerChanged(BindableObject bindable, object oldValue, object newValue)
     {
-        InitializeComponent();
-        BindingContext = scoreboard;
+        var bin = (ScoreboardLine)bindable;
+        bin.OnPropertyChanged(nameof(Nameplayer));
     }
 
 
diff --git a/Qwirkle/QwirkleViews/Views/TileView.xaml.cs b/Qwirkle/QwirkleViews/Views/TileView.xaml.cs
index 742beac..beadd41 100644
--- a/Qwirkle/QwirkleViews/Views/TileView.xaml.cs
+++ b/Qwirkle/QwirkleViews/Views/TileView.xaml.cs
@@ -15,8 +15,6 @@ namespace Qwirkle.Views;
 
 public partial class TileView : ContentView
 {
-
-  
     public TileView()
     {
         InitializeComponent();
@@ -53,11 +51,5 @@ public partial class TileView : ContentView
         set => SetValue(ShapeProperty, value);
     }
 
-    public event EventHandler InfoClicked;
-
-    void OnInfoClicked(object sender, EventArgs args)
-    {
-        InfoClicked?.Invoke(this, args);
-    }
 
 }
\ No newline at end of file