diff --git a/Sources/Model/Classes/Bateau.cs b/Sources/Model/Classes/Bateau.cs
index a06162b..b0a6c85 100644
--- a/Sources/Model/Classes/Bateau.cs
+++ b/Sources/Model/Classes/Bateau.cs
@@ -151,7 +151,7 @@ namespace Model.Classes
 
         public override string ToString()
         {
-            return "Bateau :" + Nom +" "+EstFavori +" " + NomRomanise + " " + Affiliation + " " + PremierChap + " " + PremierEp + " " + Description + " " + Caracteristique +" "+ Image;
+            return "Bateau : " + Nom +" "+EstFavori +" " + NomRomanise + " " + Affiliation + " " + PremierChap + " " + PremierEp + " " + Description + " " + Caracteristique +" "+ Image;
         }
 
        
diff --git a/Sources/Model/Classes/Bestiaire.cs b/Sources/Model/Classes/Bestiaire.cs
index d8e34c0..2b3650d 100644
--- a/Sources/Model/Classes/Bestiaire.cs
+++ b/Sources/Model/Classes/Bestiaire.cs
@@ -87,7 +87,7 @@ namespace Model.Classes
         }
         public override string ToString()
         {
-            return "Bestiaire :" + Nom +" "+EstFavori+ " " + Origine + " " + Description + " " + Caracteristique +" " + Image;
+            return "Bestiaire : " + Nom +" "+EstFavori+ " " + Origine + " " + Description + " " + Caracteristique +" " + Image;
         }       
     }
 }
diff --git a/Sources/Model/Classes/Equipage.cs b/Sources/Model/Classes/Equipage.cs
index c1104c5..ef7f611 100644
--- a/Sources/Model/Classes/Equipage.cs
+++ b/Sources/Model/Classes/Equipage.cs
@@ -21,7 +21,6 @@ namespace Model.Classes
             get => nomromanise;
             set
             {
-                if (nomromanise == value) return;
                 nomromanise = value;
                 OnPropertyChanged();
             }
@@ -32,7 +31,6 @@ namespace Model.Classes
             get=> region;
             set
             {
-                if (region == value) return;
                 region = value; 
                 OnPropertyChanged();
             } 
@@ -43,7 +41,6 @@ namespace Model.Classes
             get=>premierchap;
             set
             {
-                if(premierchap == value) return;
                 premierchap = value;
                 OnPropertyChanged();
             }
@@ -54,7 +51,6 @@ namespace Model.Classes
             get=>premierep;
             set
             {
-                if(premierep == value) return;
                 premierep = value;
                 OnPropertyChanged();
             }
@@ -65,7 +61,6 @@ namespace Model.Classes
             get=>statut;
             set
             {
-                if (statut == value) return;
                 statut = value;
                 OnPropertyChanged();
             }
@@ -76,7 +71,6 @@ namespace Model.Classes
             get=>description;
             set
             {
-                if(description == value) return;
                 description = value;
                 OnPropertyChanged();
             }
@@ -182,7 +176,7 @@ namespace Model.Classes
 
         public override string ToString()
         {
-            return "Equipage :" + Nom +" "+EstFavori+ " " + NomRomanise + " " + Region + " " + PremierChap + " " + PremierEp + " " + Statut + " " + Description + " " + Image;
+            return "Equipage : " + Nom +" "+EstFavori+ " " + NomRomanise + " " + Region + " " + PremierChap + " " + PremierEp + " " + Statut + " " + Description + " " + Image;
         }      
     }
 }
diff --git a/Sources/Model/Classes/FruitDuDemon.cs b/Sources/Model/Classes/FruitDuDemon.cs
index 0e09e02..fdad12e 100644
--- a/Sources/Model/Classes/FruitDuDemon.cs
+++ b/Sources/Model/Classes/FruitDuDemon.cs
@@ -19,7 +19,6 @@ namespace Model.Classes
             get=>nomromanise;
             set
             {
-                if(nomromanise==value) return;
                 nomromanise = value;
                 OnPropertyChanged();
             }
@@ -30,7 +29,6 @@ namespace Model.Classes
             get=>type;
             set
             {
-                if(type==value) return;
                 type = value;
                 OnPropertyChanged();
             } 
@@ -41,7 +39,6 @@ namespace Model.Classes
             get=>premierchap;
             set
             {
-                if(premierchap==value) return;
                 premierchap = value;
                 OnPropertyChanged();
             }
@@ -52,7 +49,6 @@ namespace Model.Classes
             get=>premierep;
             set
             {
-                if (premierep==value) return;
                 premierep=value;
                 OnPropertyChanged();
             }
@@ -63,7 +59,6 @@ namespace Model.Classes
             get=>description;
             set
             {
-                if (description==value) return;
                 description = value;
                 OnPropertyChanged();
             }
@@ -74,7 +69,6 @@ namespace Model.Classes
             get=>forces;
             set
             {
-                if (forces==value) return;
                 forces = value;
                 OnPropertyChanged();
             }
@@ -85,7 +79,6 @@ namespace Model.Classes
             get=>faiblesses;
             set
             {
-                if (faiblesses == value) return;
                 faiblesses = value;
                 OnPropertyChanged();
             }
@@ -148,7 +141,7 @@ namespace Model.Classes
         }
         public override string ToString()
         {
-            return "FruitDuDemon :" + Nom +" " +EstFavori+" " + NomRomanise + " " + Type + " " + PremierChap + " " + PremierEp + " " + Description + " " + Forces +" "+Faiblesses+ " " + Image;
+            return "FruitDuDemon : " + Nom +" " +EstFavori+" " + NomRomanise + " " + Type + " " + PremierChap + " " + PremierEp + " " + Description + " " + Forces +" "+Faiblesses+ " " + Image;
         }   
     }
 }
diff --git a/Sources/Model/Classes/Ile.cs b/Sources/Model/Classes/Ile.cs
index 8ca1cb6..43b574f 100644
--- a/Sources/Model/Classes/Ile.cs
+++ b/Sources/Model/Classes/Ile.cs
@@ -20,7 +20,6 @@ namespace Model.Classes
             get => nomromanise;
             set
             {
-                if (nomromanise == value) return;
                 nomromanise = value;
                 OnPropertyChanged();
             }
@@ -32,7 +31,6 @@ namespace Model.Classes
             get=>region;
             set
             {
-                if (region == value) return;
                 region = value;
                 OnPropertyChanged();
             }
@@ -43,7 +41,6 @@ namespace Model.Classes
             get=>premierchap;
             set
             {
-                if(premierchap == value) return;
                 premierchap = value;
                 OnPropertyChanged();
             }
@@ -54,7 +51,6 @@ namespace Model.Classes
             get=>premierep;
             set
             {
-                if(premierep == value) return;
                 premierep = value;
                 OnPropertyChanged();
             } 
@@ -65,7 +61,6 @@ namespace Model.Classes
             get=>description;
             set
             {
-                if (description == value) return;
                 description = value;
                 OnPropertyChanged();
             }
@@ -76,7 +71,6 @@ namespace Model.Classes
             get=>geographie;
             set
             {
-                if (geographie == value) return;
                 geographie = value;
                 OnPropertyChanged();
             } 
@@ -148,7 +142,7 @@ namespace Model.Classes
 
         public override string ToString()
         {
-            return "Ile :"+ Nom +" "+NomRomanise+" "+Region+" "+PremierChap+" "+PremierEp+" "+Description+" "+Geographie+" "+Image;
+            return "Ile : "+ Nom +" "+NomRomanise+" "+Region+" "+PremierChap+" "+PremierEp+" "+Description+" "+Geographie+" "+Image;
         }
     }
 }
diff --git a/Sources/Model/Classes/Personnage.cs b/Sources/Model/Classes/Personnage.cs
index 4bc099d..594c7f0 100644
--- a/Sources/Model/Classes/Personnage.cs
+++ b/Sources/Model/Classes/Personnage.cs
@@ -14,11 +14,7 @@ namespace Model.Classes
         public double Prime { 
             get=>prime;
             set
-            {
-                if (prime == value)
-                {
-                    return;
-                }
+            {            
                 prime = value;
                 OnPropertyChanged();
             } 
@@ -28,11 +24,7 @@ namespace Model.Classes
         public string? Epithete { 
             get=>epithete;
             set
-            {
-                if (epithete == value)
-                {
-                    return;
-                }
+            {             
                 epithete = value;
             }
         }
@@ -42,10 +34,6 @@ namespace Model.Classes
             get=>age;
             set
             {
-                if (age == value)
-                {
-                    return;
-                }
                 age = value;
                 OnPropertyChanged();
             } 
@@ -56,10 +44,6 @@ namespace Model.Classes
             get=>taille;
             set
             {
-                if (taille == value)
-                {
-                    return;
-                }
                 taille = value;
                 OnPropertyChanged();
             }
@@ -70,10 +54,6 @@ namespace Model.Classes
             get=>origine;
             set
             {
-                if (origine == value)
-                {
-                    return;
-                }
                 origine = value;
                 OnPropertyChanged();
             } 
@@ -84,10 +64,6 @@ namespace Model.Classes
             get=>biographie;
             set
             {
-                if (biographie == value)
-                {
-                    return;
-                }
                 biographie = value;
                 OnPropertyChanged();
             } 
@@ -98,10 +74,6 @@ namespace Model.Classes
             get=>citation;
             set
             {
-                if (citation == value)
-                {
-                    return;
-                }
                 citation = value;
                 OnPropertyChanged();
             }
@@ -112,10 +84,6 @@ namespace Model.Classes
             get => equipage;
             set
             {
-                if (equipage == value)
-                {
-                    return;
-                }
                 equipage = value;
                 OnPropertyChanged();
             } 
@@ -195,7 +163,7 @@ namespace Model.Classes
 
         public override string ToString()
         {
-            return "Personnage :" + Nom + " " + EstFavori + " " + Prime + " " + Epithete + " " + Age + " " + Origine + " " + Biographie + " "+ Citation+" " +Equipage+" " + Fruit+" "+ Image;
+            return "Personnage : " + Nom + " " + EstFavori + " " + Prime + " " + Epithete + " " + Age + " " + Origine + " " + Biographie + " "+ Citation+" " +Equipage+" " + Fruit+" "+ Image;
         }
     }
 }
\ No newline at end of file
diff --git a/Sources/Model/Managers/Manager.cs b/Sources/Model/Managers/Manager.cs
index f367347..c9d5614 100644
--- a/Sources/Model/Managers/Manager.cs
+++ b/Sources/Model/Managers/Manager.cs
@@ -83,12 +83,6 @@ namespace Model.Managers
             return ile;
         }
 
-        public List<ObjetOhara> FiltrerFavs(string type) 
-        {
-            List<ObjetOhara> favs = GetFavoris();
-            return favs;
-        }
-
         public List<ObjetOhara> RechercheObjetOhara(string text, List<ObjetOhara> liste)
         {
             if (text == "")
@@ -138,128 +132,134 @@ namespace Model.Managers
             return listeFavoris;
         }
 
-        public void ModifierFavFDD(FruitDuDemon fruit,bool value)
+        public void ModifierFavFDD(FruitDuDemon fruit, bool value)
         {
-            foreach (FruitDuDemon b in Fruits)
+            FruitDuDemon? fruitToUpdate = Fruits.FirstOrDefault(b => b.Equals(fruit));
+            if (fruitToUpdate != null)
             {
-                if (b.Equals(fruit))
-                {
-                    b.EstFavori = value;
-                    DataManager.SetFDD(Fruits.ToList());
-                }
+                fruitToUpdate.EstFavori = value;
+                DataManager.SetFDD(Fruits.ToList());
             }
         }
 
         public void ModifierFavEquip(Equipage equip, bool value)
         {
-            foreach (Equipage b in Equipages)
+            Equipage? equipToUpdate = Equipages.FirstOrDefault(e => e.Equals(equip));
+            if (equipToUpdate != null)
             {
-                if (b.Equals(equip))
-                {
-                    b.EstFavori = value;
-                    DataManager.SetEquipage(Equipages.ToList());
-                }
+                equipToUpdate.EstFavori = value;
+                DataManager.SetEquipage(Equipages.ToList());
             }
         }
+
         public void ModifierFavBest(Bestiaire best, bool value)
         {
-            foreach (Bestiaire b in Bestiaire)
+            Bestiaire? bestToUpdate = Bestiaire.FirstOrDefault(b => b.Equals(best));
+            if (bestToUpdate != null)
             {
-                if (b.Equals(best))
-                {
-                    b.EstFavori = value;
-                    DataManager.SetBestiaire(Bestiaire.ToList());
-                }
+                bestToUpdate.EstFavori = value;
+                DataManager.SetBestiaire(Bestiaire.ToList());
             }
         }
+
         public void ModifierFavPerso(Personnage perso, bool value)
         {
-            foreach (Personnage b in Personnages)
+            Personnage? persoToUpdate = Personnages.FirstOrDefault(p => p.Equals(perso));
+            if (persoToUpdate != null)
             {
-                if (b.Equals(perso))
-                {
-                    b.EstFavori = value;
-                    DataManager.SetPersonnage(Personnages.ToList());
-                }
+                persoToUpdate.EstFavori = value;
+                DataManager.SetPersonnage(Personnages.ToList());
             }
         }
+
         public void ModifierFavIle(Ile ile, bool value)
         {
-            foreach (Ile b in Iles)
+            Ile? ileToUpdate = Iles.FirstOrDefault(i => i.Equals(ile));
+            if (ileToUpdate != null)
             {
-                if (b.Equals(ile))
-                {
-                    b.EstFavori = value;
-                    DataManager.SetIle(Iles.ToList());
-                }
+                ileToUpdate.EstFavori = value;
+                DataManager.SetIle(Iles.ToList());
             }
         }
+
         public void ModifierFavBateau(Bateau bateau, bool value)
         {
-            foreach (Bateau b in Bateaux)
+            Bateau? bateauToUpdate = Bateaux.FirstOrDefault(b => b.Equals(bateau));
+            if (bateauToUpdate != null)
             {
-                if (b.Equals(bateau))
-                {
-                    b.EstFavori = value;
-                    DataManager.SetBateau(Bateaux.ToList());
-                }
+                bateauToUpdate.EstFavori = value;
+                DataManager.SetBateau(Bateaux.ToList());
             }
         }
         public void AjouterFDD(FruitDuDemon fruit)
         {
             Fruits.Add(fruit);
+            DataManager.SetFDD(Fruits.ToList());
         }
         public void AjouterEquip(Equipage equip)
         {
             Equipages.Add(equip);
+            DataManager.SetEquipage(Equipages.ToList());
         }
         public void AjouterBest(Bestiaire best)
         {
             Bestiaire.Add(best);
+            DataManager.SetBestiaire(Bestiaire.ToList());
         }
         public void AjouterPerso(Personnage perso)
         {
             Personnages.Add(perso);
+            DataManager.SetPersonnage(Personnages.ToList());
         }
         public void AjouterIle(Ile ile)
         {
             Iles.Add(ile);
+            DataManager.SetIle(Iles.ToList());
         }
         public void AjouterBateau(Bateau bateau)
         {
             Bateaux.Add(bateau);
+            DataManager.SetBateau(Bateaux.ToList());
         }
         public void SupprimerFDD(FruitDuDemon fruit)
         {
             Fruits.Remove(fruit);
+            DataManager.SetFDD(Fruits.ToList());
         }
         public void SupprimerEquip(Equipage equip)
         {
             Equipages.Remove(equip);
+            DataManager.SetEquipage(Equipages.ToList());
         }
         public void SupprimerBest(Bestiaire best)
         {
             Bestiaire.Remove(best);
+            DataManager.SetBestiaire(Bestiaire.ToList());
         }
         public void SupprimerPerso(Personnage perso)
         {
             Personnages.Remove(perso);
+            DataManager.SetPersonnage(Personnages.ToList());
         }
         public void SupprimerIle(Ile ile)
         {
             Iles.Remove(ile);
+            DataManager.SetIle(Iles.ToList());
         }
         public void SupprimerBateau(Bateau bateau)
         {
             Bateaux.Remove(bateau);
+            DataManager.SetBateau(Bateaux.ToList());
         }
 
         public void ModifierIle(Ile ile, string ancienNom)
         {
             Ile? ancienneIle = Iles.FirstOrDefault(p => p.Nom == ancienNom);
-            if (ancienneIle == null) return;
-            Iles.Remove(ancienneIle);
-            Iles.Add(ile);
+            if(ancienneIle !=null) {
+                Iles.Remove(ancienneIle);
+                Iles.Add(ile);
+                DataManager.SetIle(Iles.ToList());
+            }
         }
         public void ModifierBest(Bestiaire best, string ancienNom)
         {
@@ -267,6 +267,7 @@ namespace Model.Managers
             if (ancienBest == null) return;
             Bestiaire.Remove(ancienBest);
             Bestiaire.Add(best);
+            DataManager.SetBestiaire(Bestiaire.ToList());
         }
         public void ModifierEquipage(Equipage equip, string ancienNom)
         {
@@ -274,6 +275,7 @@ namespace Model.Managers
             if (ancienEquip == null) return;
             Equipages.Remove(ancienEquip);
             Equipages.Add(equip);
+            DataManager.SetEquipage(Equipages.ToList());
         }
 
         public void ModifierBateau(Bateau bateau, string ancienNom)
@@ -282,6 +284,7 @@ namespace Model.Managers
             if (ancienBateau == null) return;
             Bateaux.Remove(ancienBateau);
             Bateaux.Add(bateau);
+            DataManager.SetBateau(Bateaux.ToList());
         }
         public void ModifierFDD(FruitDuDemon fruit, string ancienNom)
         {
@@ -289,6 +292,7 @@ namespace Model.Managers
             if (ancienFDD == null) return;
             Fruits.Remove(ancienFDD);
             Fruits.Add(fruit);
+            DataManager.SetFDD(Fruits.ToList());
         }
         public void ModifierPerso(Personnage perso, string ancienNom)
         {
@@ -296,6 +300,7 @@ namespace Model.Managers
             if (ancienPerso == null) return;
             Personnages.Remove(ancienPerso);
             Personnages.Add(perso);
+            DataManager.SetPersonnage(Personnages.ToList());
         }
     }
 }
diff --git a/Sources/Model/Serializer/XML_Serializer.cs b/Sources/Model/Serializer/XML_Serializer.cs
index de81bac..86e4259 100644
--- a/Sources/Model/Serializer/XML_Serializer.cs
+++ b/Sources/Model/Serializer/XML_Serializer.cs
@@ -18,36 +18,16 @@ namespace Model.Serializer
         {
             StubManager stubManager = new StubManager();
             Chemin = Directory.GetCurrentDirectory();
-            if (!File.Exists(Path.Combine(Chemin, "./personnage.xml")))
-            {
-                SetPersonnage(stubManager.GetPersonnages().ToList());
-            }
-            if (!File.Exists(Path.Combine(Chemin, "./bateau.xml")))
-            {
-                SetBateau(stubManager.GetBateaux().ToList());
-            }
-            if (!File.Exists(Path.Combine(Chemin, "./fruitdudemon.xml")))
-            {
-                SetFDD(stubManager.GetFruits().ToList());
-            }
-            if (!File.Exists(Path.Combine(Chemin, "./bestiaire.xml")))
-            {
-                SetBestiaire(stubManager.GetBestiaires().ToList());
-            }
-            if (!File.Exists(Path.Combine(Chemin, "./equipage.xml")))
-            {
-                SetEquipage(stubManager.GetEquipages().ToList());
-            }
-            if (!File.Exists(Path.Combine(Chemin, "./ile.xml")))
-            {
-                SetIle(stubManager.GetIles().ToList());
-            }
+            InitialiserFichiers(stubManager);
         }
-
         public XML_Serializer(string path)
         {
             Chemin= path;
             StubManager stubManager = new StubManager();
+            InitialiserFichiers(stubManager);
+        }
+        public void InitialiserFichiers(StubManager stubManager)
+        {
             if (!File.Exists(Path.Combine(Chemin, "./personnage.xml")))
             {
                 SetPersonnage(stubManager.GetPersonnages().ToList());
diff --git a/Sources/Ohara/AppShell.xaml b/Sources/Ohara/AppShell.xaml
index 23cd607..4c2b3ae 100644
--- a/Sources/Ohara/AppShell.xaml
+++ b/Sources/Ohara/AppShell.xaml
@@ -4,11 +4,12 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:Ohara"
-    
+    xmlns:icon="clr-namespace:Ohara.Resources"
+    FlyoutBackgroundColor="White"
     Shell.FlyoutBehavior="Locked"
     Shell.NavBarIsVisible="False"  
-    
    >
+    
     <Shell.Resources>
         <Style TargetType="Layout" 
                ApplyToDerivedTypes="True"
@@ -16,7 +17,7 @@
             <Setter Property="WidthRequest" Value="1000"/>
             <Setter Property="VisualStateManager.VisualStateGroups">
                 <VisualStateGroupList>
-                    <VisualStateGroup>
+                    <VisualStateGroup  x:Name="CommonStates">
                         <VisualState x:Name="Normal">
                             <VisualState.Setters>
                                 <Setter Property="BackgroundColor" Value="White"/>
@@ -25,10 +26,15 @@
                         </VisualState>
                         <VisualState x:Name="PointerOver">
                             <VisualState.Setters>
-                                <Setter Property="BackgroundColor" Value="#72a3b3"/>
+                                <Setter Property="BackgroundColor" Value="#bfe5ef"/>
+                               
                             </VisualState.Setters>
                         </VisualState>
-
+                        <!--<VisualState x:Name="Selected">
+                            <VisualState.Setters>
+                                <Setter Property="BackgroundColor" Value="#72a3b3"/>
+                            </VisualState.Setters>
+                        </VisualState>-->
                     </VisualStateGroup>
                 </VisualStateGroupList>
             </Setter>
@@ -42,18 +48,23 @@
             <Setter Property="WidthRequest" Value="1000"/>
             <Setter Property="VisualStateManager.VisualStateGroups">
                 <VisualStateGroupList>
-                    <VisualStateGroup>
+                    <VisualStateGroup x:Name="CommonStates">
                         <VisualState x:Name="Normal">
                             <VisualState.Setters>
                                 <Setter Property="TextColor" Value="#72a3b3"/>
-
+                                <Setter Property="FontSize" Value="15"/>
                             </VisualState.Setters>
                         </VisualState>
-                        <VisualState x:Name="PointerOver">
+                        <!--<VisualState x:Name="PointerOver">
                             <VisualState.Setters>
                                 <Setter Property="TextColor" Value="White"/>
                             </VisualState.Setters>
                         </VisualState>
+                        <VisualState x:Name="Selected">
+                            <VisualState.Setters>
+                                <Setter Property="TextColor" Value="White"/>
+                            </VisualState.Setters>
+                        </VisualState>-->
 
                     </VisualStateGroup>
                 </VisualStateGroupList>
@@ -77,47 +88,88 @@
     </Shell.FlyoutHeader>
 
     <FlyoutItem Title="Accueil" >
-        
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Acceuil}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent  ContentTemplate="{DataTemplate local:MainPage}" />
     </FlyoutItem>
     <FlyoutItem  Title="Favoris">
         <FlyoutItem.Icon>
             <FontImageSource
                 FontFamily="Icons"
-                Glyph="\ue72c"
+                Glyph="{x:Static icon:IconFont.Fav}"
                 Color="#72a3b3"
-                Size="16"/>
+                Size="64"/>
         </FlyoutItem.Icon>
+     
         <ShellContent  ContentTemplate="{DataTemplate local:PageFavoris}" />
     </FlyoutItem>
-    <FlyoutItem Title="Carte">
-        <ShellContent  ContentTemplate="{DataTemplate local:PageCarte}" />
-    </FlyoutItem>
     <FlyoutItem Title="Personnages">
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Perso}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent  ContentTemplate="{DataTemplate local:PagePersonnage}" />
     </FlyoutItem>
     <FlyoutItem Title="Bateaux">
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Bateau}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent  ContentTemplate="{DataTemplate local:PageBateau}" />
     </FlyoutItem>
+    
     <FlyoutItem Title="Îles" >
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Ile}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent ContentTemplate="{DataTemplate local:PageIle}" />
     </FlyoutItem>
     <FlyoutItem  Title="Fruits Du Démon">
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Fdd}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent ContentTemplate="{DataTemplate local:PageFDD}" />
     </FlyoutItem>
     <FlyoutItem Title="Equipages">
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Equip}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent  ContentTemplate="{DataTemplate local:PageEquipage}" />
     </FlyoutItem>
+    
     <FlyoutItem Title="Bestiaire">
+        <FlyoutItem.Icon>
+            <FontImageSource
+                FontFamily="Icons"
+                Glyph="{x:Static icon:IconFont.Best}"
+                Color="#72a3b3"
+                Size="64"/>
+        </FlyoutItem.Icon>
         <ShellContent  ContentTemplate="{DataTemplate local:PageBestiaire}" />
     </FlyoutItem>
-        
-        
-       
-       
-   
-   
-
     <Shell.FlyoutFooter>
         <StackLayout>
             <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="4" Stroke="#72a3b3"/>
diff --git a/Sources/Ohara/MainPage.xaml b/Sources/Ohara/MainPage.xaml
index ef981f8..5fd248f 100644
--- a/Sources/Ohara/MainPage.xaml
+++ b/Sources/Ohara/MainPage.xaml
@@ -4,28 +4,53 @@
              x:Class="Ohara.MainPage"
              BackgroundColor="#e2edf1">
     <ScrollView>
-        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40" Margin="0,20,0,0">
-            <Frame CornerRadius="20"  HorizontalOptions="Center" Padding="30" BorderColor="Transparent">
-                <Label Text="Bienvenue dans Ohara !" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" TextColor="White"/>
-                <Frame.Background>
-                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Color="#cdffd8" Offset="0.1" />
-                        <GradientStop Color="#94b9ff" Offset="1.0" />
-                    </LinearGradientBrush>
-                </Frame.Background>
-            </Frame>
-            <Frame CornerRadius="20" Padding="20" HorizontalOptions="Center" BackgroundColor="#72a3b3" BorderColor="#72a3b3" Margin="50">
-                <VerticalStackLayout Spacing="10">
-                    <Label Text="Présentation :" FontAttributes="Bold" FontSize="30" HorizontalOptions="Center" VerticalOptions="Start" TextColor="White"/>
-                    <Label TextColor="White" Grid.Column="1" FontSize="17" VerticalOptions="Center" HorizontalTextAlignment="Center" >
-                        <Label.Text>
-                            Ohara est le nom d'une île dans le manga One Piece,  écrit par Eiichiro Oda. Cette île abritait de nombreux archéologues qui cherchaient à déceler les mystères du monde. 
-                            Nous avons choisi le nom Ohara pour notre projet lié à la SAE 2.01, car notre application représente une véritable encyclopédie rassemblant des informations sur One Piece. 
-                            Avec des centaines de personnages, des dizaines d'îles et de nombreux arcs d'histoire, il peut être difficile de se souvenir de tous les détails. Notre application a été conçue pour aider les fans à accéder facilement à toutes les informations sur One Piece,en offrant une expérience utilisateur fluide et intuitive.
-                        </Label.Text>
-                    </Label>
+        <VerticalStackLayout Spacing="50"  Padding="30">
+
+            <Grid  HeightRequest="500" HorizontalOptions="Center" MaximumWidthRequest="1000" >
+
+                <Frame   CornerRadius="25"
+                        BorderColor="Transparent"
+                        BackgroundColor="Black"
+                        IsClippedToBounds="True"
+                        Padding="0">
+                    <Image Source="ohara.jpg" Opacity="0.6" Aspect="Fill"/>
+
+
+                </Frame>
+                <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Start" Margin="20" Spacing="10">
+                    <Label Text="Bienvenue dans Ohara !"  FontSize="27" HorizontalTextAlignment="Center" TextColor="White"/>
+                    <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="White" />
                 </VerticalStackLayout>
-            </Frame>
+               
+                
+                <VerticalStackLayout HorizontalOptions="Center" VerticalOptions="Center" Spacing="5">
+                    
+                    <Label Text="Inventaire de votre bibliothèque :" TextColor="White" FontSize="17" FontAttributes="Bold"/>
+                    <Label Text="{Binding Personnages.Count, StringFormat=' {0} Personnages'}" TextColor="White" FontSize="17" HorizontalTextAlignment="Center"/>
+                    <Label Text="{Binding Bateaux.Count, StringFormat=' {0} Bateaux'}" TextColor="White" FontSize="17"  HorizontalTextAlignment="Center"/>
+                    <Label Text="{Binding Iles.Count, StringFormat=' {0} Îles'}" TextColor="White" FontSize="17"  HorizontalTextAlignment="Center"/>
+                    <Label Text="{Binding Fruits.Count, StringFormat=' {0} Fruit du démons'}" TextColor="White" FontSize="17"  HorizontalTextAlignment="Center"/>
+                    <Label Text="{Binding Equipages.Count, StringFormat=' {0} Equipages'}" TextColor="White" FontSize="17"  HorizontalTextAlignment="Center"/>
+                    <Label Text="{Binding Bestiaire.Count, StringFormat=' {0} Bestiaires'}" TextColor="White" FontSize="17"  HorizontalTextAlignment="Center"/>
+
+
+
+                </VerticalStackLayout>
+                <Label Text="Apprenez-en davantage sur le monde de One Piece et remplissez votre bibliothèque !" TextColor="White" FontSize="17" FontAttributes="Bold" VerticalOptions="End" HorizontalOptions="Center"  Margin="20"/>
+            </Grid>
+            <VerticalStackLayout Spacing="10">
+                <Label Text="Présentation de l'application :" FontAttributes="Bold" FontSize="25" VerticalOptions="Start" TextColor="#72a3b3" HorizontalTextAlignment="Center"/>
+                <Line X1="0" Y1="0" X2="3000" Y2="0" StrokeThickness="2" Stroke="#72a3b3" />
+                <Label TextColor="#72a3b3" FontSize="17" HorizontalTextAlignment="Center" >
+                    <Label.Text>
+                        Ohara est le nom d'une île dans le manga One Piece,  écrit par Eiichiro Oda. Cette île abritait de nombreux archéologues qui cherchaient à déceler les mystères du monde.Nous avons choisi le nom Ohara pour notre projet lié à la SAE 2.01, car notre application représente une véritable encyclopédie rassemblant des informations sur One Piece. Avec des centaines de personnages, des dizaines d'îles et de nombreux arcs d'histoire, il peut être difficile de se souvenir de tous les détails. Notre application a été conçue pour aider les fans à accéder facilement à toutes les informations sur One Piece,en offrant une expérience utilisateur fluide et intuitive.
+                    </Label.Text>
+                </Label>
+
+                <Label TextColor="#72a3b3" FontAttributes="Bold" FontSize="17" HorizontalTextAlignment="Center" Text="Commencez dès maintenant à naviguer dans l'application grâce au menu à gauche ..." />
+            </VerticalStackLayout>
+                  
+                
         </VerticalStackLayout>
     </ScrollView>
     
diff --git a/Sources/Ohara/MainPage.xaml.cs b/Sources/Ohara/MainPage.xaml.cs
index e2d8686..b34a73b 100644
--- a/Sources/Ohara/MainPage.xaml.cs
+++ b/Sources/Ohara/MainPage.xaml.cs
@@ -1,14 +1,15 @@
 using Microsoft.Maui.Platform;
+using Model.Managers;
 using Plugin.Maui.Audio;
 
 namespace Ohara;
 
 public partial class MainPage : ContentPage
-{ 
+{
+    public Manager manager => (App.Current as App).manager;
     public MainPage()
     {
         InitializeComponent();
-
-
+        BindingContext = manager;
     }
 }
\ No newline at end of file
diff --git a/Sources/Ohara/MauiProgram.cs b/Sources/Ohara/MauiProgram.cs
index b6bc056..2942024 100644
--- a/Sources/Ohara/MauiProgram.cs
+++ b/Sources/Ohara/MauiProgram.cs
@@ -16,8 +16,8 @@ public static class MauiProgram
 			.ConfigureFonts(fonts =>
 			{
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-                fonts.AddFont("microns.ttf", "Icons");
+				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");           
+                fonts.AddFont("typicons.ttf", "Icons");
             });
 
 #if DEBUG
diff --git a/Sources/Ohara/Ohara.csproj b/Sources/Ohara/Ohara.csproj
index 5ad5205..758734b 100644
--- a/Sources/Ohara/Ohara.csproj
+++ b/Sources/Ohara/Ohara.csproj
@@ -92,9 +92,6 @@
 	  <Compile Update="PageBestiaire.xaml.cs">
 		<DependentUpon>PageBestiaire.xaml</DependentUpon>
 	  </Compile>
-	  <Compile Update="PageCarte.xaml.cs">
-	    <DependentUpon>PageCarte.xaml</DependentUpon>
-	  </Compile>
 	  <Compile Update="PageBateau.xaml.cs">
 	    <DependentUpon>PageBateau.xaml</DependentUpon>
 	  </Compile>
@@ -140,9 +137,6 @@
 	  <MauiXaml Update="PageIle.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="PageCarte.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="PageInfoIle.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Sources/Ohara/PageBateau.xaml b/Sources/Ohara/PageBateau.xaml
index f6c9e7f..b947eda 100644
--- a/Sources/Ohara/PageBateau.xaml
+++ b/Sources/Ohara/PageBateau.xaml
@@ -8,20 +8,10 @@
 
 
     <VerticalStackLayout  Spacing="40">
-        <Grid ColumnDefinitions="200,*,150,20,150,20,150" BackgroundColor="#72a3b3" Padding="10">
+        <Grid ColumnDefinitions="200,*,100,10,150" BackgroundColor="#72a3b3" Padding="10">
             <SearchBar x:Name="searchBar" Placeholder="Rechercher..." BackgroundColor="#bfe5ef" Grid.Column="0"/>
-            <Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
-            <Picker Title="Filtrer" Grid.Column="4" ItemsSource="{Binding Equipages}" ItemDisplayBinding="{Binding Nom}" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}"/>
-
-
-            <Picker Title="Trier" Grid.Column="6" Style="{StaticResource pickerOhara}">
-                <Picker.ItemsSource>
-                    <x:Array Type="{x:Type x:String}">
-                        <x:String>Nom croissant</x:String>
-                        <x:String>Nom décroissant</x:String>
-                    </x:Array>
-                </Picker.ItemsSource>
-            </Picker>
+            <Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="4"/>
+            <Picker Title="Filtrer" Grid.Column="2" ItemsSource="{Binding Equipages}" ItemDisplayBinding="{Binding Nom}" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}"/>
         </Grid>
         <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
             <CollectionView x:Name="listeBateau" ItemsSource="{Binding Bateaux}" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeBateau_SelectionChanged" >
diff --git a/Sources/Ohara/PageBestiaire.xaml b/Sources/Ohara/PageBestiaire.xaml
index ed3500e..abe66fe 100644
--- a/Sources/Ohara/PageBestiaire.xaml
+++ b/Sources/Ohara/PageBestiaire.xaml
@@ -8,28 +8,9 @@
 
     <ScrollView>
         <VerticalStackLayout>
-            <Grid ColumnDefinitions="200,*,150,20,150,20,150" BackgroundColor="#72a3b3" Padding="10">
+            <Grid ColumnDefinitions="200,*,150" BackgroundColor="#72a3b3" Padding="10">
                 <SearchBar x:Name="searchBar" Placeholder="Rechercher..."  Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
                 <Button Text="Ajouter" Clicked="ButtonAjouter_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
-                <!--<Picker Title="Filtrer" Grid.Column="4" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
-                    <Picker.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Aucun</x:String>
-                            <x:String>Logia</x:String>
-                            <x:String>Paramecia</x:String>
-                            <x:String>Zoan Carnivore</x:String>
-                            <x:String>Zoan Mythique</x:String>
-                        </x:Array>
-                    </Picker.ItemsSource>
-                </Picker>-->
-                <Picker Title="Trier" Grid.Column="6" Style="{StaticResource pickerOhara}">
-                    <Picker.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Nom croissant</x:String>
-                            <x:String>Nom décroissant</x:String>
-                        </x:Array>
-                    </Picker.ItemsSource>
-                </Picker>
             </Grid>
             <FlexLayout x:Name="listeBest" AlignItems="Center" Wrap="Wrap"
                     HorizontalOptions="Center"
diff --git a/Sources/Ohara/PageCarte.xaml b/Sources/Ohara/PageCarte.xaml
deleted file mode 100644
index b8c2bce..0000000
--- a/Sources/Ohara/PageCarte.xaml
+++ /dev/null
@@ -1,22 +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="Ohara.PageCarte"
-             BackgroundColor="#e2edf1">
-
-   
-        <VerticalStackLayout Grid.Row="0" Grid.Column="1" Spacing="40">
-
-            <Image Source="carte.png" HorizontalOptions="Center" />
-
-        </VerticalStackLayout>
-
-
-
-        <!--<Rectangle WidthRequest="200" HeightRequest="300" HorizontalOptions="Start"   BackgroundColor="#72a3b3">
-            <Rectangle.Fill>
-                <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
-                    <GradientStop Color="#cdffd8" Offset="0.0" />-->
-        <!--<GradientStop Color="#94b9ff" Offset="1.0" /></LinearGradientBrush></Rectangle.Fill></Rectangle>-->
-
-</ContentPage>
diff --git a/Sources/Ohara/PageCarte.xaml.cs b/Sources/Ohara/PageCarte.xaml.cs
deleted file mode 100644
index 565e678..0000000
--- a/Sources/Ohara/PageCarte.xaml.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Plugin.Maui.Audio;
-
-namespace Ohara;
-
-public partial class PageCarte : ContentPage
-{
-    public PageCarte()
-	{
-		InitializeComponent();
-      
-    }
-   
-}
\ No newline at end of file
diff --git a/Sources/Ohara/PageEquipage.xaml b/Sources/Ohara/PageEquipage.xaml
index d76d225..70ef33a 100644
--- a/Sources/Ohara/PageEquipage.xaml
+++ b/Sources/Ohara/PageEquipage.xaml
@@ -7,18 +7,9 @@
              BackgroundColor="#e2edf1">
     <ScrollView>
         <VerticalStackLayout>
-            <Grid ColumnDefinitions="200,*,150,20,150,20,150" BackgroundColor="#72a3b3" Padding="10">
+            <Grid ColumnDefinitions="200,*,150" BackgroundColor="#72a3b3" Padding="10">
                 <SearchBar x:Name="searchBar" Placeholder="Rechercher..."  Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
                 <Button Text="Ajouter" Clicked="ButtonAjouter_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
-                
-                <Picker Title="Trier" Grid.Column="6" Style="{StaticResource pickerOhara}">
-                    <Picker.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Nom croissant</x:String>
-                            <x:String>Nom décroissant</x:String>
-                        </x:Array>
-                    </Picker.ItemsSource>
-                </Picker>
             </Grid>
             <FlexLayout x:Name="listEquip" AlignItems="Center" Wrap="Wrap"
                     HorizontalOptions="Center" JustifyContent="SpaceEvenly">
diff --git a/Sources/Ohara/PageFDD.xaml b/Sources/Ohara/PageFDD.xaml
index bac9cfc..547654d 100644
--- a/Sources/Ohara/PageFDD.xaml
+++ b/Sources/Ohara/PageFDD.xaml
@@ -7,10 +7,10 @@
              BackgroundColor="#e2edf1">
     <ScrollView>
         <VerticalStackLayout>
-            <Grid ColumnDefinitions="200,*,150,20,150,20,150" BackgroundColor="#72a3b3" Padding="10">
+            <Grid ColumnDefinitions="200,*,100,10,150" BackgroundColor="#72a3b3" Padding="10">
                 <SearchBar x:Name="searchBar" Placeholder="Rechercher..."  Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
-                <Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
-                <Picker Title="Filtrer" Grid.Column="4" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
+              
+                <Picker Title="Filtrer" Grid.Column="2" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
                     <Picker.ItemsSource>
                         <x:Array Type="{x:Type x:String}">
                             <x:String>Aucun</x:String>
@@ -21,14 +21,7 @@
                         </x:Array>
                     </Picker.ItemsSource>
                 </Picker>
-                <Picker Title="Trier" Grid.Column="6" Style="{StaticResource pickerOhara}">
-                    <Picker.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Nom croissant</x:String>
-                            <x:String>Nom décroissant</x:String>
-                        </x:Array>
-                    </Picker.ItemsSource>
-                </Picker>
+                <Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="4"/>
             </Grid>
             <FlexLayout x:Name="listeFDD" AlignItems="Center" Wrap="Wrap"
                     HorizontalOptions="Center"
diff --git a/Sources/Ohara/PageFavoris.xaml b/Sources/Ohara/PageFavoris.xaml
index 738fa24..aa6bdf1 100644
--- a/Sources/Ohara/PageFavoris.xaml
+++ b/Sources/Ohara/PageFavoris.xaml
@@ -8,28 +8,9 @@
 
     <ScrollView>
         <VerticalStackLayout>
-            <Grid ColumnDefinitions="200,*,150,20,150,20,150" BackgroundColor="#72a3b3" Padding="10">
-                <SearchBar x:Name="searchBar" Placeholder="Rechercher..."  Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
-                <!--<Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
-                <Picker Title="Filtrer" Grid.Column="4" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
-                    <Picker.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Aucun</x:String>
-                            <x:String>Logia</x:String>
-                            <x:String>Paramecia</x:String>
-                            <x:String>Zoan Carnivore</x:String>
-                            <x:String>Zoan Mythique</x:String>
-                        </x:Array>
-                    </Picker.ItemsSource>
-                </Picker>-->
-                <Picker Title="Trier" Grid.Column="6" Style="{StaticResource pickerOhara}">
-                    <Picker.ItemsSource>
-                        <x:Array Type="{x:Type x:String}">
-                            <x:String>Nom croissant</x:String>
-                            <x:String>Nom décroissant</x:String>
-                        </x:Array>
-                    </Picker.ItemsSource>
-                </Picker>
+            <Grid ColumnDefinitions="*" BackgroundColor="#72a3b3" Padding="10">
+                <SearchBar x:Name="searchBar" Placeholder="Rechercher..."  Style="{StaticResource searchBarOhara}" HorizontalOptions="Center" WidthRequest="300"/>
+            
             </Grid>
             <FlexLayout x:Name="listeFav" AlignItems="Center" Wrap="Wrap"
                     HorizontalOptions="Center" JustifyContent="SpaceEvenly">
diff --git a/Sources/Ohara/PageIle.xaml b/Sources/Ohara/PageIle.xaml
index b06f037..e45d266 100644
--- a/Sources/Ohara/PageIle.xaml
+++ b/Sources/Ohara/PageIle.xaml
@@ -5,14 +5,11 @@
              Title="PageIle"
              Appearing="ContentPage_Appearing"  
              BackgroundColor="#e2edf1">
-
-
     <VerticalStackLayout Spacing="40">
-        <Grid ColumnDefinitions="200,*,150,20,150,20,150"  BackgroundColor="#72a3b3" Padding="10">
+        <Grid ColumnDefinitions="200,*,100,10,150"  BackgroundColor="#72a3b3" Padding="10">
             <SearchBar x:Name="searchBar" Placeholder="Rechercher..."  Style="{StaticResource searchBarOhara}" Grid.Column="0"/>
-            <Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="2"/>
-            
-            <Picker Title="Filtrer" Grid.Column="4" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
+            <Button Text="Ajouter" Clicked="Button_Clicked" Style="{StaticResource buttonBarre}" Grid.Column="4"/>
+            <Picker Title="Filtrer" Grid.Column="2" SelectedIndexChanged="PickerFiltre_SelectedIndexChanged" Style="{StaticResource pickerOhara}" >
                 <Picker.ItemsSource>
                     <x:Array Type="{x:Type x:String}">
                         <x:String>Aucun</x:String>
@@ -24,21 +21,11 @@
                     </x:Array>
                 </Picker.ItemsSource>
             </Picker>
-            <Picker Title="Trier" Grid.Column="6" Style="{StaticResource pickerOhara}">
-                <Picker.ItemsSource>
-                    <x:Array Type="{x:Type x:String}">
-                        <x:String>Nom croissant</x:String>
-                        <x:String>Nom décroissant</x:String>
-                    </x:Array>
-                </Picker.ItemsSource>
-            </Picker>
         </Grid>
-
         <ScrollView Orientation="Horizontal" HorizontalScrollBarVisibility="Always">
             <CollectionView x:Name="listeIle" ItemsSource="{Binding Iles}" ItemsLayout="HorizontalList" EmptyView="Aucun résultat trouvé." SelectionMode="Single" SelectionChanged="listeIle_SelectionChanged"   >
                 <CollectionView.ItemTemplate>
                     <DataTemplate>
-
                         <Grid Padding="50" ColumnSpacing="10">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
@@ -46,8 +33,6 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="750"/>
                             </Grid.RowDefinitions>
-
-
                             <Frame
                                     CornerRadius="25"
                                     BorderColor="#e2edf1"
@@ -61,9 +46,6 @@
                                         Aspect="Fill"
                                         />
                             </Frame>
-
-
-
                             <Frame Style="{StaticResource frameObjet2}">
 
 
diff --git a/Sources/Ohara/Resources/Fonts/microns.ttf b/Sources/Ohara/Resources/Fonts/microns.ttf
deleted file mode 100644
index 71ec259..0000000
Binary files a/Sources/Ohara/Resources/Fonts/microns.ttf and /dev/null differ
diff --git a/Sources/Ohara/Resources/Fonts/typicons.ttf b/Sources/Ohara/Resources/Fonts/typicons.ttf
new file mode 100644
index 0000000..c608e1c
Binary files /dev/null and b/Sources/Ohara/Resources/Fonts/typicons.ttf differ
diff --git a/Sources/Ohara/Resources/Raw/IconFont.cs b/Sources/Ohara/Resources/Raw/IconFont.cs
index 6fff43a..6b66483 100644
--- a/Sources/Ohara/Resources/Raw/IconFont.cs
+++ b/Sources/Ohara/Resources/Raw/IconFont.cs
@@ -8,12 +8,14 @@ namespace Ohara.Resources
 {
     static class IconFont
     {
-        public const string Perso = "\ue738";
-        public const string Fav = "\ue72c";
-        public const string Equip = "\ue72e";
-        public const string Icon4 = "\ue75b";
-        public const string Suppr = "\ue732";
-        public const string Add = "\ue70d";
-        public const string Modif = "\ue736";
+
+        public const string Fdd = "\ue104";
+        public const string Equip = "\ue074";
+        public const string Bateau = "\ue003";
+        public const string Acceuil = "\ue08a";
+        public const string Best = "\ue083";
+        public const string Perso = "\ue12c";
+        public const string Ile = "\ue081";
+        public const string Fav = "\ue109";
     }
 }
diff --git a/Sources/TestProject1/TestBestiaire.cs b/Sources/TestProject1/TestBestiaire.cs
index c450f63..12ce704 100644
--- a/Sources/TestProject1/TestBestiaire.cs
+++ b/Sources/TestProject1/TestBestiaire.cs
@@ -28,9 +28,14 @@ namespace TestProject1
         {
             Bestiaire bestiaire1 = new Bestiaire("Humains", "??", "Les humains sont ...", "Ils possèdent les caractéristiques suivantes ...", "");
             Bestiaire bestiaire2 = new Bestiaire("Humains", "??", "Les humains sont ...", "Ils possèdent les caractéristiques suivantes ...", "");
+            Personnage personnage1 = new Personnage("Perso", 0, "", 0, 0, "", "", "");
+            Bestiaire bestiaire3 = new Bestiaire("adad", "??", "Les humains sont ...", "Ils possèdent les caractéristiques suivantes ...", "");
             bool resultat = (bestiaire1.Equals(bestiaire2));
+            bool resultat2 = (bestiaire1.Equals(personnage1));
+            bool resultat3 = (bestiaire1.Equals(bestiaire3));
             Assert.True(resultat, "Les deux bestiaires devraient etre égaux car ils onts le meme nom");
-
+            Assert.False(resultat2);
+            Assert.False(resultat3);
         }
     }
 }
diff --git a/Sources/TestProject1/TestManager.cs b/Sources/TestProject1/TestManager.cs
index 16209d9..37606da 100644
--- a/Sources/TestProject1/TestManager.cs
+++ b/Sources/TestProject1/TestManager.cs
@@ -114,8 +114,237 @@ namespace TestProject1
           
             Assert.True(1==result.Count);
             Assert.Contains(obj1, result);
-            Assert.False(result.Contains(obj2));       
+            Assert.True(!result.Contains(obj2));       
         }
+        [Fact]
+        public void ModifierFavFDD_UpdatesFruitDuDemonFavori()
+        {
+            var fruit = new FruitDuDemon("Fruit", "", "", 0, 0, "", "","");
+            manager.Fruits.Add(fruit);
+
+            manager.ModifierFavFDD(fruit, true);
+
+            fruit = manager.Fruits.FirstOrDefault(p => fruit.Nom == p.Nom);
+            Assert.NotNull(fruit);
+            Assert.True(fruit.EstFavori);
+        }
+
+        [Fact]
+        public void ModifierFavEquip_UpdatesEquipageFavori()
+        {         
+            var equip = new Equipage("Equipage","","",0,0,true,"");
+            manager.Equipages.Add(equip);
+
+            manager.ModifierFavEquip(equip, true);
+
+            equip = manager.Equipages.FirstOrDefault(p=> equip.Nom == p.Nom);
+            Assert.NotNull(equip);
+            Assert.True(equip.EstFavori);
+        }
+
+        [Fact]
+        public void ModifierFavBest_UpdatesBestiaireFavori()
+        {
+            var best = new Bestiaire("Bestiaire", "", "","");
+            manager.Bestiaire.Add(best);
+
+            manager.ModifierFavBest(best, true);
+
+            best = manager.Bestiaire.FirstOrDefault(p => best.Nom == p.Nom);
+            Assert.NotNull(best);
+            Assert.True(best.EstFavori);
+        }
+
+        [Fact]
+        public void ModifierFavPerso_UpdatesPersonnageFavori()
+        {
+            var perso = new Personnage("Personnage", 0, "", 0, 0, "", "", "");
+            manager.Personnages.Add(perso);
+
+            manager.ModifierFavPerso(perso, true);
+
+            perso = manager.Personnages.FirstOrDefault(p => perso.Nom == p.Nom);
+            Assert.NotNull(perso);
+            Assert.True(perso.EstFavori);
+        }
+
+        [Fact]
+        public void ModifierFavIle_UpdatesIleFavori()
+        {
+            var ile = new Ile("Ile", "", "", 0, 0, "", "");
+            manager.Iles.Add(ile);
+
+            manager.ModifierFavIle(ile, true);
 
+            ile = manager.Iles.FirstOrDefault(p => ile.Nom == p.Nom);
+            Assert.NotNull(ile);
+            Assert.True(ile.EstFavori);
+        }
+
+        [Fact]
+        public void ModifierFavBateau_UpdatesBateauFavori()
+        {
+            var bateau = new Bateau("Bateau", "", 0, 0, "", "");
+            manager.Bateaux.Add(bateau);
+
+            manager.ModifierFavBateau(bateau, true);
+
+            bateau = manager.Bateaux.FirstOrDefault(p => bateau.Nom == p.Nom);
+            Assert.NotNull(bateau);
+            Assert.True(bateau.EstFavori);
+        }
+        [Fact]
+        public void ModifierIle_Should_UpdateIle_When_ExistingAncienNom()
+        {
+            Ile ancienneIle = new Ile("AncienNom","","",0,0,"","");
+            Ile nouvelleIle = new Ile("NouveauNom", "", "", 0, 0, "", "");
+            manager.Iles.Add(ancienneIle);
+
+            manager.ModifierIle(nouvelleIle, "AncienNom");
+
+            Assert.DoesNotContain(ancienneIle,manager.Iles);
+            Assert.Contains(nouvelleIle,manager.Iles); ;
+        }
+
+        [Fact]
+        public void ModifierIle_Should_NotUpdateIle_When_NonExistingAncienNom()
+        {
+            Ile ancienneIle = new Ile("AncienNom", "", "", 0, 0, "", "");
+            Ile nouvelleIle = new Ile("NouveauNom", "", "", 0, 0, "", "");
+            manager.Iles.Add(ancienneIle);
+
+            manager.ModifierIle(nouvelleIle, "iadjadiozadioazj");
+
+            Assert.Contains(ancienneIle, manager.Iles);
+            Assert.DoesNotContain(nouvelleIle, manager.Iles);
+        }
+        [Fact]
+        public void ModifierFDD_Should_UpdateIle_When_ExistingAncienNom()
+        {
+            FruitDuDemon ancienneFDD = new FruitDuDemon("AncienNom", "", "",0, 0, "", "","");
+            FruitDuDemon nouvelleFDD = new FruitDuDemon("NouveauNom", "", "", 0, 0, "", "","");
+            manager.Fruits.Add(ancienneFDD);
+
+            manager.ModifierFDD(nouvelleFDD, "AncienNom");
+
+            Assert.DoesNotContain(ancienneFDD, manager.Fruits);
+            Assert.Contains(nouvelleFDD, manager.Fruits); ;
+        }
+
+        [Fact]
+        public void ModifierFDD_Should_NotUpdateIle_When_NonExistingAncienNom()
+        {
+            FruitDuDemon ancienneFDD = new FruitDuDemon("AncienNom", "", "", 0, 0, "", "", "");
+            FruitDuDemon nouvelleFDD = new FruitDuDemon("NouveauNom", "", "", 0, 0, "", "", "");
+            manager.Fruits.Add(ancienneFDD);
+
+            manager.ModifierFDD(nouvelleFDD, "ADADADAZDAZD");
+
+            Assert.Contains(ancienneFDD, manager.Fruits);
+            Assert.DoesNotContain(nouvelleFDD, manager.Fruits);
+        }
+        [Fact]
+        public void ModifierPerso_Should_UpdateIle_When_ExistingAncienNom()
+        {
+            Personnage ancienPerso = new Personnage("AncienNom",0,"",0,0, "", "", "");
+            Personnage nouveauPerso = new Personnage("NouveauNom", 0, "", 0,0, "", "", "");
+            manager.Personnages.Add(ancienPerso);
+
+            manager.ModifierPerso(nouveauPerso, "AncienNom");
+
+            Assert.DoesNotContain(ancienPerso, manager.Personnages);
+            Assert.Contains(nouveauPerso, manager.Personnages); 
+        }
+
+        [Fact]
+        public void ModifierPerso_Should_NotUpdateIle_When_NonExistingAncienNom()
+        {
+            Personnage ancienPerso = new Personnage("AncienNom", 0, "", 0, 0, "", "", "");
+            Personnage nouveauPerso = new Personnage("NouveauNom", 0, "", 0, 0, "", "", "");
+            manager.Personnages.Add(ancienPerso);
+
+            manager.ModifierPerso(nouveauPerso, "adadadadzdd");
+
+            Assert.Contains(ancienPerso, manager.Personnages);
+            Assert.DoesNotContain(nouveauPerso, manager.Personnages);
+        }
+        [Fact]
+        public void ModifierBest_Should_UpdateIle_When_ExistingAncienNom()
+        {
+            Bestiaire ancienBest = new Bestiaire("AncienNom", "", "", "", "");
+            Bestiaire nouveauBest = new Bestiaire("NouveauNom", "", "", "", "");
+            manager.Bestiaire.Add(ancienBest);
+
+            manager.ModifierBest(nouveauBest, "AncienNom");
+
+            Assert.DoesNotContain(ancienBest, manager.Bestiaire);
+            Assert.Contains(nouveauBest, manager.Bestiaire);
+        }
+
+        [Fact]
+        public void ModifierBest_Should_NotUpdateIle_When_NonExistingAncienNom()
+        {
+            Bestiaire ancienBest = new Bestiaire("AncienNom", "", "", "", "");
+            Bestiaire nouveauBest = new Bestiaire("NouveauNom", "", "", "", "");
+            manager.Bestiaire.Add(ancienBest);
+
+            manager.ModifierBest(nouveauBest, "adadadadzdd");
+            
+            Assert.Contains(ancienBest, manager.Bestiaire);
+            Assert.DoesNotContain(nouveauBest, manager.Bestiaire);
+        }
+        [Fact]
+        public void ModifierEquip_Should_UpdateIle_When_ExistingAncienNom()
+        {
+            Equipage ancienEquîp = new Equipage("AncienNom", "", "",0,0 ,true, "");
+            Equipage nouveauEquip = new Equipage("NouveauNom", "", "", 0, 0, true, "");
+            manager.Equipages.Add(ancienEquîp);
+
+            manager.ModifierEquipage(nouveauEquip, "AncienNom");
+
+            Assert.DoesNotContain(ancienEquîp, manager.Equipages);
+            Assert.Contains(nouveauEquip, manager.Equipages);
+        }
+
+        [Fact]
+        public void ModifierEquipage_Should_NotUpdateIle_When_NonExistingAncienNom()
+        {
+            Equipage ancienEquîp = new Equipage("AncienNom", "", "", 0, 0, true, "");
+            Equipage nouveauEquip = new Equipage("NouveauNom", "", "", 0, 0, true, "");
+            manager.Equipages.Add(ancienEquîp);
+
+            manager.ModifierEquipage(nouveauEquip, "adadadda");
+
+
+            Assert.Contains(ancienEquîp, manager.Equipages);
+            Assert.DoesNotContain(nouveauEquip, manager.Equipages);
+        }
+
+        [Fact]
+        public void ModifierBateau_Should_UpdateIle_When_ExistingAncienNom()
+        {
+            Bateau ancienBateau = new Bateau("AncienNom", "", 0, 0, "", "");
+            Bateau nouveauBateau = new Bateau("NouveauNom", "", 0, 0, "", "");
+            manager.Bateaux.Add(ancienBateau);
+
+            manager.ModifierBateau(nouveauBateau, "AncienNom");
+
+            Assert.DoesNotContain(ancienBateau, manager.Bateaux);
+            Assert.Contains(nouveauBateau, manager.Bateaux);
+        }
+
+        [Fact]
+        public void ModifierBateau_Should_NotUpdateIle_When_NonExistingAncienNom()
+        {
+            Bateau ancienBateau = new Bateau("AncienNom", "", 0, 0, "", "");
+            Bateau nouveauBateau = new Bateau("NouveauNom", "", 0, 0, "", "");
+            manager.Bateaux.Add(ancienBateau);
+
+            manager.ModifierBateau(nouveauBateau, "adfadadzdaz");
+
+
+            Assert.Contains(ancienBateau, manager.Bateaux);
+            Assert.DoesNotContain(nouveauBateau, manager.Bateaux);
+        }
     }
 }
diff --git a/Sources/TestProject1/TestObjetOhara.cs b/Sources/TestProject1/TestObjetOhara.cs
index 804bbe4..79a26ba 100644
--- a/Sources/TestProject1/TestObjetOhara.cs
+++ b/Sources/TestProject1/TestObjetOhara.cs
@@ -12,41 +12,36 @@ namespace TestProject1
         [Fact]
         public void ToString_ReturnsCorrectStringRepresentation()
         {
-            // Arrange
             var obj = new ObjetOhara("Objet 1", "image.png", true);
 
-            // Act
             var result = obj.ToString();
 
-            // Assert
             Assert.True("ObjetOhara : Objet 1 True image.png"== result);
         }
 
         [Fact]
         public void Equals_SameObject_ReturnsTrue()
         {
-            // Arrange
             var obj = new ObjetOhara("Objet 1");
-
-            // Act
+            var obj2 = new ObjetOhara("Objet 2");
+            var obj3 = new Bateau("Objet 3", "", 0, 0, "","");
             var result = obj.Equals(obj);
-
-            // Assert
+            var result2 = obj.Equals(obj2);
+            var result3 = obj.Equals(obj3);
             Assert.True(result);
+            Assert.False(result2);
+            Assert.False(result3);
         }
 
         [Fact]
         public void GetHashCode_ObjectsWithSameProperties_ReturnsSameHashCode()
         {
-            // Arrange
             var obj1 = new ObjetOhara("Objet 1", "image.png", true);
             var obj2 = new ObjetOhara("Objet 1", "image.png", true);
 
-            // Act
             var hashCode1 = obj1.GetHashCode();
             var hashCode2 = obj2.GetHashCode();
 
-            // Assert
             Assert.True(hashCode1==hashCode2);
         }
     }
diff --git a/Sources/TestProject1/XMLSerializerTests.cs b/Sources/TestProject1/XMLSerializerTests.cs
index a1dc600..ed154da 100644
--- a/Sources/TestProject1/XMLSerializerTests.cs
+++ b/Sources/TestProject1/XMLSerializerTests.cs
@@ -16,7 +16,6 @@ namespace TestProject1
         [Fact]
         public void SetPersonnage_SerializesAndWritesToFile()
         {
-            /// Arrange
             var obj1 = new Personnage("Personnage 1", 0, "", 0, 0, "", "", "");
             var obj2 = new Personnage("Personnage 2", 0, "", 0, 0, "", "", "");
             var listePerso = new List<Personnage>
@@ -25,10 +24,8 @@ namespace TestProject1
               obj2,      
             };
 
-            // Act
             serializer.SetPersonnage(listePerso);
 
-            // Assert
             string xmlFilePath = Path.Combine(serializer.Chemin, "personnage.xml");
             Assert.True(File.Exists(xmlFilePath));
 
@@ -47,7 +44,6 @@ namespace TestProject1
         [Fact]
         public void GetPersonnages_ReadsFromFileAndDeserializes()
         {
-            // Arrange
             var obj1 = new Personnage("Personnage 1", 0, "", 0, 0, "", "", "");
             var obj2 = new Personnage("Personnage 2", 0, "", 0, 0, "", "", "");
             var listePerso = new List<Personnage>
@@ -62,14 +58,291 @@ namespace TestProject1
                 xmlSerializer.WriteObject(stream, listePerso);
             }
 
-            // Act
             var result = serializer.GetPersonnages();
 
+            Assert.NotNull(result);
+            var resultList = result.ToList();
+            Assert.Contains(obj1, result);
+            Assert.Contains(obj2, result);
+        }
+
+
+        [Fact]
+        public void SetEquipages_SerializesAndWritesToFile()
+        {
+            var obj1 = new Equipage("Equipage 1", "","", 0, 0,true, "");
+            var obj2 = new Equipage("Equipage 2", "", "", 0, 0, true, "");
+            var listeEquip = new List<Equipage>
+            {
+              obj1,
+              obj2,
+            };
+
+            serializer.SetEquipage(listeEquip);
+            string xmlFilePath = Path.Combine(serializer.Chemin, "equipage.xml");
+
+            Assert.True(File.Exists(xmlFilePath));
+
+            using (Stream stream = File.OpenRead(xmlFilePath))
+            {
+                var deserializer = new DataContractSerializer(typeof(List<Equipage>));
+                var result = deserializer.ReadObject(stream) as List<Equipage>;
+
+
+                Assert.NotNull(result);
+                Assert.Contains(obj1, result);
+                Assert.Contains(obj2, result);
+            }
+        }
+
+        [Fact]
+        public void GetEquipages_ReadsFromFileAndDeserializes()
+        {
+            var obj1 = new Equipage("Equipage 1", "", "", 0, 0, true, "");
+            var obj2 = new Equipage("Equipage 2", "", "", 0, 0, true, "");
+            var listeEquip = new List<Equipage>
+            {
+              obj1,
+              obj2,
+            };
+            string xmlFilePath = Path.Combine(serializer.Chemin, "equipage.xml");
+            using (Stream stream = File.Create(xmlFilePath))
+            {
+                var xmlSerializer = new DataContractSerializer(typeof(List<Equipage>));
+                xmlSerializer.WriteObject(stream, listeEquip);
+            }
+
+            // Act
+            var result = serializer.GetEquipages();
+
             // Assert
             Assert.NotNull(result);
             var resultList = result.ToList();
             Assert.Contains(obj1, result);
             Assert.Contains(obj2, result);
         }
+
+        [Fact]
+        public void SetFDD_SerializesAndWritesToFile()
+        {
+            /// Arrange
+            var obj1 = new FruitDuDemon("Fruit 1", "","", 0, 0, "", "", "");
+            var obj2 = new FruitDuDemon("Fruit 2", "", "", 0, 0, "", "", "");
+            var listFDD = new List<FruitDuDemon>
+            {
+              obj1,
+              obj2,
+            };
+
+            // Act
+            serializer.SetFDD(listFDD);
+
+            // Assert
+            string xmlFilePath = Path.Combine(serializer.Chemin, "fruitdudemon.xml");
+            Assert.True(File.Exists(xmlFilePath));
+
+            using (Stream stream = File.OpenRead(xmlFilePath))
+            {
+                var deserializer = new DataContractSerializer(typeof(List<FruitDuDemon>));
+                var result = deserializer.ReadObject(stream) as List<FruitDuDemon>;
+
+
+                Assert.NotNull(result);
+                Assert.Contains(obj1, result);
+                Assert.Contains(obj2, result);
+            }
+        }
+
+        [Fact]
+        public void GetFDD_ReadsFromFileAndDeserializes()
+        {
+            var obj1 = new FruitDuDemon("Fruit 1", "", "", 0, 0, "", "", "");
+            var obj2 = new FruitDuDemon("Fruit 2", "", "", 0, 0, "", "", "");
+            var listFDD = new List<FruitDuDemon>
+            {
+              obj1,
+              obj2,
+            };
+            string xmlFilePath = Path.Combine(serializer.Chemin, "fruitdudemon.xml");
+            using (Stream stream = File.Create(xmlFilePath))
+            {
+                var xmlSerializer = new DataContractSerializer(typeof(List<FruitDuDemon>));
+                xmlSerializer.WriteObject(stream, listFDD);
+            }
+
+            // Act
+            var result = serializer.GetFruits();
+
+            // Assert
+            Assert.NotNull(result);
+            var resultList = result.ToList();
+            Assert.Contains(obj1, result);
+            Assert.Contains(obj2, result);
+        }
+
+        [Fact]
+        public void SetBestiaire_SerializesAndWritesToFile()
+        {
+            /// Arrange
+            var obj1 = new Bestiaire("Bestiaire 1", "", "", "");
+            var obj2 = new Bestiaire("Bestiaire 2", "", "", "");
+            var listBest = new List<Bestiaire>
+            {
+              obj1,
+              obj2,
+            };
+
+            // Act
+            serializer.SetBestiaire(listBest);
+
+            // Assert
+            string xmlFilePath = Path.Combine(serializer.Chemin, "bestiaire.xml");
+            Assert.True(File.Exists(xmlFilePath));
+
+            using (Stream stream = File.OpenRead(xmlFilePath))
+            {
+                var deserializer = new DataContractSerializer(typeof(List<Bestiaire>));
+                var result = deserializer.ReadObject(stream) as List<Bestiaire>;
+
+
+                Assert.NotNull(result);
+                Assert.Contains(obj1, result);
+                Assert.Contains(obj2, result);
+            }
+        }
+
+        [Fact]
+        public void GetBestiaire_ReadsFromFileAndDeserializes()
+        {
+            // Arrange
+            var obj1 = new Bestiaire("Bestiaire 1", "", "", "");
+            var obj2 = new Bestiaire("Bestiaire 2", "", "", "");
+            var listBest = new List<Bestiaire>
+            {
+              obj1,
+              obj2,
+            };
+            string xmlFilePath = Path.Combine(serializer.Chemin, "bestiaire.xml");
+            using (Stream stream = File.Create(xmlFilePath))
+            {
+                var xmlSerializer = new DataContractSerializer(typeof(List<Bestiaire>));
+                xmlSerializer.WriteObject(stream, listBest);
+            }
+
+            // Act
+            var result = serializer.GetBestiaires();
+
+            // Assert
+            Assert.NotNull(result);
+            var resultList = result.ToList();
+            Assert.Contains(obj1, result);
+            Assert.Contains(obj2, result);
+        }
+
+        [Fact]
+        public void SetBateau_SerializesAndWritesToFile()
+        {
+            var obj1 = new Bateau("Bateau 1", "", 0, 0, "", "", "");
+            var obj2 = new Bateau("Bateau 2", "", 0, 0, "", "", "");
+            var listeBateau = new List<Bateau>
+            {
+              obj1,
+              obj2,
+            };
+
+            serializer.SetBateau(listeBateau);
+
+            string xmlFilePath = Path.Combine(serializer.Chemin, "bateaux.xml");
+            Assert.True(File.Exists(xmlFilePath));
+
+            using (Stream stream = File.OpenRead(xmlFilePath))
+            {
+                var deserializer = new DataContractSerializer(typeof(List<Bateau>));
+                var result = deserializer.ReadObject(stream) as List<Bateau>;
+
+
+                Assert.NotNull(result);
+                Assert.Contains(obj1, result);
+                Assert.Contains(obj2, result);
+            }
+        }
+
+        [Fact]
+        public void GetBateau_ReadsFromFileAndDeserializes()
+        {
+            var obj1 = new Bateau("Bateau 1", "", 0, 0, "", "", "");
+            var obj2 = new Bateau("Bateau 2", "", 0, 0, "", "", "");
+            var listeBateau = new List<Bateau>
+            {
+              obj1,
+              obj2,
+            };
+            string xmlFilePath = Path.Combine(serializer.Chemin, "bateaux.xml");
+            using (Stream stream = File.Create(xmlFilePath))
+            {
+                var xmlSerializer = new DataContractSerializer(typeof(List<Bateau>));
+                xmlSerializer.WriteObject(stream, listeBateau);
+            }
+
+            var result = serializer.GetBateaux();
+
+            Assert.NotNull(result);
+            var resultList = result.ToList();
+            Assert.Contains(obj1, result);
+            Assert.Contains(obj2, result);
+        }
+
+        [Fact]
+        public void SetIle_SerializesAndWritesToFile()
+        {
+            var obj1 = new Ile("Ile 1", "","", 0, 0, "", "");
+            var obj2 = new Ile("Ile 2", "", "",0, 0, "", ""); 
+            var listeIle = new List<Ile>
+            {
+              obj1,
+              obj2,
+            };
+
+            serializer.SetIle(listeIle);
+
+            string xmlFilePath = Path.Combine(serializer.Chemin, "iles.xml");
+            Assert.True(File.Exists(xmlFilePath));
+
+            using (Stream stream = File.OpenRead(xmlFilePath))
+            {
+                var deserializer = new DataContractSerializer(typeof(List<Ile>));
+                var result = deserializer.ReadObject(stream) as List<Ile>;
+
+
+                Assert.NotNull(result);
+                Assert.Contains(obj1, result);
+                Assert.Contains(obj2, result);
+            }
+        }
+
+        [Fact]
+        public void GetIle_ReadsFromFileAndDeserializes()
+        {
+            var obj1 = new Ile("Ile 1", "", "", 0, 0, "", "");
+            var obj2 = new Ile("Ile 2", "", "", 0, 0, "", "");
+            var listeIle = new List<Ile>
+            {
+              obj1,
+              obj2,
+            };
+            string xmlFilePath = Path.Combine(serializer.Chemin, "iles.xml");
+            using (Stream stream = File.Create(xmlFilePath))
+            {
+                var xmlSerializer = new DataContractSerializer(typeof(List<Ile>));
+                xmlSerializer.WriteObject(stream, listeIle);
+            }
+
+            var result = serializer.GetIles();
+
+            Assert.NotNull(result);
+            var resultList = result.ToList();
+            Assert.Contains(obj1, result);
+            Assert.Contains(obj2, result);
+        }
     }
 }