diff --git a/Bitvault.Avalonia/DropdownEntryView.axaml b/Bitvault.Avalonia/DropdownEntryView.axaml
index 0107d14..7917c51 100644
--- a/Bitvault.Avalonia/DropdownEntryView.axaml
+++ b/Bitvault.Avalonia/DropdownEntryView.axaml
@@ -15,7 +15,7 @@
                 SelectedValueBinding="{ReflectionBinding Value}">
                 <ComboBox.Styles>
                     <Style Selector="ComboBox.Write">
-                        <Setter Property="MinWidth" Value="296" />
+                        <Setter Property="MinWidth" Value="{Binding Width}" />
                         <Setter Property="IsVisible" Value="True" />
                     </Style>
                     <Style Selector="ComboBox.Read">
diff --git a/Bitvault.Avalonia/MaskedTextEntryView.axaml b/Bitvault.Avalonia/MaskedTextEntryView.axaml
index 0491644..8cd25a9 100644
--- a/Bitvault.Avalonia/MaskedTextEntryView.axaml
+++ b/Bitvault.Avalonia/MaskedTextEntryView.axaml
@@ -9,7 +9,7 @@
         <MaskedTextBox Mask="{Binding Pattern}" Text="{Binding Value}">
             <TextBox.Styles>
                 <Style Selector="TextBox.Write">
-                    <Setter Property="MinWidth" Value="296" />
+                    <Setter Property="MinWidth" Value="{Binding Width}" />
                 </Style>
                 <Style Selector="TextBox.Read">
                     <Setter Property="MinWidth" Value="0" />
diff --git a/Bitvault.Avalonia/PasswordEntryView.axaml b/Bitvault.Avalonia/PasswordEntryView.axaml
index a2ec0cb..20c9b53 100644
--- a/Bitvault.Avalonia/PasswordEntryView.axaml
+++ b/Bitvault.Avalonia/PasswordEntryView.axaml
@@ -7,15 +7,58 @@
     Header="{Binding Key}">
     <SettingsExpander.Footer>
         <TextBox
-            MinWidth="264"
             Classes="revealPasswordButton"
             PasswordChar="&#x25CF;"
             Text="{Binding Value}">
+            <TextBox.Styles>
+                <Style Selector="TextBox.Write">
+                    <Setter Property="MinWidth" Value="{Binding Width}" />
+                </Style>
+                <Style Selector="TextBox.Read">
+                    <Setter Property="MinWidth" Value="0" />
+                    <Setter Property="IsReadOnly" Value="True" />
+                    <Setter Property="BorderBrush" Value="Transparent" />
+                    <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="Foreground">
+                        <Setter.Value>
+                            <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
+                        </Setter.Value>
+                    </Setter>
+                    <Style Selector="^:pointerover">
+                        <Setter Property="Foreground">
+                            <Setter.Value>
+                                <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
+                            </Setter.Value>
+                        </Setter>
+                        <Style Selector="^ /template/ Border#PART_BorderElement">
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                            <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                    </Style>
+                    <Style Selector="^:focus">
+                        <Setter Property="Foreground">
+                            <Setter.Value>
+                                <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
+                            </Setter.Value>
+                        </Setter>
+                        <Style Selector="^ /template/ Border#PART_BorderElement">
+                            <Setter Property="Background" Value="Transparent" />
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                        </Style>
+                    </Style>
+                </Style>
+            </TextBox.Styles>
             <Interaction.Behaviors>
                 <DataTriggerBehavior Binding="{Binding State}" Value="{x:Static vm:ItemState.Read}">
                     <AddClassAction ClassName="Read" RemoveIfExists="True" />
+                    <RemoveClassAction ClassName="Write" />
+                </DataTriggerBehavior>
+                <DataTriggerBehavior Binding="{Binding State}" Value="{x:Static vm:ItemState.New}">
+                    <AddClassAction ClassName="Write" RemoveIfExists="True" />
+                    <RemoveClassAction ClassName="Read" />
                 </DataTriggerBehavior>
                 <DataTriggerBehavior Binding="{Binding State}" Value="{x:Static vm:ItemState.Write}">
+                    <AddClassAction ClassName="Write" RemoveIfExists="True" />
                     <RemoveClassAction ClassName="Read" />
                 </DataTriggerBehavior>
             </Interaction.Behaviors>
diff --git a/Bitvault.Avalonia/TextEntryView.axaml b/Bitvault.Avalonia/TextEntryView.axaml
index 7e06de5..a32404f 100644
--- a/Bitvault.Avalonia/TextEntryView.axaml
+++ b/Bitvault.Avalonia/TextEntryView.axaml
@@ -6,6 +6,59 @@
     x:DataType="vm:TextEntryViewModel"
     Header="{Binding Key}">
     <SettingsExpander.Footer>
-        <DatePicker />
+        <TextBox Text="{Binding Value}">
+            <TextBox.Styles>
+                <Style Selector="TextBox.Write">
+                    <Setter Property="MinWidth" Value="{Binding Width}" />
+                </Style>
+                <Style Selector="TextBox.Read">
+                    <Setter Property="MinWidth" Value="0" />
+                    <Setter Property="IsReadOnly" Value="True" />
+                    <Setter Property="BorderBrush" Value="Transparent" />
+                    <Setter Property="Background" Value="Transparent" />
+                    <Setter Property="Foreground">
+                        <Setter.Value>
+                            <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
+                        </Setter.Value>
+                    </Setter>
+                    <Style Selector="^:pointerover">
+                        <Setter Property="Foreground">
+                            <Setter.Value>
+                                <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
+                            </Setter.Value>
+                        </Setter>
+                        <Style Selector="^ /template/ Border#PART_BorderElement">
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                            <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                    </Style>
+                    <Style Selector="^:focus">
+                        <Setter Property="Foreground">
+                            <Setter.Value>
+                                <SolidColorBrush Opacity="0.7" Color="{DynamicResource TextFillColorPrimary}" />
+                            </Setter.Value>
+                        </Setter>
+                        <Style Selector="^ /template/ Border#PART_BorderElement">
+                            <Setter Property="Background" Value="Transparent" />
+                            <Setter Property="BorderBrush" Value="Transparent" />
+                        </Style>
+                    </Style>
+                </Style>
+            </TextBox.Styles>
+            <Interaction.Behaviors>
+                <DataTriggerBehavior Binding="{Binding State}" Value="{x:Static vm:ItemState.Read}">
+                    <AddClassAction ClassName="Read" RemoveIfExists="True" />
+                    <RemoveClassAction ClassName="Write" />
+                </DataTriggerBehavior>
+                <DataTriggerBehavior Binding="{Binding State}" Value="{x:Static vm:ItemState.New}">
+                    <AddClassAction ClassName="Write" RemoveIfExists="True" />
+                    <RemoveClassAction ClassName="Read" />
+                </DataTriggerBehavior>
+                <DataTriggerBehavior Binding="{Binding State}" Value="{x:Static vm:ItemState.Write}">
+                    <AddClassAction ClassName="Write" RemoveIfExists="True" />
+                    <RemoveClassAction ClassName="Read" />
+                </DataTriggerBehavior>
+            </Interaction.Behaviors>
+        </TextBox>
     </SettingsExpander.Footer>
 </SettingsExpander>
diff --git a/Bitvault/DigitRule.cs b/Bitvault/DigitRule.cs
new file mode 100644
index 0000000..ea32b19
--- /dev/null
+++ b/Bitvault/DigitRule.cs
@@ -0,0 +1,13 @@
+using System.Text.RegularExpressions;
+
+namespace Bitvault;
+
+public partial class DigitRule : 
+    IPasswordRule
+{
+    public int CalculateScore(string password) =>
+        Regex().IsMatch(password) ? 2 : 0;
+
+    [GeneratedRegex(@"\d")]
+    private static partial Regex Regex();
+}
diff --git a/Bitvault/DiversityBonusRule.cs b/Bitvault/DiversityBonusRule.cs
new file mode 100644
index 0000000..88b088c
--- /dev/null
+++ b/Bitvault/DiversityBonusRule.cs
@@ -0,0 +1,29 @@
+using System.Text.RegularExpressions;
+
+namespace Bitvault;
+
+public partial class DiversityBonusRule : 
+    IPasswordRule
+{
+    public int CalculateScore(string password)
+    {
+        bool hasUppercase = UppercaseRegex().IsMatch(password);
+        bool hasLowercase = LowercaseRegex().IsMatch(password);
+        bool hasDigit = DigitRegex().IsMatch(password);
+        bool hasSpecialChar = SpecialCharRegex().IsMatch(password);
+
+        return (hasUppercase && hasLowercase && hasDigit && hasSpecialChar) ? 2 : 0;
+    }
+
+    [GeneratedRegex(@"[A-Z]")]
+    private static partial Regex UppercaseRegex();
+
+    [GeneratedRegex(@"[a-z]")]
+    private static partial Regex LowercaseRegex();
+
+    [GeneratedRegex(@"\d")]
+    private static partial Regex DigitRegex();
+
+    [GeneratedRegex(@"[^a-zA-Z0-9]")]
+    private static partial Regex SpecialCharRegex();
+}
\ No newline at end of file
diff --git a/Bitvault/IPasswordRule.cs b/Bitvault/IPasswordRule.cs
new file mode 100644
index 0000000..dc7f87e
--- /dev/null
+++ b/Bitvault/IPasswordRule.cs
@@ -0,0 +1,6 @@
+namespace Bitvault;
+
+public interface IPasswordRule
+{
+    int CalculateScore(string password);
+}
diff --git a/Bitvault/ItemConfiguration.cs b/Bitvault/ItemConfiguration.cs
index db8cc1e..d99575e 100644
--- a/Bitvault/ItemConfiguration.cs
+++ b/Bitvault/ItemConfiguration.cs
@@ -719,6 +719,7 @@ public record ItemConfiguration
                     {
                         Label = "Type",
                         Values = ["American Express", "Discover", "Maestro", "Mastercard", "Visa"],
+                        Width = 120
                     },
                     new MaskedTextEntryConfiguration
                     {
@@ -731,18 +732,21 @@ public record ItemConfiguration
                         Label = "Expiry Date",
                         Pattern = "00/00",
                         Value = "__/__",
+                        Width = 120
                     },
                     new MaskedTextEntryConfiguration
                     {
                         Label = "Valid From",
                         Pattern = "00/00",
                         Value = "__/__",
+                        Width = 120
                     },
                     new MaskedTextEntryConfiguration
                     {
                         Label = "Card verification code",
                         Pattern = "000",
                         Value = "___",
+                        Width = 120
                     },
                 }
             },
diff --git a/Bitvault/LengthRule.cs b/Bitvault/LengthRule.cs
new file mode 100644
index 0000000..f2680f5
--- /dev/null
+++ b/Bitvault/LengthRule.cs
@@ -0,0 +1,8 @@
+namespace Bitvault;
+
+public class LengthRule :
+    IPasswordRule
+{
+    public int CalculateScore(string password) => 
+        password.Length >= 8 ? 5 : 0;
+}
diff --git a/Bitvault/LowercaseRule.cs b/Bitvault/LowercaseRule.cs
new file mode 100644
index 0000000..fc696a4
--- /dev/null
+++ b/Bitvault/LowercaseRule.cs
@@ -0,0 +1,14 @@
+using System.Text.RegularExpressions;
+
+namespace Bitvault;
+
+public partial class LowercaseRule : 
+    IPasswordRule
+{
+    public int CalculateScore(string password) =>
+        Regex().IsMatch(password) ? 2 : 0;
+
+
+    [GeneratedRegex(@"[a-z]")]
+    private static partial Regex Regex();
+}
diff --git a/Bitvault/SpecialCharRule.cs b/Bitvault/SpecialCharRule.cs
new file mode 100644
index 0000000..ba2a10b
--- /dev/null
+++ b/Bitvault/SpecialCharRule.cs
@@ -0,0 +1,12 @@
+using System.Text.RegularExpressions;
+
+namespace Bitvault;
+
+public partial class SpecialCharRule : IPasswordRule
+{
+    public int CalculateScore(string password) => 
+        Regex().IsMatch(password) ? 2 : 0;
+
+    [GeneratedRegex(@"[^a-zA-Z0-9]")]
+    private static partial Regex Regex();
+}
\ No newline at end of file
diff --git a/Bitvault/UppercaseRule.cs b/Bitvault/UppercaseRule.cs
new file mode 100644
index 0000000..80ace89
--- /dev/null
+++ b/Bitvault/UppercaseRule.cs
@@ -0,0 +1,13 @@
+using System.Text.RegularExpressions;
+
+namespace Bitvault;
+
+public partial class UppercaseRule :
+    IPasswordRule
+{
+    public int CalculateScore(string password) =>
+        Regex().IsMatch(password) ? 2 : 0;
+
+    [GeneratedRegex(@"[A-Z]")]
+    private static partial Regex Regex();
+}