diff --git a/Sources/Stim/AddGamePage.xaml b/Sources/Stim/AddGamePage.xaml
index 102f203..42c122a 100644
--- a/Sources/Stim/AddGamePage.xaml
+++ b/Sources/Stim/AddGamePage.xaml
@@ -23,9 +23,9 @@
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
-            <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0"/>
+            <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="0"/>
             <VerticalStackLayout Background="{StaticResource Tertiary}" Grid.Column="1" Grid.RowSpan="7"/>
-            <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="4"/>
+            <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="4"/>
 
             <VerticalStackLayout Grid.Column="1">
                 <Label Text="Nom" FontSize="30" HorizontalOptions="Center"/>
diff --git a/Sources/Stim/App.xaml b/Sources/Stim/App.xaml
index 80877b5..3d62f58 100644
--- a/Sources/Stim/App.xaml
+++ b/Sources/Stim/App.xaml
@@ -15,28 +15,13 @@
             </DataTemplate>
             <DataTemplate x:Key="gameTemplate">
                 <Border MinimumWidthRequest="200" Margin="10, 10, 10, 10">
-                    <Grid HeightRequest="635">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="auto"/>
-                            <RowDefinition Height="auto"/>
-                            <RowDefinition Height="auto"/>
-                        </Grid.RowDefinitions>
-
+                    <Grid HeightRequest="635" RowDefinitions="auto, auto, auto">
                         <Image Source="{Binding Cover}" Aspect="AspectFit" Margin="0,0,0,0" WidthRequest="900" HeightRequest="455"/>
                         <Label FontAttributes="Bold" FontSize="30" Text="{Binding Name}" Grid.Row="1" HorizontalTextAlignment="Center"/>
 
-                        <Grid Grid.Row="2">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="auto"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
+                        <Grid Grid.Row="2" ColumnDefinitions="*, auto" RowDefinitions="auto, auto">
                             <Label Text="Tags :" Margin="0" Padding="0"/>
                             <CollectionView ItemsSource="{Binding Tags}" Grid.Row="1" Margin="0" ItemTemplate="{StaticResource tagsTemplate}"/>
-
                             <Label Text="{Binding Year}" Grid.Row="1" Grid.Column="2" HorizontalTextAlignment="End" VerticalTextAlignment="End"/>
                         </Grid>
                     </Grid>
@@ -44,7 +29,7 @@
             </DataTemplate>
             <DataTemplate x:Key="reviewTemplate">
                 <VerticalStackLayout>
-                    <HorizontalStackLayout> <!--BindingContextChanged="AddStars"-->
+                    <HorizontalStackLayout> <!--CONVERTER-->
                         <Label Text="{Binding AuthorName}" FontSize="20"/>
                     </HorizontalStackLayout>
                     <Label Text="{Binding Text}"/>
@@ -52,7 +37,7 @@
             </DataTemplate>
             <DataTemplate x:Key="followTemplate">
                 <Border HeightRequest="150" Margin="10">
-                    <Grid ColumnDefinitions="auto,*,3*,auto" RowDefinitions="*">
+                    <Grid ColumnDefinitions="auto, *, 3*, auto" RowDefinitions="*">
                         <Image Source="{Binding Cover}"/>
                         <Label Grid.Column="1"  Text="{Binding Name}" FontSize="50"/>
                         <ScrollView Grid.Column="2">
@@ -63,12 +48,7 @@
                 </Border>
             </DataTemplate>
             <DataTemplate x:Key="followLoginTemplate">
-                <Grid Margin="10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="5*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
+                <Grid Margin="10" ColumnDefinitions="*, 5*, *">
                     <Border>
                         <Image Source="{Binding Cover}" Grid.Column="0" HeightRequest="100"/>
                     </Border>
diff --git a/Sources/Stim/Create.xaml b/Sources/Stim/Create.xaml
index bc60331..d460c5a 100644
--- a/Sources/Stim/Create.xaml
+++ b/Sources/Stim/Create.xaml
@@ -3,51 +3,53 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Stim.Create"
              Title="Create">
-    <Grid BackgroundColor="{StaticResource Tertiary}">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
+    <ScrollView>
+        <Grid BackgroundColor="{StaticResource Tertiary}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="0"/>
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="2"/>
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
-        <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
-        <Grid Grid.Column="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="500"/>
-                <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
+                <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <Image Source="no_cover.png" HeightRequest="490" Margin="0,10,0,0"/>
-            <Grid Grid.Row="1">
+
+
+            <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="0"/>
+            <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="2"/>
+            <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="0" Grid.Row="1"/>
+            <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="2" Grid.Row="1"/>
+            <Grid Grid.Column="1">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="500"/>
                     <RowDefinition Height="auto"/>
                     <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>
-                <Entry Placeholder="Adresse Mail" PlaceholderColor="{StaticResource Primary}" IsPassword="False" x:Name="Email" HeightRequest="50" ClearButtonVisibility="WhileEditing"/>
-                <Entry Placeholder="Username"     PlaceholderColor="{StaticResource Primary}" IsPassword="False" x:Name="Username" HeightRequest="50" Grid.Row="1" ClearButtonVisibility="WhileEditing"/>
-                <Entry Placeholder="Mot de passe" PlaceholderColor="{StaticResource Primary}" IsPassword="True" x:Name="Pswd" HeightRequest="50" Grid.Row="2" ClearButtonVisibility="WhileEditing"/>
-                <Grid Grid.Row="3" Margin="10,0,0,10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="3*"/>
-                    </Grid.ColumnDefinitions>
-                    <Button Text="Se connecter"    Clicked="Se_connecter"    HeightRequest="50" BackgroundColor="{StaticResource Gray500}"/>
-                    <Button Text="Créer un compte" Clicked="Creer_un_compte" HeightRequest="50" BackgroundColor="{StaticResource Gray500}" Grid.Column="1"/>
+                <Image Source="no_cover.png" HeightRequest="490" Margin="0,10,0,0"/>
+                <Grid Grid.Row="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Entry Placeholder="Adresse Mail" PlaceholderColor="{StaticResource Primary}" IsPassword="False" x:Name="Email" HeightRequest="50" ClearButtonVisibility="WhileEditing"/>
+                    <Entry Placeholder="Username"     PlaceholderColor="{StaticResource Primary}" IsPassword="False" x:Name="Username" HeightRequest="50" Grid.Row="1" ClearButtonVisibility="WhileEditing"/>
+                    <Entry Placeholder="Mot de passe" PlaceholderColor="{StaticResource Primary}" IsPassword="True" x:Name="Pswd" HeightRequest="50" Grid.Row="2" ClearButtonVisibility="WhileEditing"/>
+                    <Grid Grid.Row="3" Margin="10,0,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="3*"/>
+                        </Grid.ColumnDefinitions>
+                        <Button Text="Se connecter"    Clicked="Se_connecter"    HeightRequest="50" BackgroundColor="{StaticResource Gray500}"/>
+                        <Button Text="Créer un compte" Clicked="Creer_un_compte" HeightRequest="50" BackgroundColor="{StaticResource Gray500}" Grid.Column="1"/>
+                    </Grid>
                 </Grid>
+                <HorizontalStackLayout x:Name="Error" Grid.Row="2" HorizontalOptions="Center">
+                </HorizontalStackLayout>
             </Grid>
-            <HorizontalStackLayout x:Name="Error" Grid.Row="2" HorizontalOptions="Center">
-            </HorizontalStackLayout>
         </Grid>
-    </Grid>
+    </ScrollView>
 </ContentPage>
\ No newline at end of file
diff --git a/Sources/Stim/DetailledPage.xaml b/Sources/Stim/DetailledPage.xaml
index e052ee2..89de643 100644
--- a/Sources/Stim/DetailledPage.xaml
+++ b/Sources/Stim/DetailledPage.xaml
@@ -10,32 +10,11 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <ScrollView>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="10*"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0"/>
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="2"/>
-
-                <Grid Background="{StaticResource Tertiary}" Grid.Column="1" >
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
+            <Grid ColumnDefinitions="*, 10*, *">
+                <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="0"/>
+                <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="2"/>
 
+                <Grid Background="{StaticResource Tertiary}" Grid.Column="1" ColumnDefinitions="*, *, *, *" RowDefinitions="auto, *, auto, auto, auto">
                     <Image Grid.RowSpan="4" Margin="5, 0, 0, 0" Source="{Binding Cover}" Aspect="AspectFit"/>
                     <Label Grid.Column="1" Text="{Binding Name}" FontSize="30"/>
                     <Label Grid.Column="2" Text="{Binding Year}" HorizontalOptions="Center"/>
@@ -46,12 +25,7 @@
                         <Label Text="{Binding Description}"/>
                     </ScrollView>
 
-                    <Grid Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="2">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="auto"/>
-                            <RowDefinition Height="auto"/>
-                        </Grid.RowDefinitions>
-
+                    <Grid Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="2" RowDefinitions="auto, auto">
                         <Label Text="Tags :"/>
                         <CollectionView Grid.Row="1" ItemsSource="{Binding Tags}" ItemTemplate="{StaticResource tagsTemplate}"/>
                     </Grid>
@@ -64,11 +38,10 @@
                     <VerticalStackLayout Grid.ColumnSpan="4" Grid.Row="4">
                         <Label Text="Avis de la communauté :" FontSize="30"/>
                         <CollectionView ItemsSource="{Binding Reviews}" ItemTemplate="{StaticResource reviewTemplate}"/>
-
                     </VerticalStackLayout>
                 </Grid>
             </Grid>
         </ScrollView>
-        <ImageButton Source="add_white.png" Background="transparent" WidthRequest="50" HeightRequest="50" HorizontalOptions="End" VerticalOptions="End" Margin="0, 0, 10, 10" Clicked="AddReview"/>
+        <ImageButton Style="{StaticResource addButton}" Clicked="AddReview"/>
     </Grid>
 </ContentPage>
diff --git a/Sources/Stim/EntryPopup.xaml b/Sources/Stim/EntryPopup.xaml
index b8b9542..57f5b2c 100644
--- a/Sources/Stim/EntryPopup.xaml
+++ b/Sources/Stim/EntryPopup.xaml
@@ -8,8 +8,8 @@
         <Grid ColumnDefinitions="*" RowDefinitions="auto, auto, auto,auto">
             <Label x:Name="LabelTxt"/>
             <Entry Grid.Row="1" x:Name="Entrytxt"/>
-            <Button Grid.Row="2" Text="Valider" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="Valider"/>
-            <Button Grid.Row="3" Text="Annuler" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="CloseButton"/>
+            <Button Grid.Row="2" Text="Valider" Style="{StaticResource popupButton}" Clicked="Valider"/>
+            <Button Grid.Row="3" Text="Annuler" Style="{StaticResource popupButton}" Clicked="CloseButton"/>
         </Grid>
     </VerticalStackLayout>
 </toolkit:Popup>
diff --git a/Sources/Stim/FollowPage.xaml b/Sources/Stim/FollowPage.xaml
index beaa911..7c8fa6b 100644
--- a/Sources/Stim/FollowPage.xaml
+++ b/Sources/Stim/FollowPage.xaml
@@ -4,21 +4,9 @@
              x:Class="Stim.FollowPage"
              Title="Suivis">
     <ScrollView>
-        <Grid BackgroundColor="#495057">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="5*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-
+        <Grid BackgroundColor="#495057" ColumnDefinitions="*, 5*, *" RowDefinitions="auto, *">
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.RowSpan="2"/>
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.RowSpan="2"/>
-
             <CollectionView ItemsSource="{Binding Followed_Games}" SelectionMode="Single" Grid.Column="1" SelectionChanged="GoToDetail" ItemTemplate="{StaticResource followTemplate}"/>
         </Grid>
     </ScrollView>
diff --git a/Sources/Stim/LoginPage.xaml b/Sources/Stim/LoginPage.xaml
index c3be651..d27f8a2 100644
--- a/Sources/Stim/LoginPage.xaml
+++ b/Sources/Stim/LoginPage.xaml
@@ -3,54 +3,28 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Stim.LoginPage"
              Title="LoginPage">
-    <Grid BackgroundColor="{StaticResource Tertiary}">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-
+    <Grid BackgroundColor="{StaticResource Tertiary}" ColumnDefinitions="*, 5*, *" RowDefinitions="auto, *">
         <VerticalStackLayout BackgroundColor="Black" Grid.Column="0"/>
         <VerticalStackLayout BackgroundColor="Black" Grid.Column="2"/>
         <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
         <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
-        <Grid Grid.Column="1">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="500"/>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="auto"/>
-            </Grid.RowDefinitions>
+        <Grid Grid.Column="1" RowDefinitions="500, auto, auto">
             <Image Source="no_cover.png" HeightRequest="490" Margin="0,10,0,0"/>
-            <Grid Grid.Row="1">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="auto"/>
-                </Grid.RowDefinitions>
+            <Grid Grid.Row="1" RowDefinitions="auto, auto, auto">
                 <Entry Placeholder="Username" PlaceholderColor="{StaticResource Primary}"
-                       IsPassword="False"
-                       x:Name="Username"
-                       HeightRequest="50"
-                       ClearButtonVisibility="WhileEditing"/>
+                        IsPassword="False"
+                        x:Name="Username"
+                        HeightRequest="50"
+                        ClearButtonVisibility="WhileEditing"/>
                 <Entry Placeholder="Mot de passe"
-                       PlaceholderColor="{StaticResource Primary}"
-                       IsPassword="True" x:Name="Pswd"
-                       HeightRequest="50"
-                       Grid.Row="1"
-                       ClearButtonVisibility="WhileEditing"/>
+                        PlaceholderColor="{StaticResource Primary}"
+                        IsPassword="True" x:Name="Pswd"
+                        HeightRequest="50"
+                        Grid.Row="1"
+                        ClearButtonVisibility="WhileEditing"/>
 
                 <Grid Grid.Row="2"
-                      Margin="10,0,0,10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="3*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
+                        Margin="10,0,0,10" ColumnDefinitions="3*, *">
                     <Button Text="Se connecter"
                             Clicked="Se_connecter"
                             HeightRequest="50"
diff --git a/Sources/Stim/MainPage.xaml b/Sources/Stim/MainPage.xaml
index 2f77fb8..d26c846 100644
--- a/Sources/Stim/MainPage.xaml
+++ b/Sources/Stim/MainPage.xaml
@@ -6,42 +6,20 @@
              Background="{StaticResource Secondary}">
     <Grid>
         <ScrollView>
-            <Grid BackgroundColor="{StaticResource Tertiary}">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="10*"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="auto"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
-
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0"/>
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="2"/>
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="0" Grid.Row="1"/>
-                <VerticalStackLayout BackgroundColor="{StaticResource Secondary}" Grid.Column="2" Grid.Row="1"/>
-
-                <Grid Grid.Column="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
+            <Grid BackgroundColor="{StaticResource Tertiary}" ColumnDefinitions="*, 10*, *" RowDefinitions="auto, *">
+                <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="0"/>
+                <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="2"/>
+                <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="0" Grid.Row="1"/>
+                <VerticalStackLayout Style="{StaticResource pageBorder}" Grid.Column="2" Grid.Row="1"/>
 
+                <Grid Grid.Column="1" ColumnDefinitions="*, *" RowDefinitions="auto, auto">
                     <SearchBar x:Name="Game" TextChanged="SearchBar_GameChanged" Grid.ColumnSpan="2" Placeholder="Rechercher un jeu" Margin="5"/>
                     <SearchBar x:Name="Tag1" TextChanged="SearchBar_GameChanged" Grid.Column="0" Grid.Row="1" Placeholder="Tag 1" WidthRequest="200" HorizontalOptions="End" Margin="5"/>
                     <SearchBar x:Name="Tag2" TextChanged="SearchBar_GameChanged" Grid.Column="1" Grid.Row="1" Placeholder="Tag 2" WidthRequest="200" HorizontalOptions="Start" Margin="5"/>
                 </Grid>
-
                 <CollectionView ItemsSource="{Binding}" SelectionMode="Single" SelectionChanged="OnClickGameList" ItemsLayout="VerticalGrid, 5"  Grid.Column="1" Grid.Row="1" ItemTemplate="{StaticResource gameTemplate}"/>
             </Grid>
         </ScrollView>
-        <ImageButton Source="add_white.png" Background="transparent" WidthRequest="50" HeightRequest="50" HorizontalOptions="End" VerticalOptions="End" Margin="0, 0, 10, 10" Clicked="GoToAddGamePage"/>
+        <ImageButton Style="{StaticResource addButton}" Clicked="GoToAddGamePage"/>
     </Grid>
 </ContentPage>
diff --git a/Sources/Stim/MessagePopup.xaml b/Sources/Stim/MessagePopup.xaml
index dc753ae..b832b69 100644
--- a/Sources/Stim/MessagePopup.xaml
+++ b/Sources/Stim/MessagePopup.xaml
@@ -7,6 +7,6 @@
 
     <Grid RowDefinitions="auto, auto" ColumnDefinitions="*">
         <Label x:Name="placeholder" Text="" HorizontalOptions="Center"/>
-        <Button Grid.Row="1" Text="Fermer" HorizontalOptions="Center" VerticalOptions="End" Background="{StaticResource Transparent}" Clicked="CloseButton"/>
+        <Button Grid.Row="1" Text="Fermer" Style="{StaticResource popupButton}" Clicked="CloseButton"/>
     </Grid>
 </toolkit:Popup>
diff --git a/Sources/Stim/ProfilPage.xaml b/Sources/Stim/ProfilPage.xaml
index f6ff7ad..1fc05cf 100644
--- a/Sources/Stim/ProfilPage.xaml
+++ b/Sources/Stim/ProfilPage.xaml
@@ -6,55 +6,30 @@
              Title="Profil">
     <ScrollView>
 
-        <Grid BackgroundColor="#495057">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="5*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <Grid.RowDefinitions>
-                <RowDefinition Height="auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-
-
+        <Grid BackgroundColor="#495057" ColumnDefinitions="*, 5*, *" RowDefinitions="auto, *">
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="0"/>
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="2"/>
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="0" Grid.Row="1"/>
             <VerticalStackLayout BackgroundColor="Black" Grid.Column="2" Grid.Row="1"/>
 
-            <Grid Grid.Column="1" Grid.Row="1" Margin="0,10,100,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+            <Grid Grid.Column="1" Grid.Row="1" Margin="0,10,100,0" ColumnDefinitions="*, *">
                 <VerticalStackLayout Grid.Column="0" Margin="10,0,0,0">
                     <Image Source="{Binding CurrentUser.UserImage}" HeightRequest="200" WidthRequest="200" Margin="0,0,10,0"/>
                     <UserInfo:UserInfo Bind="{Binding CurrentUser.Username}"/>
 
-                    <Grid Margin="0,20,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="10*"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
+                    <Grid Margin="0,20,0,0" ColumnDefinitions="10*, *">
                         <Border>
                             <Label Text="{Binding CurrentUser.Biographie}" HeightRequest="200" HorizontalTextAlignment="Start" VerticalTextAlignment="Start"/>
                         </Border>
                         <Button ImageSource="pen.png" Grid.Column="1" MaximumHeightRequest="32" MaximumWidthRequest="32" Padding="0,0,0,0" Margin="5,0,0,0" BackgroundColor="{StaticResource Gray500}"></Button>
                     </Grid>
-                    <Grid Margin="0,20,0,0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="10*"/>
-                            <ColumnDefinition Width="*"/>
-                        </Grid.ColumnDefinitions>
+                    <Grid Margin="0,20,0,0" ColumnDefinitions="10*, *">
                         <Border Margin="0,10,0,0" Padding="0">  
                             <Label Text="**********"/>
                         </Border>
                         <Button ImageSource="pen.png" Grid.Column="1" MaximumHeightRequest="32" MaximumWidthRequest="32" Padding="0,0,0,0" Margin="5,0,0,0" BackgroundColor="{StaticResource Gray500}"></Button>
                     </Grid>
                     <UserInfo:UserInfo Bind="{Binding CurrentUser.Email}"/>
-
                 </VerticalStackLayout>
                 
                 <VerticalStackLayout Grid.Column="1" Margin="100,0,0,0">
diff --git a/Sources/Stim/Resources/Styles/Styles.xaml b/Sources/Stim/Resources/Styles/Styles.xaml
index 785c236..baf038e 100644
--- a/Sources/Stim/Resources/Styles/Styles.xaml
+++ b/Sources/Stim/Resources/Styles/Styles.xaml
@@ -385,4 +385,24 @@
         <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
 
+    <Style TargetType="Button" x:Key="popupButton">
+        <Setter Property="HorizontalOptions" Value="Center"/>
+        <Setter Property="VerticalOptions" Value="End" />
+        <Setter Property="Background" Value="{StaticResource Transparent}"/>
+    </Style>
+
+    <Style TargetType="ImageButton" x:Key="addButton">
+        <Setter Property="Source" Value="add_white.png"/>
+        <Setter Property="Background" Value="{StaticResource Transparent}"/>
+        <Setter Property="WidthRequest" Value="50"/>
+        <Setter Property="HeightRequest" Value="50"/>
+        <Setter Property="HorizontalOptions" Value="End"/>
+        <Setter Property="VerticalOptions" Value="End"/>
+        <Setter Property="Margin" Value="0, 0, 10, 10"/>
+    </Style>
+
+    <Style TargetType="VerticalStackLayout" x:Key="pageBorder">
+        <Setter Property="Background" Value="{StaticResource Secondary}"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/Sources/Stim/UserInfo.xaml b/Sources/Stim/UserInfo.xaml
index dca8861..e743a83 100644
--- a/Sources/Stim/UserInfo.xaml
+++ b/Sources/Stim/UserInfo.xaml
@@ -4,11 +4,7 @@
              xmlns:local="clr-namespace:Stim"
              x:Class="Stim.UserInfo"
              x:Name="userInfoView">
-    <Grid Margin="0,20,0,0">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="10*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
+    <Grid Margin="0,20,0,0" ColumnDefinitions="10*, *">
         <Border Margin="0,10,0,0" Padding="0">
             <Label Text="{Binding Path=Bind, Source={x:Reference userInfoView}}" />
         </Border>