diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor b/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor
index c096452d2..33f7a141a 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor
@@ -119,7 +119,7 @@
                     @for (int i = TiersRange.First(); i <= TiersRange.Last(); i++)
                     {
                         int tier = i;
-                        bool isSelected = ViewModel.SelectedTiers.Contains(tier);
+                        bool isSelected = ViewModel!.SelectedTiers.Contains(tier);
                         <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleTierSelection(tier, args))" oncontextmenu="return false;">
                             @tier.ToTierString()
                         </MudButton>
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor b/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor
index 9747ffe18..928f30f8e 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor
@@ -55,7 +55,8 @@
 
 @if (ViewModel is not null)
 {
-    <MudTextField AutoFocus T="string" Margin="Margin.Normal" Adornment="Adornment.Start" Placeholder="@Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_TypeName))" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Variant="Variant.Outlined" Label="@Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_SearchAndPin))" @bind-Text="@ViewModel.ResearchedShip" Immediate="true" DebounceInterval="150"/>
+    <div style="margin: 8px 0;"></div>
+    <MudTextField AutoFocus T="string" Margin="Margin.Dense" Adornment="Adornment.Start" Placeholder="@Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_TypeName))" AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" Variant="Variant.Outlined" Label="@Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_SearchAndPin))" @bind-Text="@ViewModel.ResearchedShip" Immediate DebounceInterval="150"/>
     if (!string.IsNullOrEmpty(ViewModel.ResearchedShip))
     {
         <MudPaper Style="max-height: 300px; overflow:auto; margin-top: -9px" Outlined="true">
@@ -65,7 +66,7 @@
                         <MudStack Row Justify="Justify.Center" AlignItems="AlignItems.Center">
                             <MudImage Src="@($"{CdnOptions.Value.Host}{CdnOptions.Value.ShipImagePath}/{ship.Index}.png")" Height="35" ObjectPosition="ObjectPosition.Center"/>
                             <MudText Color="Color.Secondary" Class="mt-3">
-                                @(LocalizeShipName(ship.Index))
+                                @LocalizeShipName(ship.Index)
                             </MudText>
                         </MudStack>
                     </MudListItem>