diff --git a/Sources/Model/Stub.cs b/Sources/Model/Stub.cs
index 72d102e..97c308d 100644
--- a/Sources/Model/Stub.cs
+++ b/Sources/Model/Stub.cs
@@ -12,11 +12,11 @@ namespace Model
         {
             List<Espece> ListeEspeces = new List<Espece>();
             List<Race> Races = new List<Race>();
-            Races.Add(new("Abyssin"));
+            Races.Add(new("Abyssin", "", "", "", "", "", "", "", "", "", "Conseil Abyssin"));
             Races.Add(new("American curl"));
 
             ListeEspeces.Add(new("Chien", "Canis lupus familiaris", "chien.jpg"));
-            ListeEspeces.Add(new("Chat", "Felis catus", "chat.jpg", "15 à 20 ans", "15 à 20 kg", "10 à 15 cm", Races, "Les chats ont un comportement très solitaire", "Les chats ont une bonne santé", "Les chats s'éduque assez facilement", "Il faut changé leur caisse mais il se nettoie seul, sauf les chatons", "Vétérinaire, alimentation adapté, jouet", "Un conseil"));
+            ListeEspeces.Add(new("Chat", "Felis catus", "chat.jpg", "15 à 20 ans", "15 à 20 kg", "10 à 15 cm", Races, "Les chats ont un comportement très solitaire", "Les chats ont une bonne santé", "Les chats s'éduque assez facilement", "Il faut changé leur caisse mais il se nettoie seul, sauf les chatons", "Vétérinaire, alimentation adapté, jouet", "Un conseil pour un chat"));
             ListeEspeces.Add(new("Hamster", "Cricetinae"));
             ListeEspeces.Add(new("Lapin", "Oryctolagus cuniculus"));
 
diff --git a/Sources/Views/Animaux.xaml b/Sources/Views/Animaux.xaml
index 09a233d..2de9988 100644
--- a/Sources/Views/Animaux.xaml
+++ b/Sources/Views/Animaux.xaml
@@ -3,48 +3,47 @@
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-             Title="Vos animaux">
+             Title="Wikipet's"
+             IconImageSource="{FontImage FontFamily=Raleway}">
     <ScrollView>
+        <!-- To manage the position of elements on the page -->
         <toolkit:DockLayout>
+            <!-- To add a pet -->
             <Button Text="+" 
-                    FontSize="Large"
-                    Background="{StaticResource Primary}"
                     toolkit:DockLayout.DockPosition="Bottom"
                     VerticalOptions="End"
                     HorizontalOptions="End"
-                    Margin="20"
-                    Clicked="Button_OnClick"/>
+                    Clicked="Button_OnClick"
+                    FontSize="30"
+                    Padding="2"/>
             <VerticalStackLayout>
                 <Grid RowDefinitions="Auto, *" 
                       RowSpacing="20">
+                    <!-- To display the list of pets -->
                     <ListView ItemsSource="{Binding ListeAnimaux}" 
                               Grid.Row="1"
                               ItemTapped="OnClick">
                         <ListView.ItemTemplate>
                             <DataTemplate>
                                 <ViewCell>
-                                    <Grid Margin="0,0,0,4">
-                                        <Border Stroke="{StaticResource Secondary}" 
-                                                StrokeThickness="2" 
-                                                Margin="10" 
-                                                Padding="10" 
-                                                BackgroundColor="{StaticResource Primary}">
+                                    <Grid Margin="0,10,0,10">
+                                        <Border>
                                             <Grid ColumnDefinitions="Auto, *" 
                                                   RowDefinitions="3*"
                                                   ColumnSpacing="15">
-                                                <Frame Grid.RowSpan="3" 
-                                                       HeightRequest="60" 
-                                                       WidthRequest="60" 
-                                                       Padding="0" 
-                                                       Margin="10"
-                                                       BorderColor="{StaticResource Primary}">
+                                                <!-- To display the image -->
+                                                <Frame Grid.RowSpan="3">
                                                     <Image Source="{Binding Image}"/>
                                                 </Frame>
                                                 <VerticalStackLayout Grid.Column="1">
+                                                    <!-- To display the pet's name -->
                                                     <Label Text="{Binding Nom}" 
                                                            FontSize="Large"/>
+
+                                                    <!-- To display species -->
                                                     <Label Text="{Binding Espece}"
-                                                           FontSize="12"/>
+                                                           FontSize="12"
+                                                           FontFamily="Raleway"/>
                                                 </VerticalStackLayout>
                                             </Grid>
                                         </Border>
diff --git a/Sources/Views/AppShell.xaml b/Sources/Views/AppShell.xaml
index 6d16e09..b68d738 100644
--- a/Sources/Views/AppShell.xaml
+++ b/Sources/Views/AppShell.xaml
@@ -4,24 +4,28 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:Views"
-    Shell.FlyoutBehavior="Flyout">
+    Shell.FlyoutBehavior="Disabled">
 
-    <ShellContent
-        Title="Accueil"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
+    <!-- Page navigation bar -->
+    <TabBar>
+        <!-- Go to home page -->
+        <ShellContent Title="Accueil"
+                      ContentTemplate="{DataTemplate local:MainPage}"
+                      Route="MainPage" />
 
-    <ShellContent
-        Title="Les espèces"
-        ContentTemplate="{DataTemplate local:Especes}"
-        Route="Especes" />
+        <!-- To go to the species list -->
+        <ShellContent Title="Les espèces"
+                      ContentTemplate="{DataTemplate local:Especes}"
+                      Route="Especes" />
 
-    <ShellContent
-        Title="Vos animaux"
-        ContentTemplate="{DataTemplate local:Animaux}"
-        Route="Animaux"/>
+        <!-- To go to the user's pet list -->
+        <ShellContent Title="Vos animaux"
+                      ContentTemplate="{DataTemplate local:Animaux}"
+                      Route="Animaux"/>
+    </TabBar>
 
-    <ShellContent
-        ContentTemplate="{DataTemplate local:New_DetailAnimal}"
-        Route="New_DetailAnimal"/>
+    <!-- To go to the add a pet page without the page being in the navigation bar -->
+    <ShellContent Title="Ajout d'un animal" 
+                  ContentTemplate="{DataTemplate local:New_DetailAnimal}"
+                  Route="New_DetailAnimal"/>
 </Shell>
diff --git a/Sources/Views/DetailAnimal.xaml b/Sources/Views/DetailAnimal.xaml
index f4d0980..f8c2d89 100644
--- a/Sources/Views/DetailAnimal.xaml
+++ b/Sources/Views/DetailAnimal.xaml
@@ -2,128 +2,146 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Views.DetailAnimal"
-             Title="{Binding Nom}" x:Name="page_creation">
+             Title="{Binding Nom}">
     <ScrollView>
         <VerticalStackLayout>
-            <HorizontalStackLayout
-                VerticalOptions="Start"
-                HorizontalOptions="End">
+            <HorizontalStackLayout VerticalOptions="Start"
+                                   HorizontalOptions="End">
+                <!-- To delete the pet -->
                 <Button Text="Supprimer" 
-                    Background="{StaticResource Primary}"
-                    Margin="20"
-                    Clicked="Button_OnClick"/>
+                        Clicked="Button_OnClick"/>
             </HorizontalStackLayout>
+            
+            <!-- Pet image -->
             <Image Source="{Binding Image}"
                    MaximumWidthRequest="300"
-                   Margin="20"
                    HorizontalOptions="Center"/>
+            
+            <!-- To add or change the image -->
             <Button Text="Ajouter photo" 
-                    Background="{StaticResource Primary}"
                     VerticalOptions="Center"
-                    HorizontalOptions="Center"
-                    Margin="20"
+                    HorizontalOptions="End"
                     Clicked="TakePhoto"/>
-            <Entry Text="{Binding Nom}"
-                   HorizontalOptions="Center">
-                <Entry.Triggers>
-                    <DataTrigger TargetType="Entry"
-                                 Binding="{Binding NomIsValid}"
-                                 Value="false">
-                        <Setter Property="BackgroundColor" Value="{StaticResource Error}" />
-                    </DataTrigger> 
-                    <DataTrigger TargetType="Entry"
-                                 Binding="{Binding NomIsValid}"
-                                 Value="true">
-                        <Setter Property="BackgroundColor" Value="{StaticResource White}" />
-                    </DataTrigger>
-                </Entry.Triggers>
-            </Entry>
-            <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Margin="20"
-                        Padding="10" 
-                        Background="{StaticResource Primary}"
-                        VerticalOptions="Start"
-                        Grid.Column="1">
+            
+            <!-- Display and change pet name -->
+            <HorizontalStackLayout HorizontalOptions="Center">
+                <Label Text="Nom"
+                       VerticalOptions="Center"/>
+                <Entry Text="{Binding Nom}"
+                       Margin="20,0,0,0">
+                    
+                    <!-- To change the background if there is a name -->
+                    <Entry.Triggers>
+                        <DataTrigger TargetType="Entry"
+                                     Binding="{Binding NomIsValid}"
+                                     Value="false">
+                            <Setter Property="BackgroundColor" Value="{StaticResource Error}" />
+                        </DataTrigger>
+                        <DataTrigger TargetType="Entry"
+                                     Binding="{Binding NomIsValid}"
+                                     Value="true">
+                            <Setter Property="BackgroundColor" Value="Transparent" />
+                        </DataTrigger>
+                    </Entry.Triggers>
+                </Entry>
+            </HorizontalStackLayout>
+            
+            
+            <Border VerticalOptions="Start"
+                    Grid.Column="1"
+                    Margin="0, 10, 0, 10">
                 <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
-                          ColumnDefinitions="*, *"
-                          RowSpacing="8">
-                    <Label FontAttributes="Bold"
-                               Text="Date de naissance"/>
-                    <DatePicker Grid.Column="1"
-                                MinimumDate="01/01/2000"
-                                HorizontalOptions="End"
-                                Date="{Binding DateNaissance}"/>
+                      ColumnDefinitions="*, *"
+                      RowSpacing="8">
+                    <!-- Display and change date of birth -->
+                    <Label Text="Date de naissance"/>
+                    <DatePicker Date="{Binding DateNaissance}"/>
+                    
+                    <!-- Display and change gender -->
                     <Label Grid.Row="1"
-                               FontAttributes="Bold"
-                               Text="Sexe"/>
-                    <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Sexe}"/>
+                           Text="Sexe"/>
+                    <Picker Grid.Row="1"
+                                SelectedItem="{Binding Sexe}"
+                                SelectedIndexChanged="SexeClick">
+                        <Picker.Items>
+                            <x:String>Femelle</x:String>
+                            <x:String>Male</x:String>
+                        </Picker.Items>
+                    </Picker>
+                    
+                    <!-- Display and change date of adoption -->
                     <Label Grid.Row="2"
-                               FontAttributes="Bold"
-                               Text="Date d'adoption"/>
-                    <DatePicker Grid.Column="1"
-                                Grid.Row="2"
+                           Text="Date d'adoption"/>
+                    <DatePicker Grid.Row="2"
                                 MinimumDate="01/01/2000"
                                 HorizontalOptions="End"
                                 Date="{Binding DateAdoption}"/>
+
+                    <!-- Display and change size -->
                     <Label Grid.Row="3"
-                               FontAttributes="Bold"
-                               Text="Taille"/>
+                           Text="Taille"/>
                     <HorizontalStackLayout Grid.Column="1" 
                                            Grid.Row="3"
                                            HorizontalOptions="End">
                         <Entry Text="{Binding Taille}"/>
-                        <Label Text=" cm" VerticalOptions="Center"/>
+                        <Label Text="cm" 
+                               VerticalOptions="Center"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
                     </HorizontalStackLayout>
+
+                    <!-- Display and change weight -->
                     <Label Grid.Row="4"
-                               FontAttributes="Bold"
-                               Text="Poids"/>
+                           Text="Poids"/>
                     <HorizontalStackLayout Grid.Column="2" 
                                            Grid.Row="4"
                                            HorizontalOptions="End">
                         <Entry Text="{Binding Poids}"/>
-                        <Label Text=" kg" VerticalOptions="Center"/>
+                        <Label Text=" kg" 
+                               VerticalOptions="Center"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
                     </HorizontalStackLayout>
+
+                    <!-- Display and change power supply -->
                     <Label Grid.Row="5"
-                               FontAttributes="Bold"
-                               Text="Alimentation"/>
-                    <Entry Grid.Column="2"
-                               Grid.Row="5"
-                               HorizontalOptions="End"
-                               Text="{Binding Alimentation}"/>
+                           Text="Alimentation"/>
+                    <Entry Grid.Row="5"
+                           Text="{Binding Alimentation}"/>
+
+                    <!-- Display and change species -->
                     <Label Grid.Row="6"
-                               FontAttributes="Bold"
-                               Text="Espèce"/>
+                           Text="Espèce"/>
                     <Grid Grid.Row="6"
                           Grid.Column="1"
                           ColumnDefinitions="*"
                           RowDefinitions="Auto, Auto">
                         <Label Text="{Binding Espece}"
                                VerticalOptions="Start"
-                               HorizontalOptions="End"/>
-                        <Picker Grid.Row="1"
-                                HorizontalOptions="End"
-                                x:Name="Picker_especes"
+                               HorizontalOptions="End"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
+                        <Picker x:Name="Picker_especes"
+                                Grid.Row="1"
                                 ItemsSource="{Binding ListeEspeces}"
                                 ItemDisplayBinding="{Binding Nom}"
                                 SelectedIndexChanged="EspeceClic">
                         </Picker>
                     </Grid>
+
+                    <!-- Display and change breed -->
                     <Label Grid.Row="7"
-                               FontAttributes="Bold"
-                               Text="Race"/>
+                           Text="Race"/>
                     <Grid Grid.Row="7"
                           Grid.Column="1"
                           ColumnDefinitions="*"
                           RowDefinitions="Auto, Auto">
                         <Label Text="{Binding Race}"
                                VerticalOptions="Start"
-                               HorizontalOptions="End"/>
+                               HorizontalOptions="End"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
                         <Picker Grid.Row="1"
-                                HorizontalOptions="End"
                                 ItemsSource="{Binding Espece.ListeRaces}"
                                 ItemDisplayBinding="{Binding Nom}"
                                 SelectedIndexChanged="RaceClic">
@@ -132,247 +150,212 @@
                 </Grid>
             </Border>
 
-            <VerticalStackLayout
-                Margin="20">
+
+            <!-- Display and change petsitter -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Petsitter"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Petsitter.Nom}"/>
+                        <!-- Display and change petsitter's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Petsitter.Nom}"/>
+
+                        <!-- Display and change petsitter's address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Petsitter.Adresse}"/>
+                        
+                        <!-- Display and change petsitter's zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Petsitter.CodePostal}"/>
+
+                        <!-- Display and change petsitter's city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Petsitter.Ville}"/>
+
+                        <!-- Display and change petsitter's phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Petsitter.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- Display and change kennel -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Chenil"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Chenil.Nom}"/>
+                        <!-- Display and change kennel's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Chenil.Nom}"/>
+
+                        <!-- Display and change kennel's address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Chenil.Adresse}"/>
+
+                        <!-- Display and change kennel's zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Chenil.CodePostal}"/>
+
+                        <!-- Display and change kennel's city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Chenil.Ville}"/>
+
+                        <!-- Display and change kennel's phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Chenil.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- Display and change veterinarian -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Vétérinaire"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Veterinaire.Nom}"/>
+                        <!-- Display and change vet's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Veterinaire.Nom}"/>
+                        
+                        <!-- Display and change vet's clinic -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Clinique"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Veterinaire.Clinique}"/>
+
+                        <!-- Display and change vet's address -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Veterinaire.Adresse}"/>
+
+                        <!-- Display and change vet's zip code -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Veterinaire.CodePostal}"/>
+
+                        <!-- Display and change vet's city -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Veterinaire.Ville}"/>
+
+                        <!-- Display and change vet's phone number -->
                         <Label Grid.Row="5"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="5"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="5"
                                Text="{Binding Veterinaire.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- Display and change food store -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Magasin alimentaire"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding MagasinAlimentaire.Nom}"/>
+                        <!-- Display and change food store name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding MagasinAlimentaire.Nom}"/>
+
+                        <!-- Display and change food store address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
-                               Text="{Binding MagasinAlimentaire.Adresse}"/>
+                        <Entry Text="{Binding MagasinAlimentaire.Adresse}"/>
+
+                        <!-- Display and change food store zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding MagasinAlimentaire.CodePostal}"/>
+
+                        <!-- Display and change food store city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding MagasinAlimentaire.Ville}"/>
+
+                        <!-- Display and change food store phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding MagasinAlimentaire.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
-            
-            <VerticalStackLayout
-                Margin="20">
+
+            <!-- Display and change provenance -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Refuge, élevage, chenil de provenance"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Provenance.Nom}"/>
+                        <!-- Display and change provenance's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Provenance.Nom}"/>
+
+                        <!-- Display and change provenance's address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Provenance.Adresse}"/>
+
+                        <!-- Display and change provenance's zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Provenance.CodePostal}"/>
+
+                        <!-- Display and change provenance's city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Provenance.Ville}"/>
+
+                        <!-- Display and change provenance's phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Provenance.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
+
+            <VerticalStackLayout x:Name="PetAdvice"
+                                 Margin="0,10,0,10">
+                <Label Text="Conseils"
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Conseil}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
+                </Border>
+            </VerticalStackLayout>
         </VerticalStackLayout>
     </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Views/DetailAnimal.xaml.cs b/Sources/Views/DetailAnimal.xaml.cs
index edd6287..821d560 100644
--- a/Sources/Views/DetailAnimal.xaml.cs
+++ b/Sources/Views/DetailAnimal.xaml.cs
@@ -10,6 +10,14 @@ public partial class DetailAnimal : ContentPage
 		InitializeComponent();
 		BindingContext = (App.Current as App).AnimalSelectionner;
         Picker_especes.BindingContext = (App.Current as App).Theque;
+        if((App.Current as App).AnimalSelectionner.Espece != null)
+        {
+            if ((App.Current as App).AnimalSelectionner.Race != null)
+            {
+                PetAdvice.BindingContext = (App.Current as App).AnimalSelectionner.Race;
+            }
+            else PetAdvice.BindingContext = (App.Current as App).AnimalSelectionner.Espece;
+        }
 	}
 
     public async void Button_OnClick(object sender, EventArgs e)
@@ -18,7 +26,6 @@ public partial class DetailAnimal : ContentPage
         DataSerializerXML.Serializer((App.Current as App).SerializationPath, (App.Current as App).Theque);
         await Shell.Current.GoToAsync("//Animaux");
     }
-
     private void EspeceClic(object sender, EventArgs e)
     {
         (App.Current as App).AnimalSelectionner.Espece = (sender as Picker).SelectedItem as Espece;
@@ -57,7 +64,11 @@ public partial class DetailAnimal : ContentPage
 
     protected override bool OnBackButtonPressed()
     {
-        DataSerializerXML.Serializer((App.Current as App).SerializationPath, (App.Current as App).Theque);
-        return base.OnBackButtonPressed();
+        if((App.Current as App).AnimalSelectionner.NomIsValid == true)
+        {
+            DataSerializerXML.Serializer((App.Current as App).SerializationPath, (App.Current as App).Theque);
+            return base.OnBackButtonPressed();
+        }
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Sources/Views/DetailEspece.xaml b/Sources/Views/DetailEspece.xaml
index 90a2d30..9777903 100644
--- a/Sources/Views/DetailEspece.xaml
+++ b/Sources/Views/DetailEspece.xaml
@@ -1,127 +1,135 @@
 <?xml version="1.0" encoding="utf-8" ?>
+
+<!-- To diplay species name -->
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Views.DetailEspece"
-             Title="{Binding Nom}">
+             Title="{Binding Nom}"
+             IconImageSource="{FontImage FontFamily=Raleway}">
     <ScrollView>
         <VerticalStackLayout>
+            <!-- To diplay species image -->
             <Image Source="{Binding Image}"
                    MaximumWidthRequest="300"
                    Margin="20"
                    HorizontalOptions="Center"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Margin="20"
-                        Padding="10" 
-                        Background="{StaticResource Primary}"
-                        VerticalOptions="Start"
-                        Grid.Column="1">
+                <Border VerticalOptions="Start"
+                        Grid.Column="1"
+                        Margin="0,10,0,10">
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *"
                           RowSpacing="8">
-                        <Label FontAttributes="Bold"
-                               Text="Nom scientifique"/>
+                        <!-- To diplay species scientific name -->
+                        <Label Text="Nom scientifique"/>
                         <Label Grid.Column="1"
                                HorizontalOptions="End"
-                               Text="{Binding NomScientifique}"/>
+                               Text="{Binding NomScientifique}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
+                        
+                        <!-- To diplay species life expectancy -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Espérance de vie"/>
                         <Label Grid.Column="2"
                                Grid.Row="1"
                                HorizontalOptions="End"
-                               Text="{Binding EsperanceVie}"/>
+                               Text="{Binding EsperanceVie}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
+                        
+                        <!-- To diplay species average weight -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Poids moyen"/>
                         <Label Grid.Column="2"
                                Grid.Row="2"
                                HorizontalOptions="End"
-                               Text="{Binding PoidsMoyen}"/>
+                               Text="{Binding PoidsMoyen}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
+                        
+                        <!-- To diplay species average height -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Taille moyenne"/>
                         <Label Grid.Column="2"
                                Grid.Row="3"
                                HorizontalOptions="End"
-                               Text="{Binding TailleMoyenne}"/>
+                               Text="{Binding TailleMoyenne}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
                     </Grid>
                 </Border>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the species behavior -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Comportement"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Comportement}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Comportement}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the species health -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Santé"
                    FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Sante}"/>
+                <Border>
+                    <Label Text="{Binding Sante}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the species education -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Education"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Education}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Education}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the species maintenance -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Entretien"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Entretien}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Entretien}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout Margin="20">
+            <!-- To diplay information on the species cost -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Coût potentiel"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Cout}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Cout}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout Margin="20">
+            <!-- To diplay species advice -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Conseils"
-FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Conseil}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Conseil}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
+            <!-- To display the list of species breeds -->
             <Grid RowDefinitions="Auto, *" 
-                  RowSpacing="20" 
-                  Padding="20"> 
-                <Label Text="Les races"
+                  RowSpacing="20"
+                  Margin="0,10,0,0">
+                <Label Text="Les Races"
                        FontSize="Large"/>
                 <ListView ItemsSource="{Binding ListeRaces}" 
                           Grid.Row="1"
@@ -129,28 +137,23 @@ FontSize="Large"/>
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
-                                <Grid Margin="0,0,0,4">
-                                    <Border Stroke="{StaticResource Secondary}" 
-                                            StrokeThickness="2" 
-                                            Margin="10" 
-                                            Padding="10" 
-                                            BackgroundColor="{StaticResource Primary}">
+                                <Grid Margin="0,10,0,10">
+                                    <Border>
                                         <Grid ColumnDefinitions="Auto, *" 
                                               RowDefinitions="3*"
                                               ColumnSpacing="15">
-                                            <Frame Grid.RowSpan="3" 
-                                                   HeightRequest="60" 
-                                                   WidthRequest="60" 
-                                                   Padding="0" 
-                                                   Margin="10"
-                                                   BorderColor="{StaticResource Primary}">
+                                            <!-- To display the image -->
+                                            <Frame Grid.RowSpan="3">
                                                 <Image Source="{Binding Image}"/>
                                             </Frame>
                                             <VerticalStackLayout Grid.Column="1">
+                                                <!-- To display the breed name -->
                                                 <Label Text="{Binding Nom}" 
                                                        FontSize="Large"/>
+                                                <!-- To display the breed scientific name -->
                                                 <Label Text="{Binding NomScientifique}"
-                                                       FontSize="12"/>
+                                                       FontSize="12"
+                                                       FontFamily="Raleway"/>
                                             </VerticalStackLayout>
                                         </Grid>
                                     </Border>
diff --git a/Sources/Views/DetailRace.xaml b/Sources/Views/DetailRace.xaml
index 52c27a5..0196119 100644
--- a/Sources/Views/DetailRace.xaml
+++ b/Sources/Views/DetailRace.xaml
@@ -1,122 +1,129 @@
-<?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="Views.DetailRace"
-             Title="{Binding Nom}">
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!-- To diplay breed name -->
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Views.DetailRace"
+             Title="{Binding Nom}"
+             IconImageSource="{FontImage FontFamily=Raleway}">
     <ScrollView>
         <VerticalStackLayout>
+            <!-- To diplay breed image -->
             <Image Source="{Binding Image}"
                    MaximumWidthRequest="300"
                    Margin="20"
                    HorizontalOptions="Center"/>
-            <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Margin="20"
-                        Padding="10" 
-                        Background="{StaticResource Primary}"
-                        VerticalOptions="Start"
-                        Grid.Column="1">
+            <Border VerticalOptions="Start"
+                        Grid.Column="1"
+                        Margin="0,10,0,10">
                 <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *"
                           RowSpacing="8">
-                    <Label FontAttributes="Bold"
-                               Text="Nom scientifique"/>
+                    <!-- To diplay breed scientific name -->
+                    <Label Text="Nom scientifique"/>
                     <Label Grid.Column="1"
                                HorizontalOptions="End"
-                               Text="{Binding NomScientifique}"/>
+                               Text="{Binding NomScientifique}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
+
+                    <!-- To diplay breed life expectancy -->
                     <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Espérance de vie"/>
                     <Label Grid.Column="2"
                                Grid.Row="1"
                                HorizontalOptions="End"
-                               Text="{Binding EsperanceVie}"/>
+                               Text="{Binding EsperanceVie}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
+
+                    <!-- To diplay breed average weight -->
                     <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Poids moyen"/>
                     <Label Grid.Column="2"
                                Grid.Row="2"
                                HorizontalOptions="End"
-                               Text="{Binding PoidsMoyen}"/>
+                               Text="{Binding PoidsMoyen}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
+
+                    <!-- To diplay breed average height -->
                     <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Taille moyenne"/>
                     <Label Grid.Column="2"
                                Grid.Row="3"
                                HorizontalOptions="End"
-                               Text="{Binding TailleMoyenne}"/>
+                               Text="{Binding TailleMoyenne}"
+                               FontAttributes="None"
+                               FontFamily="Raleway"/>
                 </Grid>
             </Border>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the breed behavior -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Comportement"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Comportement}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Comportement}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the breed health -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Santé"
                    FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Sante}"/>
+                <Border>
+                    <Label Text="{Binding Sante}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the breed education -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Education"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Education}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Education}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- To diplay information on the breed maintenance -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Entretien"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Entretien}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Entretien}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout Margin="20">
+            <!-- To diplay information on the breed cost -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Coût potentiel"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Cout}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Cout}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout Margin="20">
+            <!-- To diplay breed advice -->
+            <VerticalStackLayout Margin="0,10,0,10">
                 <Label Text="Conseils"
-FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
-                    <Label Text="{Binding Conseil}"/>
+                       FontSize="Large"/>
+                <Border>
+                    <Label Text="{Binding Conseil}"
+                           FontAttributes="None"
+                           FontFamily="Raleway"/>
                 </Border>
-            </VerticalStackLayout>
-        </VerticalStackLayout>
-    </ScrollView>
+            </VerticalStackLayout>
+        </VerticalStackLayout>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Views/Especes.xaml b/Sources/Views/Especes.xaml
index 798f850..ac65127 100644
--- a/Sources/Views/Especes.xaml
+++ b/Sources/Views/Especes.xaml
@@ -2,45 +2,42 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Views.Especes"
-             Title="Les espèces">
-    <Grid RowDefinitions="Auto, *" 
-          RowSpacing="20" 
-          Padding="20">
-        <ListView ItemsSource="{Binding ListeEspeces}" 
-                  Grid.Row="1"
-                  ItemTapped="OnClick">
-            <ListView.ItemTemplate>
+             Title="Wikipet's">
+    <ScrollView>
+        <Grid RowDefinitions="Auto, *" 
+              RowSpacing="20">
+            <!-- To display the list of species -->
+            <ListView ItemsSource="{Binding ListeEspeces}" 
+                      Grid.Row="1"
+                      ItemTapped="OnClick">
+                <ListView.ItemTemplate>
                     <DataTemplate>
-                    <ViewCell>
-                        <Grid Margin="0,0,0,4">
-                            <Border Stroke="{StaticResource Secondary}" 
-                                    StrokeThickness="2" 
-                                    Margin="10" 
-                                    Padding="10" 
-                                    BackgroundColor="{StaticResource Primary}">
-                                <Grid ColumnDefinitions="Auto, *" 
-                                      RowDefinitions="3*"
-                                      ColumnSpacing="15">
-                                    <Frame Grid.RowSpan="3" 
-                                           HeightRequest="60" 
-                                           WidthRequest="60" 
-                                           Padding="0" 
-                                           Margin="10"
-                                           BorderColor="{StaticResource Primary}">
-                                        <Image Source="{Binding Image}"/>
-                                    </Frame>
-                                    <VerticalStackLayout Grid.Column="1">
-                                        <Label Text="{Binding Nom}" 
-                                               FontSize="Large"/>
-                                        <Label Text="{Binding NomScientifique}"
-                                               FontSize="12"/>
-                                    </VerticalStackLayout>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                    </ViewCell>
-                </DataTemplate>
-            </ListView.ItemTemplate>
-        </ListView>
-    </Grid>
+                        <ViewCell>
+                            <Grid Margin="0,10,0,10">
+                                <Border>
+                                    <Grid ColumnDefinitions="Auto, *" 
+                                          RowDefinitions="3*"
+                                          ColumnSpacing="15">
+                                        <!-- To display the image -->
+                                        <Frame Grid.RowSpan="3">
+                                            <Image Source="{Binding Image}"/>
+                                        </Frame>
+                                        <VerticalStackLayout Grid.Column="1">
+                                            <!-- To display the species' name -->
+                                            <Label Text="{Binding Nom}" 
+                                                   FontSize="Large"/>
+                                            <!-- To display the species' scientific name -->
+                                            <Label Text="{Binding NomScientifique}"
+                                                   FontSize="12"
+                                                   FontFamily="Raleway"/>
+                                        </VerticalStackLayout>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Grid>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Views/MainPage.xaml b/Sources/Views/MainPage.xaml
index 4afbcd2..7f2d1a9 100644
--- a/Sources/Views/MainPage.xaml
+++ b/Sources/Views/MainPage.xaml
@@ -3,20 +3,27 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:local="clr-namespace:Views"
-             x:Class="Views.MainPage">
-    <VerticalStackLayout>
-        <Image Source="accueil.png"
-               MaximumWidthRequest="200"
-               Margin="20"
-               />
-        <Label HorizontalOptions="Center" 
-               FontSize="Large" 
-               Text="Bienvenue sur Wikipet's"
-               FontFamily="DMSerifDisplay"/>
-        <Label MaximumWidthRequest="350"
-               HorizontalOptions="Center"
-               HorizontalTextAlignment="Center"
-               FontFamily="DMSerifDisplay"
-               Text="Notre application va vous permettre de découvrir l'animal de compagnie qui convient le mieux à vous et votre quotidien. Une fois l'animal adopté, vous pourrez sauvegardé tous les informations dont vous avez besoin."/>
-    </VerticalStackLayout>
+             x:Class="Views.MainPage"
+             Title="Wikipet's"
+             IconImageSource="{FontImage FontFamily=Raleway}">
+    <ScrollView>
+        <VerticalStackLayout>
+            <!-- To display the home image -->
+            <Image Source="accueil.png"
+                   MaximumWidthRequest="200"/>
+
+            <!-- To display the welcome message -->
+            <Label HorizontalOptions="Center" 
+                   FontSize="Large" 
+                   Text="Bienvenue sur Wikipet's"/>
+
+            <!-- To display a description of the application -->
+            <Label MaximumWidthRequest="350"
+                   HorizontalOptions="Center"
+                   HorizontalTextAlignment="Center"
+                   FontFamily="Raleway"
+                   FontAttributes="None"
+                   Text="Notre application va vous permettre de découvrir l'animal de compagnie qui convient le mieux à vous et votre quotidien. Une fois l'animal adopté, vous pourrez sauvegardé tous les informations dont vous avez besoin."/>
+        </VerticalStackLayout>
+    </ScrollView>
 </ContentPage>
diff --git a/Sources/Views/MauiProgram.cs b/Sources/Views/MauiProgram.cs
index a4de1c5..a7c33f2 100644
--- a/Sources/Views/MauiProgram.cs
+++ b/Sources/Views/MauiProgram.cs
@@ -13,8 +13,6 @@ namespace Views
                 .UseMauiCommunityToolkit()
                 .ConfigureFonts(fonts =>
                 {
-                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
                     fonts.AddFont("DMSerifDisplay-Regular.ttf", "DMSerifDisplay");
                     fonts.AddFont("Raleway-Light.ttf", "Raleway");
                 });
diff --git a/Sources/Views/New_DetailAnimal.xaml b/Sources/Views/New_DetailAnimal.xaml
index a5af2bc..911e1b3 100644
--- a/Sources/Views/New_DetailAnimal.xaml
+++ b/Sources/Views/New_DetailAnimal.xaml
@@ -2,132 +2,149 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Views.New_DetailAnimal"
-             Title="{Binding Nom}" x:Name="page_creation">
-    <ScrollView x:Name="scroll_view">
+             x:Name="page_creation">
+    <ScrollView>
         <VerticalStackLayout>
-            <HorizontalStackLayout
-                VerticalOptions="Start"
-                HorizontalOptions="End">
+            <HorizontalStackLayout VerticalOptions="Start"
+                                   HorizontalOptions="End">
+                <!-- To validate the addition of the pet -->
                 <Button Text="Valider" 
-                        Background="{StaticResource Primary}"
-                        Margin="20"
                         Clicked="Validate_OnClick"/>
+                
+                <!-- To delete the pet -->
                 <Button Text="Supprimer" 
-                    Background="{StaticResource Primary}"
-                    Margin="20"
-                    Clicked="Button_OnClick"/>
+                        Clicked="Button_OnClick"/>
             </HorizontalStackLayout>
+
+            <!-- Pet image -->
             <Image Source="{Binding Image}"
                    MaximumWidthRequest="300"
-                   Margin="20"
                    HorizontalOptions="Center"/>
+
+            <!-- To add or change the image -->
             <Button Text="Ajouter photo" 
-                    Background="{StaticResource Primary}"
                     VerticalOptions="Center"
-                    HorizontalOptions="Center"
-                    Margin="20"
+                    HorizontalOptions="End"
                     Clicked="TakePhoto"/>
-            <Entry Text="{Binding Nom}"
-                   HorizontalOptions="Center">
-                <Entry.Triggers>
-                    <DataTrigger TargetType="Entry"
-                                 Binding="{Binding NomIsValid}"
-                                 Value="false">
-                        <Setter Property="BackgroundColor" Value="{StaticResource Error}" />
-                    </DataTrigger> 
-                    <DataTrigger TargetType="Entry"
-                                 Binding="{Binding NomIsValid}"
-                                 Value="true">
-                        <Setter Property="BackgroundColor" Value="{StaticResource White}" />
-                    </DataTrigger>
-                </Entry.Triggers>
-            </Entry>
-            <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Margin="20"
-                        Padding="10" 
-                        Background="{StaticResource Primary}"
-                        VerticalOptions="Start"
-                        Grid.Column="1">
+
+            <!-- Display and change pet name -->
+            <HorizontalStackLayout HorizontalOptions="Center">
+                <Label Text="Nom"
+                       VerticalOptions="Center"/>
+                <Entry Text="{Binding Nom}"
+                       Margin="20,0,0,0">
+
+                    <!-- To change the background if there is a name -->
+                    <Entry.Triggers>
+                        <DataTrigger TargetType="Entry"
+                                     Binding="{Binding NomIsValid}"
+                                     Value="false">
+                            <Setter Property="BackgroundColor" Value="{StaticResource Error}" />
+                        </DataTrigger>
+                        <DataTrigger TargetType="Entry"
+                                     Binding="{Binding NomIsValid}"
+                                     Value="true">
+                            <Setter Property="BackgroundColor" Value="Transparent" />
+                        </DataTrigger>
+                    </Entry.Triggers>
+                </Entry>
+            </HorizontalStackLayout>
+
+            <Border VerticalOptions="Start"
+                    Grid.Column="1"
+                    Margin="0, 10, 0, 10">
                 <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto, Auto"
-                          ColumnDefinitions="*, *"
-                          RowSpacing="8">
-                    <Label FontAttributes="Bold"
-                               Text="Date de naissance"/>
-                    <DatePicker Grid.Column="1"
-                                MinimumDate="01/01/2000"
-                                HorizontalOptions="End"
-                                Date="{Binding DateNaissance}"/>
+                      ColumnDefinitions="*, *"
+                      RowSpacing="8">
+                    <!-- Display and change date of birth -->
+                    <Label Text="Date de naissance"/>
+                    <DatePicker Date="{Binding DateNaissance}"/>
+
+                    <!-- Display and change gender -->
                     <Label Grid.Row="1"
-                               FontAttributes="Bold"
-                               Text="Sexe"/>
-                    <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Sexe}"/>
+                           Text="Sexe"/>
+                    <Picker Grid.Row="1"
+                                SelectedItem="{Binding Sexe}"
+                                SelectedIndexChanged="SexeClick">
+                        <Picker.Items>
+                            <x:String>Femelle</x:String>
+                            <x:String>Male</x:String>
+                        </Picker.Items>
+                    </Picker>
+
+                    <!-- Display and change date of adoption -->
                     <Label Grid.Row="2"
-                               FontAttributes="Bold"
-                               Text="Date d'adoption"/>
-                    <DatePicker Grid.Column="1"
-                                Grid.Row="2"
+                           Text="Date d'adoption"/>
+                    <DatePicker Grid.Row="2"
                                 MinimumDate="01/01/2000"
                                 HorizontalOptions="End"
                                 Date="{Binding DateAdoption}"/>
+
+                    <!-- Display and change size -->
                     <Label Grid.Row="3"
-                               FontAttributes="Bold"
-                               Text="Taille"/>
+                           Text="Taille"/>
                     <HorizontalStackLayout Grid.Column="1" 
                                            Grid.Row="3"
                                            HorizontalOptions="End">
                         <Entry Text="{Binding Taille}"/>
-                        <Label Text=" cm" VerticalOptions="Center"/>
+                        <Label Text="cm" 
+                               VerticalOptions="Center"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
                     </HorizontalStackLayout>
+
+                    <!-- Display and change weight -->
                     <Label Grid.Row="4"
-                               FontAttributes="Bold"
-                               Text="Poids"/>
+                           Text="Poids"/>
                     <HorizontalStackLayout Grid.Column="2" 
                                            Grid.Row="4"
                                            HorizontalOptions="End">
                         <Entry Text="{Binding Poids}"/>
-                        <Label Text=" kg" VerticalOptions="Center"/>
+                        <Label Text=" kg" 
+                               VerticalOptions="Center"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
                     </HorizontalStackLayout>
+
+                    <!-- Display and change power supply -->
                     <Label Grid.Row="5"
-                               FontAttributes="Bold"
-                               Text="Alimentation"/>
-                    <Entry Grid.Column="2"
-                               Grid.Row="5"
-                               HorizontalOptions="End"
-                               Text="{Binding Alimentation}"/>
+                           Text="Alimentation"/>
+                    <Entry Grid.Row="5"
+                           Text="{Binding Alimentation}"/>
+
+                    <!-- Display and change species -->
                     <Label Grid.Row="6"
-                               FontAttributes="Bold"
-                               Text="Espèce"/>
+                           Text="Espèce"/>
                     <Grid Grid.Row="6"
                           Grid.Column="1"
                           ColumnDefinitions="*"
                           RowDefinitions="Auto, Auto">
                         <Label Text="{Binding Espece}"
                                VerticalOptions="Start"
-                               HorizontalOptions="End"/>
-                        <Picker Grid.Row="1"
-                                HorizontalOptions="End"
-                                x:Name="Picker_especes"
+                               HorizontalOptions="End"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
+                        <Picker x:Name="Picker_especes"
+                                Grid.Row="1"
                                 ItemsSource="{Binding ListeEspeces}"
                                 ItemDisplayBinding="{Binding Nom}"
                                 SelectedIndexChanged="EspeceClic">
                         </Picker>
                     </Grid>
+
+                    <!-- Display and change breed -->
                     <Label Grid.Row="7"
-                               FontAttributes="Bold"
-                               Text="Race"/>
+                           Text="Race"/>
                     <Grid Grid.Row="7"
                           Grid.Column="1"
                           ColumnDefinitions="*"
                           RowDefinitions="Auto, Auto">
                         <Label Text="{Binding Race}"
                                VerticalOptions="Start"
-                               HorizontalOptions="End"/>
+                               HorizontalOptions="End"
+                               FontFamily="Raleway"
+                               FontAttributes="None"/>
                         <Picker Grid.Row="1"
-                                HorizontalOptions="End"
                                 ItemsSource="{Binding Espece.ListeRaces}"
                                 ItemDisplayBinding="{Binding Nom}"
                                 SelectedIndexChanged="RaceClic">
@@ -136,243 +153,197 @@
                 </Grid>
             </Border>
 
-            <VerticalStackLayout
-                Margin="20">
+
+            <!-- Display and change petsitter -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Petsitter"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Petsitter.Nom}"/>
+                        <!-- Display and change petsitter's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Petsitter.Nom}"/>
+
+                        <!-- Display and change petsitter's address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Petsitter.Adresse}"/>
+
+                        <!-- Display and change petsitter's zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Petsitter.CodePostal}"/>
+
+                        <!-- Display and change petsitter's city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Petsitter.Ville}"/>
+
+                        <!-- Display and change petsitter's phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Petsitter.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- Display and change kennel -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Chenil"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Chenil.Nom}"/>
+                        <!-- Display and change kennel's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Chenil.Nom}"/>
+
+                        <!-- Display and change kennel's address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Chenil.Adresse}"/>
+
+                        <!-- Display and change kennel's zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Chenil.CodePostal}"/>
+
+                        <!-- Display and change kennel's city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Chenil.Ville}"/>
+
+                        <!-- Display and change kennel's phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Chenil.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- Display and change veterinarian -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Vétérinaire"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Veterinaire.Nom}"/>
+                        <!-- Display and change vet's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Veterinaire.Nom}"/>
+
+                        <!-- Display and change vet's clinic -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Clinique"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Veterinaire.Clinique}"/>
+
+                        <!-- Display and change vet's address -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Veterinaire.Adresse}"/>
+
+                        <!-- Display and change vet's zip code -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Veterinaire.CodePostal}"/>
+
+                        <!-- Display and change vet's city -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Veterinaire.Ville}"/>
+
+                        <!-- Display and change vet's phone number -->
                         <Label Grid.Row="5"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="5"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="5"
                                Text="{Binding Veterinaire.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
 
-            <VerticalStackLayout
-                Margin="20">
+            <!-- Display and change food store -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Magasin alimentaire"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding MagasinAlimentaire.Nom}"/>
+                        <!-- Display and change food store name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding MagasinAlimentaire.Nom}"/>
+
+                        <!-- Display and change food store address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
-                               Text="{Binding MagasinAlimentaire.Adresse}"/>
+                        <Entry Text="{Binding MagasinAlimentaire.Adresse}"/>
+
+                        <!-- Display and change food store zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding MagasinAlimentaire.CodePostal}"/>
+
+                        <!-- Display and change food store city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding MagasinAlimentaire.Ville}"/>
+
+                        <!-- Display and change food store phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding MagasinAlimentaire.NumTel}"/>
                     </Grid>
                 </Border>
             </VerticalStackLayout>
-            
-            <VerticalStackLayout
-                Margin="20">
+
+            <!-- Display and change provenance -->
+            <VerticalStackLayout Margin="0, 10, 0, 10">
                 <Label Text="Refuge, élevage, chenil de provenance"
-                   FontSize="Large"/>
-                <Border Stroke="{StaticResource Secondary}"
-                        StrokeThickness="2"
-                        Padding="10"
-                        Background="{StaticResource Primary}">
+                       FontSize="Large"/>
+                <Border>
                     <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto"
                           ColumnDefinitions="*, *">
-                        <Label FontAttributes="Bold"
-                               Text="Nom"/>
-                        <Entry Grid.Column="1"
-                               HorizontalOptions="End"
-                               Text="{Binding Provenance.Nom}"/>
+                        <!-- Display and change provenance's name -->
+                        <Label Text="Nom"/>
+                        <Entry Text="{Binding Provenance.Nom}"/>
+
+                        <!-- Display and change provenance's address -->
                         <Label Grid.Row="1"
-                               FontAttributes="Bold"
                                Text="Adresse"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="1"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="1"
                                Text="{Binding Provenance.Adresse}"/>
+
+                        <!-- Display and change provenance's zip code -->
                         <Label Grid.Row="2"
-                               FontAttributes="Bold"
                                Text="Code postal"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="2"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="2"
                                Text="{Binding Provenance.CodePostal}"/>
+
+                        <!-- Display and change provenance's city -->
                         <Label Grid.Row="3"
-                               FontAttributes="Bold"
                                Text="Ville"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="3"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="3"
                                Text="{Binding Provenance.Ville}"/>
+
+                        <!-- Display and change provenance's phone number -->
                         <Label Grid.Row="4"
-                               FontAttributes="Bold"
                                Text="Numéro de téléphone"/>
-                        <Entry Grid.Column="1"
-                               Grid.Row="4"
-                               HorizontalOptions="End"
+                        <Entry Grid.Row="4"
                                Text="{Binding Provenance.NumTel}"/>
                     </Grid>
                 </Border>
diff --git a/Sources/Views/Resources/Styles/Colors.xaml b/Sources/Views/Resources/Styles/Colors.xaml
index 15c2702..85a7747 100644
--- a/Sources/Views/Resources/Styles/Colors.xaml
+++ b/Sources/Views/Resources/Styles/Colors.xaml
@@ -8,7 +8,7 @@
     <Color x:Key="Secondary">#402e32</Color>
     <Color x:Key="Error">#FF5349</Color>
     <Color x:Key="Tertiary">#2B0B98</Color>
-    <Color x:Key="White">White</Color>
+    <Color x:Key="White">#faf5f0</Color>
     <Color x:Key="Black">Black</Color>
     <Color x:Key="Gray100">#E1E1E1</Color>
     <Color x:Key="Gray200">#C8C8C8</Color>
diff --git a/Sources/Views/Resources/Styles/Styles.xaml b/Sources/Views/Resources/Styles/Styles.xaml
index 050b36c..359107a 100644
--- a/Sources/Views/Resources/Styles/Styles.xaml
+++ b/Sources/Views/Resources/Styles/Styles.xaml
@@ -4,34 +4,24 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
-    <Style TargetType="ActivityIndicator">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-    </Style>
-
-    <Style TargetType="IndicatorView">
-        <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"/>
-        <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}"/>
-    </Style>
-
     <Style TargetType="Border">
-        <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+        <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Primary}}" />
         <Setter Property="StrokeShape" Value="Rectangle"/>
-        <Setter Property="StrokeThickness" Value="1"/>
-    </Style>
-
-    <Style TargetType="BoxView">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+        <Setter Property="StrokeThickness" Value="2"/>
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Primary}}"/>
+        <Setter Property="Padding" Value="15"/>
     </Style>
 
     <Style TargetType="Button">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" />
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource White}}" />
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Primary}}" />
+        <Setter Property="FontFamily" Value="Raleway"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="CornerRadius" Value="8"/>
-        <Setter Property="Padding" Value="14,10"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="Padding" Value="10"/>
+        <Setter Property="MinimumHeightRequest" Value="40"/>
+        <Setter Property="MinimumWidthRequest" Value="40"/>
+        <Setter Property="Margin" Value="0,10,0,10"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -47,82 +37,46 @@
         </Setter>
     </Style>
 
-    <Style TargetType="CheckBox">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
     <Style TargetType="DatePicker">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Raleway"/>
         <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="Editor">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="40"/>
+        <Setter Property="MinimumWidthRequest" Value="40"/>
+        <Setter Property="MinimumDate" Value="01/01/2000"/>
+        <Setter Property="HorizontalOptions" Value="End"/>
+        <Setter Property="Grid.Column" Value="1"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Primary}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>
     </Style>
-
+    
     <Style TargetType="Entry">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Raleway"/>
         <Setter Property="FontSize" Value="14" />
-        <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="40"/>
+        <Setter Property="MinimumWidthRequest" Value="40"/>
+        <Setter Property="HorizontalOptions" Value="End"/>
+        <Setter Property="Grid.Column" Value="1"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Primary}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -132,43 +86,26 @@
 
     <Style TargetType="Frame">
         <Setter Property="HasShadow" Value="False" />
-        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
+        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Primary}}" />
         <Setter Property="CornerRadius" Value="8" />
-    </Style>
-
-    <Style TargetType="ImageButton">
-        <Setter Property="Opacity" Value="1" />
-        <Setter Property="BorderColor" Value="Transparent"/>
-        <Setter Property="BorderWidth" Value="0"/>
-        <Setter Property="CornerRadius" Value="0"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="Opacity" Value="0.5" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
+        <Setter Property="HeightRequest" Value="60"/>
+        <Setter Property="WidthRequest" Value="60"/>
+        <Setter Property="Padding" Value="0"/>
     </Style>
 
     <Style TargetType="Label">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontFamily" Value="DMSerifDisplay" />
         <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontAttributes" Value="Bold"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource White}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -176,194 +113,22 @@
         </Setter>
     </Style>
 
-    <Style TargetType="ListView">
-        <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
-    </Style>
-
     <Style TargetType="Picker">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="Raleway"/>
         <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
+        <Setter Property="MinimumHeightRequest" Value="40"/>
+        <Setter Property="MinimumWidthRequest" Value="40"/>
+        <Setter Property="HorizontalOptions" Value="End"/>
+        <Setter Property="Grid.Column" Value="1"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="ProgressBar">
-        <Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="ProgressColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="RadioButton">
-        <Setter Property="BackgroundColor" Value="Transparent"/>
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="RefreshView">
-        <Setter Property="RefreshColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
-    </Style>
-
-    <Style TargetType="SearchBar">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
-        <Setter Property="CancelButtonColor" Value="{StaticResource Gray500}" />
-        <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="SearchHandler">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="PlaceholderColor" Value="{StaticResource Gray500}" />
-        <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
-        <Setter Property="FontSize" Value="14" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="Shadow">
-        <Setter Property="Radius" Value="15" />
-        <Setter Property="Opacity" Value="0.5" />
-        <Setter Property="Brush" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
-        <Setter Property="Offset" Value="10,10" />
-    </Style>
-
-    <Style TargetType="Slider">
-        <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
-        <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="SwipeItem">
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-    </Style>
-
-    <Style TargetType="Switch">
-        <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="ThumbColor" Value="{StaticResource White}" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="On">
-                        <VisualState.Setters>
-                            <Setter Property="OnColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Gray200}}" />
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="Off">
-                        <VisualState.Setters>
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray500}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
-    </Style>
-
-    <Style TargetType="TimePicker">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="BackgroundColor" Value="Transparent"/>
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="MinimumHeightRequest" Value="44"/>
-        <Setter Property="MinimumWidthRequest" Value="44"/>
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="Normal" />
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Primary}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -373,33 +138,17 @@
 
     <Style TargetType="Page" ApplyToDerivedTypes="True">
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Secondary}}" />
     </Style>
 
-    <Style TargetType="Shell" ApplyToDerivedTypes="True">
-        <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
-        <Setter Property="Shell.ForegroundColor" Value="{OnPlatform WinUI={StaticResource Primary}, Default={StaticResource White}}" />
-        <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
-        <Setter Property="Shell.NavBarHasShadow" Value="False" />
-        <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-        <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
-    </Style>
-
-    <Style TargetType="NavigationPage">
-        <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
-        <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
-        <Setter Property="IconColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
+    <Style TargetType="ScrollView">
+        <Setter Property="Margin" Value="40"/>
     </Style>
 
-    <Style TargetType="TabbedPage">
-        <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray950}}" />
-        <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="UnselectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+    <Style TargetType="Shell" ApplyToDerivedTypes="True">
+        <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Primary}}" />
+        <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Secondary}}" />
+        <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Secondary}}" />
+        <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Secondary}, Dark={StaticResource Primary}}" />
     </Style>
-
 </ResourceDictionary>