diff --git a/Source/NETworkManager.Utilities.WPF/DataGridHelper.cs b/Source/NETworkManager.Utilities.WPF/DataGridHelper.cs
new file mode 100644
index 0000000000..1d2aaf1ba6
--- /dev/null
+++ b/Source/NETworkManager.Utilities.WPF/DataGridHelper.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Threading;
+
+namespace NETworkManager.Utilities.WPF;
+
+/// <summary>
+/// Attached-property helpers for <see cref="DataGrid"/>.
+/// </summary>
+public static class DataGridHelper
+{
+    /// <summary>
+    /// When set to <see langword="true"/>, forces star-sized columns to recompute their width after
+    /// the first row is realized. Without this, an initially empty <see cref="DataGrid"/> sizes star
+    /// columns to <c>MinWidth</c> because the inner <see cref="System.Windows.Controls.ScrollViewer"/>
+    /// measures with infinite width; only a window resize would otherwise trigger a correct re-measure.
+    /// The handler unsubscribes itself after the first row so there is no ongoing overhead.
+    /// </summary>
+    public static readonly DependencyProperty RefreshStarColumnsOnFirstRowProperty =
+        DependencyProperty.RegisterAttached(
+            "RefreshStarColumnsOnFirstRow",
+            typeof(bool),
+            typeof(DataGridHelper),
+            new PropertyMetadata(false, OnRefreshStarColumnsOnFirstRowChanged));
+
+    public static void SetRefreshStarColumnsOnFirstRow(DataGrid element, bool value) =>
+        element.SetValue(RefreshStarColumnsOnFirstRowProperty, value);
+
+    public static bool GetRefreshStarColumnsOnFirstRow(DataGrid element) =>
+        (bool)element.GetValue(RefreshStarColumnsOnFirstRowProperty);
+
+    private static void OnRefreshStarColumnsOnFirstRowChanged(DependencyObject d,
+        DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not DataGrid dataGrid || e.NewValue is not bool enabled || !enabled)
+            return;
+
+        dataGrid.LoadingRow += Handler;
+        return;
+
+        void Handler(object sender, DataGridRowEventArgs args)
+        {
+            dataGrid.LoadingRow -= Handler;
+
+            dataGrid.Dispatcher.BeginInvoke(new Action(() =>
+            {
+                foreach (var column in dataGrid.Columns)
+                {
+                    if (!column.Width.IsStar)
+                        continue;
+
+                    var width = column.Width;
+                    column.Width = 0;
+                    column.Width = width;
+                }
+            }), DispatcherPriority.ContextIdle);
+        }
+    }
+}
diff --git a/Source/NETworkManager/Views/ConnectionsView.xaml b/Source/NETworkManager/Views/ConnectionsView.xaml
index b73fe87ba7..3374a8925e 100644
--- a/Source/NETworkManager/Views/ConnectionsView.xaml
+++ b/Source/NETworkManager/Views/ConnectionsView.xaml
@@ -11,7 +11,7 @@
              xmlns:utilities="clr-namespace:NETworkManager.Utilities;assembly=NETworkManager.Utilities"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
-             xmlns:wpfHelper="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ConnectionsViewModel}">
     <UserControl.InputBindings>
         <KeyBinding Key="F5" Command="{Binding RefreshCommand}" />
@@ -69,7 +69,7 @@
                                 Style="{StaticResource CleanButton}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
-                                       wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
+                                       wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform"
                                                  Visual="{iconPacks:Material Kind=Refresh}" />
@@ -95,11 +95,13 @@
                                  Style="{StaticResource ResourceKey=SearchTextBox}" />
                     </StackPanel>
                 </Grid>
-                <controls:MultiSelectDataGrid Grid.Column="0" Grid.Row="2"
+                <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                              Grid.Column="0" Grid.Row="2"
                                               ItemsSource="{Binding ResultsView}"
                                               SelectedItem="{Binding SelectedResult}"
                                               SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                              Sorting="DataGrid_OnSorting">
+                                              Sorting="DataGrid_OnSorting"
+                                              wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
                     <DataGrid.Resources>
                         <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                             <MenuItem Header="{x:Static localization:Strings.CopyDots}"
@@ -211,7 +213,8 @@
                                             SortMemberPath="ProcessName" MinWidth="150" />
                         <DataGridTextColumn Header="{x:Static Member=localization:Strings.ProcessPath}"
                                             Binding="{Binding Path=(network:ConnectionInfo.ProcessPath)}"
-                                            SortMemberPath="ProcessPath" MinWidth="150" />
+                                            SortMemberPath="ProcessPath" MinWidth="150"
+                                            Width="*" />
                     </DataGrid.Columns>
                 </controls:MultiSelectDataGrid>
                 <WrapPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal"
diff --git a/Source/NETworkManager/Views/ConnectionsView.xaml.cs b/Source/NETworkManager/Views/ConnectionsView.xaml.cs
index fb293f74d8..b7648e75d7 100644
--- a/Source/NETworkManager/Views/ConnectionsView.xaml.cs
+++ b/Source/NETworkManager/Views/ConnectionsView.xaml.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml b/Source/NETworkManager/Views/DNSLookupView.xaml
index 2f8d01c791..450f7e4375 100644
--- a/Source/NETworkManager/Views/DNSLookupView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupView.xaml
@@ -12,6 +12,7 @@
              xmlns:network="clr-namespace:NETworkManager.Models.Network;assembly=NETworkManager.Models"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              Loaded="UserControl_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupViewModel}">
     <UserControl.Resources>
@@ -84,7 +85,7 @@
                 <TextBlock Grid.Column="8" Grid.Row="0" Text="{x:Static localization:Strings.Type}"
                            Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
                 <ComboBox x:Name="ComboBoxTypes" Grid.Column="10" Grid.Row="0" ItemsSource="{Binding QueryTypes}"
-                          SelectedItem="{Binding QueryType}" Width="80" HorizontalAlignment="Left" />
+                          SelectedItem="{Binding QueryType}" Width="100" HorizontalAlignment="Left" />
                 <Button Grid.Column="12" Grid.Row="0" Command="{Binding QueryCommand}"
                         IsDefault="{Binding IsRunning, Converter={StaticResource BooleanReverseConverter}}"
                         HorizontalAlignment="Right">
@@ -148,9 +149,11 @@
                        Style="{DynamicResource StatusMessageTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <controls:MultiSelectDataGrid Grid.Row="3" ItemsSource="{Binding ResultsView}"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults" Grid.Row="3"
+                                      ItemsSource="{Binding ResultsView}"
                                       SelectedItem="{Binding SelectedResult}"
-                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.CopyDots}"
@@ -254,7 +257,14 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.Result}"
                                     Binding="{Binding Path=(network:DNSLookupRecordInfo.Result)}"
                                     SortMemberPath="Result"
-                                    MinWidth="200" />
+                                    MinWidth="200"
+                                    Width="*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style>
+                            <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
     </Grid>
diff --git a/Source/NETworkManager/Views/FirewallView.xaml b/Source/NETworkManager/Views/FirewallView.xaml
index b095a1cfc5..b708076dcf 100644
--- a/Source/NETworkManager/Views/FirewallView.xaml
+++ b/Source/NETworkManager/Views/FirewallView.xaml
@@ -5,8 +5,6 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-    xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
     xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
     xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
     xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
@@ -22,8 +20,6 @@
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:BooleanToStringConverter x:Key="BooleanToStringConverter" />
-        <converters:IntNotZeroToVisibilityCollapsedConverter x:Key="IntNotZeroToVisibilityCollapsedConverter" />
-        <converters:IntZeroToVisibilityCollapsedConverter x:Key="IntZeroToVisibilityCollapsedConverter" />
         <converters:FirewallProtocolToStringConverter x:Key="FirewallProtocolToStringConverter" />
         <converters:FirewallRuleDirectionToStringConverter x:Key="FirewallRuleDirectionToStringConverter" />
         <converters:FirewallRuleActionToStringConverter x:Key="FirewallRuleActionToStringConverter" />
@@ -31,15 +27,7 @@
         <converters:FirewallNetworkProfilesToStringConverter x:Key="FirewallNetworkProfilesToStringConverter" />
         <wpfHelpers:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
     </UserControl.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <!-- <ColumnDefinition Width="Auto" /> -->
-            <!-- <ColumnDefinition MinWidth="{x:Static settings:GlobalStaticConfiguration.Profile_WidthCollapsed}" -->
-            <!--                   Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" -->
-            <!--                   MaxWidth="{x:Static settings:GlobalStaticConfiguration.Profile_MaxWidthExpanded}" /> -->
-        </Grid.ColumnDefinitions>
-        <TabControl Grid.Row="0" Style="{StaticResource DefaultTabControl}">
+        <TabControl Style="{StaticResource DefaultTabControl}">
             <TabItem Header="{x:Static localization:Strings.Firewall}">
                 <Grid Margin="10">
                     <Grid.RowDefinitions>
@@ -100,6 +88,7 @@
                         ItemsSource="{Binding ResultsView}"
                         SelectedItem="{Binding SelectedResult}"
                         SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True"
                         RowDetailsVisibilityMode="Collapsed">
                         <controls:MultiSelectDataGrid.InputBindings>
                             <KeyBinding Command="{Binding EditRuleCommand}" Key="F2" />
@@ -401,7 +390,8 @@
                             <!-- Remote ports -->
                             <DataGridTextColumn Header="{x:Static localization:Strings.RemotePort}"
                                                 SortMemberPath="RemotePortsDisplay"
-                                                MinWidth="100">
+                                                MinWidth="100"
+                                                Width="*">
                                 <DataGridTextColumn.Binding>
                                     <Binding Path="(firewall:FirewallRule.RemotePortsDisplay)">
                                         <Binding.TargetNullValue>
@@ -596,600 +586,5 @@
                 </Grid>
             </TabItem>
         </TabControl>
-        
-        <!-- <GridSplitter Grid.Column="1" Grid.Row="0" -->
-        <!--               Focusable="False" -->
-        <!--               Style="{StaticResource ProfileGridSplitter}" /> -->
-        <!-- <Expander Grid.Column="2" Grid.Row="0" -->
-        <!--           x:Name="ExpanderProfiles" Header="{x:Static localization:Strings.Profiles}" -->
-        <!--           Style="{StaticResource ProfileExpander}" -->
-        <!--           IsExpanded="{Binding ExpandProfileView}"> -->
-        <!--     <Grid> -->
-        <!--         <Grid -->
-        <!--             Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=ProfileManagerIsEnabled, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"> -->
-        <!--             <Grid.RowDefinitions> -->
-        <!--                 <RowDefinition Height="Auto" /> -->
-        <!--                 <RowDefinition Height="10" /> -->
-        <!--                 <RowDefinition Height="*" /> -->
-        <!--             </Grid.RowDefinitions> -->
-        <!--             <Grid Grid.Column="0" Grid.Row="0"> -->
-        <!--                 <Grid.ColumnDefinitions> -->
-        <!--                     <ColumnDefinition Width="Auto" /> -->
-        <!--                     <ColumnDefinition Width="10" /> -->
-        <!--                     <ColumnDefinition Width="*" /> -->
-        <!--                     <ColumnDefinition Width="10" /> -->
-        <!--                     <ColumnDefinition Width="Auto" /> -->
-        <!--                     <ColumnDefinition Width="10" /> -->
-        <!--                     <ColumnDefinition Width="Auto" /> -->
-        <!--                 </Grid.ColumnDefinitions> -->
-        <!--                 <ToggleButton Grid.Column="0" Grid.Row="0" -->
-        <!--                               IsChecked="{Binding ExpandProfileView}" -->
-        <!--                               Focusable="False"> -->
-        <!--                     <ToggleButton.Style> -->
-        <!--                         <Style TargetType="{x:Type ToggleButton}" -->
-        <!--                                BasedOn="{StaticResource MahApps.Styles.Button.Circle}"> -->
-        <!--                             <Setter Property="Template"> -->
-        <!--                                 <Setter.Value> -->
-        <!--                                     <ControlTemplate TargetType="{x:Type ToggleButton}"> -->
-        <!--                                         <ContentPresenter HorizontalAlignment="Center" -->
-        <!--                                                           VerticalAlignment="Center" RecognizesAccessKey="True" /> -->
-        <!--                                     </ControlTemplate> -->
-        <!--                                 </Setter.Value> -->
-        <!--                             </Setter> -->
-        <!--                         </Style> -->
-        <!--                     </ToggleButton.Style> -->
-        <!--                     <Rectangle Width="16" Height="16"> -->
-        <!--                         <Rectangle.OpacityMask> -->
-        <!--                             <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronRight}" /> -->
-        <!--                         </Rectangle.OpacityMask> -->
-        <!--                         <Rectangle.Style> -->
-        <!--                             <Style TargetType="{x:Type Rectangle}"> -->
-        <!--                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" /> -->
-        <!--                                 <Style.Triggers> -->
-        <!--                                     <Trigger Property="IsMouseOver" Value="True"> -->
-        <!--                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                     </Trigger> -->
-        <!--                                 </Style.Triggers> -->
-        <!--                             </Style> -->
-        <!--                         </Rectangle.Style> -->
-        <!--                     </Rectangle> -->
-        <!--                 </ToggleButton> -->
-        <!--                 <TextBox x:Name="TextBoxSearch" Grid.Column="2" Grid.Row="0" VerticalAlignment="Center" -->
-        <!--                          Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" -->
-        <!--                          Style="{StaticResource SearchTextBox}"> -->
-        <!--                     <TextBox.InputBindings> -->
-        <!--                         <KeyBinding Command="{Binding ApplyProfileCommand}" Key="Enter" /> -->
-        <!--                     </TextBox.InputBindings> -->
-        <!--                 </TextBox> -->
-        <!--                 <Button Grid.Column="4" Grid.Row="0" -->
-        <!--                         x:Name="ButtonProfileFilter" -->
-        <!--                         Focusable="False" -->
-        <!--                         Style="{StaticResource ResourceKey=CleanButton}" -->
-        <!--                         Command="{Binding Path=OpenProfileFilterCommand}" -->
-        <!--                         ToolTip="{x:Static Member=localization:Strings.FilterProfilesDots}"> -->
-        <!--                     <Rectangle Width="16" Height="16"> -->
-        <!--                         <Rectangle.Resources> -->
-        <!--                             <VisualBrush x:Key="VisualFilter" Stretch="Uniform" -->
-        <!--                                          Visual="{iconPacks:Material Kind=FilterOutline}" /> -->
-        <!--                             <VisualBrush x:Key="VisualFilterRemove" Stretch="Uniform" -->
-        <!--                                          Visual="{iconPacks:Material Kind=FilterMultipleOutline}" /> -->
-        <!--                         </Rectangle.Resources> -->
-        <!--                         <Rectangle.Style> -->
-        <!--                             <Style TargetType="{x:Type TypeName=Rectangle}"> -->
-        <!--                                 <Setter Property="OpacityMask" -->
-        <!--                                         Value="{StaticResource ResourceKey=VisualFilter}" /> -->
-        <!--                                 <Setter Property="Fill" -->
-        <!--                                         Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" /> -->
-        <!--                                 <Style.Triggers> -->
-        <!--                                     <DataTrigger Binding="{Binding Path=IsProfileFilterSet}" Value="True"> -->
-        <!--                                         <Setter Property="OpacityMask" -->
-        <!--                                                 Value="{StaticResource ResourceKey=VisualFilterRemove}" /> -->
-        <!--                                     </DataTrigger> -->
-        <!--                                     <DataTrigger -->
-        <!--                                         Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}" -->
-        <!--                                         Value="True"> -->
-        <!--                                         <Setter Property="Fill" -->
-        <!--                                                 Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" /> -->
-        <!--                                     </DataTrigger> -->
-        <!--                                 </Style.Triggers> -->
-        <!--                             </Style> -->
-        <!--                         </Rectangle.Style> -->
-        <!--                     </Rectangle> -->
-        <!--                 </Button> -->
-        <!--                 <Popup PlacementTarget="{Binding ElementName=ButtonProfileFilter}" -->
-        <!--                        Placement="Bottom" StaysOpen="False" -->
-        <!--                        IsOpen="{Binding ProfileFilterIsOpen}" -->
-        <!--                        Width="220"> -->
-        <!--                     <Border Background="{DynamicResource MahApps.Brushes.Window.Background}" -->
-        <!--                             BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" -->
-        <!--                             BorderThickness="1"> -->
-        <!--                         <Grid Margin="10"> -->
-        <!--                             <Grid.RowDefinitions> -->
-        <!--                                 <RowDefinition Height="Auto" /> -->
-        <!--                                 <RowDefinition Height="10" /> -->
-        <!--                                 <RowDefinition MaxHeight="150" /> -->
-        <!--                                 <RowDefinition Height="10" /> -->
-        <!--                                 <RowDefinition Height="Auto" /> -->
-        <!--                                 <RowDefinition Height="10" /> -->
-        <!--                                 <RowDefinition Height="Auto" /> -->
-        <!--                                 <RowDefinition Height="10" /> -->
-        <!--                                 <RowDefinition Height="Auto" /> -->
-        <!--                             </Grid.RowDefinitions> -->
-        <!--                             <TextBlock Grid.Column="0" Grid.Row="0" -->
-        <!--                                        Text="{x:Static Member=localization:Strings.FilterByTags}" -->
-        <!--                                        Style="{StaticResource InfoTextBlock}" /> -->
-        <!--                             <ScrollViewer Grid.Column="0" Grid.Row="2" -->
-        <!--                                           VerticalScrollBarVisibility="Auto" -->
-        <!--                                           HorizontalScrollBarVisibility="Hidden" -->
-        <!--                                           Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntNotZeroToVisibilityCollapsedConverter}}"> -->
-        <!--                                 <ItemsControl ItemsSource="{Binding ProfileFilterTagsView}" -->
-        <!--                                               Width="200"> -->
-        <!--                                     <ItemsControl.ItemsPanel> -->
-        <!--                                         <ItemsPanelTemplate> -->
-        <!--                                             <WrapPanel /> -->
-        <!--                                         </ItemsPanelTemplate> -->
-        <!--                                     </ItemsControl.ItemsPanel> -->
-        <!--                                     <ItemsControl.ItemTemplate> -->
-        <!--                                         <DataTemplate DataType="{x:Type profiles:ProfileFilterTagsInfo}"> -->
-        <!--                                             <CheckBox Margin="0,5,10,5" Content="{Binding Name}" -->
-        <!--                                                       IsChecked="{Binding IsSelected}" -->
-        <!--                                                       Style="{StaticResource DefaultCheckBox}" /> -->
-        <!--                                         </DataTemplate> -->
-        <!--                                     </ItemsControl.ItemTemplate> -->
-        <!--                                 </ItemsControl> -->
-        <!--                             </ScrollViewer> -->
-        <!--                             <TextBlock Grid.Column="0" Grid.Row="2" -->
-        <!--                                        Text="{x:Static localization:Strings.NoTagsFound}" -->
-        <!--                                        Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntZeroToVisibilityCollapsedConverter}}" -->
-        <!--                                        Style="{StaticResource MessageTextBlock}" /> -->
-        <!--                             <TextBlock Grid.Column="0" Grid.Row="4" -->
-        <!--                                        Text="{x:Static localization:Strings.Match}" -->
-        <!--                                        Style="{StaticResource InfoTextBlock}" /> -->
-        <!--                             <StackPanel Grid.Column="0" Grid.Row="6" -->
-        <!--                                         Orientation="Horizontal"> -->
-        <!--                                 <RadioButton Content="{x:Static localization:Strings.Any}" -->
-        <!--                                              IsChecked="{Binding Path=ProfileFilterTagsMatchAny}" /> -->
-        <!--                                 <RadioButton Content="{x:Static localization:Strings.All}" -->
-        <!--                                              IsChecked="{Binding Path=ProfileFilterTagsMatchAll}" -->
-        <!--                                              Margin="10,0,0,0" /> -->
-        <!--                             </StackPanel> -->
-        <!--                             <StackPanel Grid.Column="0" Grid.Row="8" -->
-        <!--                                         Orientation="Horizontal" HorizontalAlignment="Right"> -->
-        <!--                                 <Button Command="{Binding ApplyProfileFilterCommand}" -->
-        <!--                                         Style="{StaticResource ImageButton}" -->
-        <!--                                         ToolTip="{x:Static localization:Strings.ApplyFilter}"> -->
-        <!--                                     <Rectangle Width="16" Height="16" -->
-        <!--                                                Fill="{DynamicResource MahApps.Brushes.Gray3}"> -->
-        <!--                                         <Rectangle.OpacityMask> -->
-        <!--                                             <VisualBrush Stretch="Uniform" -->
-        <!--                                                          Visual="{iconPacks:Material Kind=ContentSaveOutline}" /> -->
-        <!--                                         </Rectangle.OpacityMask> -->
-        <!--                                     </Rectangle> -->
-        <!--                                 </Button> -->
-        <!--                                 <Button Command="{Binding Path=ClearProfileFilterCommand}" -->
-        <!--                                         Style="{StaticResource ImageButton}" -->
-        <!--                                         ToolTip="{x:Static localization:Strings.ClearFilter}" -->
-        <!--                                         Margin="10,0,0,0"> -->
-        <!--                                     <Rectangle Width="20" Height="20" -->
-        <!--                                                Fill="{DynamicResource MahApps.Brushes.Gray3}"> -->
-        <!--                                         <Rectangle.OpacityMask> -->
-        <!--                                             <VisualBrush Stretch="Uniform" -->
-        <!--                                                          Visual="{iconPacks:Material Kind=FilterRemoveOutline}" /> -->
-        <!--                                         </Rectangle.OpacityMask> -->
-        <!--                                     </Rectangle> -->
-        <!--                                 </Button> -->
-        <!--                             </StackPanel> -->
-        <!--                         </Grid> -->
-        <!--                     </Border> -->
-        <!--                 </Popup> -->
-        <!--                 <Button Grid.Column="6" Grid.Row="0" -->
-        <!--                         Focusable="False" -->
-        <!--                         Style="{StaticResource CleanButton}" -->
-        <!--                         Command="{Binding AddProfileCommand}" -->
-        <!--                         ToolTip="{x:Static localization:Strings.AddProfileDots}"> -->
-        <!--                     <Rectangle Width="16" Height="16"> -->
-        <!--                         <Rectangle.OpacityMask> -->
-        <!--                             <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" /> -->
-        <!--                         </Rectangle.OpacityMask> -->
-        <!--                         <Rectangle.Style> -->
-        <!--                             <Style TargetType="{x:Type Rectangle}"> -->
-        <!--                                 <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" /> -->
-        <!--                                 <Style.Triggers> -->
-        <!--                                     <DataTrigger -->
-        <!--                                         Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" -->
-        <!--                                         Value="True"> -->
-        <!--                                         <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                     </DataTrigger> -->
-        <!--                                 </Style.Triggers> -->
-        <!--                             </Style> -->
-        <!--                         </Rectangle.Style> -->
-        <!--                     </Rectangle> -->
-        <!--                 </Button> -->
-        <!--             </Grid> -->
-        <!--             <ListBox Grid.Column="0" Grid.Row="2" -->
-        <!--                      ItemsSource="{Binding Profiles}" -->
-        <!--                      Visibility="{Binding IsSearching, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" -->
-        <!--                      SelectedItem="{Binding SelectedProfile}" -->
-        <!--                      Style="{StaticResource ProfileListBox}" -->
-        <!--                      ScrollViewer.CanContentScroll="True" -->
-        <!--                      VirtualizingPanel.IsVirtualizing="True" -->
-        <!--                      VirtualizingPanel.IsVirtualizingWhenGrouping="True" -->
-        <!--                      VirtualizingPanel.IsContainerVirtualizable="True" -->
-        <!--                      VirtualizingPanel.VirtualizationMode="Recycling" -->
-        <!--                      VirtualizingPanel.ScrollUnit="Item"> -->
-        <!--                 <ListBox.ItemsPanel> -->
-        <!--                     <ItemsPanelTemplate> -->
-        <!--                         <VirtualizingStackPanel IsItemsHost="True" /> -->
-        <!--                     </ItemsPanelTemplate> -->
-        <!--                 </ListBox.ItemsPanel> -->
-        <!--                 <ListBox.Resources> -->
-        <!--                     <ContextMenu x:Key="ProfileContextMenu" Opened="ContextMenu_Opened" MinWidth="150"> -->
-        <!--                         <MenuItem Header="{x:Static localization:Strings.Apply}" -->
-        <!--                                   Command="{Binding ApplyProfileCommand}"> -->
-        <!--                             <MenuItem.Icon> -->
-        <!--                                 <Rectangle Width="16" Height="16" -->
-        <!--                                            Fill="{DynamicResource MahApps.Brushes.Gray3}"> -->
-        <!--                                     <Rectangle.OpacityMask> -->
-        <!--                                         <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSave}" /> -->
-        <!--                                     </Rectangle.OpacityMask> -->
-        <!--                                 </Rectangle> -->
-        <!--                             </MenuItem.Icon> -->
-        <!--                         </MenuItem> -->
-        <!--                         <MenuItem Header="{x:Static localization:Strings.EditDots}" -->
-        <!--                                   Command="{Binding EditProfileCommand}"> -->
-        <!--                             <MenuItem.Icon> -->
-        <!--                                 <Rectangle Width="16" Height="16" -->
-        <!--                                            Fill="{DynamicResource MahApps.Brushes.Gray3}"> -->
-        <!--                                     <Rectangle.OpacityMask> -->
-        <!--                                         <VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=Edit}" /> -->
-        <!--                                     </Rectangle.OpacityMask> -->
-        <!--                                 </Rectangle> -->
-        <!--                             </MenuItem.Icon> -->
-        <!--                         </MenuItem> -->
-        <!--                         <MenuItem Header="{x:Static localization:Strings.CopyAsDots}" -->
-        <!--                                   Command="{Binding CopyAsProfileCommand}"> -->
-        <!--                             <MenuItem.Icon> -->
-        <!--                                 <Rectangle Width="16" Height="16" -->
-        <!--                                            Fill="{DynamicResource MahApps.Brushes.Gray3}"> -->
-        <!--                                     <Rectangle.OpacityMask> -->
-        <!--                                         <VisualBrush Stretch="Uniform" -->
-        <!--                                                      Visual="{iconPacks:Material Kind=ContentDuplicate}" /> -->
-        <!--                                     </Rectangle.OpacityMask> -->
-        <!--                                 </Rectangle> -->
-        <!--                             </MenuItem.Icon> -->
-        <!--                         </MenuItem> -->
-        <!--                         <MenuItem Header="{x:Static localization:Strings.Delete}" -->
-        <!--                                   Command="{Binding DeleteProfileCommand}"> -->
-        <!--                             <MenuItem.Icon> -->
-        <!--                                 <Rectangle Width="16" Height="16" -->
-        <!--                                            Fill="{DynamicResource MahApps.Brushes.Gray3}"> -->
-        <!--                                     <Rectangle.OpacityMask> -->
-        <!--                                         <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Close}" /> -->
-        <!--                                     </Rectangle.OpacityMask> -->
-        <!--                                 </Rectangle> -->
-        <!--                             </MenuItem.Icon> -->
-        <!--                         </MenuItem> -->
-        <!--                     </ContextMenu> -->
-        <!--                 </ListBox.Resources> -->
-        <!--                 <ListBox.InputBindings> -->
-        <!--                     <KeyBinding Command="{Binding EditProfileCommand}" Key="F2" /> -->
-        <!--                     <KeyBinding Command="{Binding DeleteProfileCommand}" Key="Delete" /> -->
-        <!--                     <KeyBinding Command="{Binding ApplyProfileCommand}" Key="Enter" /> -->
-        <!--                 </ListBox.InputBindings> -->
-        <!--                 <ListBox.GroupStyle> -->
-        <!--                     <GroupStyle> -->
-        <!--                         <GroupStyle.ContainerStyle> -->
-        <!--                             <Style TargetType="{x:Type GroupItem}"> -->
-        <!--                                 <Setter Property="Template"> -->
-        <!--                                     <Setter.Value> -->
-        <!--                                         <ControlTemplate> -->
-        <!--                                             <controls:GroupExpander -->
-        <!--                                                 Style="{StaticResource DefaultExpander}" -->
-        <!--                                                 StateStore="{Binding Path=DataContext.GroupExpanderStateStore, RelativeSource={RelativeSource AncestorType=ListBox}}" -->
-        <!--                                                 GroupName="{Binding Path=(CollectionViewGroup.Name)}"> -->
-        <!--                                                 <Expander.Header> -->
-        <!--                                                     <Grid> -->
-        <!--                                                         <Grid.ColumnDefinitions> -->
-        <!--                                                             <ColumnDefinition Width="*" /> -->
-        <!--                                                             <ColumnDefinition Width="10" /> -->
-        <!--                                                             <ColumnDefinition Width="Auto" /> -->
-        <!--                                                         </Grid.ColumnDefinitions> -->
-        <!--                                                          <Grid.ContextMenu> -->
-        <!--                                                                 <ContextMenu -->
-        <!--                                                                     Style="{StaticResource DefaultContextMenu}"> -->
-        <!--                                                                     <MenuItem -->
-        <!--                                                                         Header="{x:Static Member=localization:Strings.ExpandAll}" -->
-        <!--                                                                         Command="{Binding Path=Data.(viewModels:FirewallViewModel.ExpandAllProfileGroupsCommand), Source={StaticResource BindingProxy}}"> -->
-        <!--                                                                         <MenuItem.Icon> -->
-        <!--                                                                             <Rectangle Width="16" Height="16" -->
-        <!--                                                                                 Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"> -->
-        <!--                                                                                 <Rectangle.OpacityMask> -->
-        <!--                                                                                     <VisualBrush -->
-        <!--                                                                                         Stretch="Uniform" -->
-        <!--                                                                                         Visual="{iconPacks:Material Kind=PlusBoxMultipleOutline}" /> -->
-        <!--                                                                                 </Rectangle.OpacityMask> -->
-        <!--                                                                             </Rectangle> -->
-        <!--                                                                         </MenuItem.Icon> -->
-        <!--                                                                     </MenuItem> -->
-        <!--                                                                     <MenuItem -->
-        <!--                                                                         Header="{x:Static Member=localization:Strings.CollapseAll}" -->
-        <!--                                                                         Command="{Binding Path=Data.(viewModels:FirewallViewModel.CollapseAllProfileGroupsCommand), Source={StaticResource BindingProxy}}"> -->
-        <!--                                                                         <MenuItem.Icon> -->
-        <!--                                                                             <Rectangle Width="16" Height="16" -->
-        <!--                                                                                 Fill="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}"> -->
-        <!--                                                                                 <Rectangle.OpacityMask> -->
-        <!--                                                                                     <VisualBrush -->
-        <!--                                                                                         Stretch="Uniform" -->
-        <!--                                                                                         Visual="{iconPacks:Material Kind=MinusBoxMultipleOutline}" /> -->
-        <!--                                                                                 </Rectangle.OpacityMask> -->
-        <!--                                                                             </Rectangle> -->
-        <!--                                                                         </MenuItem.Icon> -->
-        <!--                                                                     </MenuItem> -->
-        <!--                                                                 </ContextMenu> -->
-        <!--                                                             </Grid.ContextMenu> -->
-        <!--                                                         <Rectangle Grid.Column="0" Grid.ColumnSpan="3" -->
-        <!--                                                                    Fill="Transparent" /> -->
-        <!--                                                         <TextBlock Grid.Column="0" -->
-        <!--                                                                    Text="{Binding (CollectionViewGroup.Name)}" -->
-        <!--                                                                    Style="{DynamicResource ProfileGroupTextBlock}" /> -->
-        <!--                                                         <Button Grid.Column="2" -->
-        <!--                                                                 ToolTip="{x:Static localization:Strings.EditGroupDots}" -->
-        <!--                                                                 Command="{Binding DataContext.EditGroupCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBox}}}" -->
-        <!--                                                                 CommandParameter="{Binding (CollectionViewGroup.Name)}" -->
-        <!--                                                                 Visibility="{Binding IsMouseOver, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid}}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" -->
-        <!--                                                                 Style="{StaticResource CleanButton}"> -->
-        <!--                                                             <Rectangle Width="16" Height="16"> -->
-        <!--                                                                 <Rectangle.OpacityMask> -->
-        <!--                                                                     <VisualBrush Stretch="Uniform" -->
-        <!--                                                                             Visual="{iconPacks:Modern Kind=Edit}" /> -->
-        <!--                                                                 </Rectangle.OpacityMask> -->
-        <!--                                                                 <Rectangle.Style> -->
-        <!--                                                                     <Style TargetType="{x:Type Rectangle}"> -->
-        <!--                                                                         <Setter Property="Fill" -->
-        <!--                                                                             Value="{DynamicResource MahApps.Brushes.Gray3}" /> -->
-        <!--                                                                         <Style.Triggers> -->
-        <!--                                                                             <DataTrigger -->
-        <!--                                                                                 Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" -->
-        <!--                                                                                 Value="True"> -->
-        <!--                                                                                 <Setter Property="Fill" -->
-        <!--                                                                                     Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                                                             </DataTrigger> -->
-        <!--                                                                         </Style.Triggers> -->
-        <!--                                                                     </Style> -->
-        <!--                                                                 </Rectangle.Style> -->
-        <!--                                                             </Rectangle> -->
-        <!--                                                         </Button> -->
-        <!--                                                     </Grid> -->
-        <!--                                                 </Expander.Header> -->
-        <!--                                                 <ItemsPresenter /> -->
-        <!--                                             </controls:GroupExpander> -->
-        <!--                                         </ControlTemplate> -->
-        <!--                                     </Setter.Value> -->
-        <!--                                 </Setter> -->
-        <!--                             </Style> -->
-        <!--                         </GroupStyle.ContainerStyle> -->
-        <!--                     </GroupStyle> -->
-        <!--                 </ListBox.GroupStyle> -->
-        <!--                 <ListBox.ItemContainerStyle> -->
-        <!--                     <Style TargetType="{x:Type ListBoxItem}" -->
-        <!--                            BasedOn="{StaticResource MahApps.Styles.ListBoxItem}"> -->
-        <!--                         <Setter Property="ContextMenu" Value="{StaticResource ProfileContextMenu}" /> -->
-        <!--                         <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" /> -->
-        <!--                         <Setter Property="VerticalContentAlignment" Value="Stretch" /> -->
-        <!--                         <Setter Property="HorizontalContentAlignment" Value="Stretch" /> -->
-        <!--                     </Style> -->
-        <!--                 </ListBox.ItemContainerStyle> -->
-        <!--                 <ListBox.ItemTemplate> -->
-        <!--                     <DataTemplate DataType="{x:Type profiles:ProfileInfo}"> -->
-        <!--                         <Grid Background="Transparent"> -->
-        <!--                             <Grid.ToolTip> -->
-        <!--                                 <ToolTip MinWidth="250"> -->
-        <!--                                     <StackPanel Margin="10"> -->
-        <!--                                         <TextBlock Text="{Binding Name}" -->
-        <!--                                                    Style="{StaticResource DefaultTextBlock}" /> -->
-        <!--                                         <Separator Background="{DynamicResource MahApps.Brushes.Gray8}" -->
-        <!--                                                    Margin="0,10" /> -->
-        <!--                                         <TextBlock Text="{Binding Description}" -->
-        <!--                                                    Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" /> -->
-        <!--                                     </StackPanel> -->
-        <!--                                 </ToolTip> -->
-        <!--                             </Grid.ToolTip> -->
-        <!--                             <TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" /> -->
-        <!--                         </Grid> -->
-        <!--                     </DataTemplate> -->
-        <!--                 </ListBox.ItemTemplate> -->
-        <!--             </ListBox> -->
-        <!--             <mah:ProgressRing Grid.Row="2" Height="50" Width="50" IsActive="{Binding IsSearching}" /> -->
-        <!--             <Grid Grid.Row="2" VerticalAlignment="Center"> -->
-        <!--                 <Grid.Style> -->
-        <!--                     <Style TargetType="{x:Type Grid}"> -->
-        <!--                         <Setter Property="Visibility" Value="Collapsed" /> -->
-        <!--                         <Style.Triggers> -->
-        <!--                             <MultiDataTrigger> -->
-        <!--                                 <MultiDataTrigger.Conditions> -->
-        <!--                                     <Condition Binding="{Binding Profiles.Count}" Value="0" /> -->
-        <!--                                     <Condition Binding="{Binding IsSearching}" Value="False" /> -->
-        <!--                                 </MultiDataTrigger.Conditions> -->
-        <!--                                 <MultiDataTrigger.Setters> -->
-        <!--                                     <Setter Property="Visibility" Value="Visible" /> -->
-        <!--                                 </MultiDataTrigger.Setters> -->
-        <!--                             </MultiDataTrigger> -->
-        <!--                         </Style.Triggers> -->
-        <!--                     </Style> -->
-        <!--                 </Grid.Style> -->
-        <!--                 <Button HorizontalAlignment="Center" Focusable="False"> -->
-        <!--                     <Button.Style> -->
-        <!--                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}"> -->
-        <!--                             <Setter Property="Command" Value="{Binding AddProfileCommand}" /> -->
-        <!--                             <Style.Triggers> -->
-        <!--                                 <DataTrigger -->
-        <!--                                     Binding="{Binding Path=IsProfileFilterSet}" -->
-        <!--                                     Value="True"> -->
-        <!--                                     <Setter Property="Command" Value="{Binding Path=ClearProfileFilterCommand}" /> -->
-        <!--                                     <Setter Property="ToolTip" -->
-        <!--                                             Value="{x:Static localization:Strings.ClearFilter}" /> -->
-        <!--                                 </DataTrigger> -->
-        <!--                             </Style.Triggers> -->
-        <!--                         </Style> -->
-        <!--                     </Button.Style> -->
-        <!--                     <Grid> -->
-        <!--                         <Grid.ColumnDefinitions> -->
-        <!--                             <ColumnDefinition Width="Auto" /> -->
-        <!--                             <ColumnDefinition Width="*" /> -->
-        <!--                         </Grid.ColumnDefinitions> -->
-        <!--                         <Rectangle Grid.Column="0" Width="20" Height="20"> -->
-        <!--                             <Rectangle.Resources> -->
-        <!--                                 <VisualBrush x:Key="VisualPlus" Stretch="Uniform" -->
-        <!--                                              Visual="{iconPacks:Material Kind=Plus}" /> -->
-        <!--                                 <VisualBrush x:Key="VisualClear" Stretch="Uniform" -->
-        <!--                                              Visual="{iconPacks:Material Kind=FilterRemoveOutline}" /> -->
-        <!--                             </Rectangle.Resources> -->
-        <!--                             <Rectangle.Style> -->
-        <!--                                 <Style TargetType="{x:Type Rectangle}"> -->
-        <!--                                     <Setter Property="OpacityMask" Value="{StaticResource VisualPlus}" /> -->
-        <!--                                     <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" /> -->
-        <!--                                     <Style.Triggers> -->
-        <!--                                         <DataTrigger -->
-        <!--                                             Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" -->
-        <!--                                             Value="True"> -->
-        <!--                                             <Setter Property="Fill" -->
-        <!--                                                     Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                         </DataTrigger> -->
-        <!--                                         <DataTrigger -->
-        <!--                                             Binding="{Binding Path=IsProfileFilterSet}" -->
-        <!--                                             Value="True"> -->
-        <!--                                             <Setter Property="OpacityMask" Value="{StaticResource VisualClear}" /> -->
-        <!--                                         </DataTrigger> -->
-        <!--                                     </Style.Triggers> -->
-        <!--                                 </Style> -->
-        <!--                             </Rectangle.Style> -->
-        <!--                         </Rectangle> -->
-        <!--                         <TextBlock Grid.Column="1"> -->
-        <!--                             <TextBlock.Style> -->
-        <!--                                 <Style TargetType="{x:Type TextBlock}" -->
-        <!--                                        BasedOn="{StaticResource MessageTextBlock}"> -->
-        <!--                                     <Setter Property="Text" -->
-        <!--                                             Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" /> -->
-        <!--                                     <Style.Triggers> -->
-        <!--                                         <DataTrigger -->
-        <!--                                             Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" -->
-        <!--                                             Value="True"> -->
-        <!--                                             <Setter Property="Foreground" -->
-        <!--                                                     Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                         </DataTrigger> -->
-        <!--                                         <DataTrigger -->
-        <!--                                             Binding="{Binding Path=IsProfileFilterSet}" -->
-        <!--                                             Value="True"> -->
-        <!--                                             <Setter Property="Text" -->
-        <!--                                                     Value="{x:Static localization:Strings.NothingFound}" /> -->
-        <!--                                         </DataTrigger> -->
-        <!--                                     </Style.Triggers> -->
-        <!--                                 </Style> -->
-        <!--                             </TextBlock.Style> -->
-        <!--                         </TextBlock> -->
-        <!--                     </Grid> -->
-        <!--                 </Button> -->
-        <!--             </Grid> -->
-        <!--         </Grid> -->
-        <!--         <Grid -->
-        <!--             Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=ProfileManagerIsEnabled, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"> -->
-        <!--             <Grid.RowDefinitions> -->
-        <!--                 ~1~ Adjust the Height without TextBox @1@ -->
-        <!--                 <RowDefinition Height="27" /> -->
-        <!--                 <RowDefinition Height="10" /> -->
-        <!--                 <RowDefinition Height="*" /> -->
-        <!--             </Grid.RowDefinitions> -->
-        <!--             <ToggleButton Grid.Row="0" Grid.Column="0" -->
-        <!--                           IsChecked="{Binding ExpandProfileView}" -->
-        <!--                           HorizontalAlignment="Left" -->
-        <!--                           Focusable="False"> -->
-        <!--                 <ToggleButton.Style> -->
-        <!--                     <Style TargetType="{x:Type ToggleButton}" -->
-        <!--                            BasedOn="{StaticResource MahApps.Styles.Button.Circle}"> -->
-        <!--                         <Setter Property="Template"> -->
-        <!--                             <Setter.Value> -->
-        <!--                                 <ControlTemplate TargetType="{x:Type ToggleButton}"> -->
-        <!--                                     <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" -->
-        <!--                                                       RecognizesAccessKey="True" /> -->
-        <!--                                 </ControlTemplate> -->
-        <!--                             </Setter.Value> -->
-        <!--                         </Setter> -->
-        <!--                     </Style> -->
-        <!--                 </ToggleButton.Style> -->
-        <!--                 <Rectangle Width="16" Height="16"> -->
-        <!--                     <Rectangle.OpacityMask> -->
-        <!--                         <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ChevronRight}" /> -->
-        <!--                     </Rectangle.OpacityMask> -->
-        <!--                     <Rectangle.Style> -->
-        <!--                         <Style TargetType="{x:Type Rectangle}"> -->
-        <!--                             <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" /> -->
-        <!--                             <Style.Triggers> -->
-        <!--                                 <Trigger Property="IsMouseOver" Value="True"> -->
-        <!--                                     <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                 </Trigger> -->
-        <!--                             </Style.Triggers> -->
-        <!--                         </Style> -->
-        <!--                     </Rectangle.Style> -->
-        <!--                 </Rectangle> -->
-        <!--             </ToggleButton> -->
-        <!--             <Grid Grid.Column="0" Grid.Row="2"> -->
-        <!--                 ~1~ Unlock profile button @1@ -->
-        <!--                 <Button HorizontalAlignment="Center" VerticalAlignment="Center" -->
-        <!--                         Focusable="False" -->
-        <!--                         Command="{Binding Path=(networkManager:MainWindow.UnlockProfileCommand), RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=mah:MetroWindow}}}" -->
-        <!--                         Style="{StaticResource CleanButton}" -->
-        <!--                         Visibility="{Binding Source={x:Static Member=settings:ConfigurationManager.Current}, Path=ProfileManagerShowUnlock, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"> -->
-        <!--                     <Grid> -->
-        <!--                         <Grid.ColumnDefinitions> -->
-        <!--                             <ColumnDefinition Width="Auto" /> -->
-        <!--                             <ColumnDefinition Width="*" /> -->
-        <!--                         </Grid.ColumnDefinitions> -->
-        <!--                         <Rectangle Grid.Column="0" Grid.Row="0" -->
-        <!--                                    Width="20" Height="20"> -->
-        <!--                             <Rectangle.OpacityMask> -->
-        <!--                                 <VisualBrush Stretch="Uniform" -->
-        <!--                                              Visual="{iconPacks:Modern Kind=InterfacePassword}" /> -->
-        <!--                             </Rectangle.OpacityMask> -->
-        <!--                             <Rectangle.Style> -->
-        <!--                                 <Style TargetType="{x:Type Rectangle}"> -->
-        <!--                                     <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" /> -->
-        <!--                                     <Style.Triggers> -->
-        <!--                                         <DataTrigger -->
-        <!--                                             Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" -->
-        <!--                                             Value="True"> -->
-        <!--                                             <Setter Property="Fill" -->
-        <!--                                                     Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                         </DataTrigger> -->
-        <!--                                     </Style.Triggers> -->
-        <!--                                 </Style> -->
-        <!--                             </Rectangle.Style> -->
-        <!--                         </Rectangle> -->
-        <!--                         <TextBlock Grid.Column="1" Grid.Row="0" -->
-        <!--                                    Text="{x:Static localization:Strings.UnlockTheProfileFileMessage}"> -->
-        <!--                             <TextBlock.Style> -->
-        <!--                                 <Style TargetType="{x:Type TextBlock}" -->
-        <!--                                        BasedOn="{StaticResource MessageTextBlock}"> -->
-        <!--                                     <Style.Triggers> -->
-        <!--                                         <DataTrigger -->
-        <!--                                             Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" -->
-        <!--                                             Value="True"> -->
-        <!--                                             <Setter Property="Foreground" -->
-        <!--                                                     Value="{DynamicResource MahApps.Brushes.Gray5}" /> -->
-        <!--                                         </DataTrigger> -->
-        <!--                                     </Style.Triggers> -->
-        <!--                                 </Style> -->
-        <!--                             </TextBlock.Style> -->
-        <!--                         </TextBlock> -->
-        <!--                     </Grid> -->
-        <!--                 </Button> -->
-        <!--                 ~1~ Profile Manager error message @1@ -->
-        <!--                 <TextBlock -->
-        <!--                     Text="{Binding Source={x:Static Member=settings:ConfigurationManager.Current}, Path=ProfileManagerErrorMessage}" -->
-        <!--                     Visibility="{Binding Source={x:Static Member=settings:ConfigurationManager.Current}, Path=ProfileManagerShowUnlock, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" -->
-        <!--                     Style="{StaticResource ResourceKey=MessageTextBlock}" /> -->
-        <!--             </Grid> -->
-        <!--         </Grid> -->
-        <!--     </Grid> -->
-        <!-- </Expander> -->
-    </Grid>
 </UserControl>
+
diff --git a/Source/NETworkManager/Views/FirewallView.xaml.cs b/Source/NETworkManager/Views/FirewallView.xaml.cs
index 7b89181733..aa92079beb 100644
--- a/Source/NETworkManager/Views/FirewallView.xaml.cs
+++ b/Source/NETworkManager/Views/FirewallView.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using NETworkManager.ViewModels;
@@ -68,5 +69,6 @@ public void OnViewVisible()
     {
         _viewModel.OnViewVisible();
     }
+
     #endregion
 }
diff --git a/Source/NETworkManager/Views/HostsFileEditorView.xaml b/Source/NETworkManager/Views/HostsFileEditorView.xaml
index f70d7c1830..d4e176e76d 100644
--- a/Source/NETworkManager/Views/HostsFileEditorView.xaml
+++ b/Source/NETworkManager/Views/HostsFileEditorView.xaml
@@ -11,7 +11,7 @@
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
              xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
-             xmlns:wpfHelper="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HostsFileEditorViewModel}">
     <UserControl.Resources>
@@ -53,7 +53,7 @@
                                 Style="{StaticResource CleanButton}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
-                                       wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
+                                       wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform"
                                                  Visual="{iconPacks:Material Kind=Refresh}" />
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml
index d157d218c7..0d7301ded9 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml
+++ b/Source/NETworkManager/Views/IPScannerView.xaml
@@ -218,11 +218,13 @@
         <TextBlock Grid.Column="0" Grid.Row="2"
                    Style="{StaticResource HeaderTextBlock}"
                    Text="{x:Static localization:Strings.Result}" />
-        <controls:MultiSelectDataGrid Grid.Column="0" Grid.Row="3"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Column="0" Grid.Row="3"
                                       ItemsSource="{Binding Path=ResultsView}"
                                       SelectedItem="{Binding Path=SelectedResult}"
                                       SelectedItemsList="{Binding Path=SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Sorting="DataGrid_OnSorting"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True"
                                       RowDetailsVisibilityMode="Collapsed"
                                       EnableRowVirtualization="True"
                                       ScrollViewer.CanContentScroll="True"
@@ -553,7 +555,8 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.Vendor}"
                                     Binding="{Binding (network:IPScannerHostInfo.Vendor), Converter={StaticResource StringNullOrEmptyToStringConverter}}"
                                     SortMemberPath="Vendor"
-                                    MinWidth="200">
+                                    MinWidth="200"
+                                    Width="*">
                     <DataGridTextColumn.Visibility>
                         <MultiBinding Converter="{StaticResource BooleansOrToVisibilityCollapsedConverter}">
                             <Binding Source="{x:Static Member=settings:SettingsManager.Current}"
diff --git a/Source/NETworkManager/Views/ListenersView.xaml b/Source/NETworkManager/Views/ListenersView.xaml
index 7882087b01..e78ab668e2 100644
--- a/Source/NETworkManager/Views/ListenersView.xaml
+++ b/Source/NETworkManager/Views/ListenersView.xaml
@@ -10,7 +10,7 @@
              xmlns:utilities="clr-namespace:NETworkManager.Utilities;assembly=NETworkManager.Utilities"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
-             xmlns:wpfHelper="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              xmlns:networkManager="clr-namespace:NETworkManager"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ListenersViewModel}">
     <UserControl.InputBindings>
@@ -68,7 +68,7 @@
                                 Style="{StaticResource CleanButton}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
-                                       wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
+                                       wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform"
                                                  Visual="{iconPacks:Material Kind=Refresh}" />
@@ -94,11 +94,13 @@
                                  Style="{StaticResource ResourceKey=SearchTextBox}" />
                     </StackPanel>
                 </Grid>
-                <controls:MultiSelectDataGrid Grid.Column="0" Grid.Row="2"
+                <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                              Grid.Column="0" Grid.Row="2"
                                               ItemsSource="{Binding ResultsView}"
                                               SelectedItem="{Binding SelectedResult}"
                                               SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                              Sorting="DataGrid_OnSorting">
+                                              Sorting="DataGrid_OnSorting"
+                                              wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
                     <controls:MultiSelectDataGrid.Resources>
                         <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                             <MenuItem Header="{x:Static localization:Strings.CopyDots}"
@@ -155,13 +157,17 @@
                     <controls:MultiSelectDataGrid.Columns>
                         <DataGridTextColumn Header="{x:Static localization:Strings.Protocol}"
                                             Binding="{Binding (network:ListenerInfo.Protocol)}"
-                                            SortMemberPath="Protocol" MinWidth="100" />
+                                            SortMemberPath="Protocol"
+                                            MinWidth="100" />
                         <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}"
                                             Binding="{Binding (network:ListenerInfo.IPAddress)}"
-                                            SortMemberPath="IPAddress" MinWidth="150" />
+                                            SortMemberPath="IPAddress"
+                                            MinWidth="150" />
                         <DataGridTextColumn Header="{x:Static localization:Strings.Port}"
                                             Binding="{Binding (network:ListenerInfo.Port)}"
-                                            SortMemberPath="Port" MinWidth="100" />
+                                            SortMemberPath="Port"
+                                            MinWidth="100" 
+                                            Width="*" />
                     </controls:MultiSelectDataGrid.Columns>
                 </controls:MultiSelectDataGrid>
                 <Grid Grid.Column="0" Grid.Row="4" VerticalAlignment="Center">
diff --git a/Source/NETworkManager/Views/ListenersView.xaml.cs b/Source/NETworkManager/Views/ListenersView.xaml.cs
index a8a1579ae0..f1b2eff3e1 100644
--- a/Source/NETworkManager/Views/ListenersView.xaml.cs
+++ b/Source/NETworkManager/Views/ListenersView.xaml.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml b/Source/NETworkManager/Views/LookupOUILookupView.xaml
index 829bc4dc21..58684519fd 100644
--- a/Source/NETworkManager/Views/LookupOUILookupView.xaml
+++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml
@@ -12,6 +12,7 @@
              xmlns:lookup="clr-namespace:NETworkManager.Models.Lookup;assembly=NETworkManager.Models"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupOUILookupViewModel}">
     <UserControl.Resources>
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
@@ -103,9 +104,11 @@
                        Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <controls:MultiSelectDataGrid Grid.Row="3" ItemsSource="{Binding ResultsView}"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Row="3" ItemsSource="{Binding ResultsView}"
                                       SelectedItem="{Binding SelectedResult}"
-                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.CopyDots}"
@@ -161,7 +164,8 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.Vendor}"
                                     Binding="{Binding (lookup:OUIInfo.Vendor), Converter={StaticResource StringNullOrEmptyToStringConverter}}"
                                     SortMemberPath="Vendor"
-                                    MinWidth="200" />
+                                    MinWidth="200"
+                                    Width="*" />
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
     </Grid>
diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs b/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs
index 3ac1334242..55fb466ff3 100644
--- a/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs
+++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using NETworkManager.ViewModels;
 
diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml b/Source/NETworkManager/Views/LookupPortLookupView.xaml
index d40ec3439c..229f4f6946 100644
--- a/Source/NETworkManager/Views/LookupPortLookupView.xaml
+++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml
@@ -12,6 +12,7 @@
              xmlns:lookup="clr-namespace:NETworkManager.Models.Lookup;assembly=NETworkManager.Models"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupPortLookupViewModel}">
     <UserControl.Resources>
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
@@ -102,9 +103,11 @@
                        Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <controls:MultiSelectDataGrid Grid.Row="3" ItemsSource="{Binding ResultsView}"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Row="3" ItemsSource="{Binding ResultsView}"
                                       SelectedItem="{Binding SelectedResult}"
-                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.CopyDots}"
@@ -172,7 +175,15 @@
                                     MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Description}"
                                     Binding="{Binding (lookup:PortLookupInfo.Description)}"
-                                    SortMemberPath="Description" MinWidth="200" />
+                                    SortMemberPath="Description"
+                                    MinWidth="200"
+                                    Width="*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style>
+                            <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
     </Grid>
diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs b/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs
index 21aeb0cda2..e27e35183c 100644
--- a/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs
+++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs
@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using NETworkManager.ViewModels;
 
diff --git a/Source/NETworkManager/Views/NeighborTableView.xaml b/Source/NETworkManager/Views/NeighborTableView.xaml
index 0497fa3e5a..df4217cc7d 100644
--- a/Source/NETworkManager/Views/NeighborTableView.xaml
+++ b/Source/NETworkManager/Views/NeighborTableView.xaml
@@ -11,7 +11,7 @@
     xmlns:networkManager="clr-namespace:NETworkManager"
     xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
     xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
-    xmlns:wpfHelper="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+    xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
     xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
     x:Class="NETworkManager.Views.NeighborTableView"
     d:DataContext="{d:DesignInstance {x:Type viewModels:NeighborTableViewModel}}"
@@ -78,7 +78,7 @@
                                 Style="{StaticResource CleanButton}"
                                 Margin="0,0,10,0">
                             <Rectangle Width="16" Height="16"
-                                       wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
+                                       wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsRefreshing}">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform"
                                                  Visual="{iconPacks:Material Kind=Refresh}" />
@@ -109,7 +109,8 @@
                                               ItemsSource="{Binding ResultsView}"
                                               SelectedItem="{Binding SelectedResult}"
                                               SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                              Sorting="DataGrid_OnSorting">
+                                              Sorting="DataGrid_OnSorting"
+                                              wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
                     <controls:MultiSelectDataGrid.Resources>
                         <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                             <MenuItem Header="{x:Static localization:Strings.DeleteEntry}"
@@ -191,11 +192,11 @@
                         <DataGridTextColumn Header="{x:Static localization:Strings.Interface}"
                                             Binding="{Binding (network:NeighborInfo.InterfaceAlias)}"
                                             SortMemberPath="InterfaceAlias"
-                                            MinWidth="120" />
+                                            MinWidth="200" />
                         <DataGridTextColumn Header="{x:Static localization:Strings.MACAddress}"
                                             Binding="{Binding (network:NeighborInfo.MACAddress), Converter={StaticResource PhysicalAddressToStringConverter}}"
                                             SortMemberPath="MACAddress"
-                                            MinWidth="200" />
+                                            MinWidth="180" />
                         <DataGridTextColumn Header="{x:Static localization:Strings.State}"
                                             Binding="{Binding (network:NeighborInfo.State), Converter={StaticResource NeighborStateToStringConverter}}"
                                             SortMemberPath="State"
@@ -203,7 +204,8 @@
                         <DataGridTextColumn Header="{x:Static localization:Strings.Multicast}"
                                             Binding="{Binding (network:NeighborInfo.IsMulticast), Converter={StaticResource BooleanToStringConverter}}"
                                             SortMemberPath="IsMulticast"
-                                            MinWidth="100" />
+                                            MinWidth="100" 
+                                            Width="*" />
                     </controls:MultiSelectDataGrid.Columns>
                 </controls:MultiSelectDataGrid>
                 <Grid Grid.Column="0" Grid.Row="4" VerticalAlignment="Center">
diff --git a/Source/NETworkManager/Views/NeighborTableView.xaml.cs b/Source/NETworkManager/Views/NeighborTableView.xaml.cs
index 096a60667e..90a839be56 100644
--- a/Source/NETworkManager/Views/NeighborTableView.xaml.cs
+++ b/Source/NETworkManager/Views/NeighborTableView.xaml.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.ComponentModel;
 using System.Windows;
diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml
index 739cf1e691..45fed20bdd 100644
--- a/Source/NETworkManager/Views/PortScannerView.xaml
+++ b/Source/NETworkManager/Views/PortScannerView.xaml
@@ -13,6 +13,7 @@
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              Loaded="UserControl_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerViewModel}">
     <UserControl.Resources>
@@ -40,11 +41,11 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="2*" />
                     <ColumnDefinition Width="10" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="10" />
-                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="1*" />
                     <ColumnDefinition Width="10" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="10" />
@@ -223,9 +224,11 @@
                        Style="{DynamicResource StatusMessageTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Result}" />
-        <controls:MultiSelectDataGrid Grid.Row="3" ItemsSource="{Binding Path=ResultsView}"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Row="3" ItemsSource="{Binding Path=ResultsView}"
                                       SelectedItem="{Binding Path=SelectedResult}"
                                       SelectedItemsList="{Binding Path=SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True"
                                       EnableRowVirtualization="True"
                                       ScrollViewer.CanContentScroll="True"
                                       VirtualizingPanel.IsVirtualizing="True"
@@ -354,7 +357,8 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.Description}"
                                     Binding="{Binding (network:PortScannerPortInfo.LookupInfo).Description}"
                                     SortMemberPath="LookupInfo.Description"
-                                    MinWidth="200" />
+                                    MinWidth="200"
+                                    Width="*" />
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
     </Grid>
diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml
index 991545ba42..283800b3c5 100644
--- a/Source/NETworkManager/Views/SNMPView.xaml
+++ b/Source/NETworkManager/Views/SNMPView.xaml
@@ -617,11 +617,13 @@
                 </Style>
             </TextBlock.Style>
         </TextBlock>
-        <controls:MultiSelectDataGrid Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3"
                                       ItemsSource="{Binding ResultsView}"
                                       SelectedItem="{Binding SelectedResult}"
                                       Sorting="DataGrid_OnSorting"
-                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.CopyDots}"
@@ -689,7 +691,15 @@
                                     MinWidth="200" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Data}"
                                     Binding="{Binding (network:SNMPInfo.Data)}"
-                                    SortMemberPath="Data" MinWidth="300" />
+                                    SortMemberPath="Data"
+                                    MinWidth="300"
+                                    Width="*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style>
+                            <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                </DataGridTextColumn>
             </DataGrid.Columns>
         </controls:MultiSelectDataGrid>
         <TextBox Grid.Row="5" Grid.Column="0" 
diff --git a/Source/NETworkManager/Views/SNTPLookupView.xaml b/Source/NETworkManager/Views/SNTPLookupView.xaml
index a455c14adc..b1808aa5b8 100644
--- a/Source/NETworkManager/Views/SNTPLookupView.xaml
+++ b/Source/NETworkManager/Views/SNTPLookupView.xaml
@@ -10,6 +10,7 @@
              xmlns:network="clr-namespace:NETworkManager.Models.Network;assembly=NETworkManager.Models"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNTPLookupViewModel}">
     <UserControl.Resources>
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
@@ -113,11 +114,13 @@
         <TextBlock Grid.Column="0" Grid.Row="2"
                    Text="{x:Static Member=localization:Strings.Result}"
                    Style="{StaticResource ResourceKey=HeaderTextBlock}" />
-        <controls:MultiSelectDataGrid Grid.Column="0" Grid.Row="3"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Column="0" Grid.Row="3"
                                       CanUserSortColumns="True"
                                       ItemsSource="{Binding Path=ResultsView}"
                                       SelectedItem="{Binding Path=SelectedResult}"
-                                      SelectedItemsList="{Binding Path=SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding Path=SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.CopyDots}"
@@ -218,7 +221,8 @@
                 <DataGridTextColumn Header="{x:Static Member=localization:Strings.RoundTripDelay}"
                                     Binding="{Binding Path=(network:SNTPLookupInfo.DateTime).RoundTripDelay, Converter={StaticResource ResourceKey=IntToMillisecondsStringConverter}}"
                                     SortMemberPath="DateTime.RoundTripDelay"
-                                    MinWidth="80" />
+                                    MinWidth="80" 
+                                    Width="*" />
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
     </Grid>
diff --git a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
index c57be5bfb4..857e1b4302 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
+++ b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
@@ -11,6 +11,7 @@
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
              xmlns:network="clr-namespace:NETworkManager.Models.Network;assembly=NETworkManager.Models"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SubnetCalculatorSubnettingViewModel}">
     <UserControl.Resources>
         <converters:BigIntegerToStringConverter x:Key="BigIntegerToStringConverter" />
@@ -139,10 +140,12 @@
         <TextBlock Grid.Row="2"
                    Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
                    Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <controls:MultiSelectDataGrid Grid.Row="3" ItemsSource="{Binding ResultsView}"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Row="3" ItemsSource="{Binding ResultsView}"
                                       Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"
                                       SelectedItem="{Binding SelectedResult}"
-                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.CopyDots}"
@@ -244,7 +247,8 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.Hosts}"
                                     Binding="{Binding (network:IPNetworkInfo.Usable), Converter={StaticResource BigIntegerToStringConverter}}"
                                     SortMemberPath="Usable"
-                                    MinWidth="80" />
+                                    MinWidth="80"
+                                    Width="*" />
             </controls:MultiSelectDataGrid.Columns>
         </controls:MultiSelectDataGrid>
         <TextBlock Grid.Column="0" Grid.Row="3"
diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml
index a41d3d26d2..3aae2b0791 100644
--- a/Source/NETworkManager/Views/TracerouteView.xaml
+++ b/Source/NETworkManager/Views/TracerouteView.xaml
@@ -14,6 +14,7 @@
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
              xmlns:models="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              Loaded="UserControl_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TracerouteViewModel}">
     <UserControl.Resources>
@@ -142,9 +143,11 @@
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static Member=localization:Strings.Route}"
                    Style="{StaticResource ResourceKey=HeaderTextBlock}" />
-        <controls:MultiSelectDataGrid Grid.Row="3" CanUserSortColumns="False" ItemsSource="{Binding Path=ResultsView}"
+        <controls:MultiSelectDataGrid x:Name="DataGridResults"
+                                      Grid.Row="3" CanUserSortColumns="False" ItemsSource="{Binding Path=ResultsView}"
                                       SelectedItem="{Binding SelectedResult}"
-                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                      SelectedItemsList="{Binding SelectedResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                      wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
             <controls:MultiSelectDataGrid.Resources>
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static Member=localization:Strings.IPScanner}"
@@ -438,7 +441,8 @@
                 <DataGridTextColumn Header="{x:Static Member=localization:Strings.Hostname}"
                                     Binding="{Binding (network:TracerouteHopInfo.Hostname), Converter={StaticResource ResourceKey=StringNullOrEmptyToStringConverter}}"
                                     Visibility="{Binding Source={x:Static Member=settings:SettingsManager.Current}, Path=Traceroute_ResolveHostname, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
-                                    MinWidth="150" />
+                                    MinWidth="150"
+                                    Width="*" />
                 <DataGridTextColumn Header="{x:Static Member=localization:Strings.Continent}"
                                     Binding="{Binding (network:TracerouteHopInfo.IPGeolocationResult).Info.Continent, Converter={StaticResource ResourceKey=StringNullOrEmptyToStringConverter}}"
                                     Visibility="{Binding Source={x:Static Member=settings:SettingsManager.Current}, Path=Traceroute_CheckIPApiIPGeolocation, Converter={StaticResource ResourceKey=BooleanToVisibilityCollapsedConverter}}"
diff --git a/Source/NETworkManager/Views/WiFiView.xaml b/Source/NETworkManager/Views/WiFiView.xaml
index d118e2d348..14353753b8 100644
--- a/Source/NETworkManager/Views/WiFiView.xaml
+++ b/Source/NETworkManager/Views/WiFiView.xaml
@@ -13,7 +13,7 @@
              xmlns:controls="clr-namespace:NETworkManager.Controls"
              xmlns:controls2="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
              xmlns:utilities="clr-namespace:NETworkManager.Utilities;assembly=NETworkManager.Utilities"
-             xmlns:wpfHelper="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              mc:Ignorable="d"
              d:DataContext="{d:DesignInstance viewModels:WiFiViewModel}">
     <UserControl.InputBindings>
@@ -171,7 +171,7 @@
                                                 Style="{StaticResource CleanButton}"
                                                 Margin="10,0,0,0">
                                             <Rectangle Width="24" Height="24"
-                                                       wpfHelper:ReloadAnimationHelper.IsReloading="{Binding IsAdaptersLoading}">
+                                                       wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding IsAdaptersLoading}">
                                                 <Rectangle.OpacityMask>
                                                     <VisualBrush Stretch="Uniform"
                                                                  Visual="{iconPacks:Material Kind=Refresh}" />
@@ -243,7 +243,7 @@
                                                     Style="{StaticResource CleanButton}"
                                                     Margin="0,0,10,0">
                                                 <Rectangle Width="24" Height="24"
-                                                           wpfHelper:ReloadAnimationHelper.IsReloading="{Binding Path=IsBackgroundSearchRunning}">
+                                                           wpfHelpers:ReloadAnimationHelper.IsReloading="{Binding Path=IsBackgroundSearchRunning}">
                                                     <Rectangle.OpacityMask>
                                                         <VisualBrush Stretch="Uniform"
                                                                      Visual="{iconPacks:Material Kind=Refresh}" />
@@ -280,11 +280,13 @@
 
 
                                     </Grid>
-                                    <controls2:MultiSelectDataGrid Grid.Row="2"
+                                    <controls2:MultiSelectDataGrid x:Name="DataGridNetworks"
+                                                                   Grid.Row="2"
                                                                    Visibility="{Binding Path=IsNetworksLoading, Converter={StaticResource ResourceKey=BooleanReverseToVisibilityCollapsedConverter}}"
                                                                    ItemsSource="{Binding Path=NetworksView}"
                                                                    SelectedItem="{Binding Path=SelectedNetwork}"
-                                                                   SelectedItemsList="{Binding Path=SelectedNetworks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                                                   SelectedItemsList="{Binding Path=SelectedNetworks, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                   wpfHelpers:DataGridHelper.RefreshStarColumnsOnFirstRow="True">
                                         <controls2:MultiSelectDataGrid.Resources>
                                             <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"
                                                          MinWidth="150">
@@ -568,7 +570,8 @@
                                                 </DataGridTemplateColumn.CellTemplate>
                                             </DataGridTemplateColumn>
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.SSID}"
-                                                                SortMemberPath="AvailableNetwork.Ssid">
+                                                                SortMemberPath="AvailableNetwork.Ssid"
+                                                                MinWidth="150">
                                                 <DataGridTextColumn.ElementStyle>
                                                     <Style TargetType="{x:Type TypeName=TextBlock}">
                                                         <Setter Property="Text"
@@ -587,50 +590,64 @@
                                             <DataGridCheckBoxColumn
                                                 Header="{x:Static Member=localization:Strings.Connected}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.IsConnected)}"
-                                                SortMemberPath="IsConnected" />
+                                                SortMemberPath="IsConnected"
+                                                MinWidth="100" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.Security}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.NetworkAuthenticationType)}"
-                                                SortMemberPath="NetworkAuthenticationType" />
+                                                SortMemberPath="NetworkAuthenticationType"
+                                                MinWidth="100" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.Frequency}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.ChannelCenterFrequencyInGigahertz), Converter={StaticResource ResourceKey=WiFiChannelCenterFrequencyToFrequencyStringConverter}}"
-                                                SortMemberPath="ChannelCenterFrequencyInGigahertz" />
+                                                SortMemberPath="ChannelCenterFrequencyInGigahertz"
+                                                MinWidth="100" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.Channel}"
                                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.Channel)}"
-                                                                SortMemberPath="Channel" />
+                                                                SortMemberPath="Channel"
+                                                                MinWidth="80" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.SignalStrength}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).NetworkRssiInDecibelMilliwatts, Converter={StaticResource ResourceKey=WiFiNetworkRssiInDecibelMilliwattsToSignalStrengthStringConverter}}"
-                                                SortMemberPath="AvailableNetwork.NetworkRssiInDecibelMilliwatts" />
+                                                SortMemberPath="AvailableNetwork.NetworkRssiInDecibelMilliwatts"
+                                                MinWidth="120" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.Authentication}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).SecuritySettings.NetworkAuthenticationType}"
-                                                SortMemberPath="AvailableNetwork.SecuritySettings.NetworkAuthenticationType" />
+                                                SortMemberPath="AvailableNetwork.SecuritySettings.NetworkAuthenticationType"
+                                                MinWidth="120" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.Encryption}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).SecuritySettings.NetworkEncryptionType}"
-                                                SortMemberPath="AvailableNetwork.NetworkEncryptionType" />
+                                                SortMemberPath="AvailableNetwork.NetworkEncryptionType"
+                                                MinWidth="100" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.BSSID}"
                                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).Bssid}"
-                                                                SortMemberPath="AvailableNetwork.Bssid" />
+                                                                SortMemberPath="AvailableNetwork.Bssid"
+                                                                MinWidth="140" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.Vendor}"
                                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.Vendor)}"
-                                                                SortMemberPath="Vendor" />
+                                                                SortMemberPath="Vendor"
+                                                                MinWidth="150" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.PhyKind}"
                                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.PhyKind)}"
-                                                                SortMemberPath="PhyKind" />
+                                                                SortMemberPath="PhyKind"
+                                                                MinWidth="100" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.NetworkKind}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).NetworkKind}"
-                                                SortMemberPath="AvailableNetwork.NetworkKind" />
+                                                SortMemberPath="AvailableNetwork.NetworkKind"
+                                                MinWidth="100" />
                                             <DataGridTextColumn
                                                 Header="{x:Static Member=localization:Strings.BeaconInterval}"
                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).BeaconInterval, Converter={StaticResource ResourceKey=TimeSpanToMillisecondConverter}}"
-                                                SortMemberPath="AvailableNetwork.BeaconInterval" />
+                                                SortMemberPath="AvailableNetwork.BeaconInterval"
+                                                MinWidth="120" />
                                             <DataGridTextColumn Header="{x:Static Member=localization:Strings.Uptime}"
                                                                 Binding="{Binding Path=(network:WiFiNetworkInfo.AvailableNetwork).Uptime, Converter={StaticResource ResourceKey=TimeSpanToStringConverter}}"
-                                                                SortMemberPath="AvailableNetwork.Uptime" />
+                                                                SortMemberPath="AvailableNetwork.Uptime"
+                                                                MinWidth="100"
+                                                                Width="*" />
                                         </controls2:MultiSelectDataGrid.Columns>
                                     </controls2:MultiSelectDataGrid>
                                     <TextBlock Grid.Row="2"
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 5c527e9422..03bbb528e3 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -76,6 +76,10 @@ Release date: **xx.xx.2025**
 
 ## Bug Fixes
 
+**General**
+
+- Fixed the last column of various DataGrids not resizing to fill the available view width. [#3417](https://github.com/BornToBeRoot/NETworkManager/pull/3417)
+
 **Port Scanner**
 
 - Fixed an app crash when double-clicking a port profile. [#3382](https://github.com/BornToBeRoot/NETworkManager/pull/3382)