diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor b/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor
index 33f7a141a..9649cee2d 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/ComparisonShipFilter.razor
@@ -13,10 +13,10 @@
                 @Localizer.SimpleAppLocalization(nameof(Translation.ShipSelectionWindow_TierFilter))
             </MudText>
             <MudButtonGroup OverrideStyles="false" Class="gap-2 mb-1" Style="flex-wrap: wrap" Size="Size.Small">
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllTiers(true))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllTiers(true))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_All))
                 </MudButton>
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllTiers(false))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllTiers(false))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_None))
                 </MudButton>
             </MudButtonGroup>
@@ -26,7 +26,7 @@
             {
                 int tier = i;
                 bool isSelected = ViewModel!.SelectedTiers.Contains(tier);
-                <MudButton @key="tier" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleTierSelection(tier, args))" oncontextmenu="return false;">
+                <MudButton @key="tier" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleTierSelection(tier, args))" oncontextmenu="return false;">
                     @tier.ToTierString()
                 </MudButton>
             }
@@ -36,10 +36,10 @@
                 @Localizer.SimpleAppLocalization(nameof(Translation.ShipSelectionWindow_ClassFilter))
             </MudText>
             <MudButtonGroup OverrideStyles="false" Class="gap-2 mb-1" Style="flex-wrap: wrap" Size="Size.Small">
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllClasses(true))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllClasses(true))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_All))
                 </MudButton>
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllClasses(false))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllClasses(false))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_None))
                 </MudButton>
             </MudButtonGroup>
@@ -48,7 +48,7 @@
             @foreach (var shipClass in ViewModel!.AvailableClasses)
             {
                 bool isSelected = ViewModel.SelectedClasses.Contains(shipClass);
-                <MudButton @key="shipClass" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleClassSelection(shipClass, args))" oncontextmenu="return false;">
+                <MudButton @key="shipClass" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleClassSelection(shipClass, args))" oncontextmenu="return false;">
                     @Localizer.GetAppLocalization(shipClass.ShipClassToString()).Localization
                 </MudButton>
             }
@@ -58,10 +58,10 @@
                 @Localizer.SimpleAppLocalization(nameof(Translation.ShipSelectionWindow_NationFilter))
             </MudText>
             <MudButtonGroup OverrideStyles="false" Class="gap-2 mb-1" Style="flex-wrap: wrap" Size="Size.Small">
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllNations(true))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllNations(true))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_All))
                 </MudButton>
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllNations(false))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllNations(false))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_None))
                 </MudButton>
             </MudButtonGroup>
@@ -70,7 +70,7 @@
             @foreach (var nation in ViewModel!.AvailableNations)
             {
                 bool isSelected = ViewModel.SelectedNations.Contains(nation);
-                <MudButton @key="nation" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleNationSelection(nation, args))" oncontextmenu="return false;">
+                <MudButton @key="nation" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleNationSelection(nation, args))" oncontextmenu="return false;">
                     @Localizer.GetAppLocalization(nation.ShipNationToString()).Localization
                 </MudButton>
             }
@@ -80,10 +80,10 @@
                 @Localizer.SimpleAppLocalization(nameof(Translation.ShipSelectionWindow_TypeFilter))
             </MudText>
             <MudButtonGroup OverrideStyles="false" Class="gap-2 mb-1" Style="flex-wrap: wrap" Size="Size.Small">
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllCategories(true))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllCategories(true))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_All))
                 </MudButton>
-                <MudButton Variant="Variant.Text" Color="Color.Info" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllCategories(false))">
+                <MudButton Variant="Variant.Text" Color="Color.Primary" DisableElevation="true" Size="Size.Small" OnClick="@(() => ToggleAllCategories(false))">
                     @Localizer.SimpleAppLocalization(nameof(Translation.ShipComparison_None))
                 </MudButton>
             </MudButtonGroup>
@@ -92,7 +92,7 @@
             @foreach (var category in ViewModel!.AvailableShipCategories)
             {
                 bool isSelected = ViewModel.SelectedCategories.Contains(category);
-                <MudButton @key="category" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleCategorySelection(category, args))" oncontextmenu="return false;">
+                <MudButton @key="category" DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleCategorySelection(category, args))" oncontextmenu="return false;">
                     @Localizer.GetAppLocalization(category.ShipCategoryToString()).Localization
                 </MudButton>
             }
@@ -120,7 +120,7 @@
                     {
                         int tier = i;
                         bool isSelected = ViewModel!.SelectedTiers.Contains(tier);
-                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleTierSelection(tier, args))" oncontextmenu="return false;">
+                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleTierSelection(tier, args))" oncontextmenu="return false;">
                             @tier.ToTierString()
                         </MudButton>
                     }
@@ -129,7 +129,7 @@
                     @foreach (var shipClass in ViewModel!.AvailableClasses)
                     {
                         bool isSelected = ViewModel.SelectedClasses.Contains(shipClass);
-                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleClassSelection(shipClass, args))" oncontextmenu="return false;">
+                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleClassSelection(shipClass, args))" oncontextmenu="return false;">
                             @Localizer.GetAppLocalization(shipClass.ShipClassToString()).Localization
                         </MudButton>
                     }
@@ -138,7 +138,7 @@
                     @foreach (var nation in ViewModel!.AvailableNations)
                     {
                         bool isSelected = ViewModel.SelectedNations.Contains(nation);
-                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleNationSelection(nation, args))" oncontextmenu="return false;">
+                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleNationSelection(nation, args))" oncontextmenu="return false;">
                             @Localizer.GetAppLocalization(nation.ShipNationToString()).Localization
                         </MudButton>
                     }
@@ -147,7 +147,7 @@
                     @foreach (var category in ViewModel!.AvailableShipCategories)
                     {
                         bool isSelected = ViewModel.SelectedCategories.Contains(category);
-                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="GetColorFromBool(isSelected)" @onmouseup="@(args => ToggleCategorySelection(category, args))" oncontextmenu="return false;">
+                        <MudButton DisableElevation="true" Variant="GetVariantFromBool(isSelected)" Color="Color.Primary" @onmouseup="@(args => ToggleCategorySelection(category, args))" oncontextmenu="return false;">
                             @Localizer.GetAppLocalization(category.ShipCategoryToString()).Localization
                         </MudButton>
                     }
@@ -203,11 +203,6 @@
         return active ? Variant.Filled : Variant.Outlined;
     }
 
-    private static Color GetColorFromBool(bool active)
-    {
-        return active ? Color.Primary : Color.Secondary;
-    }
-
     private async Task ToggleTierSelection(int tier, MouseEventArgs args)
     {
         if (args.Button == 2)
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AaDefenseFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AaDefenseFragment.razor
index 5c0ac1bb7..98d4b2a3e 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AaDefenseFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AaDefenseFragment.razor
@@ -33,9 +33,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -50,9 +48,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -67,9 +63,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -84,9 +78,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -101,9 +93,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -118,9 +108,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -135,9 +123,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -152,9 +138,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -169,9 +153,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -186,9 +168,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -203,11 +183,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AerialTorpedoesFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AerialTorpedoesFragment.razor
index 592d8b291..94612396f 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AerialTorpedoesFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AerialTorpedoesFragment.razor
@@ -49,9 +49,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -75,9 +73,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -101,9 +97,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -127,9 +121,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -153,9 +145,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -179,9 +169,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -205,9 +193,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -231,9 +217,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -257,9 +241,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -283,9 +265,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -309,9 +289,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -335,9 +313,7 @@
                         }
                         else if (classes is null && !context.Item.TorpedoBombers.WeaponDamage.Any())
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         else if (classes is not null)
                         {
@@ -356,11 +332,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AirStrikeFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AirStrikeFragment.razor
index 852325492..dd1435063 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AirStrikeFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AirStrikeFragment.razor
@@ -40,9 +40,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -57,9 +55,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -74,9 +70,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -91,9 +85,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -108,9 +100,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -125,9 +115,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -142,9 +130,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -159,9 +145,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -176,9 +160,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -193,9 +175,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -210,9 +190,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -227,9 +205,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -244,9 +220,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -261,9 +235,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -278,11 +250,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ApShellFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ApShellFragment.razor
index b537d56b2..b4e561fc2 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ApShellFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ApShellFragment.razor
@@ -38,9 +38,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -55,9 +53,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -72,9 +68,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -89,9 +83,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -106,9 +98,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -123,9 +113,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -140,9 +128,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -157,9 +143,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -174,9 +158,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -191,9 +173,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -208,9 +188,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -225,11 +203,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AswFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AswFragment.razor
index 1af2df3ad..682b1e564 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AswFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/AswFragment.razor
@@ -40,9 +40,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -57,9 +55,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -74,9 +70,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -91,9 +85,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -108,9 +100,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -125,9 +115,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -142,9 +130,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -159,9 +145,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -176,9 +160,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -193,9 +175,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -210,9 +190,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -227,9 +205,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -244,9 +220,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -261,9 +235,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -278,11 +250,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombersFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombersFragment.razor
index be69b1602..51184d2fe 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombersFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombersFragment.razor
@@ -59,9 +59,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -85,9 +83,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -111,9 +107,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -137,9 +131,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -163,9 +155,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -189,9 +179,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -215,9 +203,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -241,9 +227,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -267,9 +251,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -293,9 +275,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -319,9 +299,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -345,9 +323,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -371,9 +347,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -397,9 +371,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -423,9 +395,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -449,9 +419,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -475,9 +443,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -501,9 +467,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -527,9 +491,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -553,9 +515,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -579,9 +539,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -605,9 +563,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -631,9 +587,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -657,9 +611,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -683,9 +635,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -709,11 +659,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombsFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombsFragment.razor
index 307470738..1f29e0d23 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombsFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/BombsFragment.razor
@@ -48,9 +48,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -75,9 +73,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -101,9 +97,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -127,9 +121,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -153,9 +145,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -176,9 +166,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -188,9 +176,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -211,9 +197,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -223,9 +207,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -246,9 +228,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -258,9 +238,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -281,9 +259,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -293,9 +269,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -316,9 +290,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -328,9 +300,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -351,9 +321,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -363,9 +331,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -386,9 +352,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -398,11 +362,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ConcealmentFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ConcealmentFragment.razor
index 210725916..4e090efa8 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ConcealmentFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ConcealmentFragment.razor
@@ -27,9 +27,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -44,9 +42,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -61,9 +57,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -78,9 +72,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -95,9 +87,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -112,11 +102,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/HeShellFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/HeShellFragment.razor
index 41f66ed10..588122e67 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/HeShellFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/HeShellFragment.razor
@@ -37,9 +37,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -54,9 +52,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -71,9 +67,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -88,9 +82,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -105,9 +97,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -122,9 +112,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -139,9 +127,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -156,9 +142,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -173,9 +157,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -190,9 +172,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -207,9 +187,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -224,11 +202,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/MainBatteryFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/MainBatteryFragment.razor
index 2acfe6b2f..4934982a7 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/MainBatteryFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/MainBatteryFragment.razor
@@ -49,9 +49,7 @@
                }
                else
                {
-                   <MudText Typo="Typo.body2" Color="Color.Primary">
-                       @ShipComparisonViewModel.DataNotAvailable
-                   </MudText>
+                   @UtilityFragments.DataNotAvailableFragment
                }
            </CellTemplate>
         </TemplateColumn>
@@ -66,9 +64,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -83,9 +79,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -100,9 +94,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -117,9 +109,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -134,9 +124,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -151,9 +139,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -168,9 +154,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -185,9 +169,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -203,9 +185,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -220,9 +200,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -237,9 +215,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -254,9 +230,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -271,9 +245,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -288,9 +260,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -305,9 +275,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -322,11 +290,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ManeuverabilityFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ManeuverabilityFragment.razor
index 97028b45a..539da4726 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ManeuverabilityFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/ManeuverabilityFragment.razor
@@ -38,9 +38,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -55,9 +53,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -72,9 +68,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -89,9 +83,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -106,9 +98,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -123,9 +113,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -140,9 +128,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -157,9 +143,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -174,9 +158,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -191,9 +173,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -208,9 +188,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -225,9 +203,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -236,4 +212,4 @@
 
         <PropertyColumn ID="@($"{dataSectionString}_{columnTitleEngineProtection}")" Hidden="@element.IsColumnHidden.Invoke(dataSectionString, columnTitleEngineProtection)" T="GridDataWrapper" TProperty="decimal" Property="@(x => x.ManeuverabilityData.EngineProtection)" Title="@columnTitleEngineProtection" HeaderClass="column-text-center" CellClass="column-text-center"/>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketPlanesFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketPlanesFragment.razor
index c22461167..31b68be2d 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketPlanesFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketPlanesFragment.razor
@@ -58,9 +58,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -84,9 +82,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -110,9 +106,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -136,9 +130,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -162,9 +154,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -188,9 +178,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -214,9 +202,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -240,9 +226,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -266,9 +250,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -292,9 +274,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -318,9 +298,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -344,9 +322,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -370,9 +346,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -396,9 +370,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -422,9 +394,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -448,9 +418,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -474,9 +442,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -500,9 +466,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -526,9 +490,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -552,9 +514,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -578,9 +538,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -604,9 +562,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -630,9 +586,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -656,9 +610,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -682,11 +634,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketsFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketsFragment.razor
index cbdb3b2c9..3d426a141 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketsFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/RocketsFragment.razor
@@ -48,9 +48,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -74,9 +72,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -100,9 +96,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -126,9 +120,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -152,9 +144,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -175,9 +165,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -187,9 +175,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -210,9 +196,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -222,9 +206,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -245,9 +227,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -257,9 +237,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -280,9 +258,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -292,9 +268,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -315,9 +289,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -327,9 +299,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -350,9 +320,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -362,9 +330,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -385,9 +351,7 @@
                         }
                         else
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         if (i < items.Count - 1)
                         {
@@ -397,11 +361,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SapShellFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SapShellFragment.razor
index 42c633527..3daaec774 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SapShellFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SapShellFragment.razor
@@ -35,9 +35,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -52,9 +50,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -69,9 +65,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -86,9 +80,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -103,9 +95,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -120,9 +110,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -137,9 +125,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -154,9 +140,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -171,9 +155,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -188,11 +170,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryFragment.razor
index 2f6809fc7..43143afb4 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryFragment.razor
@@ -47,9 +47,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -74,9 +72,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -91,9 +87,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -117,9 +111,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -143,9 +135,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -169,9 +159,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -195,9 +183,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -212,11 +198,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryShellsFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryShellsFragment.razor
index c426ff603..f5368ffc5 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryShellsFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SecondaryBatteryShellsFragment.razor
@@ -49,9 +49,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -66,9 +64,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -92,9 +88,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -118,9 +112,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -144,9 +136,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -170,9 +160,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -196,9 +184,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -222,9 +208,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -248,9 +232,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -274,9 +256,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -300,9 +280,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -326,9 +304,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -352,9 +328,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -378,11 +352,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SonarFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SonarFragment.razor
index fa4278a86..093558277 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SonarFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SonarFragment.razor
@@ -33,9 +33,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -50,9 +48,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -67,9 +63,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -84,9 +78,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -101,9 +93,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -118,9 +108,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -135,9 +123,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -152,11 +138,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SurvivabilityFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SurvivabilityFragment.razor
index 4def345dd..bc05d686d 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SurvivabilityFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/SurvivabilityFragment.razor
@@ -39,9 +39,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -56,9 +54,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -75,9 +71,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -96,9 +90,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -115,9 +107,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -136,11 +126,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoBombersFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoBombersFragment.razor
index ddd7b78ff..504836ec6 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoBombersFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoBombersFragment.razor
@@ -58,9 +58,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -84,9 +82,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -110,9 +106,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -136,9 +130,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -162,9 +154,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -188,9 +178,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -214,9 +202,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -240,9 +226,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -266,9 +250,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -292,9 +274,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -318,9 +298,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -344,9 +322,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -370,9 +346,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -396,9 +370,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -422,9 +394,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -448,9 +418,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -474,9 +442,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -500,9 +466,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -526,9 +490,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -552,9 +514,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -578,9 +538,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -604,9 +562,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -630,9 +586,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -656,9 +610,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -682,11 +634,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoesFragment.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoesFragment.razor
index 4f1605573..6f50aa525 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoesFragment.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/TorpedoesFragment.razor
@@ -52,9 +52,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -85,16 +83,12 @@
                     }
                     else
                     {
-                        <MudText Typo="Typo.body2" Color="Color.Primary">
-                            @ShipComparisonViewModel.DataNotAvailable
-                        </MudText>
+                        @UtilityFragments.DataNotAvailableFragment
                     }
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -109,9 +103,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -126,9 +118,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -143,9 +133,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -160,9 +148,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -177,9 +163,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -203,9 +187,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -229,9 +211,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -242,9 +222,7 @@
                    List<string?> torps = context.Item.Torpedo.FullSalvoDamage.Where(x => !string.IsNullOrEmpty(x)).ToList();
                    if (torps.Count == 0)
                    {
-                       <MudText Typo="Typo.body2" Color="Color.Primary">
-                           @ShipComparisonViewModel.DataNotAvailable
-                       </MudText>
+                       @UtilityFragments.DataNotAvailableFragment
                    }
                    else
                    {
@@ -283,9 +261,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -309,9 +285,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -335,9 +309,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -361,9 +333,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -387,9 +357,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -413,9 +381,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -439,9 +405,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -465,9 +429,7 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
@@ -491,9 +453,7 @@
                         }
                         else if (classes is null && !context.Item.Torpedo.Damage.Any())
                         {
-                            <MudText Typo="Typo.body2" Color="Color.Primary">
-                                @ShipComparisonViewModel.DataNotAvailable
-                            </MudText>
+                            @UtilityFragments.DataNotAvailableFragment
                         }
                         else if (classes is not null)
                         {
@@ -512,11 +472,9 @@
                 }
                 else
                 {
-                    <MudText Typo="Typo.body2" Color="Color.Primary">
-                        @ShipComparisonViewModel.DataNotAvailable
-                    </MudText>
+                    @UtilityFragments.DataNotAvailableFragment
                 }
             </CellTemplate>
         </TemplateColumn>
     };
-}
\ No newline at end of file
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/UtilityFragments.razor b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/UtilityFragments.razor
new file mode 100644
index 000000000..a061ad3d2
--- /dev/null
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/GridSections/UtilityFragments.razor
@@ -0,0 +1,10 @@
+@code {
+    // Parameter needs to be named __builder, otherwise compilation will fail.
+    // ReSharper disable once InconsistentNaming UnusedParameter.Local
+    public static readonly RenderFragment DataNotAvailableFragment = __builder =>
+    {
+        <MudText Typo="Typo.body2" Color="Color.Dark">
+            @ShipComparisonViewModel.DataNotAvailable
+        </MudText>
+    };
+}
diff --git a/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor b/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor
index 928f30f8e..4abedf333 100644
--- a/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor
+++ b/WoWsShipBuilder.Common/Features/ShipComparison/ShipComparison.razor
@@ -56,7 +56,9 @@
 @if (ViewModel is not null)
 {
     <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"/>
+    <MudPaper>
+        <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"/>
+    </MudPaper>
     if (!string.IsNullOrEmpty(ViewModel.ResearchedShip))
     {
         <MudPaper Style="max-height: 300px; overflow:auto; margin-top: -9px" Outlined="true">
@@ -144,17 +146,17 @@
             <MudNumericField Value="@ViewModel.Range" ValueChanged="@(async range => await UpdateRange(range))" Label="@($"{Localizer.GetAppLocalization(nameof(Translation.ShipStats_Range)).Localization} ({Localizer.GetAppLocalization(nameof(Translation.Unit_KM)).Localization})")" Class="mud-data-grid-range-selector" Variant="Variant.Text" Immediate="true" T="double" DebounceInterval="500" Margin="Margin.Dense" Min="1" Max="50" Step="0.5"/>
         </ToolBarContent>
         <Columns>
-            <TemplateColumn T="GridDataWrapper" ShowColumnOptions="false" Hideable="false" Filterable="false" DragAndDropEnabled="false" StickyLeft SortBy="@(x => !ViewModel.SelectedShipList.ContainsKey(x.Id))" HeaderStyle="width:70px; background-clip: padding-box; background-color: #282828;" CellStyle="@($"width:70px; {StickyColumnsBackgroundColor}")" Resizable="false" HeaderClass="column-text-center" CellClass="column-text-center">
+            <TemplateColumn T="GridDataWrapper" ShowColumnOptions="false" Hideable="false" Filterable="false" DragAndDropEnabled="false" StickyLeft SortBy="@(x => !ViewModel.SelectedShipList.ContainsKey(x.Id))" HeaderStyle="width:70px; background-clip: padding-box; background-color: var(--mud-palette-surface);" CellStyle="@($"width:70px; {StickyColumnsBackgroundColor}")" Resizable="false" HeaderClass="column-text-center" CellClass="column-text-center">
                 <CellTemplate>
                     <MudIcon Icon="@(ViewModel.SelectedShipList.ContainsKey(context.Item.Id) ? Icons.Material.Filled.CheckBox : Icons.Material.Filled.CheckBoxOutlineBlank)" Size="Size.Medium" Color="@(ViewModel.SelectedShipList.ContainsKey(context.Item.Id) ? Color.Info : Color.Default)" Style="cursor: pointer" onclick="@(() => AddSelectedShip(context.Item))" ViewBox="1 1 24 24" Class="mt-1 mb-n1"/>
                 </CellTemplate>
             </TemplateColumn>
-            <TemplateColumn T="GridDataWrapper" Filterable="false" Hideable="false" ShowColumnOptions="false" DragAndDropEnabled="false" StickyLeft SortBy="@(x => !ViewModel.PinnedShipList.ContainsKey(x.Id))" HeaderStyle="width:70px; background-clip: padding-box; background-color: #282828;" CellStyle="@($"width:70px; {StickyColumnsBackgroundColor}")" Resizable="false" HeaderClass="column-text-center" CellClass="column-text-center">
+            <TemplateColumn T="GridDataWrapper" Filterable="false" Hideable="false" ShowColumnOptions="false" DragAndDropEnabled="false" StickyLeft SortBy="@(x => !ViewModel.PinnedShipList.ContainsKey(x.Id))" HeaderStyle="width:70px; background-clip: padding-box; background-color: var(--mud-palette-surface);" CellStyle="@($"width:70px; {StickyColumnsBackgroundColor}")" Resizable="false" HeaderClass="column-text-center" CellClass="column-text-center">
                 <CellTemplate>
                     <MudIcon Icon="@(ViewModel.PinnedShipList.ContainsKey(context.Item.Id) ? Icons.Material.Filled.PushPin : Icons.Material.Outlined.PushPin)" Size="Size.Medium" Color="@(ViewModel.PinnedShipList.ContainsKey(context.Item.Id) ? Color.Info : Color.Default)" Style="cursor: pointer" onclick="@(() => AddPinnedShip(context.Item))" ViewBox="1 1 24 24" Class="mt-1 mb-n1"/>
                 </CellTemplate>
             </TemplateColumn>
-            <TemplateColumn T="GridDataWrapper" TProperty="string" Title="@Localizer.SimpleAppLocalization(nameof(Translation.ShipStats_Name))" Hideable="false" StickyLeft HeaderStyle="background-clip: padding-box; background-color: #282828;" CellStyle="@($"cursor: pointer; background-clip: padding-box; {StickyColumnsBackgroundColor}")" SortBy="@(x => LocalizeShipName(x.Ship.Index))" InitialDirection="SortDirection.Ascending" HeaderClass="column-text-center" CellClass="column-text-center">
+            <TemplateColumn T="GridDataWrapper" TProperty="string" Title="@Localizer.SimpleAppLocalization(nameof(Translation.ShipStats_Name))" Hideable="false" StickyLeft HeaderStyle="background-clip: padding-box; background-color: var(--mud-palette-surface);" CellStyle="@($"cursor: pointer; background-clip: padding-box; {StickyColumnsBackgroundColor}")" SortBy="@(x => LocalizeShipName(x.Ship.Index))" InitialDirection="SortDirection.Ascending" HeaderClass="column-text-center" CellClass="column-text-center">
                 <CellTemplate>
                     <MudText Typo="Typo.body2" @onclick="@(() => ViewShipStats(context.Item.ShipBuildContainer))">
                         @LocalizeShipName(context.Item.ShipIndex)
@@ -208,7 +210,7 @@
                     }
                     else
                     {
-                        <MudText Typo="Typo.body2" Color="Color.Primary" Style="cursor: pointer" @onclick="@(() => EditBuilds(context.Item))">
+                        <MudText Typo="Typo.body2" Color="Color.Dark" Style="cursor: pointer" @onclick="@(() => EditBuilds(context.Item))">
                             @Build.DefaultBuildName
                         </MudText>
                     }
@@ -251,7 +253,7 @@
 
     private MudDataGrid<GridDataWrapper> dataGrid = default!;
 
-    private const string StickyColumnsBackgroundColor = "background-color: #242424";
+    private const string StickyColumnsBackgroundColor = "background-color: #262626";
 
     private const string TiersUrlParameter = "t";