diff --git a/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml b/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml
index a561c56..515feb7 100644
--- a/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml
+++ b/src/AdvancedCalculator.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
 	<uses-permission android:name="android.permission.INTERNET" />
-	<application android:label="AvaloniaTest" android:icon="@drawable/Icon" />
-</manifest>
+	<application android:label="Advanced Calculator" android:icon="@drawable/Icon" />
+</manifest>
\ No newline at end of file
diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml
index d44cf41..ef757f0 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml
+++ b/src/AdvancedCalculator/Views/MainView.axaml
@@ -72,7 +72,6 @@
 				<!-- History -->
                 <Grid Grid.Row="0">
                     <ListBox x:Name="HistoryList" ItemsSource="{Binding History}" SelectedIndex="{Binding SelectedHistoryIndex}"
-                             HorizontalContentAlignment="Stretch"
                          AutomationProperties.Name="History list">
                         <ListBox.ItemTemplate>
                             <DataTemplate x:DataType="m:HistoryItem">
diff --git a/src/AdvancedCalculator/Views/MainView.axaml.cs b/src/AdvancedCalculator/Views/MainView.axaml.cs
index 062a041..c21b69e 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml.cs
+++ b/src/AdvancedCalculator/Views/MainView.axaml.cs
@@ -6,6 +6,7 @@ using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using AdvancedCalculator.ViewModels;
 using AdvancedCalculator.Models;
+using Avalonia.Controls.Presenters;
 
 namespace AdvancedCalculator.Views;
 
@@ -69,7 +70,7 @@ public partial class MainView : UserControl
     private void OnHistoryTapped(object? sender, TappedEventArgs e)
     {
         // Find the ListBoxItem the tap originated from
-        var source = e.Source as IVisual;
+        var source = e.Source as ContentPresenter;
         var container = source?.FindAncestorOfType<ListBoxItem>();
         if (container?.DataContext is not HistoryItem item)
             return;