diff --git a/Wallet.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs
index ab94646..4484820 100644
--- a/Wallet.Avalonia/App.axaml.cs
+++ b/Wallet.Avalonia/App.axaml.cs
@@ -167,6 +167,7 @@ public partial class App : Application
                         services.AddTemplate<DropdownEntryViewModel, DropdownEntryView>();
                         services.AddTemplate<DateEntryViewModel, DateEntryView>();
                         services.AddTemplate<HyperlinkEntryViewModel, HyperlinkEntryView>();
+                        services.AddTemplate<PinEntryViewModel, PinEntryView>();
 
                         services.AddTemplate<ItemCommandHeaderViewModel, ItemCommandHeaderView>("ItemCommandHeader");
 
@@ -195,6 +196,7 @@ public partial class App : Application
                         services.AddHandler<DropdownEntryViewModelHandler>(nameof(DropdownEntryConfiguration));
                         services.AddHandler<DateEntryViewModelHandler>(nameof(DateEntryConfiguration));
                         services.AddHandler<HyperlinkEntryViewModelHandler>(nameof(HyperlinkEntryConfiguration));
+                        services.AddHandler<PinEntryViewModelHandler>(nameof(PinEntryConfiguration));
 
                         services.AddHandler<ItemCreatedHandler>(ServiceLifetime.Singleton);
                         services.AddHandler<ItemModifiedHandler>(ServiceLifetime.Singleton);
diff --git a/Wallet.Avalonia/HyperlinkEntryView.axaml b/Wallet.Avalonia/HyperlinkEntryView.axaml
index 7fe902f..3dc6668 100644
--- a/Wallet.Avalonia/HyperlinkEntryView.axaml
+++ b/Wallet.Avalonia/HyperlinkEntryView.axaml
@@ -33,7 +33,10 @@
                     </DataTriggerBehavior>
                 </Interaction.Behaviors>
             </TextBox>
-            <HyperlinkButton Command="{Binding InvokeCommand}" Content="{Binding Value}">
+            <HyperlinkButton
+                Padding="0"
+                Command="{Binding InvokeCommand}"
+                Content="{Binding Value}">
                 <HyperlinkButton.Styles>
                     <Style Selector="HyperlinkButton.Write">
                         <Setter Property="IsVisible" Value="False" />
diff --git a/Wallet.Avalonia/ItemView.axaml b/Wallet.Avalonia/ItemView.axaml
index e59b36d..ff60ec4 100644
--- a/Wallet.Avalonia/ItemView.axaml
+++ b/Wallet.Avalonia/ItemView.axaml
@@ -25,7 +25,7 @@
             </ConditionAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>
-    <ScrollViewer Padding="12,12,12,0">
+    <ScrollViewer Padding="12,0,12,0">
         <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
diff --git a/Wallet.Avalonia/ManageNavigationView.axaml b/Wallet.Avalonia/ManageNavigationView.axaml
index 14906ee..2fdb5c0 100644
--- a/Wallet.Avalonia/ManageNavigationView.axaml
+++ b/Wallet.Avalonia/ManageNavigationView.axaml
@@ -8,4 +8,7 @@
             <NavigateAction Region="Main" Route="Manage" />
         </EventTriggerBehavior>
     </Interaction.Behaviors>
+    <NavigationViewItem.IconSource>
+        <PathIconSource Data="M692.224,655.36C684.032,655.36 677.547,657.749 672.768,662.528C667.989,667.307 665.6,673.451 665.6,680.96C665.6,688.469 667.989,694.613 672.768,699.392C677.547,704.171 683.349,706.56 690.176,706.56L743.424,706.56C750.251,706.56 756.053,704.171 760.832,699.392C765.611,694.613 768,688.469 768,680.96C768,673.451 765.611,667.307 760.832,662.528C756.053,657.749 750.251,655.36 743.424,655.36ZM153.6,321.536C153.6,301.056 161.109,283.307 176.128,268.288C191.147,253.269 209.579,245.76 231.424,245.76L716.8,245.76C745.472,245.76 769.707,255.659 789.504,275.456C809.301,295.253 819.2,319.488 819.2,348.16L819.2,362.496C835.584,370.688 848.213,382.976 857.088,399.36C865.963,415.744 870.4,432.811 870.4,450.56L870.4,860.16C870.4,888.832 860.501,913.067 840.704,932.864C820.907,952.661 796.672,962.56 768,962.56L282.624,962.56C247.125,962.56 216.747,949.931 191.488,924.672C166.229,899.413 153.6,869.717 153.6,835.584ZM716.8,296.96L231.424,296.96C223.232,296.96 216.747,299.349 211.968,304.128C207.189,308.907 204.8,315.051 204.8,322.56C204.8,330.069 207.189,336.213 211.968,340.992C216.747,345.771 223.232,348.16 231.424,348.16L768,348.16C768,334.507 762.88,322.56 752.64,312.32C742.4,302.08 730.453,296.96 716.8,296.96ZM231.424,399.36C221.867,399.36 212.992,397.995 204.8,395.264L204.8,833.536C204.8,855.381 212.309,873.813 227.328,888.832C242.347,903.851 260.779,911.36 282.624,911.36L768,911.36C781.653,911.36 793.6,906.24 803.84,896C814.08,885.76 819.2,873.813 819.2,860.16L819.2,450.56C819.2,436.907 814.08,424.96 803.84,414.72C793.6,404.48 781.653,399.36 768,399.36Z" />
+    </NavigationViewItem.IconSource>
 </NavigationViewItem>
diff --git a/Wallet.Avalonia/ManageView.axaml b/Wallet.Avalonia/ManageView.axaml
index 2f9699e..c7de466 100644
--- a/Wallet.Avalonia/ManageView.axaml
+++ b/Wallet.Avalonia/ManageView.axaml
@@ -4,7 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Wallet"
     x:DataType="vm:ManageViewModel">
-    <ScrollViewer Padding="12" HorizontalAlignment="Stretch">
+    <ScrollViewer
+        Margin="0,44,0,0"
+        Padding="12,0,12,12"
+        HorizontalAlignment="Stretch">
         <ItemsControl
             MaxWidth="768"
             ItemTemplate="{ReflectionBinding Template}"
diff --git a/Wallet.Avalonia/PinEntryView.axaml b/Wallet.Avalonia/PinEntryView.axaml
new file mode 100644
index 0000000..cab9c7d
--- /dev/null
+++ b/Wallet.Avalonia/PinEntryView.axaml
@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Wallet.Avalonia.PinEntryView">
+  Welcome to Avalonia!
+</UserControl>
diff --git a/Wallet.Avalonia/PinEntryView.axaml.cs b/Wallet.Avalonia/PinEntryView.axaml.cs
new file mode 100644
index 0000000..d1f8e0e
--- /dev/null
+++ b/Wallet.Avalonia/PinEntryView.axaml.cs
@@ -0,0 +1,10 @@
+using Toolkit.UI.Controls.Avalonia;
+
+namespace Wallet.Avalonia;
+
+public partial class PinEntryView : 
+    SettingsExpander
+{
+    public PinEntryView() => 
+        InitializeComponent();
+}
diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index 65b0970..75a6cf7 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -82,7 +82,6 @@
                         <ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
-                <NavigateAction Region="Main" Route="Wallet" />
                 <InvokeNavigationViewItemAction />
             </ConditionAction>
         </AttachedEventTriggerBehaviour>
diff --git a/Wallet.Avalonia/WalletView.axaml b/Wallet.Avalonia/WalletView.axaml
index b4a59be..d0acc3e 100644
--- a/Wallet.Avalonia/WalletView.axaml
+++ b/Wallet.Avalonia/WalletView.axaml
@@ -51,10 +51,7 @@
             BorderThickness="1,1,0,0"
             CornerRadius="8 0 0 0">
             <Grid RowDefinitions="Auto, *">
-                <Border
-                    Grid.Row="0"
-                    Height="44"
-                    Padding="4">
+                <Border Grid.Row="0" Padding="4">
                     <ContentControl>
                         <Interaction.Behaviors>
                             <AttachedBehaviour>
diff --git a/Wallet/ItemConfiguration.cs b/Wallet/ItemConfiguration.cs
index f140faf..422099b 100644
--- a/Wallet/ItemConfiguration.cs
+++ b/Wallet/ItemConfiguration.cs
@@ -798,11 +798,12 @@ public record ItemConfiguration
             {
                 Entries = new List<ItemEntryConfiguration>
                 {
-                    new TextEntryConfiguration
-                    {
-                        Label = "Pin"
-                    },
                     new PinEntryConfiguration
+                    {
+                        Label = "Pin",
+                        Maximum = 4
+                    },
+                    new TextEntryConfiguration
                     {
                         Label = "Credit Limit",
                     },
diff --git a/Wallet/MaskedTextEntryViewModelHandler.cs b/Wallet/MaskedTextEntryViewModelHandler.cs
index de0b364..3c82331 100644
--- a/Wallet/MaskedTextEntryViewModelHandler.cs
+++ b/Wallet/MaskedTextEntryViewModelHandler.cs
@@ -11,7 +11,7 @@ public class MaskedTextEntryViewModelHandler(IServiceFactory serviceFactory) :
         if (args.Sender is MaskedTextEntryConfiguration configuration)
         {
             string? label = configuration.Label;
-            object? value = configuration.Value ?? "";
+            string? value = $"{configuration.Value}" ?? "";
             double? width = configuration.Width;
 
             if (serviceFactory.Create<MaskedTextEntryViewModel>([.. args.Parameters, configuration, configuration.Pattern, label, value, width])
diff --git a/Wallet/PinEntryConfiguration.cs b/Wallet/PinEntryConfiguration.cs
index 6876ce7..173f557 100644
--- a/Wallet/PinEntryConfiguration.cs
+++ b/Wallet/PinEntryConfiguration.cs
@@ -7,4 +7,3 @@ public record PinEntryConfiguration :
 
     public int Maximum { get; set; }
 }
-
diff --git a/Wallet/PinEntryViewModel.cs b/Wallet/PinEntryViewModel.cs
new file mode 100644
index 0000000..d99426a
--- /dev/null
+++ b/Wallet/PinEntryViewModel.cs
@@ -0,0 +1,15 @@
+using Toolkit.Foundation;
+
+namespace Wallet;
+
+public partial class PinEntryViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscription subscriber,
+    IDisposer disposer,
+    ItemState state,
+    ItemEntryConfiguration configuration,
+    string key,
+    string value,
+    double width) : ItemEntryViewModel<string>(provider, factory, mediator, publisher, subscriber, disposer, state, configuration, key, value, width);
\ No newline at end of file
diff --git a/Wallet/PinEntryViewModelHandler.cs b/Wallet/PinEntryViewModelHandler.cs
new file mode 100644
index 0000000..dcb4680
--- /dev/null
+++ b/Wallet/PinEntryViewModelHandler.cs
@@ -0,0 +1,26 @@
+using Toolkit.Foundation;
+
+namespace Wallet;
+
+public class PinEntryViewModelHandler(IServiceFactory serviceFactory) :
+    IHandler<CreateEventArgs<PinEntryConfiguration>, IItemEntryViewModel?>
+{
+    public Task<IItemEntryViewModel?> Handle(CreateEventArgs<PinEntryConfiguration> args,
+        CancellationToken cancellationToken)
+    {
+        if (args.Sender is PinEntryConfiguration configuration)
+        {
+            string? label = configuration.Label;
+            string? value = $"{configuration.Value}" ?? "";
+            double? width = configuration.Width;
+
+            if (serviceFactory.Create<PinEntryViewModel>([.. args.Parameters, configuration, label, value, width])
+                is PinEntryViewModel viewModel)
+            {
+                return Task.FromResult<IItemEntryViewModel?>(viewModel);
+            }
+        }
+
+        return Task.FromResult<IItemEntryViewModel?>(default);
+    }
+}