diff --git a/Sources/Linaris/AlbumPage.xaml b/Sources/Linaris/AlbumPage.xaml
index 516f271..360ae6f 100644
--- a/Sources/Linaris/AlbumPage.xaml
+++ b/Sources/Linaris/AlbumPage.xaml
@@ -25,23 +25,24 @@
                                Style="{StaticResource SousTitre}">
                         </Label>
 
-                        <ListView ItemsSource="{Binding InfoTitles}">
-                            <ListView.ItemTemplate>
+                        <CollectionView ItemsSource="{Binding InfoTitles}" Margin="0,0,0,10">
+                            <CollectionView.ItemTemplate>
                                 <DataTemplate>
-                                    <ViewCell>
-                                        <Frame Style="{StaticResource Song}">
-                                            <Label Text="{Binding Name}"
+                                    <Frame Style="{StaticResource Song}">
+                                        <Label Text="{Binding Name}"
                                                FontSize="20"
                                                TextColor="white"
                                                HorizontalTextAlignment="Center"/>
-                                            <Frame.GestureRecognizers>
-                                                <TapGestureRecognizer Tapped="GoToInfoTitle"/>
-                                            </Frame.GestureRecognizers>
-                                        </Frame>
-                                    </ViewCell>
+                                        <Frame.GestureRecognizers>
+                                            <TapGestureRecognizer Tapped="GoToInfoTitle"/>
+                                        </Frame.GestureRecognizers>
+                                    </Frame>
                                 </DataTemplate>
-                            </ListView.ItemTemplate>
-                        </ListView>
+                            </CollectionView.ItemTemplate>
+                            <CollectionView.ItemsLayout>
+                                <LinearItemsLayout Orientation="Vertical" ItemSpacing="10"/>
+                            </CollectionView.ItemsLayout>
+                        </CollectionView>
 
                     </VerticalStackLayout>
                     <ScrollView Grid.Column="1" VerticalOptions="Fill" BackgroundColor="gray">
diff --git a/Sources/Linaris/AlbumPage.xaml.cs b/Sources/Linaris/AlbumPage.xaml.cs
index 1d01854..b50dd43 100644
--- a/Sources/Linaris/AlbumPage.xaml.cs
+++ b/Sources/Linaris/AlbumPage.xaml.cs
@@ -22,15 +22,12 @@ public partial class AlbumPage : ContentPage
         BindingContext = album;
 	}
 
-	private async void GoToInfoTitle(object sender, EventArgs e)
-	{
-		if (sender is Frame frame)
-		{
-			if (frame.BindingContext is InfoTitle infoTitle)
-            {
-				(Application.Current as App).Manager.CurrentInfoTitle = infoTitle;
-            }
-		}
-		await Navigation.PushAsync(new InfoTitlePage());
-	}
+    private async void GoToInfoTitle(object sender, EventArgs e)
+    {
+        if (sender is Frame frame && frame.BindingContext is InfoTitle infoTitle)
+        {
+            (Application.Current as App).Manager.CurrentInfoTitle = infoTitle;
+            await Navigation.PushAsync(new InfoTitlePage());
+        }
+    }
 }
\ No newline at end of file
diff --git a/Sources/Linaris/Resources/Styles/Styles.xaml b/Sources/Linaris/Resources/Styles/Styles.xaml
index 2bb4cc3..9653e0d 100644
--- a/Sources/Linaris/Resources/Styles/Styles.xaml
+++ b/Sources/Linaris/Resources/Styles/Styles.xaml
@@ -21,7 +21,7 @@
         <Setter Property="BackgroundColor" Value="CornflowerBlue"></Setter>
         <Setter Property="CornerRadius" Value="10"></Setter>
         <Setter Property="Padding" Value="15"></Setter>
-        <Setter Property="Margin" Value="10"></Setter>
+        <Setter Property="Margin" Value="10,0,10,0"></Setter>
         <Setter Property="BorderColor" Value="Transparent"></Setter>
         <Setter Property="HorizontalOptions" Value="Fill"></Setter>
     </Style>
diff --git a/Sources/Model/Data/playlists.xml b/Sources/Model/Data/playlists.xml
index ff1dd40..d378e0c 100644
--- a/Sources/Model/Data/playlists.xml
+++ b/Sources/Model/Data/playlists.xml
@@ -5,4 +5,9 @@
     <ImageURL>D:\Images\blackcat.gif</ImageURL>
     <Titles>D:\Musique\Création\emma.mp3 D:\Musique\Création\croissant.mp3 D:\Musique\Création\Emma-.mp3 D:\Musique\Création\heaven.mp3 D:\Musique\Création\winter.mp3 D:\Musique\Création\emma.mp3</Titles>
   </Playlist>
+  <Playlist Name="coucou">
+    <Description></Description>
+    <ImageURL>none.png</ImageURL>
+    <Titles>D:\Musique\Création\emma.mp3</Titles>
+  </Playlist>
 </Playlists>
\ No newline at end of file
diff --git a/Sources/Model/Manager.cs b/Sources/Model/Manager.cs
index 78f4564..5992abc 100644
--- a/Sources/Model/Manager.cs
+++ b/Sources/Model/Manager.cs
@@ -68,9 +68,9 @@ public class Manager
         }
     }
 
-    private Album? currentAlbum;
+    private Album currentAlbum;
 
-    public Album? CurrentAlbum
+    public Album CurrentAlbum
     {
         get
         {
@@ -125,7 +125,7 @@ public class Manager
         playlists = DataManager.GetPlaylists();
         artists = DataManager.GetArtists();
 
-        currentAlbum = albums.FirstOrDefault();
+        currentAlbum = albums.First();
         currentPlaylist = playlists.FirstOrDefault();
         currentInfoTitle = infoTitles.FirstOrDefault();
     }
diff --git a/Sources/Model/Serialization/LINQ_XML_Serialization.cs b/Sources/Model/Serialization/LINQ_XML_Serialization.cs
index 70dded4..0247b5e 100644
--- a/Sources/Model/Serialization/LINQ_XML_Serialization.cs
+++ b/Sources/Model/Serialization/LINQ_XML_Serialization.cs
@@ -783,18 +783,7 @@ public class LinqXmlSerialization : IDataManager
     static string GetSerializationDirectory()
     {
         DirectoryInfo? directory = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory);
-
-        while (directory != null && ! directory.GetFiles("*.sln").Any())
-        {
-            directory = directory.Parent;
-        }
-
-        if (directory == null)
-        {
-            directory = new DirectoryInfo(Directory.GetCurrentDirectory());
-        }
-
-        return Path.Combine(directory.ToString(),"Model/Data");
+        return Path.Combine(directory.ToString(),"Linaris/Data");
     }
 
 }