diff --git a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
index f8586e1e..ed4f126a 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/AboutViewModel.cs
@@ -13,12 +13,8 @@ namespace AideDeJeu.ViewModels
         public AboutViewModel()
         {
             Title = "À propos de ...";
-
-            OpenWebCommand = new Command<string>((param) => Device.OpenUri(new Uri(param)));
         }
 
-        public ICommand OpenWebCommand { get; }
-
         public string Version {
             get
             {
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index 9eb92fc4..5bfac331 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -40,6 +40,15 @@ namespace AideDeJeu.ViewModels
             }
         }
 
+        private ICommand _OpenWebCommand = null;
+        public ICommand OpenWebCommand 
+        { 
+            get
+            {
+                return _OpenWebCommand ?? (_OpenWebCommand = new Command<string>((param) => Device.OpenUri(new Uri(param))));
+            }
+        }
+
         public async Task GotoAboutPageAsync()
         {
             //await Navigation.PushAsync(new Views.AboutPage(), true);
diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
index 5abd4484..43b2db28 100644
--- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="AideDeJeu.Views.AboutPage"
              xmlns:vm="clr-namespace:AideDeJeu.ViewModels"
-             Title="{Binding Title}">
+             Title="{Binding Title}"
+             x:DataType="vm:AboutViewModel">
     <ContentPage.BindingContext>
         <vm:AboutViewModel />
     </ContentPage.BindingContext>
@@ -42,7 +43,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://github.com/Nioux/AideDeJeu" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://github.com/Nioux/AideDeJeu" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -54,7 +55,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="http://game-icons.net" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="http://game-icons.net" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -66,7 +67,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://www.dafont.com/fr/" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://www.dafont.com/fr/" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -78,7 +79,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://www.black-book-editions.fr/forums.php?topic_id=5626" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://www.black-book-editions.fr/forums.php?topic_id=5626" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -90,7 +91,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://www.black-book-editions.fr/forums.php?topic_id=12619" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://www.black-book-editions.fr/forums.php?topic_id=12619" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -102,7 +103,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://www.black-book-editions.fr/forums.php?topic_id=7400&amp;tid=304699#msg304699" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://www.black-book-editions.fr/forums.php?topic_id=7400&amp;tid=304699#msg304699" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -116,7 +117,7 @@
                     <Label.GestureRecognizers>
                         <OnPlatform x:TypeArguments="TapGestureRecognizer">
                             <On Platform="Android, UWP">
-                                <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://fr.tipeee.com/nioux" />
+                                <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://fr.tipeee.com/nioux" />
                             </On>
                         </OnPlatform>
                     </Label.GestureRecognizers>
@@ -130,7 +131,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="http://www.black-book-editions.fr/" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="http://www.black-book-editions.fr/" />
                     </Label.GestureRecognizers>
                 </Label>
 
@@ -150,7 +151,7 @@
                         </FormattedString>
                     </Label.FormattedText>
                     <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding OpenWebCommand}" CommandParameter="https://heros-et-dragons.fr/" />
+                        <TapGestureRecognizer Command="{Binding Main.Navigator.OpenWebCommand}" CommandParameter="https://heros-et-dragons.fr/" />
                     </Label.GestureRecognizers>
                 </Label>
 
diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
index 36dd2537..443ed97a 100644
--- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml
@@ -108,18 +108,18 @@
                         <ImageButton Source="spell_book.png" Command="{Binding Main.Navigator.LibraryCommand, Mode=OneTime}" />
                     </Grid>
                 </Frame>
-                <!--<Frame>
+                <Frame>
                     <Grid>
-                        <Label Text="Favoris" />
-                        <ImageButton Source="stars_stack.png" Command="{Binding Main.Navigator.BookmarksCommand}" />
+                        <Label Text="Favoris" FontFamily="{StaticResource LinuxLibertineCapitals}" />
+                        <ImageButton Source="stars_stack.png" Command="{Binding Main.Navigator.BookmarksCommand, Mode=OneTime}" />
                     </Grid>
                 </Frame>
                 <Frame>
                     <Grid>
-                        <Label Text="Recherche" />
-                        <ImageButton Source="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand}" />
+                        <Label Text="Recherche" FontFamily="{StaticResource LinuxLibertineCapitals}" />
+                        <ImageButton Source="crystal_ball.png" Command="{Binding Main.Navigator.DeepSearchCommand, Mode=OneTime}" />
                     </Grid>
-                </Frame>-->
+                </Frame>
                 <Frame>
                     <Grid>
                         <Label Text="A propos de..." FontFamily="{StaticResource LinuxLibertineCapitals}" />