diff --git a/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml
index e8b902d3..87919fc9 100644
--- a/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemView.xaml
@@ -15,5 +15,8 @@
         </ResourceDictionary>
     </StackLayout.Resources>
     <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Name, Source={x:Reference this}}" />
-    <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Description, Source={x:Reference this}}" />
+    <mdview:MarkdownView 
+        Theme="{StaticResource MonsterMarkdownTheme}" 
+        Markdown="{Binding Description, Source={x:Reference this}}" 
+        NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 </StackLayout>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml
index c38c498a..7af24a79 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/BackgroundPage.xaml
@@ -4,8 +4,11 @@
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers"
+             xmlns:pcvm="clr-namespace:AideDeJeu.ViewModels.PlayerCharacter"
+             xmlns:lib="clr-namespace:AideDeJeuLib"
              x:Class="AideDeJeu.Views.PlayerCharacter.BackgroundPage"
-             x:Name="This">
+             x:Name="This"
+             x:DataType="pcvm:PlayerCharacterEditorViewModel">
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -46,31 +49,51 @@
                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Compétences" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.SkillProficiencies}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            HorizontalOptions="FillAndExpand" 
+                            Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.SkillProficiencies}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
                     </StackLayout>
                 </Frame>
                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Outils maîtrisés" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.MasteredTools}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            HorizontalOptions="FillAndExpand" 
+                            Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.MasteredTools}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
                     </StackLayout>
                 </Frame>
                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Langues maîtrisées" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.MasteredLanguages}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            HorizontalOptions="FillAndExpand" 
+                            Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.MasteredLanguages}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
                     </StackLayout>
                 </Frame>
                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="# Équipement" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.Equipment}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            HorizontalOptions="FillAndExpand" 
+                            Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackground.Equipment}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
                     </StackLayout>
                 </Frame>
                 <Frame BorderColor="Black" Padding="2" Margin="10" IsVisible="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackgroundSkill, Converter={StaticResource NullToFalseConverter}}">
                     <StackLayout Padding="0">
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackgroundSkill.Name, StringFormat='# {0}'}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" HorizontalOptions="FillAndExpand" Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackgroundSkill.Description}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            HorizontalOptions="FillAndExpand" 
+                            Markdown="{Binding SelectedPlayerCharacter.Background.BackgroundOrSubBackgroundSkill.Description}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
                     </StackLayout>
                 </Frame>
 
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml
index 2956e772..5fef0bfb 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/ClassPage.xaml
@@ -4,8 +4,11 @@
              xmlns:tools="clr-namespace:AideDeJeu.Tools"
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              xmlns:pickers="clr-namespace:AideDeJeu.Views.Pickers"
+             xmlns:pcvm="clr-namespace:AideDeJeu.ViewModels.PlayerCharacter"
+             xmlns:lib="clr-namespace:AideDeJeuLib"
              x:Class="AideDeJeu.Views.PlayerCharacter.ClassPage"
-             x:Name="This">
+             x:Name="This"
+             x:DataType="pcvm:PlayerCharacterEditorViewModel">
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -32,13 +35,13 @@
                         <pickers:ItemView BindingContext="{Binding}" Name="#### Armes" Description="{Binding SelectedPlayerCharacter.Class.Proficiencies.Weapons}" />
                         <pickers:ItemView BindingContext="{Binding}" Name="#### Outils" Description="{Binding SelectedPlayerCharacter.Class.Proficiencies.Tools}" />
                         <pickers:ItemView BindingContext="{Binding}" Name="#### Jets de sauvegarde" Description="{Binding SelectedPlayerCharacter.Class.Proficiencies.SavingThrows}" />
-                        <pickers:ItemView BindingContext="{Binding}" Name="#### Compétences" Description="{Binding SelectedPlayerCharacter.Class.Proficiencies.SkillProficiencies}" />
+                        <pickers:ItemView BindingContext="{Binding}" Name="#### Compétences" Description="{Binding SelectedPlayerCharacter.Class.Proficiencies.Skills}" />
 
                         <pickers:ItemView BindingContext="{Binding}" Name="#### Équipement" Description="{Binding SelectedPlayerCharacter.Class.Equipment.Description}" />
 
                         <StackLayout BindableLayout.ItemsSource="{Binding SelectedPlayerCharacter.Class.LeveledFeatures}">
                             <BindableLayout.ItemTemplate>
-                                <DataTemplate>
+                                <DataTemplate x:DataType="lib:ClassFeatureItem">
                                     <StackLayout>
                                         <pickers:ItemView BindingContext="{Binding}" Name="{Binding Name, StringFormat='#### {0}'}" Description="{Binding Description}" />
                                     </StackLayout>
diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml
index 7ca110bc..c7234c5d 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/RacePage.xaml
@@ -28,22 +28,46 @@
                     <StackLayout Padding="0">
 
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="#### Augmentation de caractéristiques" IsVisible="{Binding SelectedPlayerCharacter.Race.AbilityScoreIncrease, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.AbilityScoreIncrease}" IsVisible="{Binding SelectedPlayerCharacter.Race.AbilityScoreIncrease, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            Markdown="{Binding SelectedPlayerCharacter.Race.AbilityScoreIncrease}" 
+                            IsVisible="{Binding SelectedPlayerCharacter.Race.AbilityScoreIncrease, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="#### Âge" IsVisible="{Binding SelectedPlayerCharacter.Race.Age, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.Age}" IsVisible="{Binding SelectedPlayerCharacter.Race.Age, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            Markdown="{Binding SelectedPlayerCharacter.Race.Age}" 
+                            IsVisible="{Binding SelectedPlayerCharacter.Race.Age, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="#### Alignement" IsVisible="{Binding SelectedPlayerCharacter.Race.Alignment, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.Alignment}" IsVisible="{Binding SelectedPlayerCharacter.Race.Alignment, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            Markdown="{Binding SelectedPlayerCharacter.Race.Alignment}" 
+                            IsVisible="{Binding SelectedPlayerCharacter.Race.Alignment, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="#### Taille" IsVisible="{Binding SelectedPlayerCharacter.Race.Size, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.Size}" IsVisible="{Binding SelectedPlayerCharacter.Race.Size, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            Markdown="{Binding SelectedPlayerCharacter.Race.Size}" 
+                            IsVisible="{Binding SelectedPlayerCharacter.Race.Size, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="#### Vitesse" IsVisible="{Binding SelectedPlayerCharacter.Race.Speed, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.Speed}" IsVisible="{Binding SelectedPlayerCharacter.Race.Speed, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            Markdown="{Binding SelectedPlayerCharacter.Race.Speed}" 
+                            IsVisible="{Binding SelectedPlayerCharacter.Race.Speed, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 
                         <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="#### Vision dans le noir" IsVisible="{Binding SelectedPlayerCharacter.Race.Darkvision, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
-                        <mdview:MarkdownView Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding SelectedPlayerCharacter.Race.Darkvision}" IsVisible="{Binding SelectedPlayerCharacter.Race.Darkvision, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" />
+                        <mdview:MarkdownView 
+                            Theme="{StaticResource MonsterMarkdownTheme}" 
+                            Markdown="{Binding SelectedPlayerCharacter.Race.Darkvision}" 
+                            IsVisible="{Binding SelectedPlayerCharacter.Race.Darkvision, Converter={StaticResource NullToFalseConverter}, FallbackValue=False}" 
+                            NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand}" />
 
                         <StackLayout BindableLayout.ItemsSource="{Binding SelectedPlayerCharacter.Race.AttributesKeyValue.Values}">
                             <BindableLayout.ItemTemplate>