diff --git a/AideDeJeu.sln b/AideDeJeu.sln
index a5ddc534..136dd03a 100644
--- a/AideDeJeu.sln
+++ b/AideDeJeu.sln
@@ -160,6 +160,7 @@ Global
 		{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
 		{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x64.ActiveCfg = Release|iPhone
 		{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x86.ActiveCfg = Release|iPhone
+		{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|Any CPU.Build.0 = Debug|iPhone
 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Build.0 = Release|x86
 		{7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86
diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
index 02904da9..8bf6097f 100644
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@@ -15,7 +15,6 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -26,9 +25,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
     <AndroidSupportedAbis />
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
   </PropertyGroup>
@@ -41,9 +37,6 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
     <AndroidSupportedAbis />
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <AndroidExplicitCrunch>true</AndroidExplicitCrunch>
@@ -133,7 +126,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AideDeJeu\AideDeJeu.csproj">
-      <Project>{D9922DC7-810A-445E-B965-BF7E48E8B0D5}</Project>
+      <Project>{C0597D88-5C09-4314-80A3-64712B02D0E9}</Project>
       <Name>AideDeJeu</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
index 8a47c656..39f1b71d 100644
--- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
+++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
@@ -1,11 +1,11 @@
 #pragma warning disable 1591
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Ce code a été généré par un outil.
-//     Version du runtime :4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
-//     le code est régénéré.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
diff --git a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
index 2282ddc5..644acb54 100644
--- a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
+++ b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\Xamarin.Forms.3.4.0.1008975\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.4.0.1008975\build\Xamarin.Forms.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index c539b09f..27bf289d 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -99,26 +99,25 @@ namespace AideDeJeu.ViewModels
             if (item == null)
                 return;
 
-            //if (item is Items)
-            //{
             var items = item as Item;
-                var filterViewModel = items.GetNewFilterViewModel();
-                var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
-                itemsViewModel.LoadItemsCommand.Execute(null);
-                if (filterViewModel == null)
-                {
-                    await GotoItemsPageAsync(itemsViewModel);
-                }
-                else
-                {
-                    await GotoFilteredItemsPageAsync(itemsViewModel);
-                }
-            //}
-            //else
-            //{ 
-            //    var vm = new ItemDetailViewModel(item);
-            //    await Navigation.PushAsync(new ItemDetailPage(vm));
-            //}
+            var filterViewModel = items.GetNewFilterViewModel();
+            var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
+            itemsViewModel.LoadItemsCommand.Execute(null);
+
+            SwitchToMainTab();
+
+            if (filterViewModel == null)
+            {
+                await GotoItemsPageAsync(itemsViewModel);
+            }
+            else
+            {
+                await GotoFilteredItemsPageAsync(itemsViewModel);
+            }
+        }
+
+        public void SwitchToMainTab()
+        {
             var tabbedPage = App.Current.MainPage as MainTabbedPage;
             tabbedPage.SelectedItem = null;
             tabbedPage.SelectedItem = tabbedPage.MainNavigationPage;
@@ -165,38 +164,29 @@ namespace AideDeJeu.ViewModels
                 Main.IsLoading = false;
                 if (item != null)
                 {
-                    //if (item is Items)
-                    //{
                     var items = item; // as Items;
-                        var filterViewModel = items.GetNewFilterViewModel();
-                        var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
-                        itemsViewModel.LoadItemsCommand.Execute(null);
-                        if(!string.IsNullOrEmpty(with))
+                    var filterViewModel = items.GetNewFilterViewModel();
+                    var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
+                    itemsViewModel.LoadItemsCommand.Execute(null);
+                    if(!string.IsNullOrEmpty(with))
+                    {
+                        var swith = with.Split('_');
+                        for (int i = 0; i < swith.Length / 2; i++)
                         {
-                            var swith = with.Split('_');
-                            for (int i = 0; i < swith.Length / 2; i++)
-                            {
-                                var key = swith[i * 2 + 0];
-                                var val = swith[i * 2 + 1];
-                                filterViewModel.FilterWith(key, val);
-                            }
+                            var key = swith[i * 2 + 0];
+                            var val = swith[i * 2 + 1];
+                            filterViewModel.FilterWith(key, val);
                         }
-                        if (filterViewModel == null)
-                        {
-                            await GotoItemsPageAsync(itemsViewModel);
-                        }
-                        else
-                        {
-                            await GotoFilteredItemsPageAsync(itemsViewModel);
-                        }
-                    //}
-                    //else
-                    //{
-                    //    await GotoItemDetailPageAsync(item);
-                    //}
-                    var tabbedPage = App.Current.MainPage as MainTabbedPage;
-                    tabbedPage.SelectedItem = null;
-                    tabbedPage.SelectedItem = tabbedPage.MainNavigationPage;
+                    }
+                    SwitchToMainTab();
+                    if (filterViewModel == null)
+                    {
+                        await GotoItemsPageAsync(itemsViewModel);
+                    }
+                    else
+                    {
+                        await GotoFilteredItemsPageAsync(itemsViewModel);
+                    }
 
                 }
                 else