diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2a446a0..4147fc40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,21 @@ pour la production des paquets `.deb`.
 
 ## [1.0.8-rc1] - unstable
 
+### Added
+
+* a code cleanup
+* a failling a disabled test ala Xamarin.UITest : the Android app stil doesn't starts
+
+### Changed
+
+moslty nothing
+
+### Fixed
+
+nothing
+
+## [1.0.8-rc1] - unstable
+
 ### Added
 - `BlogAclApiTests.PostCircleAuthorization_returns_201_when_payload_mirrors_PostIt_shape_against_existing_circle_named_test`
   : test de non-régression qui épingle la forme exacte du payload
diff --git a/src/PostIt/PostIt/App.axaml.cs b/src/PostIt/PostIt/App.axaml.cs
index 10a0c8a5..b23a03f1 100644
--- a/src/PostIt/PostIt/App.axaml.cs
+++ b/src/PostIt/PostIt/App.axaml.cs
@@ -65,7 +65,10 @@ public partial class App : Application
             singleViewPlatform.MainView = CreateMainWindow();
             ApplyDarkMode(settings);
         }
+        var mainVm = ServiceProvider!.GetRequiredService<HomePageViewModel>();
+
         base.OnFrameworkInitializationCompleted();
+        this.PushPageAsync(mainVm).Wait();
     }
 
 
@@ -86,9 +89,6 @@ public partial class App : Application
             PushMainPageAsync().Wait();
         };
 
-        var homeVm = ServiceProvider!.GetRequiredService<HomePageViewModel>();
-
-        this.PushPageAsync(homeVm).Wait();
         Window.SessionBanner.DataContext = sessionStatus;
         return Window;
     }
diff --git a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
index 9e0382de..fae24fa6 100644
--- a/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
+++ b/src/PostIt/PostIt/Helpers/ServiceCollectionHelpers.cs
@@ -74,4 +74,4 @@ public static class ServiceCollectionHelpers
 
         return services.BuildServiceProvider();
     }
-}
\ No newline at end of file
+}
diff --git a/src/PostIt/PostIt/ViewLocator.cs b/src/PostIt/PostIt/ViewLocator.cs
index 03ab98a1..3543a9c9 100644
--- a/src/PostIt/PostIt/ViewLocator.cs
+++ b/src/PostIt/PostIt/ViewLocator.cs
@@ -16,12 +16,6 @@ namespace PostIt;
     Url = "https://docs.avaloniaui.net/docs/concepts/view-locator")]
 public class ViewLocator : IDataTemplate
 {
-    private readonly IServiceProvider _services;
-
-    public ViewLocator(IServiceProvider services)
-    {
-        _services = services;
-    }
 
      public Control Build(object? data)
     {
@@ -38,15 +32,17 @@ public class ViewLocator : IDataTemplate
 
     private Control BuildCore(object? data)
     {
+        var app = App.Current as App;
+        var services = app!.ServiceProvider!;
         return data switch
         {
-            MainViewModel => _services.GetRequiredService<MainPage>(),
-            Settings => _services.GetRequiredService<SettingsPage>(),
-            HomePageViewModel => _services.GetRequiredService<HomePage>(),
-            SignaturePageViewModel => _services.GetRequiredService<SignaturePage>(),
-            AddCircleMemberDialogViewModel => _services.GetRequiredService<AddCircleMemberDialog>(),
-            CirclesPageViewModel => _services.GetRequiredService<CirclesPage>(),
-            PostAclDialogViewModel => _services.GetRequiredService<PostAclDialog>(),
+            MainViewModel => services.GetRequiredService<MainPage>(),
+            Settings => services.GetRequiredService<SettingsPage>(),
+            HomePageViewModel => services.GetRequiredService<HomePage>(),
+            SignaturePageViewModel => services.GetRequiredService<SignaturePage>(),
+            AddCircleMemberDialogViewModel => services.GetRequiredService<AddCircleMemberDialog>(),
+            CirclesPageViewModel => services.GetRequiredService<CirclesPage>(),
+            PostAclDialogViewModel => services.GetRequiredService<PostAclDialog>(),
             null => new TextBlock { Text = "No view for <null>" },
             _ => new TextBlock { Text = $"No view for {data.GetType().Name}" }
         };