diff --git a/Makefile b/Makefile
index d6d69196..05aa5df2 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ POSTIT_RID ?= android-x64
 EMU_HEADLESS ?= 0
 LOGCAT_LINES ?= 600
 LOGCAT_FOLLOW ?= 0
-LOGCAT_BOOT_WAIT ?= 20
+LOGCAT_BOOT_WAIT ?= 30
 
 ANDROID_PACKAGE_NAME = fr.pschneider.PostIt
 POSTIT_ANDROID_CSPROJ := src/PostIt/PostIt.Android/PostIt.Android.csproj
@@ -275,7 +275,8 @@ qemu-logcat-boot:
 	@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
 	if [ -n "$$PID" ]; then \
 	    echo " ✅ (PID $$PID at dump time)"; \
-	    adb -s $(ADB_SERIAL) logcat -d -v time --pid=$$PID; \
+			sleep 10; \
+	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
 	else \
 	    echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
 	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
diff --git a/src/PostIt/PostIt/App.axaml.cs b/src/PostIt/PostIt/App.axaml.cs
index 1d0933a7..3b7370f9 100644
--- a/src/PostIt/PostIt/App.axaml.cs
+++ b/src/PostIt/PostIt/App.axaml.cs
@@ -87,7 +87,7 @@ public partial class App : Application
 
         sessionStatus.LoginSucceeded += () =>
         {
-            PushMainPageAsync().Wait();
+            PushMainPageAsync();
         };
 
         Window.SessionBanner.DataContext = sessionStatus;
diff --git a/src/PostIt/PostIt/Views/MainPage.axaml b/src/PostIt/PostIt/Views/MainPage.axaml
index 7f1f1196..d79253f6 100644
--- a/src/PostIt/PostIt/Views/MainPage.axaml
+++ b/src/PostIt/PostIt/Views/MainPage.axaml
@@ -97,7 +97,14 @@
 
                 <TextBlock Grid.Row="0" Text="Post detail" FontWeight="SemiBold" />
                 <TextBox Grid.Row="1" Text="{Binding DraftTitle, Mode=TwoWay}" PlaceholderText="Title" />
-                <AvaloniaEdit:TextEditor Grid.Row="2"
+                <TextBox Grid.Row="2" PlaceholderText="Write something here !"
+                  Text="{Binding DraftArticle, Mode=TwoWay}"
+                  MinHeight="320"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch">
+
+                </TextBox>
+              <!--  <AvaloniaEdit:TextEditor Grid.Row="2"
                     views:TextEditorBinding.Text="{Binding DraftArticle, Mode=TwoWay}"
                     ShowLineNumbers="True"
                     FontFamily="Cascadia Code, Consolas, Menlo, Monospace"
@@ -105,7 +112,7 @@
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Stretch"
                     VerticalScrollBarVisibility="Auto"
-                    HorizontalScrollBarVisibility="Auto" />
+                    HorizontalScrollBarVisibility="Auto" /> -->
                 <TextBlock Grid.Row="3" Text="{Binding StatusMessage}" Foreground="Gray" />
             </Grid>
         </Border>