diff --git a/Choco/networkmanager.nuspec b/Choco/networkmanager.nuspec
index a243346f50..d5f3b282d6 100644
--- a/Choco/networkmanager.nuspec
+++ b/Choco/networkmanager.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>NETworkManager</id>
-    <version>1.8.0.0</version>
+    <version>1.8.1.0</version>
     <owners>BornToBeRoot</owners>
     <title>NETworkManager</title>
     <authors>BornToBeRoot</authors>
diff --git a/Choco/tools/chocolateyinstall.ps1 b/Choco/tools/chocolateyinstall.ps1
index d488cac3e1..a66ea0034a 100644
--- a/Choco/tools/chocolateyinstall.ps1
+++ b/Choco/tools/chocolateyinstall.ps1
@@ -1,7 +1,7 @@
 
 $ErrorActionPreference = 'Stop';
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$url        = 'https://github.com/BornToBeRoot/NETworkManager/releases/download/v1.8.0.0/NETworkManager_v1.8.0.0_Setup.msi'  
+$url        = 'https://github.com/BornToBeRoot/NETworkManager/releases/download/v1.8.1.0/NETworkManager_v1.8.1.0_Setup.msi'  
 
 $packageArgs = @{
   packageName   = $env:ChocolateyPackageName
@@ -11,7 +11,7 @@ $packageArgs = @{
 
   softwareName  = 'NETworkManager*'
 
-  checksum      = 'F3470CA8626A0E2E8A7342D7EC6E1280B7955281B49F162B63215D1FB038AD67'
+  checksum      = 'CB2F9B4B1A269965AC26D3C5FE7D76D4D2B7CAED59549CF8599F83E2032CCF37'
   checksumType  = 'sha256'
 
   silentArgs    = "/qn /norestart /l*v `"$($env:TEMP)\$($packageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
diff --git a/Icon/NETworkManager.ico b/Images/NETworkManager.ico
similarity index 100%
rename from Icon/NETworkManager.ico
rename to Images/NETworkManager.ico
diff --git a/Icon/NETworkManager.svg b/Images/NETworkManager.svg
similarity index 100%
rename from Icon/NETworkManager.svg
rename to Images/NETworkManager.svg
diff --git a/Images/SplashScreen.png b/Images/SplashScreen.png
new file mode 100644
index 0000000000..6bffd7d248
Binary files /dev/null and b/Images/SplashScreen.png differ
diff --git a/Images/SplashScreen.xcf b/Images/SplashScreen.xcf
new file mode 100644
index 0000000000..97dd8221c6
Binary files /dev/null and b/Images/SplashScreen.xcf differ
diff --git a/Images/SplashScreen_large.png b/Images/SplashScreen_large.png
new file mode 100644
index 0000000000..778e7ef100
Binary files /dev/null and b/Images/SplashScreen_large.png differ
diff --git a/Images/SplashScreen_large.xcf b/Images/SplashScreen_large.xcf
new file mode 100644
index 0000000000..07af587876
Binary files /dev/null and b/Images/SplashScreen_large.xcf differ
diff --git a/Source/NETworkManager.sln.DotSettings b/Source/NETworkManager.sln.DotSettings
index 0feff53d80..790c700ebd 100644
--- a/Source/NETworkManager.sln.DotSettings
+++ b/Source/NETworkManager.sln.DotSettings
@@ -2,11 +2,13 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AES/@EntryIndexedValue">AES</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ARP/@EntryIndexedValue">ARP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CNAME/@EntryIndexedValue">CNAME</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CSV/@EntryIndexedValue">CSV</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DES/@EntryIndexedValue">DES</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DNS/@EntryIndexedValue">DNS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HTTP/@EntryIndexedValue">HTTP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=JSON/@EntryIndexedValue">JSON</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LAN/@EntryIndexedValue">LAN</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MAC/@EntryIndexedValue">MAC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD</s:String>
@@ -23,8 +25,12 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SNMPV/@EntryIndexedValue">SNMPV</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSH/@EntryIndexedValue">SSH</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TCP/@EntryIndexedValue">TCP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TTL/@EntryIndexedValue">TTL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TTY/@EntryIndexedValue">PuTTY</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TXT/@EntryIndexedValue">TXT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=UI/@EntryIndexedValue">UI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=VNC/@EntryIndexedValue">VNC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XML/@EntryIndexedValue">XML</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=CIDR/@EntryIndexedValue">CIDR</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=DNS/@EntryIndexedValue">DNS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/Abbreviations/=HTTP/@EntryIndexedValue">HTTP</s:String>
diff --git a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
index 4627dc9eb5..7a2ca2a5c5 100644
--- a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
+++ b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
@@ -78,6 +78,9 @@
                                                                     <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
                                                                         <Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
                                                                         <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsMouseOver}" Value="True">
+                                                                                <Setter Property="Foreground" Value="{DynamicResource GrayBrush5}" />
+                                                                            </DataTrigger>
                                                                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsSelected}" Value="True">
                                                                                 <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                                                                             </DataTrigger>
diff --git a/Source/NETworkManager/Controls/MultiSelectScrollingDataGrid.cs b/Source/NETworkManager/Controls/MultiSelectScrollingDataGrid.cs
new file mode 100644
index 0000000000..7d94c1e296
--- /dev/null
+++ b/Source/NETworkManager/Controls/MultiSelectScrollingDataGrid.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace NETworkManager.Controls
+{
+    public class MultiSelectScrollingDataGrid : DataGrid
+    {
+        public MultiSelectScrollingDataGrid()
+        {
+            SelectionChanged += DataGridMultiItemSelect_SelectionChanged;
+        }
+
+        private void DataGridMultiItemSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            SelectedItemsList = SelectedItems;
+        }
+
+        public IList SelectedItemsList
+        {
+            get => (IList)GetValue(SelectedItemsListProperty);
+            set => SetValue(SelectedItemsListProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectedItemsListProperty = DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectScrollingDataGrid), new PropertyMetadata(null));
+
+        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+        {
+            if (e.NewItems == null)
+                return;
+
+            var newItemCount = e.NewItems.Count;
+
+            if (newItemCount > 0)
+                ScrollIntoView(e.NewItems[newItemCount - 1]);
+
+            base.OnItemsChanged(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml
index abf28ac14e..de40cdf290 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml
@@ -16,7 +16,19 @@
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
     </UserControl.Resources>
     <Grid x:Name="RdpGrid" SizeChanged="RdpGrid_SizeChanged">
-        <WindowsFormsHost MaxWidth="{Binding RdpClientWidth, Mode=OneWay}" MaxHeight="{Binding RdpClientHeight, Mode=OneWay}" Visibility="{Binding IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+        <WindowsFormsHost MaxWidth="{Binding RdpClientWidth, Mode=OneWay}" MaxHeight="{Binding RdpClientHeight, Mode=OneWay}">
+            <WindowsFormsHost.Style>
+                <Style TargetType="{x:Type WindowsFormsHost}">
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding IsConnected}" Value="False">
+                            <Setter Property="Visibility" Value="Hidden" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding IsReconnecting}" Value="True">
+                            <Setter Property="Visibility" Value="Hidden" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </WindowsFormsHost.Style>
             <mstsc:AxMsRdpClient9NotSafeForScripting x:Name="RdpClient" />
         </WindowsFormsHost>
         <Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center" Visibility="{Binding IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
@@ -32,5 +44,16 @@
             <Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
             <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
         </Grid>
+        <Grid VerticalAlignment="Center" HorizontalAlignment="Center" TextBlock.TextAlignment="Center" Visibility="{Binding IsReconnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="20" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" />
+            <TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" />
+        </Grid>
+
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
index 1ff2ecd091..d026264fa9 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -4,7 +4,7 @@
 using System.Windows;
 using System.Windows.Input;
 using System;
-using System.Windows.Threading;
+using System.Threading.Tasks;
 using NETworkManager.Utilities;
 
 namespace NETworkManager.Controls
@@ -25,8 +25,6 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
 
         private readonly RemoteDesktopSessionInfo _rdpSessionInfo;
 
-        private readonly DispatcherTimer _reconnectAdjustScreenTimer = new DispatcherTimer();
-
         // Fix WindowsFormsHost width
         private double _rdpClientWidth;
         public double RdpClientWidth
@@ -98,6 +96,20 @@ public string DisconnectReason
                 OnPropertyChanged();
             }
         }
+
+        private bool _isReconnecting;
+        public bool IsReconnecting
+        {
+            get => _isReconnecting;
+            set
+            {
+                if (value == _isReconnecting)
+                    return;
+
+                _isReconnecting = value;
+                OnPropertyChanged();
+            }
+        }
         #endregion
 
         #region Constructor, load
@@ -108,20 +120,17 @@ public RemoteDesktopControl(RemoteDesktopSessionInfo info)
 
             _rdpSessionInfo = info;
 
-            _reconnectAdjustScreenTimer.Tick += ReconnectAdjustScreenTimer_Tick;
-            _reconnectAdjustScreenTimer.Interval = new TimeSpan(0, 0, 0, 0, 500);
-
             Dispatcher.ShutdownStarted += Dispatcher_ShutdownStarted;
         }
 
         private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
             // Connect after the control is drawn and only on the first init
-            if (!_initialized)
-            {
-                Connect();
-                _initialized = true;
-            }
+            if (_initialized)
+                return;
+
+            Connect();
+            _initialized = true;
         }
 
         private void Dispatcher_ShutdownStarted(object sender, EventArgs e)
@@ -357,18 +366,23 @@ private void RdpClient_OnDisconnected(object sender, AxMSTSCLib.IMsTscAxEvents_O
 
         private void RdpGrid_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            // Prevent with a timer, that the function (rdpClient.Reconnect()) is executed too often
-            if (IsConnected && _rdpSessionInfo.AdjustScreenAutomatically)
-                _reconnectAdjustScreenTimer.Start();
+            if (IsConnected && _rdpSessionInfo.AdjustScreenAutomatically && !IsReconnecting)
+                InitiateReconnection();
         }
 
-        private void ReconnectAdjustScreenTimer_Tick(object sender, EventArgs e)
+        private async void InitiateReconnection()
         {
-            // Stop timer
-            _reconnectAdjustScreenTimer.Stop();
+            IsReconnecting = true;
+
+            do
+            {
+                await Task.Delay(500);
+
+            } while (Mouse.LeftButton == MouseButtonState.Pressed);
 
-            // Reconnect with new resulution
             ReconnectAdjustScreen();
+
+            IsReconnecting = false;
         }
         #endregion
     }
diff --git a/Source/NETworkManager/Controls/ScrollingDataGrid.cs b/Source/NETworkManager/Controls/ScrollingDataGrid.cs
deleted file mode 100644
index d44f99cea7..0000000000
--- a/Source/NETworkManager/Controls/ScrollingDataGrid.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections.Specialized;
-using System.Windows.Controls;
-
-namespace NETworkManager.Controls
-{
-    public class ScrollingDataGrid : DataGrid
-    {
-        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
-        {
-            if (e.NewItems == null)
-                return;
-
-            var newItemCount = e.NewItems.Count;
-
-            if (newItemCount > 0)
-                ScrollIntoView(e.NewItems[newItemCount - 1]);
-
-            base.OnItemsChanged(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Source/NETworkManager/Converters/AccentToStringConverter.cs b/Source/NETworkManager/Converters/AccentToStringConverter.cs
index 0fa77dcaae..9eb9ee7647 100644
--- a/Source/NETworkManager/Converters/AccentToStringConverter.cs
+++ b/Source/NETworkManager/Converters/AccentToStringConverter.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using NETworkManager.Models.Settings;
 
 namespace NETworkManager.Converters
 {
@@ -13,7 +14,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (!(value is Accent accent))
                 return "No valid accent passed!";
 
-            var name = Resources.Localization.Strings.ResourceManager.GetString(accent.Name);
+            var name = Resources.Localization.Strings.ResourceManager.GetString(accent.Name, LocalizationManager.Culture);
 
             if (string.IsNullOrEmpty(name))
                 name = accent.Name;
diff --git a/Source/NETworkManager/Converters/AppThemeToStringConverter.cs b/Source/NETworkManager/Converters/AppThemeToStringConverter.cs
index 08dea08016..55b87442a7 100644
--- a/Source/NETworkManager/Converters/AppThemeToStringConverter.cs
+++ b/Source/NETworkManager/Converters/AppThemeToStringConverter.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using NETworkManager.Models.Settings;
 
 namespace NETworkManager.Converters
 {
@@ -13,7 +14,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (!(value is AppTheme theme))
                 return "No valid theme passed!";
 
-            var name = Resources.Localization.Strings.ResourceManager.GetString(theme.Name);
+            var name = Resources.Localization.Strings.ResourceManager.GetString(theme.Name, LocalizationManager.Culture);
 
             if (string.IsNullOrEmpty(name))
                 name = theme.Name;
diff --git a/Source/NETworkManager/Converters/AutoRefreshTimeToStringConverter.cs b/Source/NETworkManager/Converters/AutoRefreshTimeToStringConverter.cs
index 57f19772fa..220978fe66 100644
--- a/Source/NETworkManager/Converters/AutoRefreshTimeToStringConverter.cs
+++ b/Source/NETworkManager/Converters/AutoRefreshTimeToStringConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using NETworkManager.Models.Settings;
 using static NETworkManager.Utilities.AutoRefreshTime;
 
 namespace NETworkManager.Converters
@@ -12,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (!(value is TimeUnit timeUnit))
                 return "No valid time unit passed!";
 
-            var timeUnitTranslated = Resources.Localization.Strings.ResourceManager.GetString("TimeUnit_" + timeUnit);
+            var timeUnitTranslated = Resources.Localization.Strings.ResourceManager.GetString("TimeUnit_" + timeUnit, LocalizationManager.Culture);
 
             return string.IsNullOrEmpty(timeUnitTranslated) ? timeUnit.ToString() : timeUnitTranslated;
         }
diff --git a/Source/NETworkManager/Converters/IPStatusToStringConverter.cs b/Source/NETworkManager/Converters/IPStatusToStringConverter.cs
index fc91246e4c..b4b8f0a3e5 100644
--- a/Source/NETworkManager/Converters/IPStatusToStringConverter.cs
+++ b/Source/NETworkManager/Converters/IPStatusToStringConverter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
-using System.Net.NetworkInformation;
 using System.Windows.Data;
+using NETworkManager.Models.Settings;
 
 namespace NETworkManager.Converters
 {
@@ -9,12 +9,7 @@ public sealed class IPStatusToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if(!(value is IPStatus ipStatus))
-                return "-/-";
-
-            var status = Resources.Localization.Strings.ResourceManager.GetString("IPStatus_" + ipStatus);
-
-            return string.IsNullOrEmpty(status) ? ipStatus.ToString() : status;
+           return LocalizationManager.TranslateIPStatus(value);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/Source/NETworkManager/Converters/PingStatusToBoolConverter.cs b/Source/NETworkManager/Converters/PingStatusToBoolConverter.cs
new file mode 100644
index 0000000000..bdfcbea23c
--- /dev/null
+++ b/Source/NETworkManager/Converters/PingStatusToBoolConverter.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using System.Net.NetworkInformation;
+using System.Windows.Data;
+
+namespace NETworkManager.Converters
+{
+    public sealed class PingStatusToBoolConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value != null && (IPStatus) value == IPStatus.Success;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Source/NETworkManager/Converters/PingTimeToStringConverter.cs b/Source/NETworkManager/Converters/PingTimeToStringConverter.cs
index 04ab7323fe..1d91a48295 100644
--- a/Source/NETworkManager/Converters/PingTimeToStringConverter.cs
+++ b/Source/NETworkManager/Converters/PingTimeToStringConverter.cs
@@ -9,16 +9,7 @@ public sealed class PingTimeToStringConverter : IMultiValueConverter
     {
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            var status = (IPStatus)values[0];
-
-
-            if (status != IPStatus.Success && status != IPStatus.TtlExpired)
-                return "-/-";
-
-            long.TryParse(values[1].ToString(), out var time);
-
-            return time == 0 ? "<1 ms" : $"{time} ms";
-
+            return Models.Network.Ping.TimeToString((IPStatus)values[0], (long)values[1]);
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
diff --git a/Source/NETworkManager/Converters/PortStatusToStringConverter.cs b/Source/NETworkManager/Converters/PortStatusToStringConverter.cs
index 221c8678e3..7c2f4b76b1 100644
--- a/Source/NETworkManager/Converters/PortStatusToStringConverter.cs
+++ b/Source/NETworkManager/Converters/PortStatusToStringConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using NETworkManager.Models.Settings;
 using static NETworkManager.Models.Network.PortInfo;
 
 namespace NETworkManager.Converters
@@ -12,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (!(value is PortStatus portStatus))
                 return "-/-";
 
-            var status = Resources.Localization.Strings.ResourceManager.GetString("PortState_" + portStatus);
+            var status = Resources.Localization.Strings.ResourceManager.GetString("PortState_" + portStatus, LocalizationManager.Culture);
 
             return string.IsNullOrEmpty(status) ? portStatus.ToString() : status;
         }
diff --git a/Source/NETworkManager/Converters/TcpStateToStringConverter.cs b/Source/NETworkManager/Converters/TcpStateToStringConverter.cs
index eb91bc7e39..c4049d3643 100644
--- a/Source/NETworkManager/Converters/TcpStateToStringConverter.cs
+++ b/Source/NETworkManager/Converters/TcpStateToStringConverter.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Net.NetworkInformation;
 using System.Windows.Data;
+using NETworkManager.Models.Settings;
 
 namespace NETworkManager.Converters
 {
@@ -12,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (!(value is TcpState tcpState))
                 return "-/-";
 
-            var status = Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + tcpState);
+            var status = Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + tcpState, LocalizationManager.Culture);
 
             return string.IsNullOrEmpty(status) ? tcpState.ToString() : status;
         }
diff --git a/Source/NETworkManager/GlobalStaticConfiguration.cs b/Source/NETworkManager/GlobalStaticConfiguration.cs
new file mode 100644
index 0000000000..9e3fa482db
--- /dev/null
+++ b/Source/NETworkManager/GlobalStaticConfiguration.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace NETworkManager
+{
+    public class GlobalStaticConfiguration
+    {
+        // Average type speed --> 187 chars/min
+        public static TimeSpan SearchDispatcherTimerTimeSpan => new TimeSpan(0, 0, 0, 0, 750);
+        public static TimeSpan CredentialsUILockTime => new TimeSpan(0, 0, 120);
+        public static double ProfileWidthCollapsed => 40;
+        public static double ProfileDefaultWidthExpanded => 250;
+        public static double ProfileMaxWidthExpanded => 350;
+    }
+}
\ No newline at end of file
diff --git a/Source/NETworkManager/Licenses/Newtonsoft.Json.txt b/Source/NETworkManager/Licenses/Newtonsoft.Json.txt
new file mode 100644
index 0000000000..6f6dcfb268
--- /dev/null
+++ b/Source/NETworkManager/Licenses/Newtonsoft.Json.txt
@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/Source/NETworkManager/Models/Documentation/LibraryManager.cs b/Source/NETworkManager/Models/Documentation/LibraryManager.cs
index e014872088..38d035d853 100644
--- a/Source/NETworkManager/Models/Documentation/LibraryManager.cs
+++ b/Source/NETworkManager/Models/Documentation/LibraryManager.cs
@@ -23,7 +23,8 @@ public static string GetLicenseLocation()
             new LibraryInfo("#SNMP Libary", "https://github.com/lextm/sharpsnmplib", "Sharp SNMP Library - Open Source SNMP for .NET and Mono", "MIT License", "https://github.com/lextm/sharpsnmplib/blob/master/LICENSE"),
             new LibraryInfo("Dragablz", "https://github.com/ButchersBoy/Dragablz", "Dragable and tearable tab control for WPF", "MIT License","https://github.com/ButchersBoy/Dragablz/blob/master/LICENSE"),
             new LibraryInfo("IPNetwork", "https://github.com/lduchosal/ipnetwork", "C# library take care of complex network, IP, IPv4, IPv6, netmask, CIDR, subnet, subnetting, supernet, and supernetting calculation for .NET developers.", "BSD-2-Clause", "https://github.com/lduchosal/ipnetwork/blob/master/LICENSE"),
-            new LibraryInfo("AirspaceFixer" ,"https://github.com/chris84948/AirspaceFixer", "AirspacePanel fixes all Airspace issues with WPF-hosted Winforms.", "MIT License", "https://github.com/chris84948/AirspaceFixer/blob/master/LICENSE")
+            new LibraryInfo("AirspaceFixer" ,"https://github.com/chris84948/AirspaceFixer", "AirspacePanel fixes all Airspace issues with WPF-hosted Winforms.", "MIT License", "https://github.com/chris84948/AirspaceFixer/blob/master/LICENSE"),
+            new LibraryInfo("Newtonsoft.Json", "https://github.com/JamesNK/Newtonsoft.Json", "Json.NET is a popular high-performance JSON framework for .NET", "MIT License","https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md")
         };
     }
 }
diff --git a/Source/NETworkManager/Models/Export/ExportManager.cs b/Source/NETworkManager/Models/Export/ExportManager.cs
new file mode 100644
index 0000000000..41737c2f2c
--- /dev/null
+++ b/Source/NETworkManager/Models/Export/ExportManager.cs
@@ -0,0 +1,898 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Xml.Linq;
+using Newtonsoft.Json;
+using NETworkManager.Models.Lookup;
+using NETworkManager.Models.Network;
+
+namespace NETworkManager.Models.Export
+{
+    public static class ExportManager
+    {
+        #region Variables
+        private static readonly XDeclaration DefaultXDeclaration = new XDeclaration("1.0", "utf-8", "yes");
+        #endregion
+
+        #region Methods
+
+        #region Export
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<HostInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<PortInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<PingInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<TracerouteHopInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<DNSLookupRecordInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<SNMPReceivedInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<IPNetwork> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<OUIInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<PortLookupInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<ConnectionInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<ListenerInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, ExportFileType fileType, ObservableCollection<ARPInfo> collection)
+        {
+            switch (fileType)
+            {
+                case ExportFileType.CSV:
+                    CreateCSV(collection, filePath);
+                    break;
+                case ExportFileType.XML:
+                    CreateXML(collection, filePath);
+                    break;
+                case ExportFileType.JSON:
+                    CreateJSON(collection, filePath);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+
+        public static void Export(string filePath, string content)
+        {
+            CreateTXT(content, filePath);
+        }
+        #endregion
+
+        #region CreateCSV
+        private static void CreateCSV(IEnumerable<HostInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(PingInfo.IPAddress)},{nameof(HostInfo.Hostname)},{nameof(HostInfo.MACAddress)},{nameof(HostInfo.Vendor)},{nameof(PingInfo.Bytes)},{nameof(PingInfo.Time)},{nameof(PingInfo.TTL)},{nameof(PingInfo.Status)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.PingInfo.IPAddress},{info.Hostname},{info.MACAddress},{info.Vendor},{info.PingInfo.Bytes},{Ping.TimeToString(info.PingInfo.Status, info.PingInfo.Time, true)},{info.PingInfo.TTL},{info.PingInfo.Status}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<PortInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(PortInfo.IPAddress)},{nameof(PortInfo.Hostname)},{nameof(PortInfo.Port)},{nameof(PortLookupInfo.Protocol)},{nameof(PortLookupInfo.Service)},{nameof(PortLookupInfo.Description)},{nameof(PortInfo.Status)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.IPAddress},{info.Hostname},{info.Port},{info.LookupInfo.Protocol},{info.LookupInfo.Service},{info.LookupInfo.Description},{info.Status}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<PingInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(PingInfo.Timestamp)},{nameof(PingInfo.IPAddress)},{nameof(PingInfo.Hostname)},{nameof(PingInfo.Bytes)},{nameof(PingInfo.Time)},{nameof(PingInfo.TTL)},{nameof(PingInfo.Status)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Timestamp},{info.IPAddress},{info.Hostname},{info.Bytes},{Ping.TimeToString(info.Status, info.Time, true)},{info.TTL},{info.Status}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<TracerouteHopInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(TracerouteHopInfo.Hop)},{nameof(TracerouteHopInfo.Time1)},{nameof(TracerouteHopInfo.Time2)},{nameof(TracerouteHopInfo.Time3)},{nameof(TracerouteHopInfo.IPAddress)},{nameof(TracerouteHopInfo.Hostname)},{nameof(TracerouteHopInfo.Status1)},{nameof(TracerouteHopInfo.Status2)},{nameof(TracerouteHopInfo.Status3)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Hop},{Ping.TimeToString(info.Status1, info.Time1, true)},{Ping.TimeToString(info.Status2, info.Time2, true)},{Ping.TimeToString(info.Status3, info.Time3, true)},{info.IPAddress},{info.Hostname},{info.Status1},{info.Status2},{info.Status3}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<DNSLookupRecordInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(DNSLookupRecordInfo.Name)},{nameof(DNSLookupRecordInfo.TTL)},{nameof(DNSLookupRecordInfo.Class)},{nameof(DNSLookupRecordInfo.Type)},{nameof(DNSLookupRecordInfo.Result)},{nameof(DNSLookupRecordInfo.DNSServer)},{nameof(DNSLookupRecordInfo.Port)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Name},{info.TTL},{info.Class},{info.Type},{info.Result},{info.DNSServer},{info.Port}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<SNMPReceivedInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(SNMPReceivedInfo.OID)},{nameof(SNMPReceivedInfo.Data)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.OID},{info.Data}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<IPNetwork> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(IPNetwork.Network)},{nameof(IPNetwork.Broadcast)},{nameof(IPNetwork.Total)},{nameof(IPNetwork.Netmask)},{nameof(IPNetwork.Cidr)},{nameof(IPNetwork.FirstUsable)},{nameof(IPNetwork.LastUsable)},{nameof(IPNetwork.Usable)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Network},{info.Broadcast},{info.Total},{info.Netmask},{info.Cidr},{info.FirstUsable},{info.LastUsable},{info.Usable}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<OUIInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(OUIInfo.MACAddress)},{nameof(OUIInfo.Vendor)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.MACAddress},{info.Vendor}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<PortLookupInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(PortLookupInfo.Number)},{nameof(PortLookupInfo.Protocol)},{nameof(PortLookupInfo.Service)},{nameof(PortLookupInfo.Description)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Number},{info.Protocol},{info.Service},{info.Description}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<ConnectionInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(ConnectionInfo.Protocol)},{nameof(ConnectionInfo.LocalIPAddress)},{nameof(ConnectionInfo.LocalPort)},{nameof(ConnectionInfo.RemoteIPAddress)},{nameof(ConnectionInfo.RemotePort)},{nameof(ConnectionInfo.TcpState)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Protocol},{info.LocalIPAddress},{info.LocalPort},{info.RemoteIPAddress},{info.RemotePort},{info.TcpState}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<ListenerInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(ListenerInfo.Protocol)},{nameof(ListenerInfo.IPAddress)},{nameof(ListenerInfo.Port)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.Protocol},{info.IPAddress},{info.Port}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+
+        private static void CreateCSV(IEnumerable<ARPInfo> collection, string filePath)
+        {
+            var stringBuilder = new StringBuilder();
+
+            stringBuilder.AppendLine($"{nameof(ARPInfo.IPAddress)},{nameof(ARPInfo.MACAddress)},{nameof(ARPInfo.IsMulticast)}");
+
+            foreach (var info in collection)
+                stringBuilder.AppendLine($"{info.IPAddress},{info.MACAddress},{info.IsMulticast}");
+
+            System.IO.File.WriteAllText(filePath, stringBuilder.ToString());
+        }
+        #endregion
+
+        #region CreateXML
+        public static void CreateXML(IEnumerable<HostInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.IPScanner.ToString(),
+                    new XElement(nameof(HostInfo) + "s",
+
+                    from info in collection
+                    select
+                        new XElement(nameof(HostInfo),
+                            new XElement(nameof(PingInfo.IPAddress), info.PingInfo.IPAddress),
+                            new XElement(nameof(HostInfo.Hostname), info.Hostname),
+                            new XElement(nameof(HostInfo.MACAddress), info.MACAddress),
+                            new XElement(nameof(HostInfo.Vendor), info.Vendor),
+                            new XElement(nameof(PingInfo.Bytes), info.PingInfo.Bytes),
+                            new XElement(nameof(PingInfo.Time), Ping.TimeToString(info.PingInfo.Status, info.PingInfo.Time, true)),
+                            new XElement(nameof(PingInfo.TTL), info.PingInfo.TTL),
+                            new XElement(nameof(PingInfo.Status), info.PingInfo.Status)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<PortInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.PortScanner.ToString(),
+                    new XElement(nameof(PortInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(PortInfo),
+                                new XElement(nameof(PortInfo.IPAddress), info.IPAddress),
+                                new XElement(nameof(PortInfo.Hostname), info.Hostname),
+                                new XElement(nameof(PortInfo.Port), info.Port),
+                                new XElement(nameof(PortLookupInfo.Protocol), info.LookupInfo.Protocol),
+                                new XElement(nameof(PortLookupInfo.Service), info.LookupInfo.Service),
+                                new XElement(nameof(PortLookupInfo.Description), info.LookupInfo.Description),
+                                new XElement(nameof(PortInfo.Status), info.Status)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<PingInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.Ping.ToString(),
+                    new XElement(nameof(PingInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(PingInfo),
+                                new XElement(nameof(PingInfo.Timestamp), info.Timestamp),
+                                new XElement(nameof(PingInfo.IPAddress), info.IPAddress),
+                                new XElement(nameof(PingInfo.Hostname), info.Hostname),
+                                new XElement(nameof(PingInfo.Bytes), info.Bytes),
+                                new XElement(nameof(PingInfo.Time), Ping.TimeToString(info.Status, info.Time, true)),
+                                new XElement(nameof(PingInfo.TTL), info.TTL),
+                                new XElement(nameof(PingInfo.Status), info.Status)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<TracerouteHopInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.Traceroute.ToString(),
+                    new XElement(nameof(TracerouteHopInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(TracerouteHopInfo),
+                                new XElement(nameof(TracerouteHopInfo.Hop), info.Hop),
+                                new XElement(nameof(TracerouteHopInfo.Time1), Ping.TimeToString(info.Status1, info.Time1, true)),
+                                new XElement(nameof(TracerouteHopInfo.Time2), Ping.TimeToString(info.Status2, info.Time2, true)),
+                                new XElement(nameof(TracerouteHopInfo.Time3), Ping.TimeToString(info.Status3, info.Time3, true)),
+                                new XElement(nameof(TracerouteHopInfo.IPAddress), info.IPAddress),
+                                new XElement(nameof(TracerouteHopInfo.Hostname), info.Hostname),
+                                new XElement(nameof(TracerouteHopInfo.Status1), info.Status1),
+                                new XElement(nameof(TracerouteHopInfo.Status2), info.Status2),
+                                new XElement(nameof(TracerouteHopInfo.Status3), info.Status3)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<DNSLookupRecordInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.DNSLookup.ToString(),
+                    new XElement(nameof(DNSLookupRecordInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(DNSLookupRecordInfo),
+                                new XElement(nameof(DNSLookupRecordInfo.Name), info.Name),
+                                new XElement(nameof(DNSLookupRecordInfo.TTL), info.TTL),
+                                new XElement(nameof(DNSLookupRecordInfo.Class), info.Class),
+                                new XElement(nameof(DNSLookupRecordInfo.Type), info.Type),
+                                new XElement(nameof(DNSLookupRecordInfo.Result), info.Result),
+                                new XElement(nameof(DNSLookupRecordInfo.DNSServer), info.DNSServer),
+                                new XElement(nameof(DNSLookupRecordInfo.Port), info.Port)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<SNMPReceivedInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.SNMP.ToString(),
+                    new XElement(nameof(SNMPReceivedInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(SNMPReceivedInfo),
+                                new XElement(nameof(SNMPReceivedInfo.OID), info.OID),
+                                new XElement(nameof(SNMPReceivedInfo.Data), info.Data)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<IPNetwork> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.SNMP.ToString(),
+                    new XElement(nameof(IPNetwork) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(IPNetwork),
+                                new XElement(nameof(IPNetwork.Network), info.Network),
+                                new XElement(nameof(IPNetwork.Broadcast), info.Broadcast),
+                                new XElement(nameof(IPNetwork.Total), info.Total),
+                                new XElement(nameof(IPNetwork.Netmask), info.Netmask),
+                                new XElement(nameof(IPNetwork.Cidr), info.Cidr),
+                                new XElement(nameof(IPNetwork.FirstUsable), info.FirstUsable),
+                                new XElement(nameof(IPNetwork.LastUsable), info.LastUsable),
+                                new XElement(nameof(IPNetwork.Usable), info.Usable)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<OUIInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.Lookup.ToString(),
+                    new XElement(nameof(OUIInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(OUIInfo),
+                                new XElement(nameof(OUIInfo.MACAddress), info.MACAddress),
+                                new XElement(nameof(OUIInfo.Vendor), info.Vendor)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<PortLookupInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.Lookup.ToString(),
+                    new XElement(nameof(PortLookupInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(PortLookupInfo),
+                                new XElement(nameof(PortLookupInfo.Number), info.Number),
+                                new XElement(nameof(PortLookupInfo.Protocol), info.Protocol),
+                                new XElement(nameof(PortLookupInfo.Service), info.Service),
+                                new XElement(nameof(PortLookupInfo.Description), info.Description)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<ConnectionInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.Connections.ToString(),
+                    new XElement(nameof(ConnectionInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(ConnectionInfo),
+                                new XElement(nameof(ConnectionInfo.Protocol), info.Protocol),
+                                new XElement(nameof(ConnectionInfo.LocalIPAddress), info.LocalIPAddress),
+                                new XElement(nameof(ConnectionInfo.LocalPort), info.LocalPort),
+                                new XElement(nameof(ConnectionInfo.RemoteIPAddress), info.RemoteIPAddress),
+                                new XElement(nameof(ConnectionInfo.RemotePort), info.RemotePort),
+                                new XElement(nameof(ConnectionInfo.TcpState), info.TcpState)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<ListenerInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.Listeners.ToString(),
+                    new XElement(nameof(ListenerInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(ListenerInfo),
+                                new XElement(nameof(ListenerInfo.Protocol), info.Protocol),
+                                new XElement(nameof(ListenerInfo.IPAddress), info.IPAddress),
+                                new XElement(nameof(ListenerInfo.Port), info.Port)))));
+
+            document.Save(filePath);
+        }
+
+        public static void CreateXML(IEnumerable<ARPInfo> collection, string filePath)
+        {
+            var document = new XDocument(DefaultXDeclaration,
+
+                new XElement(ApplicationViewManager.Name.ARPTable.ToString(),
+                    new XElement(nameof(ARPInfo) + "s",
+
+                        from info in collection
+                        select
+                            new XElement(nameof(ARPInfo),
+                                new XElement(nameof(ARPInfo.IPAddress), info.IPAddress),
+                                new XElement(nameof(ARPInfo.MACAddress), info.MACAddress),
+                                new XElement(nameof(ARPInfo.IsMulticast), info.IsMulticast)))));
+
+            document.Save(filePath);
+        }
+        #endregion
+
+        #region CreateJSON
+        // This might be a horror to maintain, but i have no other idea...
+        public static void CreateJSON(ObservableCollection<HostInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    IPAddress = collection[i].PingInfo.IPAddress.ToString(),
+                    collection[i].Hostname,
+                    MACAddress = collection[i].MACAddress.ToString(),
+                    collection[i].Vendor,
+                    collection[i].PingInfo.Bytes,
+                    Time = Ping.TimeToString(collection[i].PingInfo.Status, collection[i].PingInfo.Time, true),
+                    collection[i].PingInfo.TTL,
+                    Status = collection[i].PingInfo.Status.ToString()
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<PortInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    IPAddress = collection[i].IPAddress.ToString(),
+                    collection[i].Hostname,
+                    collection[i].Port,
+                    Protocol = collection[i].LookupInfo.Protocol.ToString(),
+                    collection[i].LookupInfo.Service,
+                    collection[i].LookupInfo.Description,
+                    Status = collection[i].Status.ToString()
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<PingInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    collection[i].Timestamp,
+                    IPAddress = collection[i].IPAddress.ToString(),
+                    collection[i].Hostname,
+                    collection[i].Bytes,
+                    Time = Ping.TimeToString(collection[i].Status, collection[i].Time, true),
+                    collection[i].TTL,
+                    Status = collection[i].Status.ToString()
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<TracerouteHopInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    collection[i].Hop,
+                    Time1 = Ping.TimeToString(collection[i].Status1, collection[i].Time1, true),
+                    Time2 = Ping.TimeToString(collection[i].Status2, collection[i].Time2, true),
+                    Time3 = Ping.TimeToString(collection[i].Status3, collection[i].Time3, true),
+                    IPAddress = collection[i].IPAddress.ToString(),
+                    collection[i].Hostname,
+                    Status1 = collection[i].Status1.ToString(),
+                    Status2 = collection[i].Status2.ToString(),
+                    Status3 = collection[i].Status3.ToString()
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<DNSLookupRecordInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    collection[i].Name,
+                    collection[i].TTL,
+                    collection[i].Class,
+                    collection[i].Type,
+                    collection[i].Result,
+                    collection[i].DNSServer,
+                    collection[i].Port
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<SNMPReceivedInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    collection[i].OID,
+                    collection[i].Data
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<IPNetwork> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    Network = collection[i].Network.ToString(),
+                    Broadcast = collection[i].Broadcast.ToString(),
+                    collection[i].Total,
+                    Netmask = collection[i].Netmask.ToString(),
+                    collection[i].Cidr,
+                    FirstUsable = collection[i].FirstUsable.ToString(),
+                    LastUsable = collection[i].LastUsable.ToString(),
+                    collection[i].Usable
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<OUIInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    collection[i].MACAddress,
+                    collection[i].Vendor
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<PortLookupInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    collection[i].Number,
+                    Protocol = collection[i].Protocol.ToString(),
+                    collection[i].Service,
+                    collection[i].Description
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<ConnectionInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    Protocol = collection[i].Protocol.ToString(),
+                    LocalIPAddress = collection[i].LocalIPAddress.ToString(),
+                    collection[i].LocalPort,
+                    RemoteIPAddress = collection[i].RemoteIPAddress.ToString(),
+                    collection[i].RemotePort,
+                    TcpState = collection[i].TcpState.ToString()
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<ListenerInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    Protocol = collection[i].Protocol.ToString(),
+                    IPAddress = collection[i].IPAddress.ToString(),
+                    collection[i].Port
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+
+        public static void CreateJSON(ObservableCollection<ARPInfo> collection, string filePath)
+        {
+            var jsonData = new object[collection.Count];
+
+            for (var i = 0; i < collection.Count; i++)
+            {
+                jsonData[i] = new
+                {
+                    IPAddress = collection[i].IPAddress.ToString(),
+                    MACAddress = collection[i].MACAddress.ToString(),
+                    collection[i].IsMulticast
+                };
+            }
+
+            System.IO.File.WriteAllText(filePath, JsonConvert.SerializeObject(jsonData, Formatting.Indented));
+        }
+        #endregion
+
+        #region CreateTXT
+
+        public static void CreateTXT(string content, string filePath)
+        {
+            System.IO.File.WriteAllText(filePath, content);
+        }
+        #endregion
+
+        public static string GetFileExtensionAsString(ExportFileType fileExtension)
+        {
+            switch (fileExtension)
+            {
+                case ExportFileType.CSV:
+                    return "CSV";
+                case ExportFileType.XML:
+                    return "XML";
+                case ExportFileType.JSON:
+                    return "JSON";
+                case ExportFileType.TXT:
+                    return "TXT";
+                default:
+                    return string.Empty;
+            }
+        }
+        #endregion
+
+        public enum ExportFileType
+        {
+            CSV,
+            XML,
+            JSON,
+            TXT
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Lookup/PortLookup.cs b/Source/NETworkManager/Models/Lookup/PortLookup.cs
index d3778356a9..de11f3f56f 100644
--- a/Source/NETworkManager/Models/Lookup/PortLookup.cs
+++ b/Source/NETworkManager/Models/Lookup/PortLookup.cs
@@ -5,6 +5,8 @@
 using NETworkManager.Models.Settings;
 using System;
 using System.Xml;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace NETworkManager.Models.Lookup
 {
diff --git a/Source/NETworkManager/Models/Network/ARPTable.cs b/Source/NETworkManager/Models/Network/ARP.cs
similarity index 94%
rename from Source/NETworkManager/Models/Network/ARPTable.cs
rename to Source/NETworkManager/Models/Network/ARP.cs
index 1fc1004897..ff95a479ff 100644
--- a/Source/NETworkManager/Models/Network/ARPTable.cs
+++ b/Source/NETworkManager/Models/Network/ARP.cs
@@ -14,7 +14,7 @@
 namespace NETworkManager.Models.Network
 {
     [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public class ARPTable
+    public class ARP
     {
         #region Variables
         // The max number of physical addresses.
@@ -77,14 +77,14 @@ protected virtual void OnUserHasCanceled()
         #endregion
 
         #region Methods
-        public static Task<List<ARPTableInfo>> GetTableAsync()
+        public static Task<List<ARPInfo>> GetTableAsync()
         {
             return Task.Run(() => GetTable());
         }
 
-        public static List<ARPTableInfo> GetTable()
+        public static List<ARPInfo> GetTable()
         {
-            var list = new List<ARPTableInfo>();
+            var list = new List<ARPInfo>();
 
             // The number of bytes needed.
             var bytesNeeded = 0;
@@ -151,7 +151,7 @@ public static List<ARPTableInfo> GetTable()
 
                     // Filter 0.0.0.0.0.0, 255.255.255.255.255.255
                     if (!macAddress.Equals(virtualMAC) && !macAddress.Equals(broadcastMAC))
-                        list.Add(new ARPTableInfo(ipAddress, macAddress, (ipAddress.IsIPv6Multicast || IPv4AddressHelper.IsMulticast(ipAddress))));
+                        list.Add(new ARPInfo(ipAddress, macAddress, (ipAddress.IsIPv6Multicast || IPv4AddressHelper.IsMulticast(ipAddress))));
                 }
 
                 return list;
@@ -167,7 +167,7 @@ private void RunPSCommand(string command)
         {
             try
             {
-                PowerShellHelper.RunPSCommand(command, true);
+                PowerShellHelper.ExecuteCommand(command, true);
             }
             catch (Win32Exception win32Ex)
             {
diff --git a/Source/NETworkManager/Models/Network/ARPTableInfo.cs b/Source/NETworkManager/Models/Network/ARPInfo.cs
similarity index 79%
rename from Source/NETworkManager/Models/Network/ARPTableInfo.cs
rename to Source/NETworkManager/Models/Network/ARPInfo.cs
index e5b7f67e21..86c9dbf6a2 100644
--- a/Source/NETworkManager/Models/Network/ARPTableInfo.cs
+++ b/Source/NETworkManager/Models/Network/ARPInfo.cs
@@ -4,7 +4,7 @@
 
 namespace NETworkManager.Models.Network
 {
-    public class ARPTableInfo
+    public class ARPInfo
     {
         public IPAddress IPAddress { get; set; }
         public PhysicalAddress MACAddress { get; set; }
@@ -12,12 +12,12 @@ public class ARPTableInfo
 
         public int IPAddressInt32 => IPAddress.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork ? IPv4AddressHelper.ConvertToInt32(IPAddress) : 0;
 
-        public ARPTableInfo()
+        public ARPInfo()
         {
 
         }
 
-        public ARPTableInfo(IPAddress ipAddress, PhysicalAddress macAddress, bool isMulticast)
+        public ARPInfo(IPAddress ipAddress, PhysicalAddress macAddress, bool isMulticast)
         {
             IPAddress = ipAddress;
             MACAddress = macAddress;
diff --git a/Source/NETworkManager/Models/Network/ConnectionInfo.cs b/Source/NETworkManager/Models/Network/ConnectionInfo.cs
index 4094a1c3fc..d0b77c3939 100644
--- a/Source/NETworkManager/Models/Network/ConnectionInfo.cs
+++ b/Source/NETworkManager/Models/Network/ConnectionInfo.cs
@@ -12,7 +12,7 @@ public class ConnectionInfo
         public int LocalPort { get; set; }
         public IPAddress RemoteIPAddress { get; set; }
         public int RemotePort { get; set; }
-        public TcpState State { get; set; }
+        public TcpState TcpState { get; set; }
 
         public int LocalIPAddressInt32 => LocalIPAddress.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork ? IPv4AddressHelper.ConvertToInt32(LocalIPAddress) : 0;
 
@@ -23,14 +23,14 @@ public ConnectionInfo()
 
         }
 
-        public ConnectionInfo(Protocol protocol, IPAddress localIPAddress, int localPort, IPAddress remoteIPAddress, int remotePort, TcpState state)
+        public ConnectionInfo(Protocol protocol, IPAddress localIPAddress, int localPort, IPAddress remoteIPAddress, int remotePort, TcpState tcpState)
         {
             Protocol = protocol;
             LocalIPAddress = localIPAddress;
             LocalPort = localPort;
             RemoteIPAddress = remoteIPAddress;
             RemotePort = remotePort;
-            State = state;
+            TcpState = tcpState;
         }
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/Models/Network/IPScannerHostFoundArgs.cs b/Source/NETworkManager/Models/Network/HostFoundArgs.cs
similarity index 68%
rename from Source/NETworkManager/Models/Network/IPScannerHostFoundArgs.cs
rename to Source/NETworkManager/Models/Network/HostFoundArgs.cs
index 5d4d20fc36..acb2277a08 100644
--- a/Source/NETworkManager/Models/Network/IPScannerHostFoundArgs.cs
+++ b/Source/NETworkManager/Models/Network/HostFoundArgs.cs
@@ -2,19 +2,19 @@
 
 namespace NETworkManager.Models.Network
 {
-    public class IPScannerHostFoundArgs : System.EventArgs
+    public class HostFoundArgs : System.EventArgs
     {
         public PingInfo PingInfo { get; set; }
         public string Hostname { get; set; }
         public PhysicalAddress MACAddress { get; set; }
         public string Vendor { get; set; }
 
-        public IPScannerHostFoundArgs()
+        public HostFoundArgs()
         {
 
         }
 
-        public IPScannerHostFoundArgs(PingInfo pingInfo, string hostname, PhysicalAddress macAddress, string vendor)
+        public HostFoundArgs(PingInfo pingInfo, string hostname, PhysicalAddress macAddress, string vendor)
         {
             PingInfo = pingInfo;
             Hostname = hostname;
diff --git a/Source/NETworkManager/Models/Network/IPScannerHostInfo.cs b/Source/NETworkManager/Models/Network/HostInfo.cs
similarity index 57%
rename from Source/NETworkManager/Models/Network/IPScannerHostInfo.cs
rename to Source/NETworkManager/Models/Network/HostInfo.cs
index 3bc8ec11cd..a6614cdb28 100644
--- a/Source/NETworkManager/Models/Network/IPScannerHostInfo.cs
+++ b/Source/NETworkManager/Models/Network/HostInfo.cs
@@ -2,19 +2,21 @@
 
 namespace NETworkManager.Models.Network
 {
-    public class IPScannerHostInfo
+    public class HostInfo
     {
         public PingInfo PingInfo { get; set; }
         public string Hostname { get; set; }
         public PhysicalAddress MACAddress { get; set; }
         public string Vendor { get; set; }
 
-        public IPScannerHostInfo()
+        public string MACAddressString => MACAddress.ToString();
+
+        public HostInfo()
         {
 
         }
 
-        public IPScannerHostInfo(PingInfo pingInfo, string hostname, PhysicalAddress macAddress, string vendor)
+        public HostInfo(PingInfo pingInfo, string hostname, PhysicalAddress macAddress, string vendor)
         {
             PingInfo = pingInfo;
             Hostname = hostname;
@@ -22,9 +24,9 @@ public IPScannerHostInfo(PingInfo pingInfo, string hostname, PhysicalAddress mac
             Vendor = vendor;
         }
 
-        public static IPScannerHostInfo Parse(IPScannerHostFoundArgs e)
+        public static HostInfo Parse(HostFoundArgs e)
         {
-            return new IPScannerHostInfo(e.PingInfo, e.Hostname, e.MACAddress, e.Vendor);
+            return new HostInfo(e.PingInfo, e.Hostname, e.MACAddress, e.Vendor);
         }
     }
 }
diff --git a/Source/NETworkManager/Models/Network/IPScanner.cs b/Source/NETworkManager/Models/Network/IPScanner.cs
index 0f6bafdfe1..9fee3f12f4 100644
--- a/Source/NETworkManager/Models/Network/IPScanner.cs
+++ b/Source/NETworkManager/Models/Network/IPScanner.cs
@@ -14,9 +14,9 @@ public class IPScanner
         #endregion
 
         #region Events
-        public event EventHandler<IPScannerHostFoundArgs> HostFound;
+        public event EventHandler<HostFoundArgs> HostFound;
 
-        protected virtual void OnHostFound(IPScannerHostFoundArgs e)
+        protected virtual void OnHostFound(HostFoundArgs e)
         {
             HostFound?.Invoke(this, e);
         }
@@ -128,7 +128,7 @@ public void ScanAsync(IPAddress[] ipAddresses, IPScannerOptions ipScannerOptions
                             if (ipScannerOptions.ResolveMACAddress)
                             {
                                 // Get info from arp table
-                                var arpTableInfo = ARPTable.GetTable().FirstOrDefault(p => p.IPAddress.ToString() == ipAddress.ToString());
+                                var arpTableInfo = ARP.GetTable().FirstOrDefault(p => p.IPAddress.ToString() == ipAddress.ToString());
 
                                 if (arpTableInfo != null)
                                     macAddress = arpTableInfo.MACAddress;
@@ -152,7 +152,7 @@ public void ScanAsync(IPAddress[] ipAddresses, IPScannerOptions ipScannerOptions
                                 }
                             }
 
-                            OnHostFound(new IPScannerHostFoundArgs(pingInfo, hostname, macAddress, vendor));
+                            OnHostFound(new HostFoundArgs(pingInfo, hostname, macAddress, vendor));
                         }
 
                         IncreaseProcess();
diff --git a/Source/NETworkManager/Models/Network/NetworkInterface.cs b/Source/NETworkManager/Models/Network/NetworkInterface.cs
index 47c7156b53..9f071020b2 100644
--- a/Source/NETworkManager/Models/Network/NetworkInterface.cs
+++ b/Source/NETworkManager/Models/Network/NetworkInterface.cs
@@ -144,7 +144,7 @@ public void ConfigureNetworkInterface(NetworkInterfaceConfig config)
 
             try
             {
-                PowerShellHelper.RunPSCommand(command, true);
+                PowerShellHelper.ExecuteCommand(command, true);
             }
             catch (Win32Exception win32Ex)
             {
@@ -159,39 +159,52 @@ public void ConfigureNetworkInterface(NetworkInterfaceConfig config)
             }
         }
 
-        public static Task FlushDnsResolverCacheAsync()
+        public static Task FlushDnsAsync()
         {
-            return Task.Run(() => FlushDnsResolverCache());
+            return Task.Run(() => FlushDns());
         }
 
-        public static void FlushDnsResolverCache()
+        public static void FlushDns()
         {
             const string command = @"ipconfig /flushdns";
 
-            PowerShellHelper.RunPSCommand(command);
+            PowerShellHelper.ExecuteCommand(command);
         }
 
-        public static Task IPConfigReleaseRenewAsync(IPConfigReleaseRenewMode mode)
+        public static Task ReleaseRenewAsync(IPConfigReleaseRenewMode mode)
         {
-            return Task.Run(() => IPConfigReleaseRenew(mode));
+            return Task.Run(() => ReleaseRenew(mode));
         }
 
-        public static void IPConfigReleaseRenew(IPConfigReleaseRenewMode mode)
+        public static void ReleaseRenew(IPConfigReleaseRenewMode mode)
         {
             if (mode == IPConfigReleaseRenewMode.ReleaseRenew || mode == IPConfigReleaseRenewMode.Release)
             {
-                const string releaseCommand = @"ipconfig /release";
+                const string command = @"ipconfig /release";
 
-                PowerShellHelper.RunPSCommand(releaseCommand);
+                PowerShellHelper.ExecuteCommand(command);
             }
 
             if (mode == IPConfigReleaseRenewMode.ReleaseRenew || mode == IPConfigReleaseRenewMode.Renew)
             {
-                const string renewCommand = @"ipconfig /renew";
+                const string command = @"ipconfig /renew";
 
-                PowerShellHelper.RunPSCommand(renewCommand);
+                PowerShellHelper.ExecuteCommand(command);
             }
         }
+
+        public static Task AddIPAddressToNetworkInterfaceAsync(NetworkInterfaceConfig config)
+        {
+            return Task.Run(() => AddIPAddressToNetworkInterface(config));
+        }
+
+        public static void AddIPAddressToNetworkInterface(NetworkInterfaceConfig config)
+        {
+            var command = @"netsh interface ipv4 add address '" + config.Name + @"' " + config.IPAddress + @" " + config.Subnetmask;
+
+            PowerShellHelper.ExecuteCommand(command, true);
+        }
+
         #endregion
 
         #region Enum
@@ -202,5 +215,7 @@ public enum IPConfigReleaseRenewMode
             Renew
         }
         #endregion
+
+
     }
 }
diff --git a/Source/NETworkManager/Models/Network/Ping.cs b/Source/NETworkManager/Models/Network/Ping.cs
index 2fe46dc041..008586d9cb 100644
--- a/Source/NETworkManager/Models/Network/Ping.cs
+++ b/Source/NETworkManager/Models/Network/Ping.cs
@@ -85,7 +85,7 @@ public void SendAsync(IPAddress ipAddress, PingOptions pingOptions, Cancellation
                                 if (pingReply != null && pingReply.Address == null)
                                     OnPingReceived(new PingReceivedArgs(timestamp, ipAddress, hostname, pingReply.Status));
                                 else if (pingReply != null)
-                                    OnPingReceived(new PingReceivedArgs(timestamp, pingReply.Address, hostname,pingReply.Status));
+                                    OnPingReceived(new PingReceivedArgs(timestamp, pingReply.Address, hostname, pingReply.Status));
                             }
                             else
                             {
@@ -128,6 +128,17 @@ public void SendAsync(IPAddress ipAddress, PingOptions pingOptions, Cancellation
                     OnPingCompleted();
             }, cancellationToken);
         }
+
+        // Param: disableSpecialChar --> ExportManager --> "<" this char cannot be displayed in xml
+        public static string TimeToString(IPStatus status, long time, bool disableSpecialChar = false)
+        {
+            if (status != IPStatus.Success && status != IPStatus.TtlExpired)
+                return "-/-";
+
+            long.TryParse(time.ToString(), out var t);
+
+            return disableSpecialChar ? $"{t} ms" : t == 0 ? "<1 ms" : $"{t} ms";
+        }
     }
 }
 
diff --git a/Source/NETworkManager/Models/Network/PortInfo.cs b/Source/NETworkManager/Models/Network/PortInfo.cs
index 988c066152..52bedcaf91 100644
--- a/Source/NETworkManager/Models/Network/PortInfo.cs
+++ b/Source/NETworkManager/Models/Network/PortInfo.cs
@@ -1,12 +1,12 @@
 using NETworkManager.Models.Lookup;
-using System;
 using System.Net;
 
 namespace NETworkManager.Models.Network
 {
     public class PortInfo
     {
-        public Tuple<IPAddress, string> Host { get; set; }
+        public IPAddress IPAddress { get; set; }
+        public string Hostname { get; set; }
         public int Port { get; set; }
         public PortLookupInfo LookupInfo { get; set; }
         public PortStatus Status { get; set; }
@@ -16,9 +16,10 @@ public PortInfo()
 
         }
 
-        public PortInfo(Tuple<IPAddress, string> host, int port, PortLookupInfo lookupInfo, PortStatus status)
+        public PortInfo(IPAddress ipAddress, string hostname, int port, PortLookupInfo lookupInfo, PortStatus status)
         {
-            Host = host;
+            IPAddress = ipAddress;
+            Hostname = hostname;
             Port = port;
             LookupInfo = lookupInfo;
             Status = status;
@@ -26,7 +27,7 @@ public PortInfo(Tuple<IPAddress, string> host, int port, PortLookupInfo lookupIn
 
         public static PortInfo Parse(PortScannedArgs e)
         {
-            return new PortInfo(e.Host, e.Port, e.LookupInfo, e.Status);
+            return new PortInfo(e.IPAddress, e.Hostname, e.Port, e.LookupInfo, e.Status);
         }
 
         public enum PortStatus
diff --git a/Source/NETworkManager/Models/Network/PortScannedArgs.cs b/Source/NETworkManager/Models/Network/PortScannedArgs.cs
index b743d8f4e5..48812dedb2 100644
--- a/Source/NETworkManager/Models/Network/PortScannedArgs.cs
+++ b/Source/NETworkManager/Models/Network/PortScannedArgs.cs
@@ -6,7 +6,8 @@ namespace NETworkManager.Models.Network
 {
     public class PortScannedArgs : EventArgs
     {
-        public Tuple <IPAddress, string> Host { get; set; }
+        public IPAddress IPAddress { get; set; }
+        public string Hostname { get; set; }
         public int Port { get; set; }
         public PortLookupInfo LookupInfo { get; set; }
         public PortInfo.PortStatus Status { get; set; }
@@ -16,9 +17,10 @@ public PortScannedArgs()
 
         }
 
-        public PortScannedArgs(Tuple<IPAddress, string> host, int port, PortLookupInfo lookupInfo, PortInfo.PortStatus status)
+        public PortScannedArgs(IPAddress ipAddres, string hostname, int port, PortLookupInfo lookupInfo, PortInfo.PortStatus status)
         {
-            Host = host;
+            IPAddress = ipAddres;
+            Hostname = hostname;
             Port = port;
             LookupInfo = lookupInfo;
             Status = status;
diff --git a/Source/NETworkManager/Models/Network/PortScanner.cs b/Source/NETworkManager/Models/Network/PortScanner.cs
index 04dc4b5d10..46578c044b 100644
--- a/Source/NETworkManager/Models/Network/PortScanner.cs
+++ b/Source/NETworkManager/Models/Network/PortScanner.cs
@@ -81,18 +81,18 @@ public void ScanAsync(List<Tuple<IPAddress, string>> hostData, int[] ports, Port
                                     {
                                         tcpClient.EndConnect(tcpClientConnection);
 
-                                        OnPortScanned(new PortScannedArgs(host, port, PortLookup.Lookup(port).FirstOrDefault(x => x.Protocol == PortLookup.Protocol.Tcp), PortInfo.PortStatus.Open));
+                                        OnPortScanned(new PortScannedArgs(host.Item1,host.Item2, port, PortLookup.Lookup(port).FirstOrDefault(x => x.Protocol == PortLookup.Protocol.Tcp), PortInfo.PortStatus.Open));
                                     }
                                     catch
                                     {
                                         if (portScannerOptions.ShowClosed)
-                                            OnPortScanned(new PortScannedArgs(host, port, PortLookup.Lookup(port).FirstOrDefault(x => x.Protocol == PortLookup.Protocol.Tcp), PortInfo.PortStatus.Closed));
+                                            OnPortScanned(new PortScannedArgs(host.Item1, host.Item2, port, PortLookup.Lookup(port).FirstOrDefault(x => x.Protocol == PortLookup.Protocol.Tcp), PortInfo.PortStatus.Closed));
                                     }
                                 }
                                 else
                                 {
                                     if (portScannerOptions.ShowClosed)
-                                        OnPortScanned(new PortScannedArgs(host, port, PortLookup.Lookup(port).FirstOrDefault(x => x.Protocol == PortLookup.Protocol.Tcp), PortInfo.PortStatus.Closed));
+                                        OnPortScanned(new PortScannedArgs(host.Item1, host.Item2, port, PortLookup.Lookup(port).FirstOrDefault(x => x.Protocol == PortLookup.Protocol.Tcp), PortInfo.PortStatus.Closed));
                                 }
                             }
 
diff --git a/Source/NETworkManager/Models/Network/TracerouteHopInfo.cs b/Source/NETworkManager/Models/Network/TracerouteHopInfo.cs
index c0686c6b07..3656a7147b 100644
--- a/Source/NETworkManager/Models/Network/TracerouteHopInfo.cs
+++ b/Source/NETworkManager/Models/Network/TracerouteHopInfo.cs
@@ -7,9 +7,9 @@ namespace NETworkManager.Models.Network
     public class TracerouteHopInfo
     {
         public int Hop { get; set; }
-        public double Time1 { get; set; }
-        public double Time2 { get; set; }
-        public double Time3 { get; set; }
+        public long Time1 { get; set; }
+        public long Time2 { get; set; }
+        public long Time3 { get; set; }
         public IPAddress IPAddress { get; set; }
         public string Hostname { get; set; }
         public IPStatus Status1 { get; set; }
@@ -36,7 +36,7 @@ public TracerouteHopInfo(int hop, long time1, long time2, long time3, IPAddress
 
         public static TracerouteHopInfo Parse(TracerouteHopReceivedArgs e)
         {
-            return new TracerouteHopInfo(e.Hop, e.Time1, e.Time2, e.Time3, e.IPAddress, e.Hostname, e.Status1,e.Status2,e.Status3);
+            return new TracerouteHopInfo(e.Hop, e.Time1, e.Time2, e.Time3, e.IPAddress, e.Hostname, e.Status1, e.Status2, e.Status3);
         }
     }
 }
diff --git a/Source/NETworkManager/Models/PuTTY/PuTTY.cs b/Source/NETworkManager/Models/PuTTY/PuTTY.cs
index 1af5f94253..66a9b4624b 100644
--- a/Source/NETworkManager/Models/PuTTY/PuTTY.cs
+++ b/Source/NETworkManager/Models/PuTTY/PuTTY.cs
@@ -2,12 +2,12 @@
 {
     public class PuTTY
     {
-        public static string BuildCommandLine(PuTTYSessionInfo ProfileInfo)
+        public static string BuildCommandLine(PuTTYSessionInfo profileInfo)
         {
             var command = string.Empty;
 
             // Protocol
-            switch (ProfileInfo.Mode)
+            switch (profileInfo.Mode)
             {
                 case ConnectionMode.SSH:
                     command += "-ssh";
@@ -27,24 +27,24 @@ public static string BuildCommandLine(PuTTYSessionInfo ProfileInfo)
             }
 
             // Profile
-            if (!string.IsNullOrEmpty(ProfileInfo.Profile))
-                command += $" -load {'"'}{ProfileInfo.Profile}{'"'}";
+            if (!string.IsNullOrEmpty(profileInfo.Profile))
+                command += $" -load {'"'}{profileInfo.Profile}{'"'}";
 
             // Username
-            if (!string.IsNullOrEmpty(ProfileInfo.Username))
-                command += $" -l {ProfileInfo.Username}";
+            if (!string.IsNullOrEmpty(profileInfo.Username))
+                command += $" -l {profileInfo.Username}";
 
             // Additional commands
-            if (!string.IsNullOrEmpty(ProfileInfo.AdditionalCommandLine))
-                command += $" {ProfileInfo.AdditionalCommandLine}";
+            if (!string.IsNullOrEmpty(profileInfo.AdditionalCommandLine))
+                command += $" {profileInfo.AdditionalCommandLine}";
 
             // SerialLine, Baud
-            if (ProfileInfo.Mode == ConnectionMode.Serial)
-                command += $" {ProfileInfo.HostOrSerialLine} -sercfg {ProfileInfo.PortOrBaud}";
+            if (profileInfo.Mode == ConnectionMode.Serial)
+                command += $" {profileInfo.HostOrSerialLine} -sercfg {profileInfo.PortOrBaud}";
 
             // Port, Host
-            if (ProfileInfo.Mode != ConnectionMode.Serial)
-                command += $" -P {ProfileInfo.PortOrBaud} {ProfileInfo.HostOrSerialLine}";
+            if (profileInfo.Mode != ConnectionMode.Serial)
+                command += $" -P {profileInfo.PortOrBaud} {profileInfo.HostOrSerialLine}";
 
             return command;
         }
diff --git a/Source/NETworkManager/Models/Settings/ConfigurationManager.cs b/Source/NETworkManager/Models/Settings/ConfigurationManager.cs
index 4d1ec8855c..fac929dc56 100644
--- a/Source/NETworkManager/Models/Settings/ConfigurationManager.cs
+++ b/Source/NETworkManager/Models/Settings/ConfigurationManager.cs
@@ -14,7 +14,7 @@ public static void Detect()
 
             Current = new ConfigurationInfo
             {
-                IsAdmin = (new WindowsPrincipal(WindowsIdentity.GetCurrent())).IsInRole(WindowsBuiltInRole.Administrator),
+                IsAdmin = new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator),
                 ExecutionPath = Path.GetDirectoryName(applicationLocation),
                 ApplicationFullName = applicationLocation,
                 ApplicationName = Path.GetFileNameWithoutExtension(Path.GetFileName(applicationLocation))
diff --git a/Source/NETworkManager/Models/Settings/LocalizationManager.cs b/Source/NETworkManager/Models/Settings/LocalizationManager.cs
index 8e5cb45079..5c82b8951c 100644
--- a/Source/NETworkManager/Models/Settings/LocalizationManager.cs
+++ b/Source/NETworkManager/Models/Settings/LocalizationManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Net.NetworkInformation;
 
 namespace NETworkManager.Models.Settings
 {
@@ -50,5 +51,16 @@ public static void Change(LocalizationInfo info)
             // Set the culture code
             Culture = new CultureInfo(info.Code);
         }
+
+
+        public static string TranslateIPStatus(object value)
+        {
+            if (!(value is IPStatus ipStatus))
+                return "-/-";
+
+            var status = Resources.Localization.Strings.ResourceManager.GetString("IPStatus_" + ipStatus, Culture);
+
+            return string.IsNullOrEmpty(status) ? ipStatus.ToString() : status;
+        }
     }
 }
diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
index 61cdac2086..5840ce7470 100644
--- a/Source/NETworkManager/Models/Settings/SettingsInfo.cs
+++ b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -8,6 +8,7 @@
 using System.Xml.Serialization;
 using Heijden.DNS;
 using Lextm.SharpSnmpLib.Messaging;
+using NETworkManager.Models.Export;
 using NETworkManager.Models.Network;
 using NETworkManager.Utilities;
 using static NETworkManager.Models.Network.SNMP;
@@ -371,7 +372,7 @@ public bool NetworkInterface_ExpandProfileView
             }
         }
 
-        private double _networkInterface_ProfileWidth = 250;
+        private double _networkInterface_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double NetworkInterface_ProfileWidth
         {
             get => _networkInterface_ProfileWidth;
@@ -645,7 +646,7 @@ public bool IPScanner_ExpandProfileView
             }
         }
 
-        private double _ipScanner_ProfileWidth = 250;
+        private double _ipScanner_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double IPScanner_ProfileWidth
         {
             get => _ipScanner_ProfileWidth;
@@ -675,6 +676,34 @@ public bool IPScanner_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _ipScanner_ExportFilePath;
+        public string IPScanner_ExportFilePath
+        {
+            get => _ipScanner_ExportFilePath;
+            set
+            {
+                if (value == _ipScanner_ExportFilePath)
+                    return;
+
+                _ipScanner_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _ipScanner_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType IPScanner_ExportFileType
+        {
+            get => _ipScanner_ExportFileType;
+            set
+            {
+                if(value == _ipScanner_ExportFileType)
+                    return;
+
+                _ipScanner_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Port Scanner
@@ -790,7 +819,7 @@ public bool PortScanner_ExpandProfileView
             }
         }
 
-        private double _portScanner_ProfileWidth = 250;
+        private double _portScanner_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double PortScanner_ProfileWidth
         {
             get => _portScanner_ProfileWidth;
@@ -820,6 +849,34 @@ public bool PortScanner_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _portScanner_ExportFilePath;
+        public string PortScanner_ExportFilePath
+        {
+            get => _portScanner_ExportFilePath;
+            set
+            {
+                if (value == _portScanner_ExportFilePath)
+                    return;
+
+                _portScanner_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _portScanner_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType PortScanner_ExportFileType
+        {
+            get => _portScanner_ExportFileType;
+            set
+            {
+                if (value == _portScanner_ExportFileType)
+                    return;
+
+                _portScanner_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Ping
@@ -977,7 +1034,7 @@ public bool Ping_ExpandProfileView
             }
         }
 
-        private double _ping_ProfileWidth = 250;
+        private double _ping_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double Ping_ProfileWidth
         {
             get => _ping_ProfileWidth;
@@ -1007,6 +1064,51 @@ public bool Ping_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _ping_ExportFilePath;
+        public string Ping_ExportFilePath
+        {
+            get => _ping_ExportFilePath;
+            set
+            {
+                if (value == _ping_ExportFilePath)
+                    return;
+
+                _ping_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _ping_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType Ping_ExportFileType
+        {
+            get => _ping_ExportFileType;
+            set
+            {
+                if (value == _ping_ExportFileType)
+                    return;
+
+                _ping_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private bool _ping_HighlightTimeouts = true;
+        public bool Ping_HighlightTimeouts
+        {
+            get => _ping_HighlightTimeouts;
+            set
+            {
+                if(value == _ping_HighlightTimeouts)
+                    return;
+
+                _ping_HighlightTimeouts = value;
+                
+                OnPropertyChanged();
+
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Traceroute
@@ -1125,7 +1227,7 @@ public bool Traceroute_ExpandProfileView
             }
         }
 
-        private double _traceroute_ProfileWidth = 250;
+        private double _traceroute_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double Traceroute_ProfileWidth
         {
             get => _traceroute_ProfileWidth;
@@ -1155,6 +1257,34 @@ public bool Traceroute_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _traceroute_ExportFilePath;
+        public string Traceroute_ExportFilePath
+        {
+            get => _traceroute_ExportFilePath;
+            set
+            {
+                if (value == _traceroute_ExportFilePath)
+                    return;
+
+                _traceroute_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _traceroute_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType Traceroute_ExportFileType
+        {
+            get => _traceroute_ExportFileType;
+            set
+            {
+                if (value == _traceroute_ExportFileType)
+                    return;
+
+                _traceroute_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region DNS Lookup
@@ -1399,7 +1529,7 @@ public bool DNSLookup_ExpandProfileView
             }
         }
 
-        private double _dnsLookup_ProfileWidth = 250;
+        private double _dnsLookup_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double DNSLookup_ProfileWidth
         {
             get => _dnsLookup_ProfileWidth;
@@ -1429,6 +1559,34 @@ public bool DNSLookup_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _dnsLookup_ExportFilePath;
+        public string DNSLookup_ExportFilePath
+        {
+            get => _dnsLookup_ExportFilePath;
+            set
+            {
+                if (value == _dnsLookup_ExportFilePath)
+                    return;
+
+                _dnsLookup_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _dnsLookup_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType DNSLookup_ExportFileType
+        {
+            get => _dnsLookup_ExportFileType;
+            set
+            {
+                if (value == _dnsLookup_ExportFileType)
+                    return;
+
+                _dnsLookup_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region RemoteDesktop 
@@ -1726,7 +1884,7 @@ public bool RemoteDesktop_ExpandProfileView
             }
         }
 
-        private double _remoteDesktop_ProfileWidth = 250;
+        private double _remoteDesktop_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double RemoteDesktop_ProfileWidth
         {
             get => _remoteDesktop_ProfileWidth;
@@ -1840,7 +1998,7 @@ public bool PuTTY_ExpandProfileView
             }
         }
 
-        private double _puTTY_ProfileWidth = 250;
+        private double _puTTY_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double PuTTY_ProfileWidth
         {
             get => _puTTY_ProfileWidth;
@@ -1999,7 +2157,7 @@ public bool TightVNC_ExpandProfileView
             }
         }
 
-        private double _tightVNC_ProfileWidth = 250;
+        private double _tightVNC_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double TightVNC_ProfileWidth
         {
             get => _tightVNC_ProfileWidth;
@@ -2230,6 +2388,34 @@ public bool SNMP_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _snmp_ExportFilePath;
+        public string SNMP_ExportFilePath
+        {
+            get => _snmp_ExportFilePath;
+            set
+            {
+                if (value == _snmp_ExportFilePath)
+                    return;
+
+                _snmp_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _snmp_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType SNMP_ExportFileType
+        {
+            get => _snmp_ExportFileType;
+            set
+            {
+                if (value == _snmp_ExportFileType)
+                    return;
+
+                _snmp_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region WakeOnLAN
@@ -2261,7 +2447,7 @@ public bool WakeOnLAN_ExpandClientView
             }
         }
 
-        private double _wakeOnLAN_ClientWidth = 250;
+        private double _wakeOnLAN_ClientWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double WakeOnLAN_ClientWidth
         {
             get => _wakeOnLAN_ClientWidth;
@@ -2333,7 +2519,7 @@ public bool HTTPHeaders_ExpandProfileView
             }
         }
 
-        private double _httpHeaders_ProfileWidth = 250;
+        private double _httpHeaders_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double HTTPHeaders_ProfileWidth
         {
             get => _httpHeaders_ProfileWidth;
@@ -2363,6 +2549,34 @@ public bool HTTPHeaders_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _httpHeaders_ExportFilePath;
+        public string HTTPHeaders_ExportFilePath
+        {
+            get => _httpHeaders_ExportFilePath;
+            set
+            {
+                if (value == _httpHeaders_ExportFilePath)
+                    return;
+
+                _httpHeaders_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _httpHeaders_ExportFileType = ExportManager.ExportFileType.TXT;
+        public ExportManager.ExportFileType HTTPHeaders_ExportFileType
+        {
+            get => _httpHeaders_ExportFileType;
+            set
+            {
+                if (value == _httpHeaders_ExportFileType)
+                    return;
+
+                _httpHeaders_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Subnet Calculator
@@ -2411,37 +2625,64 @@ public ObservableCollection<string> SubnetCalculator_Subnetting_NewSubnetmaskOrC
                 SettingsChanged = true;
             }
         }
-        #endregion
 
-        private ObservableCollection<string> _subnetCalculator_Supernetting_Subnet1 = new ObservableCollection<string>();
-        public ObservableCollection<string> SubnetCalculator_Supernetting_Subnet1
+        private string _subnetCalculator_Subnetting_ExportFilePath;
+        public string SubnetCalculator_Subnetting_ExportFilePath
         {
-            get => _subnetCalculator_Supernetting_Subnet1;
+            get => _subnetCalculator_Subnetting_ExportFilePath;
             set
             {
-                if (value == _subnetCalculator_Supernetting_Subnet1)
+                if (value == _subnetCalculator_Subnetting_ExportFilePath)
                     return;
 
-                _subnetCalculator_Supernetting_Subnet1 = value;
+                _subnetCalculator_Subnetting_ExportFilePath = value;
                 SettingsChanged = true;
             }
         }
 
-        private ObservableCollection<string> _subnetCalculator_Supernetting_Subnet2 = new ObservableCollection<string>();
-        public ObservableCollection<string> SubnetCalculator_Supernetting_Subnet2
+        private ExportManager.ExportFileType _subnetCalculator_Subnetting_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType SubnetCalculator_Subnetting_ExportFileType
         {
-            get => _subnetCalculator_Supernetting_Subnet2;
+            get => _subnetCalculator_Subnetting_ExportFileType;
             set
             {
-                if (value == _subnetCalculator_Supernetting_Subnet2)
+                if (value == _subnetCalculator_Subnetting_ExportFileType)
                     return;
 
-                _subnetCalculator_Supernetting_Subnet2 = value;
+                _subnetCalculator_Subnetting_ExportFileType = value;
                 SettingsChanged = true;
             }
         }
-        #region Supernetting
+        #endregion
 
+        #region WideSubnet
+        private ObservableCollection<string> _subnetCalculator_WideSubnet_Subnet1 = new ObservableCollection<string>();
+        public ObservableCollection<string> SubnetCalculator_WideSubnet_Subnet1
+        {
+            get => _subnetCalculator_WideSubnet_Subnet1;
+            set
+            {
+                if (value == _subnetCalculator_WideSubnet_Subnet1)
+                    return;
+
+                _subnetCalculator_WideSubnet_Subnet1 = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ObservableCollection<string> _subnetCalculator_WideSubnet_Subnet2 = new ObservableCollection<string>();
+        public ObservableCollection<string> SubnetCalculator_WideSubnet_Subnet2
+        {
+            get => _subnetCalculator_WideSubnet_Subnet2;
+            set
+            {
+                if (value == _subnetCalculator_WideSubnet_Subnet2)
+                    return;
+
+                _subnetCalculator_WideSubnet_Subnet2 = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #endregion
@@ -2461,6 +2702,34 @@ public ObservableCollection<string> Lookup_OUI_MACAddressOrVendorHistory
             }
         }
 
+        private string _lookup_OUI_ExportFilePath;
+        public string Lookup_OUI_ExportFilePath
+        {
+            get => _lookup_OUI_ExportFilePath;
+            set
+            {
+                if (value == _lookup_OUI_ExportFilePath)
+                    return;
+
+                _lookup_OUI_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _lookup_OUI_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType Lookup_OUI_ExportFileType
+        {
+            get => _lookup_OUI_ExportFileType;
+            set
+            {
+                if (value == _lookup_OUI_ExportFileType)
+                    return;
+
+                _lookup_OUI_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
+
         private ObservableCollection<string> _lookup_Port_PortsHistory = new ObservableCollection<string>();
         public ObservableCollection<string> Lookup_Port_PortsHistory
         {
@@ -2474,6 +2743,34 @@ public ObservableCollection<string> Lookup_Port_PortsHistory
                 SettingsChanged = true;
             }
         }
+
+        private string _lookup_Port_ExportFilePath;
+        public string Lookup_Port_ExportFilePath
+        {
+            get => _lookup_Port_ExportFilePath;
+            set
+            {
+                if (value == _lookup_Port_ExportFilePath)
+                    return;
+
+                _lookup_Port_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _lookup_Port_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType Lookup_Port_ExportFileType
+        {
+            get => _lookup_Port_ExportFileType;
+            set
+            {
+                if (value == _lookup_Port_ExportFileType)
+                    return;
+
+                _lookup_Port_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Whois
@@ -2519,7 +2816,7 @@ public bool Whois_ExpandProfileView
             }
         }
 
-        private double _whois_ProfileWidth = 250;
+        private double _whois_ProfileWidth = GlobalStaticConfiguration.ProfileDefaultWidthExpanded;
         public double Whois_ProfileWidth
         {
             get => _whois_ProfileWidth;
@@ -2549,6 +2846,34 @@ public bool Whois_ShowStatistics
                 SettingsChanged = true;
             }
         }
+
+        private string _whois_ExportFilePath;
+        public string Whois_ExportFilePath
+        {
+            get => _whois_ExportFilePath;
+            set
+            {
+                if (value == _whois_ExportFilePath)
+                    return;
+
+                _whois_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _whois_ExportFileType = ExportManager.ExportFileType.TXT;
+        public ExportManager.ExportFileType Whois_ExportFileType
+        {
+            get => _whois_ExportFileType;
+            set
+            {
+                if (value == _whois_ExportFileType)
+                    return;
+
+                _whois_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Connections
@@ -2579,6 +2904,34 @@ public AutoRefreshTimeInfo Connections_AutoRefreshTime
                 SettingsChanged = true;
             }
         }
+    
+        private string _connections_ExportFilePath;
+        public string Connections_ExportFilePath
+        {
+            get => _connections_ExportFilePath;
+            set
+            {
+                if (value == _connections_ExportFilePath)
+                    return;
+
+                _connections_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _connections_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType Connections_ExportFileType
+        {
+            get => _connections_ExportFileType;
+            set
+            {
+                if (value == _connections_ExportFileType)
+                    return;
+
+                _connections_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region Listeners
@@ -2609,6 +2962,34 @@ public AutoRefreshTimeInfo Listeners_AutoRefreshTime
                 SettingsChanged = true;
             }
         }
+
+        private string _listeners_ExportFilePath;
+        public string Listeners_ExportFilePath
+        {
+            get => _listeners_ExportFilePath;
+            set
+            {
+                if (value == _listeners_ExportFilePath)
+                    return;
+
+                _listeners_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _listeners_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType Listeners_ExportFileType
+        {
+            get => _listeners_ExportFileType;
+            set
+            {
+                if (value == _listeners_ExportFileType)
+                    return;
+
+                _listeners_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #region ARPTable
@@ -2639,6 +3020,34 @@ public AutoRefreshTimeInfo ARPTable_AutoRefreshTime
                 SettingsChanged = true;
             }
         }
+
+        private string _arpTable_ExportFilePath;
+        public string ARPTable_ExportFilePath
+        {
+            get => _arpTable_ExportFilePath;
+            set
+            {
+                if (value == _arpTable_ExportFilePath)
+                    return;
+
+                _arpTable_ExportFilePath = value;
+                SettingsChanged = true;
+            }
+        }
+
+        private ExportManager.ExportFileType _arpTable_ExportFileType = ExportManager.ExportFileType.CSV;
+        public ExportManager.ExportFileType ARPTable_ExportFileType
+        {
+            get => _arpTable_ExportFileType;
+            set
+            {
+                if (value == _arpTable_ExportFileType)
+                    return;
+
+                _arpTable_ExportFileType = value;
+                SettingsChanged = true;
+            }
+        }
         #endregion
 
         #endregion
@@ -2678,7 +3087,7 @@ public SettingsInfo()
             PuTTY_ProfileHistory.CollectionChanged += CollectionChanged;
 
             // TightVNC
-            TightVNC_HostHistory.CollectionChanged += CollectionChanged; 
+            TightVNC_HostHistory.CollectionChanged += CollectionChanged;
 
             // SNMP
             SNMP_HostHistory.CollectionChanged += CollectionChanged;
@@ -2695,8 +3104,8 @@ public SettingsInfo()
             SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory.CollectionChanged += CollectionChanged;
 
             // Subnet Calculator / Supernetting
-            SubnetCalculator_Supernetting_Subnet1.CollectionChanged += CollectionChanged;
-            SubnetCalculator_Supernetting_Subnet2.CollectionChanged += CollectionChanged;
+            SubnetCalculator_WideSubnet_Subnet1.CollectionChanged += CollectionChanged;
+            SubnetCalculator_WideSubnet_Subnet2.CollectionChanged += CollectionChanged;
 
             // Lookup / OUI
             Lookup_OUI_MACAddressOrVendorHistory.CollectionChanged += CollectionChanged;
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
index 1270729bf9..d1114e9cda 100644
--- a/Source/NETworkManager/NETworkManager.csproj
+++ b/Source/NETworkManager/NETworkManager.csproj
@@ -105,6 +105,9 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>obj\Debug\MSTSCLib.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Octokit.0.32.0\lib\net45\Octokit.dll</HintPath>
     </Reference>
@@ -233,6 +236,7 @@
     <Compile Include="Converters\ListToStringConverter.cs" />
     <Compile Include="Converters\BooleanReverseToVisibilityHiddenConverter.cs" />
     <Compile Include="Converters\ApplicationNameToTranslatedStringConverter.cs" />
+    <Compile Include="Converters\PingStatusToBoolConverter.cs" />
     <Compile Include="Converters\TcpStateToStringConverter.cs" />
     <Compile Include="Converters\StringIsNotNullOrEmptyToBoolConverter.cs" />
     <Compile Include="Converters\StringIsNotNullOrEmptyToVisibilityConverter.cs" />
@@ -245,6 +249,7 @@
     <Compile Include="Models\Documentation\CommunityManager.cs" />
     <Compile Include="Models\Documentation\ResourceInfo.cs" />
     <Compile Include="Models\Documentation\ResourceManager.cs" />
+    <Compile Include="Models\Export\ExportManager.cs" />
     <Compile Include="Models\Network\DNSServer.cs" />
     <Compile Include="Models\Network\DNSServerInfo.cs" />
     <Compile Include="Models\Network\Listener.cs" />
@@ -270,12 +275,14 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Strings.resx</DependentUpon>
     </Compile>
+    <Compile Include="GlobalStaticConfiguration.cs" />
     <Compile Include="Utilities\CommonMethods.cs" />
     <Compile Include="Utilities\ArrayHelper.cs" />
     <Compile Include="Utilities\AutoRefreshTime.cs" />
     <Compile Include="Utilities\AutoRefreshTimeInfo.cs" />
     <Compile Include="Utilities\EventSystemRedirectApplicationArgs.cs" />
     <Compile Include="Utilities\EventSystem.cs" />
+    <Compile Include="Utilities\JsonIPAddressConverter.cs" />
     <Compile Include="Utilities\NativeMethods.cs" />
     <Compile Include="Utilities\PowerShellHelper.cs" />
     <Compile Include="Utilities\SecureStringHelper.cs" />
@@ -287,7 +294,7 @@
     <Compile Include="Models\Documentation\DocumentationManager.cs" />
     <Compile Include="Models\Network\HTTPHeadersOptions.cs" />
     <Compile Include="Models\Network\HTTPHeaders.cs" />
-    <Compile Include="Models\Network\ARPTableInfo.cs" />
+    <Compile Include="Models\Network\ARPInfo.cs" />
     <Compile Include="Models\Network\SNMPOptions.cs" />
     <Compile Include="Models\Network\SNMPReceivedInfo.cs" />
     <Compile Include="Models\Network\SNMPReceivedArgs.cs" />
@@ -299,6 +306,7 @@
     <Compile Include="Models\Settings\CredentialManager.cs" />
     <Compile Include="Models\Update\UpdateAvailableArgs.cs" />
     <Compile Include="Models\Update\Updater.cs" />
+    <Compile Include="Validators\FilePathValidator.cs" />
     <Compile Include="Validators\DomainValidator.cs" />
     <Compile Include="Validators\IPv4IPv6SubnetmaskOrCIDRValidator.cs" />
     <Compile Include="Validators\IsCredentialNameUnique.cs" />
@@ -313,7 +321,10 @@
     <Compile Include="Validators\HttpAndHttpsUriValidator.cs" />
     <Compile Include="Validators\IPv4IPv6SubnetValidator.cs" />
     <Compile Include="Validators\IsProfileNameUnique.cs" />
+    <Compile Include="ViewModels\NetworkInterfaceAddIPAddressViewModel.cs" />
+    <Compile Include="ViewModels\ExportViewModel.cs" />
     <Compile Include="ViewModels\DNSServerViewModel.cs" />
+    <Compile Include="ViewModels\SubnetCalculatorWideSubnetViewModel.cs" />
     <Compile Include="ViewModels\TightVNCConnectViewModel.cs" />
     <Compile Include="ViewModels\TightVNCSettingsViewModel.cs" />
     <Compile Include="ViewModels\TightVNCHostViewModel.cs" />
@@ -330,7 +341,6 @@
     <Compile Include="ViewModels\DNSLookupHostViewModel.cs" />
     <Compile Include="ViewModels\HTTPHeadersHostViewModel.cs" />
     <Compile Include="ViewModels\SNMPHostViewModel.cs" />
-    <Compile Include="ViewModels\SubnetCalculatorSupernettingViewModel.cs" />
     <Compile Include="ViewModels\ProfileViewModel.cs" />
     <Compile Include="ViewModels\TracerouteHostViewModel.cs" />
     <Compile Include="ViewModels\PuTTYHostViewModel.cs" />
@@ -372,9 +382,18 @@
       <DependentUpon>RemoteDesktopControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\SettingsUpdateViewModel.cs" />
+    <Compile Include="Views\NetworkInterfaceAddIPAddressDialog.xaml.cs">
+      <DependentUpon>NetworkInterfaceAddIPAddressDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ExportDialog.xaml.cs">
+      <DependentUpon>ExportDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DNSServerDialog.xaml.cs">
       <DependentUpon>DNSServerDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SubnetCalculatorWideSubnetView.xaml.cs">
+      <DependentUpon>SubnetCalculatorWideSubnetView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\TightVNCConnectDialog.xaml.cs">
       <DependentUpon>TightVNCConnectDialog.xaml</DependentUpon>
     </Compile>
@@ -417,9 +436,6 @@
     <Compile Include="Views\SNMPHostView.xaml.cs">
       <DependentUpon>SNMPHostView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SubnetCalculatorSupernettingView.xaml.cs">
-      <DependentUpon>SubnetCalculatorSupernettingView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\ProfileDialog.xaml.cs">
       <DependentUpon>ProfileDialog.xaml</DependentUpon>
     </Compile>
@@ -632,6 +648,9 @@
     <Content Include="Licenses\NETworkManager.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Licenses\Newtonsoft.Json.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Licenses\Octokit.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -642,6 +661,7 @@
     <Resource Include="Resources\Localization\Flags\en-US.png" />
     <Resource Include="Resources\Localization\Flags\ru-RU.png" />
     <Resource Include="Resources\Localization\Flags\es-ES.png" />
+    <SplashScreen Include="Resources\Images\SplashScreen.png" />
     <Content Include="Resources\WhoisServers.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -660,10 +680,22 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Page Include="Views\NetworkInterfaceAddIPAddressDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\ExportDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DNSServerDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\SubnetCalculatorWideSubnetView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\TightVNCConnectDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -720,10 +752,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\SubnetCalculatorSupernettingView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\ProfileDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -941,7 +969,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Controls\MultiSelectDataGrid.cs" />
-    <Compile Include="Controls\ScrollingDataGrid.cs" />
+    <Compile Include="Controls\MultiSelectScrollingDataGrid.cs" />
     <Compile Include="Converters\PortStatusToStringConverter.cs" />
     <Compile Include="Converters\IPAddressToStringConverter.cs" />
     <Compile Include="Converters\ValidateSettingsImportConverter.cs" />
@@ -949,7 +977,7 @@
     <Compile Include="Converters\ValidateSettingsExportConverter.cs" />
     <Compile Include="Utilities\ListHelper.cs" />
     <Compile Include="Utilities\HotKeys.cs" />
-    <Compile Include="Models\Network\ARPTable.cs" />
+    <Compile Include="Models\Network\ARP.cs" />
     <Compile Include="Utilities\PortRangeHelper.cs" />
     <Compile Include="Utilities\IPScanRangeHelper.cs" />
     <Compile Include="Utilities\IPv4AddressHelper.cs" />
@@ -985,8 +1013,8 @@
     <Compile Include="Models\Network\ProgressChangedArgs.cs" />
     <Compile Include="Models\Network\TracerouteHopInfo.cs" />
     <Compile Include="Models\Network\TracerouteHopReceivedArgs.cs" />
-    <Compile Include="Models\Network\IPScannerHostFoundArgs.cs" />
-    <Compile Include="Models\Network\IPScannerHostInfo.cs" />
+    <Compile Include="Models\Network\HostFoundArgs.cs" />
+    <Compile Include="Models\Network\HostInfo.cs" />
     <Compile Include="Models\Network\IPScanner.cs" />
     <Compile Include="Models\Network\IPScannerOptions.cs" />
     <Compile Include="Models\Network\MaximumHopsReachedArgs.cs" />
diff --git a/Source/NETworkManager/Properties/AssemblyInfo.cs b/Source/NETworkManager/Properties/AssemblyInfo.cs
index fcd38ffe63..c896d610de 100644
--- a/Source/NETworkManager/Properties/AssemblyInfo.cs
+++ b/Source/NETworkManager/Properties/AssemblyInfo.cs
@@ -49,6 +49,6 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.1.0")]
-[assembly: AssemblyFileVersion("1.8.1.0")]
+[assembly: AssemblyVersion("1.8.2.0")]
+[assembly: AssemblyFileVersion("1.8.2.0")]
 
diff --git a/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml b/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml
index 845896203e..6e18a9949f 100644
--- a/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml
+++ b/Source/NETworkManager/Resources/ContextMenu/ContextMenu.xaml
@@ -83,4 +83,45 @@
             </MenuItem.Icon>
         </MenuItem>
     </ContextMenu>
+
+    <ContextMenu x:Key="CopyExportContextMenu" MinWidth="150">
+        <MenuItem Header="{x:Static localization:Strings.Copy}" Command="Copy">
+            <MenuItem.Icon>
+                <Rectangle Width="16" Height="16">
+                    <Rectangle.Style>
+                        <Style TargetType="{x:Type Rectangle}">
+                            <Setter Property="Fill" Value="{DynamicResource BlackColorBrush}" />
+                            <Style.Triggers>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Fill" Value="{DynamicResource MenuItemDisabledBrush}" />
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Rectangle.Style>
+                    <Rectangle.OpacityMask>
+                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentCopy}" />
+                    </Rectangle.OpacityMask>
+                </Rectangle>
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+            <MenuItem.Icon>
+                <Rectangle Width="16" Height="16">
+                    <Rectangle.Style>
+                        <Style TargetType="{x:Type Rectangle}">
+                            <Setter Property="Fill" Value="{DynamicResource BlackColorBrush}" />
+                            <Style.Triggers>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Fill" Value="{DynamicResource MenuItemDisabledBrush}" />
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Rectangle.Style>
+                    <Rectangle.OpacityMask>
+                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentCopy}" />
+                    </Rectangle.OpacityMask>
+                </Rectangle>
+            </MenuItem.Icon>
+        </MenuItem>
+    </ContextMenu>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Source/NETworkManager/Resources/Images/NETworkManager.ico b/Source/NETworkManager/Resources/Images/NETworkManager.ico
index 03586145ae..c54d6faf6d 100644
Binary files a/Source/NETworkManager/Resources/Images/NETworkManager.ico and b/Source/NETworkManager/Resources/Images/NETworkManager.ico differ
diff --git a/Source/NETworkManager/Resources/Images/SplashScreen.png b/Source/NETworkManager/Resources/Images/SplashScreen.png
new file mode 100644
index 0000000000..6bffd7d248
Binary files /dev/null and b/Source/NETworkManager/Resources/Images/SplashScreen.png differ
diff --git a/Source/NETworkManager/Resources/Localization/StaticStrings.Designer.cs b/Source/NETworkManager/Resources/Localization/StaticStrings.Designer.cs
index d9c6ea6e2b..7afad591a4 100644
--- a/Source/NETworkManager/Resources/Localization/StaticStrings.Designer.cs
+++ b/Source/NETworkManager/Resources/Localization/StaticStrings.Designer.cs
@@ -60,6 +60,420 @@ internal StaticStrings() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to CSV.
+        /// </summary>
+        public static string CSV {
+            get {
+                return ResourceManager.GetString("CSV", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 9600.
+        /// </summary>
+        public static string ExampleBaud9600 {
+            get {
+                return ResourceManager.GetString("ExampleBaud9600", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Windows-Testuser.
+        /// </summary>
+        public static string ExampleCredentialName {
+            get {
+                return ResourceManager.GetString("ExampleCredentialName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to example.com.
+        /// </summary>
+        public static string ExampleDomain {
+            get {
+                return ResourceManager.GetString("ExampleDomain", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Servers.
+        /// </summary>
+        public static string ExampleGroupServers {
+            get {
+                return ResourceManager.GetString("ExampleGroupServers", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Switche.
+        /// </summary>
+        public static string ExampleGroupSwitche {
+            get {
+                return ResourceManager.GetString("ExampleGroupSwitche", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SERVER-01.
+        /// </summary>
+        public static string ExampleHostname {
+            get {
+                return ResourceManager.GetString("ExampleHostname", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.1; fritz.box.
+        /// </summary>
+        public static string ExampleHostnameAndOrIPAddress {
+            get {
+                return ResourceManager.GetString("ExampleHostnameAndOrIPAddress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to SERVER-01 or 172.16.0.100.
+        /// </summary>
+        public static string ExampleHostnameOrIPAddress {
+            get {
+                return ResourceManager.GetString("ExampleHostnameOrIPAddress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24.
+        /// </summary>
+        public static string ExampleIPScanRange {
+            get {
+                return ResourceManager.GetString("ExampleIPScanRange", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.55.
+        /// </summary>
+        public static string ExampleIPv4Address {
+            get {
+                return ResourceManager.GetString("ExampleIPv4Address", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.255.
+        /// </summary>
+        public static string ExampleIPv4Broadcast {
+            get {
+                return ResourceManager.GetString("ExampleIPv4Broadcast", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 8.8.8.8.
+        /// </summary>
+        public static string ExampleIPv4DNSServer {
+            get {
+                return ResourceManager.GetString("ExampleIPv4DNSServer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.1; 8.8.8.8; 8.8.4.4.
+        /// </summary>
+        public static string ExampleIPv4DNSServers {
+            get {
+                return ResourceManager.GetString("ExampleIPv4DNSServers", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.1.
+        /// </summary>
+        public static string ExampleIPv4Gateway {
+            get {
+                return ResourceManager.GetString("ExampleIPv4Gateway", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.133/255.255.255.0 or 2001:0db8::/64.
+        /// </summary>
+        public static string ExampleIPv4IPv6Subnet {
+            get {
+                return ResourceManager.GetString("ExampleIPv4IPv6Subnet", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.134/255.255.255.0 or 2001:0db9::/64.
+        /// </summary>
+        public static string ExampleIPv4IPv6Subnet2 {
+            get {
+                return ResourceManager.GetString("ExampleIPv4IPv6Subnet2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.180.0/24 or 2001:0db9::/54.
+        /// </summary>
+        public static string ExampleIPv4IPv6Subnet3 {
+            get {
+                return ResourceManager.GetString("ExampleIPv4IPv6Subnet3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.178.0/24 or 192.168.178.0/255.255.255.0.
+        /// </summary>
+        public static string ExampleIPv4Subnet {
+            get {
+                return ResourceManager.GetString("ExampleIPv4Subnet", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.179.0/24 or 192.168.179.0/255.255.255.0.
+        /// </summary>
+        public static string ExampleIPv4Subnet2 {
+            get {
+                return ResourceManager.GetString("ExampleIPv4Subnet2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 255.255.255.0.
+        /// </summary>
+        public static string ExampleIPv4Subnetmask {
+            get {
+                return ResourceManager.GetString("ExampleIPv4Subnetmask", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to /24 or 255.255.255.0.
+        /// </summary>
+        public static string ExampleIPv4SubnetmaskIPv4CIDR {
+            get {
+                return ResourceManager.GetString("ExampleIPv4SubnetmaskIPv4CIDR", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 255.255.255.0 or /64.
+        /// </summary>
+        public static string ExampleIPv4SubnetmaskIPv6CIDR {
+            get {
+                return ResourceManager.GetString("ExampleIPv4SubnetmaskIPv6CIDR", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 192.168.100.0/24.
+        /// </summary>
+        public static string ExampleIPv4SubnetWithCIDR {
+            get {
+                return ResourceManager.GetString("ExampleIPv4SubnetWithCIDR", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 00:F1:21:AB:0B:35.
+        /// </summary>
+        public static string ExampleMACAddress {
+            get {
+                return ResourceManager.GetString("ExampleMACAddress", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus.
+        /// </summary>
+        public static string ExampleMACAddressesOrVendor {
+            get {
+                return ResourceManager.GetString("ExampleMACAddressesOrVendor", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 161.
+        /// </summary>
+        public static string ExamplePort161 {
+            get {
+                return ResourceManager.GetString("ExamplePort161", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 22.
+        /// </summary>
+        public static string ExamplePort22 {
+            get {
+                return ResourceManager.GetString("ExamplePort22", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 23.
+        /// </summary>
+        public static string ExamplePort23 {
+            get {
+                return ResourceManager.GetString("ExamplePort23", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 3389.
+        /// </summary>
+        public static string ExamplePort3389 {
+            get {
+                return ResourceManager.GetString("ExamplePort3389", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 513.
+        /// </summary>
+        public static string ExamplePort513 {
+            get {
+                return ResourceManager.GetString("ExamplePort513", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 53.
+        /// </summary>
+        public static string ExamplePort53 {
+            get {
+                return ResourceManager.GetString("ExamplePort53", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 5900.
+        /// </summary>
+        public static string ExamplePort5900 {
+            get {
+                return ResourceManager.GetString("ExamplePort5900", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 7.
+        /// </summary>
+        public static string ExamplePort7 {
+            get {
+                return ResourceManager.GetString("ExamplePort7", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 22; 80; https; ldaps; 777 - 999; 8080.
+        /// </summary>
+        public static string ExamplePortPortRangeOrService {
+            get {
+                return ResourceManager.GetString("ExamplePortPortRangeOrService", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 22; 80; 443; 500 - 999; 8080.
+        /// </summary>
+        public static string ExamplePortScanRange {
+            get {
+                return ResourceManager.GetString("ExamplePortScanRange", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Webserver.
+        /// </summary>
+        public static string ExampleRemoteDesktopProfileName {
+            get {
+                return ResourceManager.GetString("ExampleRemoteDesktopProfileName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to COM5.
+        /// </summary>
+        public static string ExampleSerialLine {
+            get {
+                return ResourceManager.GetString("ExampleSerialLine", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to public.
+        /// </summary>
+        public static string ExampleSNMPCommunity {
+            get {
+                return ResourceManager.GetString("ExampleSNMPCommunity", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 1.3.6.1.2.1.1.
+        /// </summary>
+        public static string ExampleSNMPOID {
+            get {
+                return ResourceManager.GetString("ExampleSNMPOID", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to snmp-user.
+        /// </summary>
+        public static string ExampleSNMPUsername {
+            get {
+                return ResourceManager.GetString("ExampleSNMPUsername", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to fritz.box.
+        /// </summary>
+        public static string ExampleSuffix {
+            get {
+                return ResourceManager.GetString("ExampleSuffix", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to server; dmz.
+        /// </summary>
+        public static string ExampleTags {
+            get {
+                return ResourceManager.GetString("ExampleTags", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Admin.
+        /// </summary>
+        public static string ExampleUsername {
+            get {
+                return ResourceManager.GetString("ExampleUsername", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to 80; 443; 8080; 8443.
+        /// </summary>
+        public static string ExampleWebserverPorts {
+            get {
+                return ResourceManager.GetString("ExampleWebserverPorts", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to http(s)://example.com/index.html.
+        /// </summary>
+        public static string ExampleWebsiteUri {
+            get {
+                return ResourceManager.GetString("ExampleWebsiteUri", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to GitHub.
         /// </summary>
@@ -87,6 +501,15 @@ public static string HiddenPassword {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to JSON.
+        /// </summary>
+        public static string JSON {
+            get {
+                return ResourceManager.GetString("JSON", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to NETworkManager.
         /// </summary>
@@ -95,5 +518,23 @@ public static string ProductName {
                 return ResourceManager.GetString("ProductName", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to TXT.
+        /// </summary>
+        public static string TXT {
+            get {
+                return ResourceManager.GetString("TXT", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to XML.
+        /// </summary>
+        public static string XML {
+            get {
+                return ResourceManager.GetString("XML", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Source/NETworkManager/Resources/Localization/StaticStrings.resx b/Source/NETworkManager/Resources/Localization/StaticStrings.resx
index 2f068d6b21..8f2cdab618 100644
--- a/Source/NETworkManager/Resources/Localization/StaticStrings.resx
+++ b/Source/NETworkManager/Resources/Localization/StaticStrings.resx
@@ -117,6 +117,144 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CSV" xml:space="preserve">
+    <value>CSV</value>
+  </data>
+  <data name="ExampleBaud9600" xml:space="preserve">
+    <value>9600</value>
+  </data>
+  <data name="ExampleCredentialName" xml:space="preserve">
+    <value>Windows-Testuser</value>
+  </data>
+  <data name="ExampleDomain" xml:space="preserve">
+    <value>example.com</value>
+  </data>
+  <data name="ExampleGroupServers" xml:space="preserve">
+    <value>Servers</value>
+  </data>
+  <data name="ExampleGroupSwitche" xml:space="preserve">
+    <value>Switche</value>
+  </data>
+  <data name="ExampleHostname" xml:space="preserve">
+    <value>SERVER-01</value>
+  </data>
+  <data name="ExampleHostnameAndOrIPAddress" xml:space="preserve">
+    <value>192.168.178.1; fritz.box</value>
+  </data>
+  <data name="ExampleHostnameOrIPAddress" xml:space="preserve">
+    <value>SERVER-01 or 172.16.0.100</value>
+  </data>
+  <data name="ExampleIPScanRange" xml:space="preserve">
+    <value>192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24</value>
+  </data>
+  <data name="ExampleIPv4Address" xml:space="preserve">
+    <value>192.168.178.55</value>
+  </data>
+  <data name="ExampleIPv4Broadcast" xml:space="preserve">
+    <value>192.168.178.255</value>
+  </data>
+  <data name="ExampleIPv4DNSServer" xml:space="preserve">
+    <value>8.8.8.8</value>
+  </data>
+  <data name="ExampleIPv4DNSServers" xml:space="preserve">
+    <value>192.168.178.1; 8.8.8.8; 8.8.4.4</value>
+  </data>
+  <data name="ExampleIPv4Gateway" xml:space="preserve">
+    <value>192.168.178.1</value>
+  </data>
+  <data name="ExampleIPv4IPv6Subnet" xml:space="preserve">
+    <value>192.168.178.133/255.255.255.0 or 2001:0db8::/64</value>
+  </data>
+  <data name="ExampleIPv4IPv6Subnet2" xml:space="preserve">
+    <value>192.168.178.134/255.255.255.0 or 2001:0db9::/64</value>
+  </data>
+  <data name="ExampleIPv4IPv6Subnet3" xml:space="preserve">
+    <value>192.168.180.0/24 or 2001:0db9::/54</value>
+  </data>
+  <data name="ExampleIPv4Subnet" xml:space="preserve">
+    <value>192.168.178.0/24 or 192.168.178.0/255.255.255.0</value>
+  </data>
+  <data name="ExampleIPv4Subnet2" xml:space="preserve">
+    <value>192.168.179.0/24 or 192.168.179.0/255.255.255.0</value>
+  </data>
+  <data name="ExampleIPv4Subnetmask" xml:space="preserve">
+    <value>255.255.255.0</value>
+  </data>
+  <data name="ExampleIPv4SubnetmaskIPv4CIDR" xml:space="preserve">
+    <value>/24 or 255.255.255.0</value>
+  </data>
+  <data name="ExampleIPv4SubnetmaskIPv6CIDR" xml:space="preserve">
+    <value>255.255.255.0 or /64</value>
+  </data>
+  <data name="ExampleIPv4SubnetWithCIDR" xml:space="preserve">
+    <value>192.168.100.0/24</value>
+  </data>
+  <data name="ExampleMACAddress" xml:space="preserve">
+    <value>00:F1:21:AB:0B:35</value>
+  </data>
+  <data name="ExampleMACAddressesOrVendor" xml:space="preserve">
+    <value>01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</value>
+  </data>
+  <data name="ExamplePort161" xml:space="preserve">
+    <value>161</value>
+  </data>
+  <data name="ExamplePort22" xml:space="preserve">
+    <value>22</value>
+  </data>
+  <data name="ExamplePort23" xml:space="preserve">
+    <value>23</value>
+  </data>
+  <data name="ExamplePort3389" xml:space="preserve">
+    <value>3389</value>
+  </data>
+  <data name="ExamplePort513" xml:space="preserve">
+    <value>513</value>
+  </data>
+  <data name="ExamplePort53" xml:space="preserve">
+    <value>53</value>
+  </data>
+  <data name="ExamplePort5900" xml:space="preserve">
+    <value>5900</value>
+  </data>
+  <data name="ExamplePort7" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="ExamplePortPortRangeOrService" xml:space="preserve">
+    <value>22; 80; https; ldaps; 777 - 999; 8080</value>
+  </data>
+  <data name="ExamplePortScanRange" xml:space="preserve">
+    <value>22; 80; 443; 500 - 999; 8080</value>
+  </data>
+  <data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
+    <value>Webserver</value>
+  </data>
+  <data name="ExampleSerialLine" xml:space="preserve">
+    <value>COM5</value>
+  </data>
+  <data name="ExampleSNMPCommunity" xml:space="preserve">
+    <value>public</value>
+  </data>
+  <data name="ExampleSNMPOID" xml:space="preserve">
+    <value>1.3.6.1.2.1.1</value>
+  </data>
+  <data name="ExampleSNMPUsername" xml:space="preserve">
+    <value>snmp-user</value>
+  </data>
+  <data name="ExampleSuffix" xml:space="preserve">
+    <value>fritz.box</value>
+  </data>
+  <data name="ExampleTags" xml:space="preserve">
+    <value>server; dmz</value>
+  </data>
+  <data name="ExampleUsername" xml:space="preserve">
+    <value>Admin</value>
+  </data>
+  <data name="ExampleWebserverPorts" xml:space="preserve">
+    <value>80; 443; 8080; 8443</value>
+  </data>
+  <data name="ExampleWebsiteUri" xml:space="preserve">
+    <value>http(s)://example.com/index.html</value>
+  </data>
   <data name="GitHub" xml:space="preserve">
     <value>GitHub</value>
   </data>
@@ -126,7 +264,16 @@
   <data name="HiddenPassword" xml:space="preserve">
     <value>••••••••••••</value>
   </data>
+  <data name="JSON" xml:space="preserve">
+    <value>JSON</value>
+  </data>
   <data name="ProductName" xml:space="preserve">
     <value>NETworkManager</value>
   </data>
+  <data name="TXT" xml:space="preserve">
+    <value>TXT</value>
+  </data>
+  <data name="XML" xml:space="preserve">
+    <value>XML</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs
index b10eaf3ef6..91326ad86b 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs
+++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs
@@ -222,6 +222,24 @@ public static string AddEntryDots {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add IPv4 address.
+        /// </summary>
+        public static string AddIPv4Address {
+            get {
+                return ResourceManager.GetString("AddIPv4Address", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Add IPv4 address....
+        /// </summary>
+        public static string AddIPv4AddressDots {
+            get {
+                return ResourceManager.GetString("AddIPv4AddressDots", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Additional command line.
         /// </summary>
@@ -258,6 +276,15 @@ public static string AddProfileDots {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Add tab....
+        /// </summary>
+        public static string AddTabDots {
+            get {
+                return ResourceManager.GetString("AddTabDots", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Adjust screen automatically.
         /// </summary>
@@ -276,6 +303,15 @@ public static string Administrator {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to All.
+        /// </summary>
+        public static string All {
+            get {
+                return ResourceManager.GetString("All", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Always show icon in tray.
         /// </summary>
@@ -294,6 +330,15 @@ public static string Amber {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred while exporting the data. See error message for details:.
+        /// </summary>
+        public static string AnErrorOccurredWhileExportingTheData {
+            get {
+                return ResourceManager.GetString("AnErrorOccurredWhileExportingTheData", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Answers.
         /// </summary>
@@ -1248,6 +1293,15 @@ public static string Description {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Design.
+        /// </summary>
+        public static string Design {
+            get {
+                return ResourceManager.GetString("Design", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Destination.
         /// </summary>
@@ -1627,11 +1681,11 @@ public static string EnterSubnetAndANewSubnetmaskToCreateSubnets {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Enter subnets to create a supernet....
+        ///   Looks up a localized string similar to Enter subnets to create a wide subnet....
         /// </summary>
-        public static string EnterSubnetsToCreateASupernet {
+        public static string EnterSubnetsToCreateAWideSubnet {
             get {
-                return ResourceManager.GetString("EnterSubnetsToCreateASupernet", resourceCulture);
+                return ResourceManager.GetString("EnterSubnetsToCreateAWideSubnet", resourceCulture);
             }
         }
         
@@ -1653,6 +1707,15 @@ public static string EnterValidDomain {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enter valid file path!.
+        /// </summary>
+        public static string EnterValidFilePath {
+            get {
+                return ResourceManager.GetString("EnterValidFilePath", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enter valid hosts (multiple hosts can not end with &quot;;&quot;)!.
         /// </summary>
@@ -1825,416 +1888,65 @@ public static string Everything {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 9600.
-        /// </summary>
-        public static string ExampleBaud9600 {
-            get {
-                return ResourceManager.GetString("ExampleBaud9600", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Windows-Testuser.
-        /// </summary>
-        public static string ExampleCredentialName {
-            get {
-                return ResourceManager.GetString("ExampleCredentialName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to example.com.
-        /// </summary>
-        public static string ExampleDomain {
-            get {
-                return ResourceManager.GetString("ExampleDomain", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Servers.
-        /// </summary>
-        public static string ExampleGroupServers {
-            get {
-                return ResourceManager.GetString("ExampleGroupServers", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Switche.
-        /// </summary>
-        public static string ExampleGroupSwitche {
-            get {
-                return ResourceManager.GetString("ExampleGroupSwitche", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SERVER-01.
-        /// </summary>
-        public static string ExampleHostname {
-            get {
-                return ResourceManager.GetString("ExampleHostname", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.1; fritz.box.
-        /// </summary>
-        public static string ExampleHostnameAndOrIPAddress {
-            get {
-                return ResourceManager.GetString("ExampleHostnameAndOrIPAddress", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to SERVER-01 or 172.16.0.100.
-        /// </summary>
-        public static string ExampleHostnameOrIPAddress {
-            get {
-                return ResourceManager.GetString("ExampleHostnameOrIPAddress", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24.
-        /// </summary>
-        public static string ExampleIPScanRange {
-            get {
-                return ResourceManager.GetString("ExampleIPScanRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.55.
-        /// </summary>
-        public static string ExampleIPv4Address {
-            get {
-                return ResourceManager.GetString("ExampleIPv4Address", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.255.
-        /// </summary>
-        public static string ExampleIPv4Broadcast {
-            get {
-                return ResourceManager.GetString("ExampleIPv4Broadcast", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 8.8.8.8.
-        /// </summary>
-        public static string ExampleIPv4DNSServer {
-            get {
-                return ResourceManager.GetString("ExampleIPv4DNSServer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.1; 8.8.8.8; 8.8.4.4.
-        /// </summary>
-        public static string ExampleIPv4DNSServers {
-            get {
-                return ResourceManager.GetString("ExampleIPv4DNSServers", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.1.
-        /// </summary>
-        public static string ExampleIPv4Gateway {
-            get {
-                return ResourceManager.GetString("ExampleIPv4Gateway", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.133/255.255.255.0 or 2001:0db8::/64.
-        /// </summary>
-        public static string ExampleIPv4IPv6Subnet {
-            get {
-                return ResourceManager.GetString("ExampleIPv4IPv6Subnet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.134/255.255.255.0 or 2001:0db9::/64.
-        /// </summary>
-        public static string ExampleIPv4IPv6Subnet2 {
-            get {
-                return ResourceManager.GetString("ExampleIPv4IPv6Subnet2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.178.133/22 or 192.168.178.133/255.255.252.0.
-        /// </summary>
-        public static string ExampleIPv4Subnet {
-            get {
-                return ResourceManager.GetString("ExampleIPv4Subnet", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 255.255.255.0.
-        /// </summary>
-        public static string ExampleIPv4Subnetmask {
-            get {
-                return ResourceManager.GetString("ExampleIPv4Subnetmask", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to /24 or 255.255.255.0.
-        /// </summary>
-        public static string ExampleIPv4SubnetmaskIPv4CIDR {
-            get {
-                return ResourceManager.GetString("ExampleIPv4SubnetmaskIPv4CIDR", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 255.255.255.0 or /64.
-        /// </summary>
-        public static string ExampleIPv4SubnetmaskIPv6CIDR {
-            get {
-                return ResourceManager.GetString("ExampleIPv4SubnetmaskIPv6CIDR", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 192.168.100.0/24.
-        /// </summary>
-        public static string ExampleIPv4SubnetWithCIDR {
-            get {
-                return ResourceManager.GetString("ExampleIPv4SubnetWithCIDR", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 00:F1:21:AB:0B:35.
-        /// </summary>
-        public static string ExampleMACAddress {
-            get {
-                return ResourceManager.GetString("ExampleMACAddress", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus.
-        /// </summary>
-        public static string ExampleMACAddressesOrVendor {
-            get {
-                return ResourceManager.GetString("ExampleMACAddressesOrVendor", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 161.
-        /// </summary>
-        public static string ExamplePort161 {
-            get {
-                return ResourceManager.GetString("ExamplePort161", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 22.
-        /// </summary>
-        public static string ExamplePort22 {
-            get {
-                return ResourceManager.GetString("ExamplePort22", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 23.
-        /// </summary>
-        public static string ExamplePort23 {
-            get {
-                return ResourceManager.GetString("ExamplePort23", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 3389.
-        /// </summary>
-        public static string ExamplePort3389 {
-            get {
-                return ResourceManager.GetString("ExamplePort3389", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 513.
-        /// </summary>
-        public static string ExamplePort513 {
-            get {
-                return ResourceManager.GetString("ExamplePort513", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 53.
-        /// </summary>
-        public static string ExamplePort53 {
-            get {
-                return ResourceManager.GetString("ExamplePort53", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 5900.
-        /// </summary>
-        public static string ExamplePort5900 {
-            get {
-                return ResourceManager.GetString("ExamplePort5900", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 7.
-        /// </summary>
-        public static string ExamplePort7 {
-            get {
-                return ResourceManager.GetString("ExamplePort7", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 22; 80; https; ldaps; 777 - 999; 8080.
-        /// </summary>
-        public static string ExamplePortPortRangeOrService {
-            get {
-                return ResourceManager.GetString("ExamplePortPortRangeOrService", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 22; 80; 443; 500 - 999; 8080.
-        /// </summary>
-        public static string ExamplePortScanRange {
-            get {
-                return ResourceManager.GetString("ExamplePortScanRange", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Webserver.
-        /// </summary>
-        public static string ExampleRemoteDesktopProfileName {
-            get {
-                return ResourceManager.GetString("ExampleRemoteDesktopProfileName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to COM5.
-        /// </summary>
-        public static string ExampleSerialLine {
-            get {
-                return ResourceManager.GetString("ExampleSerialLine", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to public.
-        /// </summary>
-        public static string ExampleSNMPCommunity {
-            get {
-                return ResourceManager.GetString("ExampleSNMPCommunity", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 1.3.6.1.2.1.1.
-        /// </summary>
-        public static string ExampleSNMPOID {
-            get {
-                return ResourceManager.GetString("ExampleSNMPOID", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to snmp-user.
-        /// </summary>
-        public static string ExampleSNMPUsername {
-            get {
-                return ResourceManager.GetString("ExampleSNMPUsername", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to fritz.box.
-        /// </summary>
-        public static string ExampleSuffix {
-            get {
-                return ResourceManager.GetString("ExampleSuffix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to server; dmz.
+        ///   Looks up a localized string similar to Expand.
         /// </summary>
-        public static string ExampleTags {
+        public static string Expand {
             get {
-                return ResourceManager.GetString("ExampleTags", resourceCulture);
+                return ResourceManager.GetString("Expand", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Admin.
+        ///   Looks up a localized string similar to Export.
         /// </summary>
-        public static string ExampleUsername {
+        public static string Export {
             get {
-                return ResourceManager.GetString("ExampleUsername", resourceCulture);
+                return ResourceManager.GetString("Export", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 80; 443; 8080; 8443.
+        ///   Looks up a localized string similar to Export all.
         /// </summary>
-        public static string ExampleWebserverPorts {
+        public static string ExportAll {
             get {
-                return ResourceManager.GetString("ExampleWebserverPorts", resourceCulture);
+                return ResourceManager.GetString("ExportAll", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to http(s)://example.com/index.html.
+        ///   Looks up a localized string similar to Export....
         /// </summary>
-        public static string ExampleWebsiteUri {
+        public static string ExportDots {
             get {
-                return ResourceManager.GetString("ExampleWebsiteUri", resourceCulture);
+                return ResourceManager.GetString("ExportDots", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Expand.
+        ///   Looks up a localized string similar to Export selected.
         /// </summary>
-        public static string Expand {
+        public static string ExportSelected {
             get {
-                return ResourceManager.GetString("Expand", resourceCulture);
+                return ResourceManager.GetString("ExportSelected", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Export.
+        ///   Looks up a localized string similar to Field cannot be empty!.
         /// </summary>
-        public static string Export {
+        public static string FieldCannotBeEmpty {
             get {
-                return ResourceManager.GetString("Export", resourceCulture);
+                return ResourceManager.GetString("FieldCannotBeEmpty", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Field cannot be empty!.
+        ///   Looks up a localized string similar to File.
         /// </summary>
-        public static string FieldCannotBeEmpty {
+        public static string File {
             get {
-                return ResourceManager.GetString("FieldCannotBeEmpty", resourceCulture);
+                return ResourceManager.GetString("File", resourceCulture);
             }
         }
         
@@ -2310,6 +2022,15 @@ public static string ForkMeOnGitHub {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Format.
+        /// </summary>
+        public static string Format {
+            get {
+                return ResourceManager.GetString("Format", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Found.
         /// </summary>
@@ -2427,6 +2148,15 @@ public static string HiddenApplications {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Highlight timeouts.
+        /// </summary>
+        public static string HighlightTimeouts {
+            get {
+                return ResourceManager.GetString("HighlightTimeouts", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to History.
         /// </summary>
@@ -2841,6 +2571,15 @@ public static string Location {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Location....
+        /// </summary>
+        public static string LocationDots {
+            get {
+                return ResourceManager.GetString("LocationDots", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Location of the import file....
         /// </summary>
@@ -3139,7 +2878,8 @@ public static string NoPortsFoundCheckYourInput {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No profiles found! Create one....
+        ///   Looks up a localized string similar to No profiles found!
+        ///Create one....
         /// </summary>
         public static string NoProfilesFoundCreateOne {
             get {
@@ -3156,6 +2896,15 @@ public static string NotChanged {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Note.
+        /// </summary>
+        public static string Note {
+            get {
+                return ResourceManager.GetString("Note", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Nothing found!.
         /// </summary>
@@ -4319,6 +4068,16 @@ public static string Reset {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to If you have forgotten your password and want to start over, delete the following file and restart the application.
+        ///Path: &quot;{0}&quot;.
+        /// </summary>
+        public static string ResetCredentialsMessage {
+            get {
+                return ResourceManager.GetString("ResetCredentialsMessage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Resolve CNAME on ANY requests.
         /// </summary>
@@ -4571,6 +4330,15 @@ public static string SelectAScreenResolution {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Selected.
+        /// </summary>
+        public static string Selected {
+            get {
+                return ResourceManager.GetString("Selected", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The selected settings are overwritten..
         /// </summary>
@@ -4940,15 +4708,6 @@ public static string Steel {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        public static string String1 {
-            get {
-                return ResourceManager.GetString("String1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Subnet.
         /// </summary>
@@ -5021,15 +4780,6 @@ public static string Success {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Supernetting.
-        /// </summary>
-        public static string Supernetting {
-            get {
-                return ResourceManager.GetString("Supernetting", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Tags.
         /// </summary>
@@ -5732,6 +5482,15 @@ public static string WhoisServerNotFoundForTheDomain {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Wide Subnet.
+        /// </summary>
+        public static string WideSubnet {
+            get {
+                return ResourceManager.GetString("WideSubnet", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Width.
         /// </summary>
diff --git a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx
index 6a282a41b5..28f66f4731 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -375,9 +375,6 @@
   <data name="Success" xml:space="preserve">
     <value>Erfolgreich!</value>
   </data>
-  <data name="Supernetting" xml:space="preserve">
-    <value>Supernetting</value>
-  </data>
   <data name="Theme" xml:space="preserve">
     <value>Thema</value>
   </data>
@@ -873,9 +870,6 @@
   <data name="EnterSubnetAndANewSubnetmaskToCreateSubnets" xml:space="preserve">
     <value>Geben Sie das Subnetz und eine neue Subnetzmaske ein, um Subnetze zu erstellen...</value>
   </data>
-  <data name="EnterSubnetsToCreateASupernet" xml:space="preserve">
-    <value>Geben Sie Subnetze ein, um ein Supernet zu erstellen...</value>
-  </data>
   <data name="ErrorCheckingApiGithubComVerifyYourNetworkConnection" xml:space="preserve">
     <value>Fehler beim Überprüfen von 'api.github.com', überprüfen Sie Ihre Netzwerkverbindung!</value>
   </data>
@@ -973,7 +967,8 @@
     <value>Keine Ports gefunden. Überprüfen Sie Ihre Eingabe!</value>
   </data>
   <data name="NoProfilesFoundCreateOne" xml:space="preserve">
-    <value>Keine Profile gefunden! Erstelle eins...</value>
+    <value>Keine Profile gefunden!
+Erstelle eins...</value>
   </data>
   <data name="NothingFound" xml:space="preserve">
     <value>Nichts gefunden!</value>
@@ -1343,129 +1338,6 @@ Wenn Sie auf "Verschieben &amp; neu starten" klicken, werden die restlichen Date
   <data name="Everything" xml:space="preserve">
     <value>Alles</value>
   </data>
-  <data name="ExampleBaud9600" xml:space="preserve">
-    <value>9600</value>
-  </data>
-  <data name="ExampleCredentialName" xml:space="preserve">
-    <value>Windows-Testbenutzer</value>
-  </data>
-  <data name="ExampleGroupServers" xml:space="preserve">
-    <value>Server</value>
-  </data>
-  <data name="ExampleGroupSwitche" xml:space="preserve">
-    <value>Switche</value>
-  </data>
-  <data name="ExampleHostname" xml:space="preserve">
-    <value>SERVER-01</value>
-  </data>
-  <data name="ExampleHostnameAndOrIPAddress" xml:space="preserve">
-    <value>192.168.178.1; fritz.box</value>
-  </data>
-  <data name="ExampleHostnameOrIPAddress" xml:space="preserve">
-    <value>SERVER-01 und 172.16.0.100</value>
-  </data>
-  <data name="ExampleIPScanRange" xml:space="preserve">
-    <value>192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24</value>
-  </data>
-  <data name="ExampleIPv4Address" xml:space="preserve">
-    <value>192.168.178.55</value>
-  </data>
-  <data name="ExampleIPv4Broadcast" xml:space="preserve">
-    <value>192.168.178.255</value>
-  </data>
-  <data name="ExampleIPv4DNSServer" xml:space="preserve">
-    <value>8.8.8.8</value>
-  </data>
-  <data name="ExampleIPv4DNSServers" xml:space="preserve">
-    <value>192.168.178.1; 8.8.8.8; 8.8.4.4</value>
-  </data>
-  <data name="ExampleIPv4Gateway" xml:space="preserve">
-    <value>192.168.178.1</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet" xml:space="preserve">
-    <value>192.168.178.133/255.255.255.0 oder 2001:0db8::/64</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet2" xml:space="preserve">
-    <value>192.168.178.134/255.255.255.0 oder 2001:0db9::/64</value>
-  </data>
-  <data name="ExampleIPv4Subnet" xml:space="preserve">
-    <value>192.168.178.133/22 oder 192.168.178.133/255.255.252.0</value>
-  </data>
-  <data name="ExampleIPv4Subnetmask" xml:space="preserve">
-    <value>255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv4CIDR" xml:space="preserve">
-    <value>/24 oder 255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv6CIDR" xml:space="preserve">
-    <value>255.255.255.0 oder /64</value>
-  </data>
-  <data name="ExampleIPv4SubnetWithCIDR" xml:space="preserve">
-    <value>192.168.100.0/24</value>
-  </data>
-  <data name="ExampleMACAddress" xml:space="preserve">
-    <value>00:F1:21:AB:0B:35</value>
-  </data>
-  <data name="ExampleMACAddressesOrVendor" xml:space="preserve">
-    <value>01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</value>
-  </data>
-  <data name="ExamplePort161" xml:space="preserve">
-    <value>161</value>
-  </data>
-  <data name="ExamplePort22" xml:space="preserve">
-    <value>22</value>
-  </data>
-  <data name="ExamplePort23" xml:space="preserve">
-    <value>23</value>
-  </data>
-  <data name="ExamplePort3389" xml:space="preserve">
-    <value>3389</value>
-  </data>
-  <data name="ExamplePort513" xml:space="preserve">
-    <value>513</value>
-  </data>
-  <data name="ExamplePort53" xml:space="preserve">
-    <value>53</value>
-  </data>
-  <data name="ExamplePort7" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="ExamplePortPortRangeOrService" xml:space="preserve">
-    <value>22; 80; https; ldaps; 777 - 999; 8080</value>
-  </data>
-  <data name="ExamplePortScanRange" xml:space="preserve">
-    <value>22; 80; 443; 500 - 999; 8080</value>
-  </data>
-  <data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
-    <value>Webserver</value>
-  </data>
-  <data name="ExampleSerialLine" xml:space="preserve">
-    <value>COM5</value>
-  </data>
-  <data name="ExampleSNMPCommunity" xml:space="preserve">
-    <value>public</value>
-  </data>
-  <data name="ExampleSNMPOID" xml:space="preserve">
-    <value>1.3.6.1.2.1.1</value>
-  </data>
-  <data name="ExampleSNMPUsername" xml:space="preserve">
-    <value>snmp-user</value>
-  </data>
-  <data name="ExampleSuffix" xml:space="preserve">
-    <value>fritz.box</value>
-  </data>
-  <data name="ExampleTags" xml:space="preserve">
-    <value>server; dmz</value>
-  </data>
-  <data name="ExampleUsername" xml:space="preserve">
-    <value>Admin</value>
-  </data>
-  <data name="ExampleWebserverPorts" xml:space="preserve">
-    <value>80; 443; 8080; 8443</value>
-  </data>
-  <data name="ExampleWebsiteUri" xml:space="preserve">
-    <value>http(s)://example.com/index.html</value>
-  </data>
   <data name="FilterDots" xml:space="preserve">
     <value>Filter...</value>
   </data>
@@ -1964,9 +1836,6 @@ Wenn Sie auf "Verschieben &amp; neu starten" klicken, werden die restlichen Date
   <data name="WhoisServerNotFoundForTheDomain" xml:space="preserve">
     <value>Whois-Server nicht gefunden für die Domain: "{0}"</value>
   </data>
-  <data name="ExampleDomain" xml:space="preserve">
-    <value>example.com</value>
-  </data>
   <data name="Routing" xml:space="preserve">
     <value>Routing</value>
   </data>
@@ -2000,9 +1869,6 @@ Wenn Sie auf "Verschieben &amp; neu starten" klicken, werden die restlichen Date
   <data name="RestartSession" xml:space="preserve">
     <value>Session neu starten</value>
   </data>
-  <data name="ExamplePort5900" xml:space="preserve">
-    <value>5900</value>
-  </data>
   <data name="TightVNC" xml:space="preserve">
     <value>TightVNC</value>
   </data>
@@ -2030,7 +1896,62 @@ Wenn Sie auf "Verschieben &amp; neu starten" klicken, werden die restlichen Date
   <data name="ResolveMACAddressAndVendor" xml:space="preserve">
     <value>MAC-Adresse und Hersteller auflösen</value>
   </data>
-  <data name="String1" xml:space="preserve">
-    <value/>
+  <data name="Note" xml:space="preserve">
+    <value>Hinweis</value>
+  </data>
+  <data name="ExportAll" xml:space="preserve">
+    <value>Alles exportieren</value>
+  </data>
+  <data name="ExportDots" xml:space="preserve">
+    <value>Exportieren...</value>
+  </data>
+  <data name="ExportSelected" xml:space="preserve">
+    <value>Ausgewählte exportieren</value>
+  </data>
+  <data name="LocationDots" xml:space="preserve">
+    <value>Speicherort...</value>
+  </data>
+  <data name="File" xml:space="preserve">
+    <value>Datei</value>
+  </data>
+  <data name="EnterValidFilePath" xml:space="preserve">
+    <value>Geben Sie einen gültigen Dateipfad ein!</value>
+  </data>
+  <data name="All" xml:space="preserve">
+    <value>Alle</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="Selected" xml:space="preserve">
+    <value>Ausgewählte</value>
+  </data>
+  <data name="AnErrorOccurredWhileExportingTheData" xml:space="preserve">
+    <value>Beim Exportieren der Daten ist ein Fehler aufgetreten. Siehe Fehlermeldung für Details:</value>
+  </data>
+  <data name="Design" xml:space="preserve">
+    <value>Design</value>
+  </data>
+  <data name="HighlightTimeouts" xml:space="preserve">
+    <value>Timeouts hervorheben</value>
+  </data>
+  <data name="EnterSubnetsToCreateAWideSubnet" xml:space="preserve">
+    <value>Geben Sie Subnetze ein, um ein WideSubnet zu erstellen...</value>
+  </data>
+  <data name="WideSubnet" xml:space="preserve">
+    <value>Wide Subnet</value>
+  </data>
+  <data name="AddTabDots" xml:space="preserve">
+    <value>Tab hinzufügen...</value>
+  </data>
+  <data name="ResetCredentialsMessage" xml:space="preserve">
+    <value>Wenn Sie Ihr Passwort vergessen haben und neu beginnen möchten, löschen Sie die folgende Datei und starten Sie die Anwendung erneut.
+Pfad: "{0}"</value>
+  </data>
+  <data name="AddIPv4AddressDots" xml:space="preserve">
+    <value>IPv4-Adresse hinzufügen...</value>
+  </data>
+  <data name="AddIPv4Address" xml:space="preserve">
+    <value>IPv4-Adresse hinzufügen</value>
   </data>
 </root>
diff --git a/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx b/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx
index 228445397b..39eee3e18e 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -375,9 +375,6 @@
   <data name="Success" xml:space="preserve">
     <value>¡Éxito!</value>
   </data>
-  <data name="Supernetting" xml:space="preserve">
-    <value>Superredes</value>
-  </data>
   <data name="Theme" xml:space="preserve">
     <value>Tema</value>
   </data>
@@ -571,7 +568,7 @@
     <value>Reinicio requerido</value>
   </data>
   <data name="RestartRequiredSettingsChangedMessage" xml:space="preserve">
-    <value>¡Algunas configuraciones se aplican solo después de reiniciar la aplicación!</value>
+    <value>¡Algunas configuraciones se aplican sólo después de reiniciar la aplicación!</value>
   </data>
   <data name="SaveSettingsInApplicationFolder" xml:space="preserve">
     <value>Guardar configuración en la directorio de la aplicación</value>
@@ -873,9 +870,6 @@
   <data name="EnterSubnetAndANewSubnetmaskToCreateSubnets" xml:space="preserve">
     <value>Ingrese la subred y una nueva máscara de subred para crear subredes...</value>
   </data>
-  <data name="EnterSubnetsToCreateASupernet" xml:space="preserve">
-    <value>Ingrese las subredes para crear una super-red...</value>
-  </data>
   <data name="ErrorCheckingApiGithubComVerifyYourNetworkConnection" xml:space="preserve">
     <value>¡Error al comprobar 'api.github.com', compruebe su conexión de red!</value>
   </data>
@@ -964,22 +958,23 @@
     <value>Nueva conexión...</value>
   </data>
   <data name="NoDNSRecordFoundCheckYourInputAndSettings" xml:space="preserve">
-    <value>¡No se encontró registro DNS para "{0}"! Compruebe su entrada y la configuración.</value>
+    <value>¡No se encontró registro DNS para "{0}"! Compruebe sus datos y la configuración.</value>
   </data>
   <data name="NoEnabledNetworkAdaptersFound" xml:space="preserve">
     <value>¡No se encontraron adaptadores de red habilitados!</value>
   </data>
   <data name="NoPortsFoundCheckYourInput" xml:space="preserve">
-    <value>No se encontraron puertos. ¡Comprueba tu opinión!</value>
+    <value>No se encontraron puertos. ¡Compruebe sus datos!</value>
   </data>
   <data name="NoProfilesFoundCreateOne" xml:space="preserve">
-    <value>¡No se encontraron perfiles! Crear uno...</value>
+    <value>¡No se han encontrado perfiles!
+Crear uno...</value>
   </data>
   <data name="NothingFound" xml:space="preserve">
     <value>¡No se encontró nada!</value>
   </data>
   <data name="NothingToDoCheckYourInput" xml:space="preserve">
-    <value>Nada que hacer. ¡Comprueba tu opinión!</value>
+    <value>Nada que hacer. ¡Compruebe sus datos!</value>
   </data>
   <data name="NoUpdateAvailable" xml:space="preserve">
     <value>¡Actualización no disponible!</value>
@@ -988,7 +983,7 @@
     <value>No se encontró ningún archivo válido para importar.</value>
   </data>
   <data name="NoVendorFoundCheckYourInput" xml:space="preserve">
-    <value>Ningún proveedor encontrado. ¡Comprueba tu opinión!</value>
+    <value>Ningún proveedor encontrado. ¡Compruebe sus datos!</value>
   </data>
   <data name="NumberOfErrorsAfterWhichIsCanceled" xml:space="preserve">
     <value>Número de errores después de los cuales se cancela:</value>
@@ -1000,7 +995,7 @@
     <value>OID</value>
   </data>
   <data name="OnlyWhenUsingTheFullScreen" xml:space="preserve">
-    <value>Solo cuando se usa la pantalla completa</value>
+    <value>Sólo cuando se usa la pantalla completa</value>
   </data>
   <data name="OnTheRemoteComputer" xml:space="preserve">
     <value>En el equipo remoto</value>
@@ -1173,7 +1168,7 @@
     <value>Mostrar el título de la aplicación actual</value>
   </data>
   <data name="ShowOnlyMostCommonQueryTypes" xml:space="preserve">
-    <value>Mostrar solo los tipos de consulta más comunes</value>
+    <value>Mostrar sólo los tipos de consulta más comunes</value>
   </data>
   <data name="ShowScanResultForAllIPAddresses" xml:space="preserve">
     <value>Mostrar el resultado del escaneo para todas las direcciones IP</value>
@@ -1343,129 +1338,6 @@
   <data name="Everything" xml:space="preserve">
     <value>Todo</value>
   </data>
-  <data name="ExampleBaud9600" xml:space="preserve">
-    <value>9600</value>
-  </data>
-  <data name="ExampleCredentialName" xml:space="preserve">
-    <value>Usuario de prueba-Windows</value>
-  </data>
-  <data name="ExampleGroupServers" xml:space="preserve">
-    <value>Servidores</value>
-  </data>
-  <data name="ExampleGroupSwitche" xml:space="preserve">
-    <value>Switche</value>
-  </data>
-  <data name="ExampleHostname" xml:space="preserve">
-    <value>SERVER-01</value>
-  </data>
-  <data name="ExampleHostnameAndOrIPAddress" xml:space="preserve">
-    <value>192.168.178.1; fritz.box</value>
-  </data>
-  <data name="ExampleHostnameOrIPAddress" xml:space="preserve">
-    <value>SERVER-01 o 172.16.0.100</value>
-  </data>
-  <data name="ExampleIPScanRange" xml:space="preserve">
-    <value>192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24</value>
-  </data>
-  <data name="ExampleIPv4Address" xml:space="preserve">
-    <value>192.168.178.55</value>
-  </data>
-  <data name="ExampleIPv4Broadcast" xml:space="preserve">
-    <value>192.168.178.255</value>
-  </data>
-  <data name="ExampleIPv4DNSServer" xml:space="preserve">
-    <value>8.8.8.8</value>
-  </data>
-  <data name="ExampleIPv4DNSServers" xml:space="preserve">
-    <value>192.168.178.1; 8.8.8.8; 8.8.4.4</value>
-  </data>
-  <data name="ExampleIPv4Gateway" xml:space="preserve">
-    <value>192.168.178.1</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet" xml:space="preserve">
-    <value>192.168.178.133/255.255.255.0 o 2001:0db8::/64</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet2" xml:space="preserve">
-    <value>192.168.178.134/255.255.255.0 o 2001:0db9::/64</value>
-  </data>
-  <data name="ExampleIPv4Subnet" xml:space="preserve">
-    <value>192.168.178.133/22 o 192.168.178.133/255.255.252.0</value>
-  </data>
-  <data name="ExampleIPv4Subnetmask" xml:space="preserve">
-    <value>255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv4CIDR" xml:space="preserve">
-    <value>/24 o 255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv6CIDR" xml:space="preserve">
-    <value>255.255.255.0 o /64</value>
-  </data>
-  <data name="ExampleIPv4SubnetWithCIDR" xml:space="preserve">
-    <value>192.168.100.0/24</value>
-  </data>
-  <data name="ExampleMACAddress" xml:space="preserve">
-    <value>00:F1:21:AB:0B:35</value>
-  </data>
-  <data name="ExampleMACAddressesOrVendor" xml:space="preserve">
-    <value>01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</value>
-  </data>
-  <data name="ExamplePort161" xml:space="preserve">
-    <value>161</value>
-  </data>
-  <data name="ExamplePort22" xml:space="preserve">
-    <value>22</value>
-  </data>
-  <data name="ExamplePort23" xml:space="preserve">
-    <value>23</value>
-  </data>
-  <data name="ExamplePort3389" xml:space="preserve">
-    <value>3389</value>
-  </data>
-  <data name="ExamplePort513" xml:space="preserve">
-    <value>513</value>
-  </data>
-  <data name="ExamplePort53" xml:space="preserve">
-    <value>53</value>
-  </data>
-  <data name="ExamplePort7" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="ExamplePortPortRangeOrService" xml:space="preserve">
-    <value>22; 80; https; ldaps; 777 - 999; 8080</value>
-  </data>
-  <data name="ExamplePortScanRange" xml:space="preserve">
-    <value>22; 80; 443; 500 - 999; 8080</value>
-  </data>
-  <data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
-    <value>Servidor web</value>
-  </data>
-  <data name="ExampleSerialLine" xml:space="preserve">
-    <value>COM5</value>
-  </data>
-  <data name="ExampleSNMPCommunity" xml:space="preserve">
-    <value>público</value>
-  </data>
-  <data name="ExampleSNMPOID" xml:space="preserve">
-    <value>1.3.6.1.2.1.1</value>
-  </data>
-  <data name="ExampleSNMPUsername" xml:space="preserve">
-    <value>snmp-user</value>
-  </data>
-  <data name="ExampleSuffix" xml:space="preserve">
-    <value>fritz.box</value>
-  </data>
-  <data name="ExampleTags" xml:space="preserve">
-    <value>servidor; dmz</value>
-  </data>
-  <data name="ExampleUsername" xml:space="preserve">
-    <value>Admin</value>
-  </data>
-  <data name="ExampleWebserverPorts" xml:space="preserve">
-    <value>80; 443; 8080; 8443</value>
-  </data>
-  <data name="ExampleWebsiteUri" xml:space="preserve">
-    <value>http(s)://example.com/index.html</value>
-  </data>
   <data name="FilterDots" xml:space="preserve">
     <value>Filtrar...</value>
   </data>
@@ -1662,7 +1534,7 @@
     <value>¡Ingrese una subred válida (como 192.168.178.133/26)!</value>
   </data>
   <data name="EnterValidWebsiteUri" xml:space="preserve">
-    <value>Ingrese una página web válida (como https://example.com/index.html)</value>
+    <value>Ingrese un sitio web válida (como https://ejemplo.com/index.html)</value>
   </data>
   <data name="Green" xml:space="preserve">
     <value>Verde</value>
@@ -1707,7 +1579,7 @@
     <value>Aceituna</value>
   </data>
   <data name="OnlyNumbersCanBeEntered" xml:space="preserve">
-    <value>¡Solo se pueden ingresar números!</value>
+    <value>¡Sólo se pueden ingresar números!</value>
   </data>
   <data name="Orange" xml:space="preserve">
     <value>Naranja</value>
@@ -1964,9 +1836,6 @@
   <data name="WhoisServerNotFoundForTheDomain" xml:space="preserve">
     <value>El servidor Whois no encuentró el dominio: "{0}"</value>
   </data>
-  <data name="ExampleDomain" xml:space="preserve">
-    <value>ejemplo.com</value>
-  </data>
   <data name="Routing" xml:space="preserve">
     <value>Enrutado</value>
   </data>
@@ -2000,9 +1869,6 @@
   <data name="RestartSession" xml:space="preserve">
     <value>Reiniciar sesión</value>
   </data>
-  <data name="ExamplePort5900" xml:space="preserve">
-    <value>5900</value>
-  </data>
   <data name="TightVNC" xml:space="preserve">
     <value>TightVNC</value>
   </data>
@@ -2028,9 +1894,64 @@
     <value>Conectando...</value>
   </data>
   <data name="ResolveMACAddressAndVendor" xml:space="preserve">
-    <value>Resolve MAC address and vendor</value>
+    <value>Resolver la dirección MAC y el proveedor</value>
+  </data>
+  <data name="Note" xml:space="preserve">
+    <value>Nota</value>
+  </data>
+  <data name="ExportAll" xml:space="preserve">
+    <value>Exportar todo</value>
+  </data>
+  <data name="ExportDots" xml:space="preserve">
+    <value>Exportar...</value>
+  </data>
+  <data name="ExportSelected" xml:space="preserve">
+    <value>Exportar seleccionado</value>
+  </data>
+  <data name="LocationDots" xml:space="preserve">
+    <value>Ubicación...</value>
+  </data>
+  <data name="File" xml:space="preserve">
+    <value>Archivo</value>
+  </data>
+  <data name="EnterValidFilePath" xml:space="preserve">
+    <value>¡Ingrese una ruta de archivo válida!</value>
+  </data>
+  <data name="All" xml:space="preserve">
+    <value>Todo</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Formato</value>
+  </data>
+  <data name="Selected" xml:space="preserve">
+    <value>Seleccionado</value>
+  </data>
+  <data name="AnErrorOccurredWhileExportingTheData" xml:space="preserve">
+    <value>Se ha producido un error al exportar los datos. Ver el mensaje de error para más detalles:</value>
+  </data>
+  <data name="Design" xml:space="preserve">
+    <value>Diseño</value>
+  </data>
+  <data name="HighlightTimeouts" xml:space="preserve">
+    <value>Resaltar tiempos de espera</value>
+  </data>
+  <data name="EnterSubnetsToCreateAWideSubnet" xml:space="preserve">
+    <value>Ingrese subredes para crear una subred amplia...</value>
+  </data>
+  <data name="WideSubnet" xml:space="preserve">
+    <value>Subred amplia</value>
+  </data>
+  <data name="AddTabDots" xml:space="preserve">
+    <value>Añadir pestaña...</value>
+  </data>
+  <data name="ResetCredentialsMessage" xml:space="preserve">
+    <value>Si ha olvidado su contraseña y desea comenzar de nuevo, elimine el siguiente archivo y reinicie la aplicación.
+Ruta: "{0}"</value>
+  </data>
+  <data name="AddIPv4AddressDots" xml:space="preserve">
+    <value>Añadir dirección IPv4...</value>
   </data>
-  <data name="String1" xml:space="preserve">
-    <value/>
+  <data name="AddIPv4Address" xml:space="preserve">
+    <value>Añadir dirección IPv4</value>
   </data>
 </root>
diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx
index cae8869085..7dceebdfba 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.resx
@@ -375,9 +375,6 @@
   <data name="Success" xml:space="preserve">
     <value>Success!</value>
   </data>
-  <data name="Supernetting" xml:space="preserve">
-    <value>Supernetting</value>
-  </data>
   <data name="Theme" xml:space="preserve">
     <value>Theme</value>
   </data>
@@ -873,9 +870,6 @@
   <data name="EnterSubnetAndANewSubnetmaskToCreateSubnets" xml:space="preserve">
     <value>Enter subnet and a new subnet mask to create subnets...</value>
   </data>
-  <data name="EnterSubnetsToCreateASupernet" xml:space="preserve">
-    <value>Enter subnets to create a supernet...</value>
-  </data>
   <data name="ErrorCheckingApiGithubComVerifyYourNetworkConnection" xml:space="preserve">
     <value>Error checking 'api.github.com', check your network connection!</value>
   </data>
@@ -973,7 +967,8 @@
     <value>No ports found. Check your input!</value>
   </data>
   <data name="NoProfilesFoundCreateOne" xml:space="preserve">
-    <value>No profiles found! Create one...</value>
+    <value>No profiles found!
+Create one...</value>
   </data>
   <data name="NothingFound" xml:space="preserve">
     <value>Nothing found!</value>
@@ -1343,129 +1338,6 @@ If you click "Move &amp; Restart", the remaining files will be copied and the ap
   <data name="Everything" xml:space="preserve">
     <value>Everything</value>
   </data>
-  <data name="ExampleBaud9600" xml:space="preserve">
-    <value>9600</value>
-  </data>
-  <data name="ExampleCredentialName" xml:space="preserve">
-    <value>Windows-Testuser</value>
-  </data>
-  <data name="ExampleGroupServers" xml:space="preserve">
-    <value>Servers</value>
-  </data>
-  <data name="ExampleGroupSwitche" xml:space="preserve">
-    <value>Switche</value>
-  </data>
-  <data name="ExampleHostname" xml:space="preserve">
-    <value>SERVER-01</value>
-  </data>
-  <data name="ExampleHostnameAndOrIPAddress" xml:space="preserve">
-    <value>192.168.178.1; fritz.box</value>
-  </data>
-  <data name="ExampleHostnameOrIPAddress" xml:space="preserve">
-    <value>SERVER-01 or 172.16.0.100</value>
-  </data>
-  <data name="ExampleIPScanRange" xml:space="preserve">
-    <value>192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24</value>
-  </data>
-  <data name="ExampleIPv4Address" xml:space="preserve">
-    <value>192.168.178.55</value>
-  </data>
-  <data name="ExampleIPv4Broadcast" xml:space="preserve">
-    <value>192.168.178.255</value>
-  </data>
-  <data name="ExampleIPv4DNSServer" xml:space="preserve">
-    <value>8.8.8.8</value>
-  </data>
-  <data name="ExampleIPv4DNSServers" xml:space="preserve">
-    <value>192.168.178.1; 8.8.8.8; 8.8.4.4</value>
-  </data>
-  <data name="ExampleIPv4Gateway" xml:space="preserve">
-    <value>192.168.178.1</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet" xml:space="preserve">
-    <value>192.168.178.133/255.255.255.0 or 2001:0db8::/64</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet2" xml:space="preserve">
-    <value>192.168.178.134/255.255.255.0 or 2001:0db9::/64</value>
-  </data>
-  <data name="ExampleIPv4Subnet" xml:space="preserve">
-    <value>192.168.178.133/22 or 192.168.178.133/255.255.252.0</value>
-  </data>
-  <data name="ExampleIPv4Subnetmask" xml:space="preserve">
-    <value>255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv4CIDR" xml:space="preserve">
-    <value>/24 or 255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv6CIDR" xml:space="preserve">
-    <value>255.255.255.0 or /64</value>
-  </data>
-  <data name="ExampleIPv4SubnetWithCIDR" xml:space="preserve">
-    <value>192.168.100.0/24</value>
-  </data>
-  <data name="ExampleMACAddress" xml:space="preserve">
-    <value>00:F1:21:AB:0B:35</value>
-  </data>
-  <data name="ExampleMACAddressesOrVendor" xml:space="preserve">
-    <value>01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</value>
-  </data>
-  <data name="ExamplePort161" xml:space="preserve">
-    <value>161</value>
-  </data>
-  <data name="ExamplePort22" xml:space="preserve">
-    <value>22</value>
-  </data>
-  <data name="ExamplePort23" xml:space="preserve">
-    <value>23</value>
-  </data>
-  <data name="ExamplePort3389" xml:space="preserve">
-    <value>3389</value>
-  </data>
-  <data name="ExamplePort513" xml:space="preserve">
-    <value>513</value>
-  </data>
-  <data name="ExamplePort53" xml:space="preserve">
-    <value>53</value>
-  </data>
-  <data name="ExamplePort7" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="ExamplePortPortRangeOrService" xml:space="preserve">
-    <value>22; 80; https; ldaps; 777 - 999; 8080</value>
-  </data>
-  <data name="ExamplePortScanRange" xml:space="preserve">
-    <value>22; 80; 443; 500 - 999; 8080</value>
-  </data>
-  <data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
-    <value>Webserver</value>
-  </data>
-  <data name="ExampleSerialLine" xml:space="preserve">
-    <value>COM5</value>
-  </data>
-  <data name="ExampleSNMPCommunity" xml:space="preserve">
-    <value>public</value>
-  </data>
-  <data name="ExampleSNMPOID" xml:space="preserve">
-    <value>1.3.6.1.2.1.1</value>
-  </data>
-  <data name="ExampleSNMPUsername" xml:space="preserve">
-    <value>snmp-user</value>
-  </data>
-  <data name="ExampleSuffix" xml:space="preserve">
-    <value>fritz.box</value>
-  </data>
-  <data name="ExampleTags" xml:space="preserve">
-    <value>server; dmz</value>
-  </data>
-  <data name="ExampleUsername" xml:space="preserve">
-    <value>Admin</value>
-  </data>
-  <data name="ExampleWebserverPorts" xml:space="preserve">
-    <value>80; 443; 8080; 8443</value>
-  </data>
-  <data name="ExampleWebsiteUri" xml:space="preserve">
-    <value>http(s)://example.com/index.html</value>
-  </data>
   <data name="FilterDots" xml:space="preserve">
     <value>Filter...</value>
   </data>
@@ -1964,9 +1836,6 @@ If you click "Move &amp; Restart", the remaining files will be copied and the ap
   <data name="WhoisServerNotFoundForTheDomain" xml:space="preserve">
     <value>Whois server not found for the domain: "{0}"</value>
   </data>
-  <data name="ExampleDomain" xml:space="preserve">
-    <value>example.com</value>
-  </data>
   <data name="Routing" xml:space="preserve">
     <value>Routing</value>
   </data>
@@ -2000,9 +1869,6 @@ If you click "Move &amp; Restart", the remaining files will be copied and the ap
   <data name="RestartSession" xml:space="preserve">
     <value>Restart session</value>
   </data>
-  <data name="ExamplePort5900" xml:space="preserve">
-    <value>5900</value>
-  </data>
   <data name="TightVNC" xml:space="preserve">
     <value>TightVNC</value>
   </data>
@@ -2030,7 +1896,62 @@ If you click "Move &amp; Restart", the remaining files will be copied and the ap
   <data name="ResolveMACAddressAndVendor" xml:space="preserve">
     <value>Resolve MAC address and vendor</value>
   </data>
-  <data name="String1" xml:space="preserve">
-    <value />
+  <data name="Note" xml:space="preserve">
+    <value>Note</value>
+  </data>
+  <data name="ExportAll" xml:space="preserve">
+    <value>Export all</value>
+  </data>
+  <data name="ExportDots" xml:space="preserve">
+    <value>Export...</value>
+  </data>
+  <data name="ExportSelected" xml:space="preserve">
+    <value>Export selected</value>
+  </data>
+  <data name="LocationDots" xml:space="preserve">
+    <value>Location...</value>
+  </data>
+  <data name="File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="EnterValidFilePath" xml:space="preserve">
+    <value>Enter valid file path!</value>
+  </data>
+  <data name="All" xml:space="preserve">
+    <value>All</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Format</value>
+  </data>
+  <data name="Selected" xml:space="preserve">
+    <value>Selected</value>
+  </data>
+  <data name="AnErrorOccurredWhileExportingTheData" xml:space="preserve">
+    <value>An error occurred while exporting the data. See error message for details:</value>
+  </data>
+  <data name="Design" xml:space="preserve">
+    <value>Design</value>
+  </data>
+  <data name="HighlightTimeouts" xml:space="preserve">
+    <value>Highlight timeouts</value>
+  </data>
+  <data name="EnterSubnetsToCreateAWideSubnet" xml:space="preserve">
+    <value>Enter subnets to create a wide subnet...</value>
+  </data>
+  <data name="WideSubnet" xml:space="preserve">
+    <value>Wide Subnet</value>
+  </data>
+  <data name="AddTabDots" xml:space="preserve">
+    <value>Add tab...</value>
+  </data>
+  <data name="ResetCredentialsMessage" xml:space="preserve">
+    <value>If you have forgotten your password and want to start over, delete the following file and restart the application.
+Path: "{0}"</value>
+  </data>
+  <data name="AddIPv4AddressDots" xml:space="preserve">
+    <value>Add IPv4 address...</value>
+  </data>
+  <data name="AddIPv4Address" xml:space="preserve">
+    <value>Add IPv4 address</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx b/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx
index 90c4c8c1b7..101e71f36e 100644
--- a/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx
+++ b/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -375,9 +375,6 @@
   <data name="Success" xml:space="preserve">
     <value>Успешно!</value>
   </data>
-  <data name="Supernetting" xml:space="preserve">
-    <value>Супер плетение</value>
-  </data>
   <data name="Theme" xml:space="preserve">
     <value>Тема</value>
   </data>
@@ -652,7 +649,7 @@
     <value>Да</value>
   </data>
   <data name="Add" xml:space="preserve">
-    <value>Add</value>
+    <value>Добавить</value>
   </data>
   <data name="AddATabToOpenANewConnection" xml:space="preserve">
     <value>Добавить вкладку, чтобы открыть новое соединение...</value>
@@ -873,9 +870,6 @@
   <data name="EnterSubnetAndANewSubnetmaskToCreateSubnets" xml:space="preserve">
     <value>Введите подсеть и новую маску подсети для создания подсетей...</value>
   </data>
-  <data name="EnterSubnetsToCreateASupernet" xml:space="preserve">
-    <value>Введите подсети для создания суперсети...</value>
-  </data>
   <data name="ErrorCheckingApiGithubComVerifyYourNetworkConnection" xml:space="preserve">
     <value>Проверка ошибок "api.github.com', проверьте подключение к сети!</value>
   </data>
@@ -973,7 +967,8 @@
     <value>Порты не найдены. Проверьте ввод!</value>
   </data>
   <data name="NoProfilesFoundCreateOne" xml:space="preserve">
-    <value>Профили не найдены! Создать...</value>
+    <value>Профили не найдены!
+Создать один...</value>
   </data>
   <data name="NothingFound" xml:space="preserve">
     <value>Ничего не найдено!</value>
@@ -1343,129 +1338,6 @@
   <data name="Everything" xml:space="preserve">
     <value>Что угодно</value>
   </data>
-  <data name="ExampleBaud9600" xml:space="preserve">
-    <value>9600</value>
-  </data>
-  <data name="ExampleCredentialName" xml:space="preserve">
-    <value>Windows-Testuser</value>
-  </data>
-  <data name="ExampleGroupServers" xml:space="preserve">
-    <value>Сервера</value>
-  </data>
-  <data name="ExampleGroupSwitche" xml:space="preserve">
-    <value>Switche</value>
-  </data>
-  <data name="ExampleHostname" xml:space="preserve">
-    <value>SERVER-01</value>
-  </data>
-  <data name="ExampleHostnameAndOrIPAddress" xml:space="preserve">
-    <value>192.168.178.1; fritz.box</value>
-  </data>
-  <data name="ExampleHostnameOrIPAddress" xml:space="preserve">
-    <value>SERVER-01 or 172.16.0.100</value>
-  </data>
-  <data name="ExampleIPScanRange" xml:space="preserve">
-    <value>192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150; server-01/24</value>
-  </data>
-  <data name="ExampleIPv4Address" xml:space="preserve">
-    <value>192.168.178.55</value>
-  </data>
-  <data name="ExampleIPv4Broadcast" xml:space="preserve">
-    <value>192.168.178.255</value>
-  </data>
-  <data name="ExampleIPv4DNSServer" xml:space="preserve">
-    <value>8.8.8.8</value>
-  </data>
-  <data name="ExampleIPv4DNSServers" xml:space="preserve">
-    <value>192.168.178.1; 8.8.8.8; 8.8.4.4</value>
-  </data>
-  <data name="ExampleIPv4Gateway" xml:space="preserve">
-    <value>192.168.178.1</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet" xml:space="preserve">
-    <value>192.168.178.133/255.255.255.0 or 2001:0db8::/64</value>
-  </data>
-  <data name="ExampleIPv4IPv6Subnet2" xml:space="preserve">
-    <value>192.168.178.134/255.255.255.0 or 2001:0db9::/64</value>
-  </data>
-  <data name="ExampleIPv4Subnet" xml:space="preserve">
-    <value>192.168.178.133/22 or 192.168.178.133/255.255.252.0</value>
-  </data>
-  <data name="ExampleIPv4Subnetmask" xml:space="preserve">
-    <value>255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv4CIDR" xml:space="preserve">
-    <value>/24 or 255.255.255.0</value>
-  </data>
-  <data name="ExampleIPv4SubnetmaskIPv6CIDR" xml:space="preserve">
-    <value>255.255.255.0 or /64</value>
-  </data>
-  <data name="ExampleIPv4SubnetWithCIDR" xml:space="preserve">
-    <value>192.168.100.0/24</value>
-  </data>
-  <data name="ExampleMACAddress" xml:space="preserve">
-    <value>00:F1:21:AB:0B:35</value>
-  </data>
-  <data name="ExampleMACAddressesOrVendor" xml:space="preserve">
-    <value>01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</value>
-  </data>
-  <data name="ExamplePort161" xml:space="preserve">
-    <value>161</value>
-  </data>
-  <data name="ExamplePort22" xml:space="preserve">
-    <value>22</value>
-  </data>
-  <data name="ExamplePort23" xml:space="preserve">
-    <value>23</value>
-  </data>
-  <data name="ExamplePort3389" xml:space="preserve">
-    <value>3389</value>
-  </data>
-  <data name="ExamplePort513" xml:space="preserve">
-    <value>513</value>
-  </data>
-  <data name="ExamplePort53" xml:space="preserve">
-    <value>53</value>
-  </data>
-  <data name="ExamplePort7" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="ExamplePortPortRangeOrService" xml:space="preserve">
-    <value>22; 80; https; ldaps; 777 - 999; 8080</value>
-  </data>
-  <data name="ExamplePortScanRange" xml:space="preserve">
-    <value>22; 80; 443; 500 - 999; 8080</value>
-  </data>
-  <data name="ExampleRemoteDesktopProfileName" xml:space="preserve">
-    <value>Webserver</value>
-  </data>
-  <data name="ExampleSerialLine" xml:space="preserve">
-    <value>COM5</value>
-  </data>
-  <data name="ExampleSNMPCommunity" xml:space="preserve">
-    <value>public</value>
-  </data>
-  <data name="ExampleSNMPOID" xml:space="preserve">
-    <value>1.3.6.1.2.1.1</value>
-  </data>
-  <data name="ExampleSNMPUsername" xml:space="preserve">
-    <value>snmp-user</value>
-  </data>
-  <data name="ExampleSuffix" xml:space="preserve">
-    <value>fritz.box</value>
-  </data>
-  <data name="ExampleTags" xml:space="preserve">
-    <value>server; dmz</value>
-  </data>
-  <data name="ExampleUsername" xml:space="preserve">
-    <value>Admin</value>
-  </data>
-  <data name="ExampleWebserverPorts" xml:space="preserve">
-    <value>80; 443; 8080; 8443</value>
-  </data>
-  <data name="ExampleWebsiteUri" xml:space="preserve">
-    <value>http(s)://example.com/index.html</value>
-  </data>
   <data name="FilterDots" xml:space="preserve">
     <value>Фильтр...</value>
   </data>
@@ -1956,81 +1828,130 @@
     <value>Whois</value>
   </data>
   <data name="AddATabToQueryWhois" xml:space="preserve">
-    <value>Add a tab to query whois...</value>
+    <value>Добавьте вкладку для запроса whois...</value>
   </data>
   <data name="EnterValidDomain" xml:space="preserve">
-    <value>Enter a valid domain (like "example.com")!</value>
+    <value>Введите допустимый домен (например "example.com")!</value>
   </data>
   <data name="WhoisServerNotFoundForTheDomain" xml:space="preserve">
-    <value>Whois server not found for the domain: "{0}"</value>
-  </data>
-  <data name="ExampleDomain" xml:space="preserve">
-    <value>example.com</value>
+    <value>Whois-сервер, домен не найден:  "{0}"</value>
   </data>
   <data name="Routing" xml:space="preserve">
-    <value>Routing</value>
+    <value>Маршрут</value>
   </data>
   <data name="Release" xml:space="preserve">
-    <value>Release</value>
+    <value>Выпуск</value>
   </data>
   <data name="ReleaseRenew" xml:space="preserve">
-    <value>Release &amp; Renew</value>
+    <value>Выпуск &amp; Обновление</value>
   </data>
   <data name="Renew" xml:space="preserve">
-    <value>Renew</value>
+    <value>Обновление</value>
   </data>
   <data name="WindowsDNSSettings" xml:space="preserve">
-    <value>Windows DNS settings</value>
+    <value>Параметры DNS Windows</value>
   </data>
   <data name="DeleteDNSServer" xml:space="preserve">
-    <value>Delete DNS server</value>
+    <value>Удаление DNS-сервера</value>
   </data>
   <data name="DeleteDNSServerMessage" xml:space="preserve">
-    <value>The selected DNS server will be deleted permanently.</value>
+    <value>Выбранный DNS-сервер будет удален безвозвратно.</value>
   </data>
   <data name="AddDNSServer" xml:space="preserve">
-    <value>Add DNS server</value>
+    <value>Добавить DNS-сервер</value>
   </data>
   <data name="EditDNSServer" xml:space="preserve">
-    <value>Edit DNS server</value>
+    <value>Изменить DNS-сервер</value>
   </data>
   <data name="DNSServerWithThisNameAlreadyExists" xml:space="preserve">
-    <value>A DNS server with this name already exists!</value>
+    <value>DNS-сервер с таким именем уже существует!</value>
   </data>
   <data name="RestartSession" xml:space="preserve">
-    <value>Restart session</value>
-  </data>
-  <data name="ExamplePort5900" xml:space="preserve">
-    <value>5900</value>
+    <value>Перезапустить сеанс</value>
   </data>
   <data name="TightVNC" xml:space="preserve">
     <value>TightVNC</value>
   </data>
   <data name="ConfigureThePathToTightVNCInTheSettingsDots" xml:space="preserve">
-    <value>Configure the path to TightVNC in the settings...</value>
+    <value>Настройте путь к TightVNC в настройках...</value>
   </data>
   <data name="ConfigureTightVNC" xml:space="preserve">
-    <value>Configure TightVNC</value>
+    <value>Настройка TightVNC</value>
   </data>
   <data name="DefaultVNCPort" xml:space="preserve">
-    <value>Default VNC port</value>
+    <value>Порт VNC по умолчанию</value>
   </data>
   <data name="DisableTransparencyInTheSettingsToUseTightVNC" xml:space="preserve">
-    <value>Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use TightVNC.</value>
+    <value>Чтобы использовать TightVNC, отключите прозрачность в настройках (общи / внешний вид) и перезапустите приложение. </value>
   </data>
   <data name="TightVNCLocationDots" xml:space="preserve">
-    <value>TightVNC location...</value>
+    <value>TightVNC локация...</value>
   </data>
   <data name="TightVNCProcessHasEnded" xml:space="preserve">
-    <value>TightVNC process has ended!</value>
+    <value>TightVNC процесс закончился!</value>
   </data>
   <data name="ConnectingDots" xml:space="preserve">
-    <value>Connecting...</value>
+    <value>Соединение...</value>
   </data>
   <data name="ResolveMACAddressAndVendor" xml:space="preserve">
-    <value>Resolve MAC address and vendor</value>
+    <value>Запрос MAC-адрес и производителя</value>
+  </data>
+  <data name="Note" xml:space="preserve">
+    <value>Заметка</value>
+  </data>
+  <data name="ExportAll" xml:space="preserve">
+    <value>Экспортировать все</value>
+  </data>
+  <data name="ExportDots" xml:space="preserve">
+    <value>Экспортировать...</value>
+  </data>
+  <data name="ExportSelected" xml:space="preserve">
+    <value>Экспортировать выбранные</value>
+  </data>
+  <data name="LocationDots" xml:space="preserve">
+    <value>Локация...</value>
+  </data>
+  <data name="File" xml:space="preserve">
+    <value>Файл</value>
+  </data>
+  <data name="EnterValidFilePath" xml:space="preserve">
+    <value>Введите правильный путь к файлу!</value>
+  </data>
+  <data name="All" xml:space="preserve">
+    <value>Все</value>
+  </data>
+  <data name="Format" xml:space="preserve">
+    <value>Формат</value>
+  </data>
+  <data name="Selected" xml:space="preserve">
+    <value>Выделенный</value>
+  </data>
+  <data name="AnErrorOccurredWhileExportingTheData" xml:space="preserve">
+    <value>Ошибка при экспорте данных. Увидеть сообщение об ошибке подробнее:</value>
+  </data>
+  <data name="Design" xml:space="preserve">
+    <value>Дизайн</value>
+  </data>
+  <data name="HighlightTimeouts" xml:space="preserve">
+    <value>Выделите время ожидания</value>
+  </data>
+  <data name="EnterSubnetsToCreateAWideSubnet" xml:space="preserve">
+    <value>Введите подсети, чтобы создать широкую подсеть...</value>
+  </data>
+  <data name="WideSubnet" xml:space="preserve">
+    <value>Широкая Подсеть</value>
+  </data>
+  <data name="AddTabDots" xml:space="preserve">
+    <value>Добавить вкладку...</value>
+  </data>
+  <data name="ResetCredentialsMessage" xml:space="preserve">
+    <value>Если вы забыли пароль и хотите начать все сначала, удалите следующий файл и перезапустите приложение.
+Путь: "{0}"</value>
+  </data>
+  <data name="AddIPv4AddressDots" xml:space="preserve">
+    <value>Добавить адрес IPv4...</value>
   </data>
-  <data name="String1" xml:space="preserve">
-    <value/>
+  <data name="AddIPv4Address" xml:space="preserve">
+    <value>Добавить адрес IPv6...</value>
   </data>
 </root>
diff --git a/Source/NETworkManager/Resources/Styles/DataGridStyles.xaml b/Source/NETworkManager/Resources/Styles/DataGridStyles.xaml
index 3bde83a200..01750b0e75 100644
--- a/Source/NETworkManager/Resources/Styles/DataGridStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/DataGridStyles.xaml
@@ -12,7 +12,7 @@
     </Style>
 
     <Style TargetType="{x:Type DataGrid}" BasedOn="{StaticResource DefaultDataGrid}" />
-    <Style TargetType="{x:Type networkManagerControls:ScrollingDataGrid}" BasedOn="{StaticResource DefaultDataGrid}" />
+    <Style TargetType="{x:Type networkManagerControls:MultiSelectScrollingDataGrid}" BasedOn="{StaticResource DefaultDataGrid}" />
 
     <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MetroDataGridColumnHeader}" >
         <Setter Property="mahAppsControls:ControlsHelper.ContentCharacterCasing" Value="Normal" />
diff --git a/Source/NETworkManager/Resources/Styles/DragablzStyles.xaml b/Source/NETworkManager/Resources/Styles/DragablzStyles.xaml
index f5fe634a75..6d412f5032 100644
--- a/Source/NETworkManager/Resources/Styles/DragablzStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/DragablzStyles.xaml
@@ -53,7 +53,7 @@
         <Setter Property="AdjacentHeaderItemOffset" Value="0" />
         <Setter Property="Margin" Value="0,-2,0,0" />
         <Setter Property="Focusable" Value="False" />
-        <Setter Property="EmptyHeaderSizingHint" Value="PreviousTab" />
+        <Setter Property="EmptyHeaderSizingHint" Value="PreviousTab" />        
         <Setter Property="ContentTemplateSelector" Value="{x:Null}" />
         <Setter Property="HeaderItemTemplate">
             <Setter.Value>
@@ -70,6 +70,9 @@
                                             <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
                                                 <Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
                                                 <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsMouseOver}" Value="True">
+                                                        <Setter Property="Foreground" Value="{DynamicResource GrayBrush5}" />
+                                                    </DataTrigger>
                                                     <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsSelected}" Value="True">
                                                         <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                                                     </DataTrigger>
diff --git a/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml b/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
index 9f45e42dfb..ac099f4df2 100644
--- a/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ExpanderStyles.xaml
@@ -93,7 +93,7 @@
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinDown}" />
                                 </Rectangle.OpacityMask>
-                            </Rectangle>                           
+                            </Rectangle>
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -128,22 +128,22 @@
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Border Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="Transparent" SnapsToDevicePixels="False">
+                            BorderBrush="{StaticResource GrayBrush8}"
+                            BorderThickness="0,0,0,1">
+                        <Grid Background="Transparent" SnapsToDevicePixels="False" Margin="0,10,0,5">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0" Text="{TemplateBinding Content}" Style="{StaticResource HeaderTextBlock}" Margin="10,10,10,0" />
-                            <Rectangle Grid.Column="1" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource GrayBrush3}" Margin="0,10,10,0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Grid.Column="0" Text="{TemplateBinding Content}" Style="{StaticResource HeaderTextBlock}" Margin="10,0" />
+                            <Rectangle Grid.Column="1" x:Name="Chevron" Width="16" Height="16" Fill="{DynamicResource GrayBrush3}" Margin="0,0,10,0" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <Rectangle.OpacityMask>
                                     <VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinLeft}" />
                                 </Rectangle.OpacityMask>
-                            </Rectangle>                           
+                            </Rectangle>
                         </Grid>
                     </Border>
-                    <ControlTemplate.Triggers>                      
+                    <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="Chevron" Property="Fill" Value="{DynamicResource GrayBrush5}"/>
                         </Trigger>
@@ -171,14 +171,15 @@
                                     <VisualBrush Stretch="Uniform" Visual="{iconPacks:Entypo Kind=ChevronThinRight}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
-                            <TextBlock Grid.Row="1" Text="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" Style="{StaticResource HeaderTextBlock}" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+                            <TextBlock Grid.Row="1" Text="{TemplateBinding Content}" TextOptions.TextFormattingMode="Display" Foreground="{TemplateBinding Foreground}" Style="{StaticResource DefaultTextBlock}" FontSize="18" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center">
                                 <TextBlock.LayoutTransform>
-                                    <RotateTransform Angle="90" />
+                                        <RotateTransform Angle="-90" />
                                 </TextBlock.LayoutTransform>
-                            </TextBlock>                            
+                            </TextBlock>
+
                         </Grid>
                     </Border>
-                    <ControlTemplate.Triggers>                   
+                    <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="Chevron" Property="Fill" Value="{DynamicResource GrayBrush5}"/>
                         </Trigger>
@@ -187,7 +188,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style x:Key="RightExpander" TargetType="{x:Type Expander}" BasedOn="{StaticResource MetroExpander}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Background" Value="Transparent" />
diff --git a/Source/NETworkManager/Resources/Styles/GridSplitterStyles.xaml b/Source/NETworkManager/Resources/Styles/GridSplitterStyles.xaml
index d797ccd63d..46fe33c57b 100644
--- a/Source/NETworkManager/Resources/Styles/GridSplitterStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/GridSplitterStyles.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style x:Key="ProfileGridSplitter" TargetType="{x:Type GridSplitter}">
         <Setter Property="Width" Value="7" />
-        <Setter Property="Margin" Value="-3,0" />
+        <Setter Property="Margin" Value="-3,-3" />
         <Setter Property="BorderThickness" Value="3" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Panel.ZIndex" Value="1" />
diff --git a/Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml b/Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml
index 7a32ac12a4..98bb9bb68b 100644
--- a/Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ScrollBarStyles.xaml
@@ -9,6 +9,22 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="TextBoxScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MetroScrollBar}">
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto"/>
+                <Setter Property="Height" Value="8" />
+            </Trigger>
+            <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="Width" Value="8"/>
+                <Setter Property="Height" Value="Auto" />
+            </Trigger>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type TextBox}}, Path=IsMouseOver}" Value="False">
+                <Setter Property="Opacity" Value="0.5" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
     <Style x:Key="DataGridScrollBar" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MetroScrollBar}">
            <Style.Triggers>
             <Trigger Property="Orientation" Value="Horizontal">
@@ -51,7 +67,7 @@
                 <Setter Property="Width" Value="8"/>
                 <Setter Property="Height" Value="Auto" />
             </Trigger>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type networkManagerControls:ScrollingDataGrid}}, Path=IsMouseOver}" Value="False">
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type networkManagerControls:MultiSelectScrollingDataGrid}}, Path=IsMouseOver}" Value="False">
                 <Setter Property="Opacity" Value="0.5" />
             </DataTrigger>
         </Style.Triggers>
diff --git a/Source/NETworkManager/SettingsViewManager.cs b/Source/NETworkManager/SettingsViewManager.cs
index 574f4c760b..fe309f8dd4 100644
--- a/Source/NETworkManager/SettingsViewManager.cs
+++ b/Source/NETworkManager/SettingsViewManager.cs
@@ -25,9 +25,9 @@ public static class SettingsViewManager
             new SettingsViewInfo(Name.Ping, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Ping), Group.Applications),
             new SettingsViewInfo(Name.Traceroute, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.Traceroute), Group.Applications),
             new SettingsViewInfo(Name.DNSLookup, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.DNSLookup), Group.Applications ),
-            new SettingsViewInfo(Name.RemoteDesktop, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.PuTTY), Group.Applications),
-            new SettingsViewInfo(Name.PuTTY, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.TightVNC), Group.Applications),
-            new SettingsViewInfo(Name.TightVNC, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.IPScanner), Group.Applications),
+            new SettingsViewInfo(Name.RemoteDesktop, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.RemoteDesktop), Group.Applications),
+            new SettingsViewInfo(Name.PuTTY, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.PuTTY), Group.Applications),
+            new SettingsViewInfo(Name.TightVNC, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.TightVNC), Group.Applications),
             new SettingsViewInfo(Name.SNMP, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.SNMP), Group.Applications),
             new SettingsViewInfo(Name.WakeOnLAN, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.WakeOnLAN), Group.Applications),
             new SettingsViewInfo(Name.HTTPHeaders, ApplicationViewManager.GetIconByName(ApplicationViewManager.Name.HTTPHeaders), Group.Applications),
diff --git a/Source/NETworkManager/Utilities/JSONIPAddressConverter.cs b/Source/NETworkManager/Utilities/JSONIPAddressConverter.cs
new file mode 100644
index 0000000000..19ef186016
--- /dev/null
+++ b/Source/NETworkManager/Utilities/JSONIPAddressConverter.cs
@@ -0,0 +1,48 @@
+// Blog: https://pingfu.net/how-to-serialise-ipaddress-ipendpoint
+// Source: https://gist.github.com/marcbarry/2e7a64fed2ae539cf415
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace NETworkManager.Utilities
+{
+    public class JsonIPAddressConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(IPAddress) || objectType == typeof(List<IPAddress>);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            // convert an ipaddress represented as a string into an IPAddress object and return it to the caller
+            if (objectType == typeof(IPAddress))
+                return IPAddress.Parse(JToken.Load(reader).ToString());
+
+            // convert a json array of ipaddresses represented as strings into a List<IPAddress> object and return it to the caller
+            if (objectType == typeof(List<IPAddress>))
+                return JToken.Load(reader).Select(address => IPAddress.Parse((string)address)).ToList();
+
+            throw new NotImplementedException();
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value.GetType() == typeof(IPAddress))
+            {
+                JToken.FromObject(value.ToString()).WriteTo(writer);
+                return;
+            }
+
+            // convert a List<IPAddress> object to an array of strings of ipaddresses and write it to the serialiser
+            if (value.GetType() != typeof(List<IPAddress>))
+                throw new NotImplementedException();
+
+            JToken.FromObject((from n in (List<IPAddress>)value select n.ToString()).ToList()).WriteTo(writer);
+        }
+    }
+}
diff --git a/Source/NETworkManager/Utilities/PowerShellHelper.cs b/Source/NETworkManager/Utilities/PowerShellHelper.cs
index 80594fda35..fae6f739da 100644
--- a/Source/NETworkManager/Utilities/PowerShellHelper.cs
+++ b/Source/NETworkManager/Utilities/PowerShellHelper.cs
@@ -4,7 +4,7 @@ namespace NETworkManager.Utilities
 {
     public static class PowerShellHelper
     {
-        public static void RunPSCommand(string command, bool asAdmin = false, ProcessWindowStyle windowStyle = ProcessWindowStyle.Hidden)
+        public static void ExecuteCommand(string command, bool asAdmin = false, ProcessWindowStyle windowStyle = ProcessWindowStyle.Hidden)
         {
             var info = new ProcessStartInfo()
             {
diff --git a/Source/NETworkManager/Utilities/RegexHelper.cs b/Source/NETworkManager/Utilities/RegexHelper.cs
index 8779001349..46c5499b81 100644
--- a/Source/NETworkManager/Utilities/RegexHelper.cs
+++ b/Source/NETworkManager/Utilities/RegexHelper.cs
@@ -63,5 +63,8 @@ public static class RegexHelper
 
         // Match a domain local.example.com
         public const string DomainRegex = @"^(?!:\/\/)([a-zA-Z0-9-_]+\.)*[a-zA-Z0-9][a-zA-Z0-9-_]+\.[a-zA-Z]{2,11}?$";
+
+        // Match any filepath --> https://www.codeproject.com/Tips/216238/Regular-Expression-to-Validate-File-Path-and-Exten
+        public const string FilePath = @"^(?:[\w]\:|\\)(\\[a-z_\-\s0-9\.]+)+\.[a-zA-z0-9]{1,4}$";
     }
 }
diff --git a/Source/NETworkManager/Validators/FilePathValidator.cs b/Source/NETworkManager/Validators/FilePathValidator.cs
new file mode 100644
index 0000000000..91981656a1
--- /dev/null
+++ b/Source/NETworkManager/Validators/FilePathValidator.cs
@@ -0,0 +1,18 @@
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows.Controls;
+using NETworkManager.Resources.Localization;
+using NETworkManager.Utilities;
+
+namespace NETworkManager.Validators
+{
+    public class FilePathValidator : ValidationRule
+    {
+        public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+        {
+            var regex = new Regex(RegexHelper.FilePath, RegexOptions.IgnoreCase);
+
+            return value != null && regex.IsMatch((string)value) ? ValidationResult.ValidResult : new ValidationResult(false, Strings.EnterValidFilePath);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/ARPTableAddEntryViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableAddEntryViewModel.cs
index f150b27147..17ac633f71 100644
--- a/Source/NETworkManager/ViewModels/ARPTableAddEntryViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ARPTableAddEntryViewModel.cs
@@ -11,7 +11,7 @@ public class ArpTableAddEntryViewModel : ViewModelBase
         public ICommand CancelCommand { get; }
 
         private string _ipAddress;
-        public string IpAddress
+        public string IPAddress
         {
             get => _ipAddress;
             set
@@ -25,7 +25,7 @@ public string IpAddress
         }
 
         private string _macAddress;
-        public string MacAddress
+        public string MACAddress
         {
             get => _macAddress;
             set
diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
index cb783815d4..4d9f4a00ef 100644
--- a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
@@ -1,5 +1,6 @@
 using NETworkManager.Models.Network;
 using System;
+using System.Collections;
 using System.Windows.Input;
 using System.ComponentModel;
 using System.Windows.Data;
@@ -10,6 +11,7 @@
 using NETworkManager.Models.Settings;
 using System.Windows.Threading;
 using System.Linq;
+using NETworkManager.Models.Export;
 
 namespace NETworkManager.ViewModels
 {
@@ -32,42 +34,56 @@ public string Search
 
                 _search = value;
 
-                ARPTableView.Refresh();
+                ARPInfoResultsView.Refresh();
 
                 OnPropertyChanged();
             }
         }
 
-        private ObservableCollection<ARPTableInfo> _arpTable = new ObservableCollection<ARPTableInfo>();
-        public ObservableCollection<ARPTableInfo> ARPTable
+        private ObservableCollection<ARPInfo> _arpInfoResults = new ObservableCollection<ARPInfo>();
+        public ObservableCollection<ARPInfo> ARPInfoResults
         {
-            get => _arpTable;
+            get => _arpInfoResults;
             set
             {
-                if (value == _arpTable)
+                if (value == _arpInfoResults)
                     return;
 
-                _arpTable = value;
+                _arpInfoResults = value;
                 OnPropertyChanged();
             }
         }
 
-        public ICollectionView ARPTableView { get; }
+        public ICollectionView ARPInfoResultsView { get; }
 
-        private ARPTableInfo _selectedARPTableInfo;
-        public ARPTableInfo SelectedARPTableInfo
+        private ARPInfo _selectedARPInfo;
+        public ARPInfo SelectedARPInfo
         {
-            get => _selectedARPTableInfo;
+            get => _selectedARPInfo;
             set
             {
-                if (value == _selectedARPTableInfo)
+                if (value == _selectedARPInfo)
                     return;
 
-                _selectedARPTableInfo = value;
+                _selectedARPInfo = value;
                 OnPropertyChanged();
             }
         }
 
+        private IList _selectedARPInfos = new ArrayList();
+        public IList SelectedARPInfos
+        {
+            get => _selectedARPInfos;
+            set
+            {
+                if (Equals(value, _selectedARPInfos))
+                    return;
+
+                _selectedARPInfos = value;
+                OnPropertyChanged();
+            }
+        }
+        
         private bool _autoRefresh;
         public bool AutoRefresh
         {
@@ -167,11 +183,11 @@ public ARPTableViewModel(IDialogCoordinator instance)
             _isLoading = true;
             _dialogCoordinator = instance;
 
-            ARPTableView = CollectionViewSource.GetDefaultView(ARPTable);
-            ARPTableView.SortDescriptions.Add(new SortDescription(nameof(ARPTableInfo.IPAddressInt32), ListSortDirection.Ascending));
-            ARPTableView.Filter = o =>
+            ARPInfoResultsView = CollectionViewSource.GetDefaultView(ARPInfoResults);
+            ARPInfoResultsView.SortDescriptions.Add(new SortDescription(nameof(ARPInfo.IPAddressInt32), ListSortDirection.Ascending));
+            ARPInfoResultsView.Filter = o =>
             {
-                if (!(o is ARPTableInfo info))
+                if (!(o is ARPInfo info))
                     return false;
 
                 if (string.IsNullOrEmpty(Search))
@@ -228,7 +244,7 @@ private async void DeleteTableAction()
 
             try
             {
-                var arpTable = new ARPTable();
+                var arpTable = new ARP();
 
                 arpTable.UserHasCanceled += ArpTable_UserHasCanceled;
 
@@ -254,11 +270,11 @@ private async void DeleteEntryAction()
 
             try
             {
-                var arpTable = new ARPTable();
+                var arpTable = new ARP();
 
                 arpTable.UserHasCanceled += ArpTable_UserHasCanceled;
 
-                await arpTable.DeleteEntryAsync(SelectedARPTableInfo.IPAddress.ToString());
+                await arpTable.DeleteEntryAsync(SelectedARPInfo.IPAddress.ToString());
 
                 Refresh();
             }
@@ -289,11 +305,11 @@ private async void AddEntryAction()
 
                 try
                 {
-                    var arpTable = new ARPTable();
+                    var arpTable = new ARP();
 
                     arpTable.UserHasCanceled += ArpTable_UserHasCanceled;
 
-                    await arpTable.AddEntryAsync(instance.IpAddress, MACAddressHelper.Format(instance.MacAddress, "-"));
+                    await arpTable.AddEntryAsync(instance.IPAddress, MACAddressHelper.Format(instance.MACAddress, "-"));
 
                     Refresh();
                 }
@@ -322,7 +338,7 @@ public ICommand CopySelectedIPAddressCommand
 
         private void CopySelectedIPAddressAction()
         {
-            CommonMethods.SetClipboard(SelectedARPTableInfo.IPAddress.ToString());
+            CommonMethods.SetClipboard(SelectedARPInfo.IPAddress.ToString());
         }
 
         public ICommand CopySelectedMACAddressCommand
@@ -332,7 +348,7 @@ public ICommand CopySelectedMACAddressCommand
 
         private void CopySelectedMACAddressAction()
         {
-            CommonMethods.SetClipboard(MACAddressHelper.GetDefaultFormat(SelectedARPTableInfo.MACAddress.ToString()));
+            CommonMethods.SetClipboard(MACAddressHelper.GetDefaultFormat(SelectedARPInfo.MACAddress.ToString()));
         }
 
         public ICommand CopySelectedMulticastCommand
@@ -342,7 +358,47 @@ public ICommand CopySelectedMulticastCommand
 
         private void CopySelectedMulticastAction()
         {
-            CommonMethods.SetClipboard(SelectedARPTableInfo.IsMulticast ? Resources.Localization.Strings.Yes : Resources.Localization.Strings.No);
+            CommonMethods.SetClipboard(SelectedARPInfo.IsMulticast ? Resources.Localization.Strings.Yes : Resources.Localization.Strings.No);
+        }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? ARPInfoResults : new ObservableCollection<ARPInfo>(SelectedARPInfos.Cast<ARPInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.ARPTable_ExportFileType = instance.FileType;
+                SettingsManager.Current.ARPTable_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.ARPTable_ExportFileType, SettingsManager.Current.ARPTable_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
 
@@ -351,9 +407,9 @@ private async void Refresh()
         {
             IsRefreshing = true;
 
-            ARPTable.Clear();
+            ARPInfoResults.Clear();
 
-            (await Models.Network.ARPTable.GetTableAsync()).ForEach(x => ARPTable.Add(x));
+            (await ARP.GetTableAsync()).ForEach(x => ARPInfoResults.Add(x));
 
             IsRefreshing = false;
         }
diff --git a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
index 4e6b541d18..32879492b8 100644
--- a/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ConnectionsViewModel.cs
@@ -1,20 +1,25 @@
 using NETworkManager.Models.Network;
 using System;
+using System.Collections;
 using System.Windows.Input;
 using System.ComponentModel;
 using System.Windows.Data;
 using System.Collections.ObjectModel;
 using NETworkManager.Utilities;
-using System.Windows;
 using NETworkManager.Models.Settings;
 using System.Windows.Threading;
 using System.Linq;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class ConnectionsViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private readonly bool _isLoading;
         private readonly DispatcherTimer _autoRefreshTimer = new DispatcherTimer();
 
@@ -29,27 +34,27 @@ public string Search
 
                 _search = value;
 
-                ConnectionsView.Refresh();
+                ConnectionResultsView.Refresh();
 
                 OnPropertyChanged();
             }
         }
 
-        private ObservableCollection<ConnectionInfo> _connections = new ObservableCollection<ConnectionInfo>();
-        public ObservableCollection<ConnectionInfo> Connections
+        private ObservableCollection<ConnectionInfo> _connectionResults = new ObservableCollection<ConnectionInfo>();
+        public ObservableCollection<ConnectionInfo> ConnectionResults
         {
-            get => _connections;
+            get => _connectionResults;
             set
             {
-                if (value == _connections)
+                if (value == _connectionResults)
                     return;
 
-                _connections = value;
+                _connectionResults = value;
                 OnPropertyChanged();
             }
         }
 
-        public ICollectionView ConnectionsView { get; }
+        public ICollectionView ConnectionResultsView { get; }
 
         private ConnectionInfo _selectedConnectionInfo;
         public ConnectionInfo SelectedConnectionInfo
@@ -65,6 +70,20 @@ public ConnectionInfo SelectedConnectionInfo
             }
         }
 
+        private IList _selectedConnectionInfos = new ArrayList();
+        public IList SelectedConnectionInfos
+        {
+            get => _selectedConnectionInfos;
+            set
+            {
+                if (Equals(value, _selectedConnectionInfos))
+                    return;
+
+                _selectedConnectionInfos = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _autoRefresh;
         public bool AutoRefresh
         {
@@ -159,13 +178,15 @@ public string StatusMessage
         #endregion
 
         #region Contructor, load settings
-        public ConnectionsViewModel()
+        public ConnectionsViewModel(IDialogCoordinator instance)
         {
             _isLoading = true;
 
-            ConnectionsView = CollectionViewSource.GetDefaultView(Connections);
-            ConnectionsView.SortDescriptions.Add(new SortDescription(nameof(ConnectionInfo.LocalIPAddressInt32), ListSortDirection.Ascending));
-            ConnectionsView.Filter = o =>
+            _dialogCoordinator = instance;
+
+            ConnectionResultsView = CollectionViewSource.GetDefaultView(ConnectionResults);
+            ConnectionResultsView.SortDescriptions.Add(new SortDescription(nameof(ConnectionInfo.LocalIPAddressInt32), ListSortDirection.Ascending));
+            ConnectionResultsView.Filter = o =>
             {
                 if (string.IsNullOrEmpty(Search))
                     return true;
@@ -173,7 +194,7 @@ public ConnectionsViewModel()
                 var filter = Search.Replace(" ", "").Replace("-", "").Replace(":", "");
 
                 // Search by local/remote IP Address, local/remote Port, Protocol and State
-                return o is ConnectionInfo info && (info.LocalIPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.LocalPort.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.RemoteIPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.RemotePort.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.Protocol.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + info.State.ToString()).IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1);
+                return o is ConnectionInfo info && (info.LocalIPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.LocalPort.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.RemoteIPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.RemotePort.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.Protocol.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + info.TcpState.ToString(), LocalizationManager.Culture).IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1);
             };
 
             AutoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults);
@@ -267,7 +288,47 @@ public ICommand CopySelectedStateCommand
 
         private void CopySelectedStateAction()
         {
-            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + SelectedConnectionInfo.State));
+            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString("TcpState_" + SelectedConnectionInfo.TcpState, LocalizationManager.Culture));
+        }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? ConnectionResults : new ObservableCollection<ConnectionInfo>(SelectedConnectionInfos.Cast<ConnectionInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Connections_ExportFileType = instance.FileType;
+                SettingsManager.Current.Connections_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Connections_ExportFileType, SettingsManager.Current.Connections_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
 
@@ -276,9 +337,9 @@ private async void Refresh()
         {
             IsRefreshing = true;
 
-            Connections.Clear();
+            ConnectionResults.Clear();
 
-            (await Connection.GetActiveTcpConnectionsAsync()).ForEach(x => Connections.Add(x));
+            (await Connection.GetActiveTcpConnectionsAsync()).ForEach(x => ConnectionResults.Add(x));
 
             IsRefreshing = false;
         }         
diff --git a/Source/NETworkManager/ViewModels/CredentialsViewModel.cs b/Source/NETworkManager/ViewModels/CredentialsViewModel.cs
index 36e28c1c4c..76ccdb42f3 100644
--- a/Source/NETworkManager/ViewModels/CredentialsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/CredentialsViewModel.cs
@@ -11,6 +11,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using NETworkManager.Resources.Localization;
 
 namespace NETworkManager.ViewModels
 {
@@ -18,8 +19,8 @@ public class CredentialsViewModel : ViewModelBase
     {
         #region Variables
         private readonly IDialogCoordinator _dialogCoordinator;
+        private readonly DispatcherTimer _searchDispatcherTimer = new DispatcherTimer();
         private readonly DispatcherTimer _dispatcherTimer;
-        private const int LockTime = 120; // Seconds remaining until the ui is locked
 
         private bool _credentialsFileExists;
         public bool CredentialsFileExists
@@ -119,7 +120,7 @@ public string Search
 
                 _search = value;
 
-                Credentials.Refresh();
+                _searchDispatcherTimer.Start();
 
                 OnPropertyChanged();
             }
@@ -150,6 +151,9 @@ public CredentialsViewModel(IDialogCoordinator instance)
             _dispatcherTimer = new DispatcherTimer();
             _dispatcherTimer.Tick += _dispatcherTimer_Tick;
             _dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
+
+            _searchDispatcherTimer.Interval = GlobalStaticConfiguration.SearchDispatcherTimerTimeSpan;
+            _searchDispatcherTimer.Tick += SearchDispatcherTimer_Tick;
         }
 
         private void _dispatcherTimer_Tick(object sender, EventArgs e)
@@ -216,7 +220,12 @@ private void AddAction()
 
         public ICommand EditCommand
         {
-            get { return new RelayCommand(p => EditAction()); }
+            get { return new RelayCommand(p => EditAction(), Edit_CanExecute); }
+        }
+
+        private bool Edit_CanExecute(object paramter)
+        {
+            return SelectedCredentials.Count == 1;
         }
 
         private void EditAction()
@@ -250,7 +259,7 @@ public async void SetMasterPassword()
         {
             var customDialog = new CustomDialog
             {
-                Title = Resources.Localization.Strings.SetMasterPassword
+                Title = Strings.SetMasterPassword
             };
 
             var credentialsSetMasterPasswordViewModel = new CredentialsSetMasterPasswordViewModel(instance =>
@@ -281,7 +290,7 @@ public async void DecryptAndLoad()
         {
             var customDialog = new CustomDialog
             {
-                Title = Resources.Localization.Strings.MasterPassword
+                Title = Strings.MasterPassword
             };
 
             var credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance =>
@@ -289,7 +298,7 @@ public async void DecryptAndLoad()
                 await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
 
                 if (!CredentialManager.Load(instance.Password))
-                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.WrongPassword, Resources.Localization.Strings.WrongPasswordDecryptionFailedMessage, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+                    await _dialogCoordinator.ShowMessageAsync(this, Strings.WrongPassword, Strings.WrongPasswordDecryptionFailedMessage + Environment.NewLine + Environment.NewLine + string.Format(Strings.ResetCredentialsMessage,CredentialManager.GetCredentialsFilePath()), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
 
                 CheckCredentialsLoaded();
 
@@ -337,7 +346,7 @@ public async void Add()
         {
             var customDialog = new CustomDialog
             {
-                Title = Resources.Localization.Strings.AddCredentials
+                Title = Strings.AddCredentials
             };
 
             var credentialViewModel = new CredentialViewModel(instance =>
@@ -358,7 +367,7 @@ public async void Add()
             }, instance =>
             {
                 _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, false);
+            });
 
             customDialog.Content = new CredentialDialog
             {
@@ -372,7 +381,7 @@ public async void Edit()
         {
             var customDialog = new CustomDialog
             {
-                Title = Resources.Localization.Strings.EditCredentials
+                Title = Strings.EditCredentials
             };
 
             var credentialViewModel = new CredentialViewModel(instance =>
@@ -409,7 +418,7 @@ public async void Delete()
         {
             var customDialog = new CustomDialog
             {
-                Title = Resources.Localization.Strings.DeleteCredentials
+                Title = Strings.DeleteCredentials
             };
 
             var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance =>
@@ -425,7 +434,7 @@ public async void Delete()
             }, instance =>
             {
                 _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
-            }, Resources.Localization.Strings.DeleteCredentialMessage);
+            }, Strings.DeleteCredentialMessage);
 
             customDialog.Content = new ConfirmRemoveDialog
             {
@@ -441,7 +450,7 @@ public async void LockUnlock()
             {
                 var customDialogMasterPassword = new CustomDialog
                 {
-                    Title = Resources.Localization.Strings.MasterPassword
+                    Title = Strings.MasterPassword
                 };
 
                 var credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance =>
@@ -451,7 +460,7 @@ public async void LockUnlock()
                     if (CredentialManager.VerifyMasterPasword(instance.Password))
                         TimerLockUiStart();
                     else
-                        await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.WrongPassword, Resources.Localization.Strings.WrongPasswordMessage, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+                        await _dialogCoordinator.ShowMessageAsync(this, Strings.WrongPassword, Strings.WrongPasswordMessage, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
                 }, instance =>
                 {
                     _dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword);
@@ -474,7 +483,7 @@ private void TimerLockUiStart()
         {
             IsLocked = false;
 
-            TimeRemaining = TimeSpan.FromSeconds(LockTime);
+            TimeRemaining = GlobalStaticConfiguration.CredentialsUILockTime;
 
             _dispatcherTimer.Start();
         }
@@ -486,5 +495,14 @@ private void TimerLockUiStop()
             IsLocked = true;
         }
         #endregion
+
+        #region Event
+        private void SearchDispatcherTimer_Tick(object sender, EventArgs e)
+        {
+            _searchDispatcherTimer.Stop();
+
+            Credentials.Refresh();
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs
index 5ef63919cb..bf6b7cabde 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs
@@ -107,7 +107,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.DNSLookup_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -169,7 +169,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.DNSLookup_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.DNSLookup_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.DNSLookup_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.DNSLookup_ProfileWidth;
         }
@@ -372,18 +372,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
index 401eb1d77a..5061ba9d6f 100644
--- a/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/DNSLookupViewModel.cs
@@ -1,6 +1,7 @@
 using NETworkManager.Models.Network;
 using NETworkManager.Models.Settings;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Input;
@@ -14,12 +15,17 @@
 using System.Collections.ObjectModel;
 using NETworkManager.Controls;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class DNSLookupViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+        
         private readonly int _tabId;
         private bool _firstLoad = true;
 
@@ -108,20 +114,20 @@ public bool IsLookupRunning
             }
         }
 
-        private ObservableCollection<DNSLookupRecordInfo> _lookupResult = new ObservableCollection<DNSLookupRecordInfo>();
-        public ObservableCollection<DNSLookupRecordInfo> LookupResult
+        private ObservableCollection<DNSLookupRecordInfo> _lookupResults = new ObservableCollection<DNSLookupRecordInfo>();
+        public ObservableCollection<DNSLookupRecordInfo> LookupResults
         {
-            get => _lookupResult;
+            get => _lookupResults;
             set
             {
-                if (value != null && value == _lookupResult)
-                    return;
+               if(Equals(value, _lookupResults))
+                   return;
 
-                _lookupResult = value;
+                _lookupResults = value;
             }
         }
 
-        public ICollectionView LookupResultView { get; }
+        public ICollectionView LookupResultsView { get; }
 
         private DNSLookupRecordInfo _selectedLookupResult;
         public DNSLookupRecordInfo SelectedLookupResult
@@ -137,6 +143,20 @@ public DNSLookupRecordInfo SelectedLookupResult
             }
         }
 
+        private IList _selectedLookupResults = new ArrayList();
+        public IList SelectedLookupResults
+        {
+            get => _selectedLookupResults;
+            set
+            {
+                if (Equals(value, _selectedLookupResults))
+                    return;
+
+                _selectedLookupResults = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _displayStatusMessage;
         public bool DisplayStatusMessage
         {
@@ -228,10 +248,12 @@ public bool ExpandStatistics
         #endregion
 
         #region Contructor, load settings
-        public DNSLookupViewModel(int tabId, string host)
+        public DNSLookupViewModel(IDialogCoordinator instance, int tabId, string host)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             Host = host;
 
@@ -245,8 +267,8 @@ public DNSLookupViewModel(int tabId, string host)
             DNSServers.SortDescriptions.Add(new SortDescription(nameof(DNSServerInfo.Name), ListSortDirection.Ascending));
             DNSServer = DNSServers.SourceCollection.Cast<DNSServerInfo>().FirstOrDefault(x => x.Name == SettingsManager.Current.DNSLookup_SelectedDNSServer.Name) ?? DNSServers.SourceCollection.Cast<DNSServerInfo>().First();
 
-            LookupResultView = CollectionViewSource.GetDefaultView(LookupResult);
-            LookupResultView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(DNSLookupRecordInfo.DNSServer)));
+            LookupResultsView = CollectionViewSource.GetDefaultView(LookupResults);
+            LookupResultsView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(DNSLookupRecordInfo.DNSServer)));
 
             LoadSettings();
 
@@ -347,6 +369,46 @@ private void CopySelectedResultAction()
         {
             CommonMethods.SetClipboard(SelectedLookupResult.Result);
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? LookupResults : new ObservableCollection<DNSLookupRecordInfo>(SelectedLookupResults.Cast<DNSLookupRecordInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.DNSLookup_ExportFileType = instance.FileType;
+                SettingsManager.Current.DNSLookup_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.DNSLookup_ExportFileType, SettingsManager.Current.DNSLookup_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods      
@@ -366,7 +428,7 @@ private void StartLookup()
             EndTime = null;
 
             // Reset the latest results
-            LookupResult.Clear();
+            LookupResults.Clear();
 
             // Change the tab title (not nice, but it works)
             var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
@@ -457,8 +519,8 @@ private void DNSLookup_RecordReceived(object sender, DNSLookupRecordArgs e)
 
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
             {
-                lock (LookupResult)
-                    LookupResult.Add(dnsLookupRecordInfo);
+                lock (LookupResults)
+                    LookupResults.Add(dnsLookupRecordInfo);
             }));
         }
 
diff --git a/Source/NETworkManager/ViewModels/ExportViewModel.cs b/Source/NETworkManager/ViewModels/ExportViewModel.cs
new file mode 100644
index 0000000000..11bf1fbd98
--- /dev/null
+++ b/Source/NETworkManager/ViewModels/ExportViewModel.cs
@@ -0,0 +1,219 @@
+using NETworkManager.Utilities;
+using System;
+using System.IO;
+using System.Windows.Forms;
+using System.Windows.Input;
+using NETworkManager.Models.Export;
+using NETworkManager.Resources.Localization;
+
+namespace NETworkManager.ViewModels
+{
+    public class ExportViewModel : ViewModelBase
+    {
+        public ICommand ExportCommand { get; }
+
+        public ICommand CancelCommand { get; }
+
+        private bool _exportAll;
+        public bool ExportAll
+        {
+            get => _exportAll;
+            set
+            {
+                if (value == _exportAll)
+                    return;
+
+                _exportAll = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _exportSelected;
+        public bool ExportSelected
+        {
+            get => _exportSelected;
+            set
+            {
+                if (value == _exportSelected)
+                    return;
+
+                _exportSelected = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _textOnly;
+        public bool TextOnly
+        {
+            get => _textOnly;
+            set
+            {
+                if (value == _textOnly)
+                    return;
+
+                _textOnly = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public ExportManager.ExportFileType FileType { get; set; }
+
+        private bool _useCSV;
+        public bool UseCSV
+        {
+            get => _useCSV;
+            set
+            {
+                if (value == _useCSV)
+                    return;
+
+                if (value)
+                {
+                    FileType = ExportManager.ExportFileType.CSV;
+                    ChangeFilePathExtension(FileType);
+                }
+
+                _useCSV = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _useXML;
+        public bool UseXML
+        {
+            get => _useXML;
+            set
+            {
+                if (value == _useXML)
+                    return;
+
+                if (value)
+                {
+                    FileType = ExportManager.ExportFileType.XML;
+                    ChangeFilePathExtension(FileType);
+                }
+
+                _useXML = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _useJSON;
+        public bool UseJSON
+        {
+            get => _useJSON;
+            set
+            {
+                if (value == _useJSON)
+                    return;
+
+                if (value)
+                {
+                    FileType = ExportManager.ExportFileType.JSON;
+                    ChangeFilePathExtension(FileType);
+                }
+
+                _useJSON = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private bool _useTXT;
+        public bool UseTXT
+        {
+            get => _useTXT;
+            set
+            {
+                if (value == _useTXT)
+                    return;
+
+                if (value)
+                {
+                    FileType = ExportManager.ExportFileType.TXT;
+                    ChangeFilePathExtension(FileType);
+                }
+
+                _useTXT = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private string _filePath;
+        public string FilePath
+        {
+            get => _filePath;
+            set
+            {
+                if (value == _filePath)
+                    return;
+
+                _filePath = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public ExportViewModel(Action<ExportViewModel> deleteCommand, Action<ExportViewModel> cancelHandler, ExportManager.ExportFileType fileType = ExportManager.ExportFileType.CSV, string filePath = "")
+        {
+            ExportCommand = new RelayCommand(p => deleteCommand(this));
+            CancelCommand = new RelayCommand(p => cancelHandler(this));
+
+            // Default
+            ExportAll = true;
+
+            FilePath = filePath;
+            
+            switch (fileType)
+            {
+                case ExportManager.ExportFileType.CSV:
+                    UseCSV = true;
+                    break;
+                case ExportManager.ExportFileType.XML:
+                    UseXML = true;
+                    break;
+                case ExportManager.ExportFileType.JSON:
+                    UseJSON = true;
+                    break;
+                case ExportManager.ExportFileType.TXT:
+                    UseTXT = true;
+                    TextOnly = true;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(fileType), fileType, null);
+            }
+        }
+       
+        public ICommand BrowseFileCommand
+        {
+            get { return new RelayCommand(p => BrowseFileAction()); }
+        }
+
+        private void BrowseFileAction()
+        {
+            var saveFileDialog = new SaveFileDialog();
+
+            var fileExtension = ExportManager.GetFileExtensionAsString(FileType);
+
+            saveFileDialog.Filter = $@"{fileExtension}-{Strings.File} | *.{fileExtension.ToLower()}";
+
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                FilePath = saveFileDialog.FileName;
+            }
+        }
+
+        private void ChangeFilePathExtension(ExportManager.ExportFileType fileType)
+        {
+            if (string.IsNullOrEmpty(FilePath))
+                return;
+
+            var extension = Path.GetExtension(FilePath).Replace(".", "");
+
+            if (extension.Equals(ExportManager.GetFileExtensionAsString(fileType), StringComparison.CurrentCultureIgnoreCase))
+                return;
+
+            FilePath = FilePath.Substring(0, FilePath.Length - extension.Length);
+
+            FilePath += ExportManager.GetFileExtensionAsString(fileType).ToLower();
+        }
+    }
+}
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs
index de0ab33d73..c72ec71c05 100644
--- a/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs
@@ -107,7 +107,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.HTTPHeaders_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -169,7 +169,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.HTTPHeaders_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.HTTPHeaders_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.HTTPHeaders_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.HTTPHeaders_ProfileWidth;
         }
@@ -372,18 +372,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
index 3244c37cdf..603fd75001 100644
--- a/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/HTTPHeadersViewModel.cs
@@ -11,12 +11,18 @@
 using System.Windows;
 using NETworkManager.Controls;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
+using NETworkManager.Resources.Localization;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class HTTPHeadersViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private readonly int _tabId;
         private bool _firstLoad = true;
 
@@ -175,10 +181,12 @@ public bool ExpandStatistics
         #endregion
 
         #region Contructor, load settings
-        public HTTPHeadersViewModel(int tabId, string websiteUri)
+        public HTTPHeadersViewModel(IDialogCoordinator instance ,int tabId, string websiteUri)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             WebsiteUri = websiteUri;
 
@@ -220,6 +228,46 @@ private void CheckAction()
         {
             Check();
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, Headers);
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Strings.Error, Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.HTTPHeaders_ExportFileType = instance.FileType;
+                SettingsManager.Current.HTTPHeaders_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.HTTPHeaders_ExportFileType, SettingsManager.Current.HTTPHeaders_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods
diff --git a/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs
index 5ce3472259..18d53d9b45 100644
--- a/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs
@@ -107,7 +107,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.IPScanner_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -169,7 +169,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.IPScanner_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.IPScanner_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.IPScanner_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.IPScanner_ProfileWidth;
         }
@@ -372,18 +372,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
index 20a1fa04e1..5b35a814cc 100644
--- a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -4,6 +4,7 @@
 using System.Windows.Input;
 using System.Windows;
 using System;
+using System.Collections;
 using System.Threading;
 using System.Collections.Generic;
 using NETworkManager.Models.Network;
@@ -14,13 +15,17 @@
 using System.Linq;
 using NETworkManager.Utilities;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class IPScannerViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
 
         private CancellationTokenSource _cancellationTokenSource;
 
@@ -33,6 +38,7 @@ public class IPScannerViewModel : ViewModelBase
         private readonly bool _isLoading;
 
         private string _ipRange;
+
         public string IPRange
         {
             get => _ipRange;
@@ -76,23 +82,23 @@ public bool CancelScan
             }
         }
 
-        private ObservableCollection<IPScannerHostInfo> _ipScanResult = new ObservableCollection<IPScannerHostInfo>();
-        public ObservableCollection<IPScannerHostInfo> IPScanResult
+        private ObservableCollection<HostInfo> _ipScanResults = new ObservableCollection<HostInfo>();
+        public ObservableCollection<HostInfo> IPScanResults
         {
-            get => _ipScanResult;
+            get => _ipScanResults;
             set
             {
-                if (value != null && value == _ipScanResult)
+                if (value != null && value == _ipScanResults)
                     return;
 
-                _ipScanResult = value;
+                _ipScanResults = value;
             }
         }
 
-        public ICollectionView IPScanResultView { get; }
+        public ICollectionView IPScanResultsView { get; }
 
-        private IPScannerHostInfo _selectedIPScanResult;
-        public IPScannerHostInfo SelectedIPScanResult
+        private HostInfo _selectedIPScanResult;
+        public HostInfo SelectedIPScanResult
         {
             get => _selectedIPScanResult;
             set
@@ -105,6 +111,20 @@ public IPScannerHostInfo SelectedIPScanResult
             }
         }
 
+        private IList _selectedIPScanResults = new ArrayList();
+        public IList SelectedIPScanResults
+        {
+            get => _selectedIPScanResults;
+            set
+            {
+                if (Equals(value, _selectedIPScanResults))
+                    return;
+
+                _selectedIPScanResults = value;
+                OnPropertyChanged();
+            }
+        }
+
         public bool ResolveHostname => SettingsManager.Current.IPScanner_ResolveHostname;
 
         public bool ResolveMACAddress => SettingsManager.Current.IPScanner_ResolveMACAddress;
@@ -253,14 +273,15 @@ public bool ExpandStatistics
         }
 
         public bool ShowStatistics => SettingsManager.Current.IPScanner_ShowStatistics;
-
         #endregion
 
         #region Constructor, load settings, shutdown
-        public IPScannerViewModel(int tabId, string ipRange)
+        public IPScannerViewModel(IDialogCoordinator instance, int tabId, string ipRange)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             IPRange = ipRange;
 
@@ -268,8 +289,10 @@ public IPScannerViewModel(int tabId, string ipRange)
             IPRangeHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.IPScanner_IPRangeHistory);
 
             // Result view
-            IPScanResultView = CollectionViewSource.GetDefaultView(IPScanResult);
-            IPScanResultView.SortDescriptions.Add(new SortDescription(nameof(IPScannerHostInfo.PingInfo) + "." + nameof(PingInfo.IPAddressInt32), ListSortDirection.Ascending));
+            IPScanResultsView = CollectionViewSource.GetDefaultView(IPScanResults);
+            IPScanResultsView.SortDescriptions.Add(new SortDescription(
+                nameof(HostInfo.PingInfo) + "." + nameof(PingInfo.IPAddressInt32),
+                ListSortDirection.Ascending));
 
             LoadSettings();
 
@@ -281,13 +304,13 @@ public IPScannerViewModel(int tabId, string ipRange)
 
         public void OnLoaded()
         {
-            if (_firstLoad)
-            {
-                if (!string.IsNullOrEmpty(IPRange))
-                    StartScan();
+            if (!_firstLoad)
+                return;
 
-                _firstLoad = false;
-            }
+            if (!string.IsNullOrEmpty(IPRange))
+                StartScan();
+
+            _firstLoad = false;
         }
 
         private void LoadSettings()
@@ -297,6 +320,7 @@ private void LoadSettings()
         #endregion
 
         #region ICommands & Actions
+
         public ICommand ScanCommand
         {
             get { return new RelayCommand(p => ScanAction()); }
@@ -320,11 +344,10 @@ private void RedirectToApplicationAction(object name)
             if (!(name is string appName))
                 return;
 
-            if(!Enum.TryParse(appName, out ApplicationViewManager.Name app))
+            if (!Enum.TryParse(appName, out ApplicationViewManager.Name app))
                 return;
 
-            var host = !string.IsNullOrEmpty(SelectedIPScanResult.Hostname) ? SelectedIPScanResult.Hostname : SelectedIPScanResult
-                .PingInfo.IPAddress.ToString();
+            var host = !string.IsNullOrEmpty(SelectedIPScanResult.Hostname) ? SelectedIPScanResult.Hostname : SelectedIPScanResult.PingInfo.IPAddress.ToString();
 
             EventSystem.RedirectToApplication(app, host);
         }
@@ -336,7 +359,8 @@ public ICommand PerformDNSLookupIPAddressCommand
 
         private void PerformDNSLookupIPAddressAction()
         {
-            EventSystem.RedirectToApplication(ApplicationViewManager.Name.DNSLookup, SelectedIPScanResult.PingInfo.IPAddress.ToString());
+            EventSystem.RedirectToApplication(ApplicationViewManager.Name.DNSLookup,
+                SelectedIPScanResult.PingInfo.IPAddress.ToString());
         }
 
         public ICommand PerformDNSLookupHostnameCommand
@@ -348,7 +372,7 @@ private void PerformDNSLookupHostnameAction()
         {
             EventSystem.RedirectToApplication(ApplicationViewManager.Name.DNSLookup, SelectedIPScanResult.Hostname);
         }
-        
+
         public ICommand CopySelectedIPAddressCommand
         {
             get { return new RelayCommand(p => CopySelectedIPAddressAction()); }
@@ -426,7 +450,47 @@ public ICommand CopySelectedStatusCommand
 
         private void CopySelectedStatusAction()
         {
-            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString("IPStatus_" + SelectedIPScanResult.PingInfo.Status));
+            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString("IPStatus_" + SelectedIPScanResult.PingInfo.Status, LocalizationManager.Culture));
+        }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? IPScanResults : new ObservableCollection<HostInfo>(SelectedIPScanResults.Cast<HostInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+                
+                SettingsManager.Current.IPScanner_ExportFileType = instance.FileType;
+                SettingsManager.Current.IPScanner_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.IPScanner_ExportFileType, SettingsManager.Current.IPScanner_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
 
@@ -445,7 +509,7 @@ private async void StartScan()
             _dispatcherTimer.Start();
             EndTime = null;
 
-            IPScanResult.Clear();
+            IPScanResults.Clear();
             HostsFound = 0;
 
             // Change the tab title (not nice, but it works)
@@ -468,16 +532,17 @@ private async void StartScan()
 
             try
             {
-                ipRanges = await IPScanRangeHelper.ResolveHostnamesInIPRangeAsync(ipHostOrRanges, _cancellationTokenSource.Token);
+                ipRanges = await IPScanRangeHelper.ResolveHostnamesInIPRangeAsync(ipHostOrRanges,
+                    _cancellationTokenSource.Token);
             }
             catch (OperationCanceledException)
             {
-                IpScanner_UserHasCanceled(this, EventArgs.Empty);
+                IPScanner_UserHasCanceled(this, EventArgs.Empty);
                 return;
             }
             catch (AggregateException exceptions) // DNS error (could not resolve hostname...)
             {
-                IpScanner_DnsResolveFailed(exceptions);
+                IPScanner_DnsResolveFailed(exceptions);
                 return;
             }
 
@@ -486,11 +551,13 @@ private async void StartScan()
             try
             {
                 // Create a list of all ip addresses
-                ipAddresses = await IPScanRangeHelper.ConvertIPRangeToIPAddressesAsync(ipRanges.ToArray(), _cancellationTokenSource.Token);
+                ipAddresses =
+                    await IPScanRangeHelper.ConvertIPRangeToIPAddressesAsync(ipRanges.ToArray(),
+                        _cancellationTokenSource.Token);
             }
             catch (OperationCanceledException)
             {
-                IpScanner_UserHasCanceled(this, EventArgs.Empty);
+                IPScanner_UserHasCanceled(this, EventArgs.Empty);
                 return;
             }
 
@@ -524,9 +591,9 @@ private async void StartScan()
             var ipScanner = new IPScanner();
 
             ipScanner.HostFound += IpScanner_HostFound;
-            ipScanner.ScanComplete += IpScanner_ScanComplete;
+            ipScanner.ScanComplete += IPScanner_ScanComplete;
             ipScanner.ProgressChanged += IpScanner_ProgressChanged;
-            ipScanner.UserHasCanceled += IpScanner_UserHasCanceled;
+            ipScanner.UserHasCanceled += IPScanner_UserHasCanceled;
 
             ipScanner.ScanAsync(ipAddresses, ipScannerOptions, _cancellationTokenSource.Token);
         }
@@ -555,7 +622,7 @@ private void ScanFinished()
         private void AddIPRangeToHistory(string ipRange)
         {
             // Create the new list
-            List<string> list = ListHelper.Modify(SettingsManager.Current.IPScanner_IPRangeHistory.ToList(), ipRange, SettingsManager.Current.General_HistoryListEntries);
+            var list = ListHelper.Modify(SettingsManager.Current.IPScanner_IPRangeHistory.ToList(), ipRange, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
             SettingsManager.Current.IPScanner_IPRangeHistory.Clear();
@@ -571,23 +638,25 @@ public void OnClose()
             if (IsScanRunning)
                 StopScan();
         }
+
         #endregion
 
         #region Events
-        private void IpScanner_HostFound(object sender, IPScannerHostFoundArgs e)
+
+        private void IpScanner_HostFound(object sender, HostFoundArgs e)
         {
-            var ipScannerHostInfo = IPScannerHostInfo.Parse(e);
+            var ipScannerHostInfo = HostInfo.Parse(e);
 
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
             {
-                lock (IPScanResult)
-                    IPScanResult.Add(ipScannerHostInfo);
+                lock (IPScanResults)
+                    IPScanResults.Add(ipScannerHostInfo);
             }));
 
             HostsFound++;
         }
 
-        private void IpScanner_ScanComplete(object sender, EventArgs e)
+        private void IPScanner_ScanComplete(object sender, EventArgs e)
         {
             ScanFinished();
         }
@@ -597,7 +666,7 @@ private void IpScanner_ProgressChanged(object sender, ProgressChangedArgs e)
             IPAddressesScanned = e.Value;
         }
 
-        private void IpScanner_DnsResolveFailed(AggregateException e)
+        private void IPScanner_DnsResolveFailed(AggregateException e)
         {
             StatusMessage = $"{Resources.Localization.Strings.TheFollowingHostnamesCouldNotBeResolved} {string.Join(", ", e.Flatten().InnerExceptions.Select(x => x.Message))}";
             DisplayStatusMessage = true;
@@ -605,7 +674,7 @@ private void IpScanner_DnsResolveFailed(AggregateException e)
             ScanFinished();
         }
 
-        private void IpScanner_UserHasCanceled(object sender, EventArgs e)
+        private void IPScanner_UserHasCanceled(object sender, EventArgs e)
         {
             StatusMessage = Resources.Localization.Strings.CanceledByUserMessage;
             DisplayStatusMessage = true;
@@ -635,4 +704,4 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
         }
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/ListenersViewModel.cs b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
index 5d85055ebe..5104c245d6 100644
--- a/Source/NETworkManager/ViewModels/ListenersViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
@@ -1,20 +1,25 @@
 using NETworkManager.Models.Network;
 using System;
+using System.Collections;
 using System.Windows.Input;
 using System.ComponentModel;
 using System.Windows.Data;
 using System.Collections.ObjectModel;
 using NETworkManager.Utilities;
-using System.Windows;
 using NETworkManager.Models.Settings;
 using System.Windows.Threading;
 using System.Linq;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class ListenersViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private readonly bool _isLoading;
         private readonly DispatcherTimer _autoRefreshTimer = new DispatcherTimer();
 
@@ -29,27 +34,27 @@ public string Search
 
                 _search = value;
 
-                ListenersView.Refresh();
+                ListenerResultsView.Refresh();
 
                 OnPropertyChanged();
             }
         }
 
-        private ObservableCollection<ListenerInfo> _listeners = new ObservableCollection<ListenerInfo>();
-        public ObservableCollection<ListenerInfo> Listeners
+        private ObservableCollection<ListenerInfo> _listenerResults = new ObservableCollection<ListenerInfo>();
+        public ObservableCollection<ListenerInfo> ListenerResults
         {
-            get => _listeners;
+            get => _listenerResults;
             set
             {
-                if (value == _listeners)
+                if (value == _listenerResults)
                     return;
 
-                _listeners = value;
+                _listenerResults = value;
                 OnPropertyChanged();
             }
         }
 
-        public ICollectionView ListenersView { get; }
+        public ICollectionView ListenerResultsView { get; }
 
         private ListenerInfo _selectedListenerInfo;
         public ListenerInfo SelectedListenerInfo
@@ -65,6 +70,20 @@ public ListenerInfo SelectedListenerInfo
             }
         }
 
+        private IList _selectedListenerInfos = new ArrayList();
+        public IList SelectedListenerInfos
+        {
+            get => _selectedListenerInfos;
+            set
+            {
+                if (Equals(value, _selectedListenerInfos))
+                    return;
+
+                _selectedListenerInfos = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _autoRefresh;
         public bool AutoRefresh
         {
@@ -159,14 +178,16 @@ public string StatusMessage
         #endregion
 
         #region Contructor, load settings
-        public ListenersViewModel()
+        public ListenersViewModel(IDialogCoordinator instance)
         {
             _isLoading = true;
 
-            ListenersView = CollectionViewSource.GetDefaultView(Listeners);
-            ListenersView.SortDescriptions.Add(new SortDescription(nameof(ListenerInfo.Protocol), ListSortDirection.Ascending));
-            ListenersView.SortDescriptions.Add(new SortDescription(nameof(ListenerInfo.IPAddressInt32), ListSortDirection.Ascending));
-            ListenersView.Filter = o =>
+            _dialogCoordinator = instance;
+
+            ListenerResultsView = CollectionViewSource.GetDefaultView(ListenerResults);
+            ListenerResultsView.SortDescriptions.Add(new SortDescription(nameof(ListenerInfo.Protocol), ListSortDirection.Ascending));
+            ListenerResultsView.SortDescriptions.Add(new SortDescription(nameof(ListenerInfo.IPAddressInt32), ListSortDirection.Ascending));
+            ListenerResultsView.Filter = o =>
             {
 
                 if (!(o is ListenerInfo info))
@@ -244,6 +265,46 @@ private void CopySelectedPortAction()
         {
             CommonMethods.SetClipboard(SelectedListenerInfo.Port.ToString());
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? ListenerResults : new ObservableCollection<ListenerInfo>(SelectedListenerInfos.Cast<ListenerInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Listeners_ExportFileType = instance.FileType;
+                SettingsManager.Current.Listeners_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Listeners_ExportFileType, SettingsManager.Current.Listeners_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods
@@ -251,9 +312,9 @@ private async void Refresh()
         {
             IsRefreshing = true;
 
-            Listeners.Clear();
+            ListenerResults.Clear();
 
-            (await Listener.GetAllActiveListenersAsync()).ForEach(x => Listeners.Add(x));
+            (await Listener.GetAllActiveListenersAsync()).ForEach(x => ListenerResults.Add(x));
 
             IsRefreshing = false;
         }
diff --git a/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs b/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
index ea2138da8f..5c6d8528eb 100644
--- a/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/LookupOUILookupViewModel.cs
@@ -1,20 +1,26 @@
-using System.Windows.Input;
+using System;
+using System.Collections;
+using System.Windows.Input;
 using System.Collections.ObjectModel;
 using NETworkManager.Models.Settings;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.ComponentModel;
 using System.Windows.Data;
-using System.Windows;
 using NETworkManager.Models.Lookup;
 using System.Linq;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
 using NETworkManager.Utilities;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class LookupOUILookupViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+        
         private string _macOrVendorAddress;
         public string MACAddressOrVendor
         {
@@ -59,31 +65,45 @@ public bool IsLookupRunning
             }
         }
 
-        private ObservableCollection<OUIInfo> _ouiLookupResult = new ObservableCollection<OUIInfo>();
-        public ObservableCollection<OUIInfo> OUILookupResult
+        private ObservableCollection<OUIInfo> _ouiLookupResults = new ObservableCollection<OUIInfo>();
+        public ObservableCollection<OUIInfo> OUILookupResults
         {
-            get => _ouiLookupResult;
+            get => _ouiLookupResults;
             set
             {
-                if (value != null && value == _ouiLookupResult)
+                if (value != null && value == _ouiLookupResults)
                     return;
 
-                _ouiLookupResult = value;
+                _ouiLookupResults = value;
             }
         }
 
-        public ICollectionView OUILookupResultView { get; }
+        public ICollectionView OUILookupResultsView { get; }
 
-        private OUIInfo _selectedOUILookup;
-        public OUIInfo SelectedOUILookup
+        private OUIInfo _selectedOUILookupResult;
+        public OUIInfo SelectedOUILookupResult
         {
-            get => _selectedOUILookup;
+            get => _selectedOUILookupResult;
             set
             {
-                if (value == _selectedOUILookup)
+                if (value == _selectedOUILookupResult)
                     return;
 
-                _selectedOUILookup = value;
+                _selectedOUILookupResult = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private IList _selectedOUILookupResults = new ArrayList();
+        public IList SelectedOUILookupResults
+        {
+            get => _selectedOUILookupResults;
+            set
+            {
+                if (Equals(value, _selectedOUILookupResults))
+                    return;
+
+                _selectedOUILookupResults = value;
                 OnPropertyChanged();
             }
         }
@@ -104,11 +124,13 @@ public bool NoVendorFound
         #endregion
 
         #region Constructor, Load settings
-        public LookupOUILookupViewModel()
+        public LookupOUILookupViewModel(IDialogCoordinator instance)
         {
+            _dialogCoordinator = instance;
+
             // Set collection view
             MACAddressOrVendorHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.Lookup_OUI_MACAddressOrVendorHistory);
-            OUILookupResultView = CollectionViewSource.GetDefaultView(OUILookupResult);
+            OUILookupResultsView = CollectionViewSource.GetDefaultView(OUILookupResults);
         }
         #endregion
 
@@ -127,7 +149,7 @@ private async void OUILookupAction()
         {
             IsLookupRunning = true;
 
-            OUILookupResult.Clear();
+            OUILookupResults.Clear();
 
             var vendors = new List<string>();
 
@@ -139,7 +161,7 @@ private async void OUILookupAction()
                 {
                     foreach (var info in await OUILookup.LookupAsync(macAddressOrVendor1))
                     {
-                        OUILookupResult.Add(info);
+                        OUILookupResults.Add(info);
                     }
                 }
                 else
@@ -150,10 +172,10 @@ private async void OUILookupAction()
 
             foreach (var info in await OUILookup.LookupByVendorAsync(vendors))
             {
-                OUILookupResult.Add(info);
+                OUILookupResults.Add(info);
             }
 
-            if (OUILookupResult.Count == 0)
+            if (OUILookupResults.Count == 0)
             {
                 NoVendorFound = true;
             }
@@ -173,7 +195,7 @@ public ICommand CopySelectedMACAddressCommand
 
         private void CopySelectedMACAddressAction()
         {
-            CommonMethods.SetClipboard(SelectedOUILookup.MACAddress);
+            CommonMethods.SetClipboard(SelectedOUILookupResult.MACAddress);
         }
 
         public ICommand CopySelectedVendorCommand
@@ -183,7 +205,47 @@ public ICommand CopySelectedVendorCommand
 
         private void CopySelectedVendorAction()
         {
-            CommonMethods.SetClipboard(SelectedOUILookup.Vendor);
+            CommonMethods.SetClipboard(SelectedOUILookupResult.Vendor);
+        }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? OUILookupResults : new ObservableCollection<OUIInfo>(SelectedOUILookupResults.Cast<OUIInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Lookup_OUI_ExportFileType = instance.FileType;
+                SettingsManager.Current.Lookup_OUI_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Lookup_OUI_ExportFileType, SettingsManager.Current.Lookup_OUI_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
 
diff --git a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
index 8ef5b67ade..94b67208c3 100644
--- a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
+++ b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
@@ -1,4 +1,6 @@
-using System.Windows.Input;
+using System;
+using System.Collections;
+using System.Windows.Input;
 using System.Collections.ObjectModel;
 using NETworkManager.Models.Settings;
 using System.Collections.Generic;
@@ -6,13 +8,18 @@
 using System.Windows.Data;
 using NETworkManager.Models.Lookup;
 using System.Linq;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
 using NETworkManager.Utilities;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class LookupPortLookupViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private string _portOrService;
         public string PortOrService
         {
@@ -56,20 +63,20 @@ public bool IsLookupRunning
             }
         }
 
-        private ObservableCollection<PortLookupInfo> _portLookupResult = new ObservableCollection<PortLookupInfo>();
-        public ObservableCollection<PortLookupInfo> PortLookupResult
+        private ObservableCollection<PortLookupInfo> _portLookupResults = new ObservableCollection<PortLookupInfo>();
+        public ObservableCollection<PortLookupInfo> PortLookupResults
         {
-            get => _portLookupResult;
+            get => _portLookupResults;
             set
             {
-                if (value != null && value == _portLookupResult)
+                if (value != null && value == _portLookupResults)
                     return;
 
-                _portLookupResult = value;
+                _portLookupResults = value;
             }
         }
 
-        public ICollectionView PortLookupResultView { get; }
+        public ICollectionView PortLookupResultsView { get; }
 
         private PortLookupInfo _selectedPortLookupResult;
         public PortLookupInfo SelectedPortLookupResult
@@ -85,6 +92,21 @@ public PortLookupInfo SelectedPortLookupResult
             }
         }
 
+        private IList _selectedPortLookupResults = new ArrayList();
+        public IList SelectedPortLookupResults
+        {
+            get => _selectedPortLookupResults;
+            set
+            {
+                if (Equals(value, _selectedPortLookupResults))
+                    return;
+
+                _selectedPortLookupResults = value;
+                OnPropertyChanged();
+            }
+        }
+
+
         private bool _noPortsFound;
         public bool NoPortsFound
         {
@@ -101,10 +123,12 @@ public bool NoPortsFound
         #endregion
 
         #region Constructor, Load settings
-        public LookupPortLookupViewModel()
+        public LookupPortLookupViewModel(IDialogCoordinator instance)
         {
+            _dialogCoordinator = instance;
+
             PortsOrServicesHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.Lookup_Port_PortsHistory);
-            PortLookupResultView = CollectionViewSource.GetDefaultView(PortLookupResult);
+            PortLookupResultsView = CollectionViewSource.GetDefaultView(PortLookupResults);
         }
         #endregion
 
@@ -123,7 +147,7 @@ private async void PortLookupAction()
         {
             IsLookupRunning = true;
 
-            PortLookupResult.Clear();
+            PortLookupResults.Clear();
 
             var portsByService = new List<string>();
 
@@ -143,7 +167,7 @@ private async void PortLookupAction()
                             {
                                 foreach (var info in await PortLookup.LookupAsync(i))
                                 {
-                                    PortLookupResult.Add(info);
+                                    PortLookupResults.Add(info);
                                 }
                             }
                         }
@@ -166,7 +190,7 @@ private async void PortLookupAction()
                         {
                             foreach (var info in await PortLookup.LookupAsync(port))
                             {
-                                PortLookupResult.Add(info);
+                                PortLookupResults.Add(info);
                             }
                         }
                         else
@@ -183,10 +207,10 @@ private async void PortLookupAction()
 
             foreach (var info in await PortLookup.LookupByServiceAsync(portsByService))
             {
-                PortLookupResult.Add(info);
+                PortLookupResults.Add(info);
             }
 
-            if (PortLookupResult.Count == 0)
+            if (PortLookupResults.Count == 0)
             {
                 NoPortsFound = true;
             }
@@ -238,6 +262,46 @@ private void CopySelectedDescriptionAction()
         {
             CommonMethods.SetClipboard(SelectedPortLookupResult.Description);
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? PortLookupResults : new ObservableCollection<PortLookupInfo>(SelectedPortLookupResults.Cast<PortLookupInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Lookup_Port_ExportFileType = instance.FileType;
+                SettingsManager.Current.Lookup_Port_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Lookup_Port_ExportFileType, SettingsManager.Current.Lookup_Port_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region  Methods
diff --git a/Source/NETworkManager/ViewModels/NetworkInterfaceAddIPAddressViewModel.cs b/Source/NETworkManager/ViewModels/NetworkInterfaceAddIPAddressViewModel.cs
new file mode 100644
index 0000000000..7601857e73
--- /dev/null
+++ b/Source/NETworkManager/ViewModels/NetworkInterfaceAddIPAddressViewModel.cs
@@ -0,0 +1,47 @@
+using NETworkManager.Utilities;
+using System;
+using System.Windows.Input;
+
+namespace NETworkManager.ViewModels
+{
+    public class NetworkInterfaceAddIPAddressViewModel : ViewModelBase
+    {
+        public ICommand AddCommand { get; }
+
+        public ICommand CancelCommand { get; }
+
+        private string _ipAddress;
+        public string IPAddress
+        {
+            get => _ipAddress;
+            set
+            {
+                if (value == _ipAddress)
+                    return;
+
+                _ipAddress = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private string _subnetmaskOrCidr;
+        public string SubnetmaskOrCidr
+        {
+            get => _subnetmaskOrCidr;
+            set
+            {
+                if (value == _subnetmaskOrCidr)
+                    return;
+
+                _subnetmaskOrCidr = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public NetworkInterfaceAddIPAddressViewModel(Action<NetworkInterfaceAddIPAddressViewModel> addCommand, Action<NetworkInterfaceAddIPAddressViewModel> cancelHandler)
+        {
+            AddCommand = new RelayCommand(p => addCommand(this));
+            CancelCommand = new RelayCommand(p => cancelHandler(this));
+        }        
+    }
+}
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
index 0f7b56712d..14bef79ba7 100644
--- a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
+++ b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs
@@ -581,7 +581,6 @@ public string ConfigSecondaryDNSServer
         #endregion
 
         #region Profiles
-
         public ICollectionView Profiles { get; }
 
         private ProfileInfo _selectedProfile = new ProfileInfo();
@@ -661,7 +660,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.NetworkInterface_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -738,7 +737,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.NetworkInterface_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.NetworkInterface_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.NetworkInterface_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.NetworkInterface_ProfileWidth;
         }
@@ -761,7 +760,7 @@ private async void ReloadNetworkInterfacesAction()
 
             await Task.Delay(2000); // Make the user happy, let him see a reload animation (and he cannot spam the reload command)
 
-            string id = string.Empty;
+            var id = string.Empty;
 
             if (SelectedNetworkInterface != null)
                 id = SelectedNetworkInterface.Id;
@@ -801,14 +800,19 @@ public void ApplyNetworkInterfaceConfigAction()
             ApplyNetworkInterfaceConfig();
         }
 
-        public ICommand ApplyProfileCommand
+        private void ApplyNetworkInterfaceConfig()
+        {
+            throw new NotImplementedException();
+        }
+
+        public ICommand ApplyProfileConfigCommand
         {
-            get { return new RelayCommand(p => ApplyProfileAction()); }
+            get { return new RelayCommand(p => ApplyProfileProfileAction()); }
         }
 
-        private void ApplyProfileAction()
+        private void ApplyProfileProfileAction()
         {
-            ApplyProfile();
+            ApplyProfileConfig();
         }
 
         public ICommand AddProfileCommand
@@ -962,17 +966,17 @@ private async void EditGroupAction(object group)
             await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
 
-        public ICommand FlushDNSCacheCommand
+        public ICommand FlushDNSCommand
         {
-            get { return new RelayCommand(p => FlushDNSCacheAction()); }
+            get { return new RelayCommand(p => FlushDNSAction()); }
         }
 
-        private async void FlushDNSCacheAction()
+        private async void FlushDNSAction()
         {
             IsConfigurationRunning = true;
             DisplayStatusMessage = false;
 
-            await Models.Network.NetworkInterface.FlushDnsResolverCacheAsync();
+            await Models.Network.NetworkInterface.FlushDnsAsync();
             
             IsConfigurationRunning = false;
         }
@@ -987,51 +991,82 @@ private void ClearSearchAction()
             Search = string.Empty;
         }
 
-        public ICommand IPConfigReleaseRenewCommand
+        public ICommand ReleaseRenewCommand
         {
-            get { return new RelayCommand(p => IPConfigReleaseRenewAction()); }
+            get { return new RelayCommand(p => ReleaseRenewAction()); }
         }
 
-        private async void IPConfigReleaseRenewAction()
+        private async void ReleaseRenewAction()
         {
             IsConfigurationRunning = true;
 
-            await Models.Network.NetworkInterface.IPConfigReleaseRenewAsync(Models.Network.NetworkInterface.IPConfigReleaseRenewMode.ReleaseRenew);
+            await Models.Network.NetworkInterface.ReleaseRenewAsync(Models.Network.NetworkInterface.IPConfigReleaseRenewMode.ReleaseRenew);
 
             IsConfigurationRunning = false;
         }
 
-        public ICommand IPConfigReleaseCommand
+        public ICommand ReleaseCommand
         {
-            get { return new RelayCommand(p => IPConfigReleaseAction()); }
+            get { return new RelayCommand(p => ReleaseAction()); }
         }
 
-        private async void IPConfigReleaseAction()
+        private async void ReleaseAction()
         {
             IsConfigurationRunning = true;
 
-            await Models.Network.NetworkInterface.IPConfigReleaseRenewAsync(Models.Network.NetworkInterface.IPConfigReleaseRenewMode.Release);
+            await Models.Network.NetworkInterface.ReleaseRenewAsync(Models.Network.NetworkInterface.IPConfigReleaseRenewMode.Release);
 
             IsConfigurationRunning = false;
         }
 
-        public ICommand IPConfigRenewCommand
+        public ICommand RenewCommand
         {
-            get { return new RelayCommand(p => IPConfigRenewAction()); }
+            get { return new RelayCommand(p => RenewAction()); }
         }
 
-        private async void IPConfigRenewAction()
+        private async void RenewAction()
         {
             IsConfigurationRunning = true;
 
-            await Models.Network.NetworkInterface.IPConfigReleaseRenewAsync(Models.Network.NetworkInterface.IPConfigReleaseRenewMode.Renew);
+            await Models.Network.NetworkInterface.ReleaseRenewAsync(Models.Network.NetworkInterface.IPConfigReleaseRenewMode.Renew);
 
             IsConfigurationRunning = false;
         }
+        
+        public ICommand AddIPv4AddressCommand
+        {
+            get { return new RelayCommand(p => AddIPv4AddressAction());}
+        }
+
+        private async void AddIPv4AddressAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.AddIPv4Address
+            };
+
+            var networkInterfaceAddIPAddressViewModel = new NetworkInterfaceAddIPAddressViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+                
+                AddIPv4Address(instance.IPAddress, instance.SubnetmaskOrCidr);
+            }, instance =>
+            {
+                _dialogCoordinator.HideMetroDialogAsync(this, customDialog); 
+            });
+
+            customDialog.Content = new NetworkInterfaceAddIPAddressDialog
+            {
+                DataContext = networkInterfaceAddIPAddressViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
+
         #endregion
 
         #region Methods
-        public async void ApplyNetworkInterfaceConfig()
+        public async void ApplyConfig()
         {
             IsConfigurationRunning = true;
             DisplayStatusMessage = false;
@@ -1086,7 +1121,42 @@ public async void ApplyNetworkInterfaceConfig()
             }
         }
 
-        public async void ApplyProfile()
+        public async void AddIPv4Address(string ipAddress, string subnetmaskOrCidr)
+        {
+            IsConfigurationRunning = true;
+            DisplayStatusMessage = false;
+
+            var subnetmask = subnetmaskOrCidr;
+
+            // CIDR to subnetmask
+            if (subnetmask.StartsWith("/"))
+                subnetmask = Subnetmask.GetFromCidr(int.Parse(subnetmask.TrimStart('/'))).Subnetmask;
+
+            var config = new NetworkInterfaceConfig
+            {
+                Name = SelectedNetworkInterface.Name,
+                IPAddress = ipAddress,
+                Subnetmask = subnetmask
+            };
+            
+            try
+            {
+                await Models.Network.NetworkInterface.AddIPAddressToNetworkInterfaceAsync(config);
+
+                ReloadNetworkInterfacesAction();
+            }
+            catch (Exception ex)
+            {
+                StatusMessage = ex.Message;
+                DisplayStatusMessage = true;
+            }
+            finally
+            {
+                IsConfigurationRunning = false;
+            }
+        }
+
+        public async void ApplyProfileConfig()
         {
             IsConfigurationRunning = true;
             DisplayStatusMessage = false;
@@ -1152,18 +1222,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/PingHostViewModel.cs b/Source/NETworkManager/ViewModels/PingHostViewModel.cs
index 9d51a3fb79..0d59251e54 100644
--- a/Source/NETworkManager/ViewModels/PingHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingHostViewModel.cs
@@ -108,7 +108,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.Ping_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -172,7 +172,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.Ping_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Ping_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Ping_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.Ping_ProfileWidth;
         }
@@ -373,18 +373,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
index 6da227bb46..6a8452d481 100644
--- a/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingSettingsViewModel.cs
@@ -158,6 +158,23 @@ public bool ResolveHostnamePreferIPv6
             }
         }
         
+        private bool _highlightTimeouts;
+        public bool HighlightTimeouts
+        {
+            get => _highlightTimeouts;
+            set
+            {
+                if (value == _highlightTimeouts)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.Ping_HighlightTimeouts = value;
+
+                _highlightTimeouts = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _showStatistics;
         public bool ShowStatistics
         {
@@ -201,6 +218,7 @@ private void LoadSettings()
             else
                 ResolveHostnamePreferIPv6 = true;
 
+            HighlightTimeouts = SettingsManager.Current.Ping_HighlightTimeouts;
             ShowStatistics = SettingsManager.Current.Ping_ShowStatistics;
         }
         #endregion
diff --git a/Source/NETworkManager/ViewModels/PingViewModel.cs b/Source/NETworkManager/ViewModels/PingViewModel.cs
index bb8e4ee40d..db4941388b 100644
--- a/Source/NETworkManager/ViewModels/PingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PingViewModel.cs
@@ -1,6 +1,7 @@
 using NETworkManager.Models.Network;
 using NETworkManager.Models.Settings;
 using System;
+using System.Collections;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
@@ -16,12 +17,17 @@
 using NETworkManager.Utilities;
 using System.Collections.ObjectModel;
 using System.Globalization;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class PingViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private CancellationTokenSource _cancellationTokenSource;
 
         private readonly int _tabId;
@@ -76,20 +82,20 @@ public bool CancelPing
             }
         }
 
-        private ObservableCollection<PingInfo> _pingResult = new ObservableCollection<PingInfo>();
-        public ObservableCollection<PingInfo> PingResult
+        private ObservableCollection<PingInfo> _pingResults = new ObservableCollection<PingInfo>();
+        public ObservableCollection<PingInfo> PingResults
         {
-            get => _pingResult;
+            get => _pingResults;
             set
             {
-                if (value != null && value == _pingResult)
+                if (value != null && value == _pingResults)
                     return;
 
-                _pingResult = value;
+                _pingResults = value;
             }
         }
 
-        public ICollectionView PingResultView { get; }
+        public ICollectionView PingResultsView { get; }
 
         private PingInfo _selectedPingResult;
         public PingInfo SelectedPingResult
@@ -105,6 +111,20 @@ public PingInfo SelectedPingResult
             }
         }
 
+        private IList _selectedPingResults = new ArrayList();
+        public IList SelectedPingResults
+        {
+            get => _selectedPingResults;
+            set
+            {
+                if (Equals(value, _selectedPingResults))
+                    return;
+
+                _selectedPingResults = value;
+                OnPropertyChanged();
+            }
+        }
+
         private int _pingsTransmitted;
         public int PingsTransmitted
         {
@@ -278,13 +298,16 @@ public string StatusMessage
 
         public bool ShowStatistics => SettingsManager.Current.Ping_ShowStatistics;
 
+        public bool HighlightTimeouts => SettingsManager.Current.Ping_HighlightTimeouts;
         #endregion
 
         #region Contructor, load settings    
-        public PingViewModel(int tabId, string host)
+        public PingViewModel(IDialogCoordinator instance, int tabId, string host)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             Host = host;
 
@@ -292,7 +315,7 @@ public PingViewModel(int tabId, string host)
             HostHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.Ping_HostHistory);
 
             // Result view
-            PingResultView = CollectionViewSource.GetDefaultView(PingResult);
+            PingResultsView = CollectionViewSource.GetDefaultView(PingResults);
 
             LoadSettings();
 
@@ -400,7 +423,47 @@ public ICommand CopySelectedStatusCommand
 
         private void CopySelectedStatusAction()
         {
-            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString("IPStatus_" + SelectedPingResult.Status));
+            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString("IPStatus_" + SelectedPingResult.Status, LocalizationManager.Culture));
+        }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? PingResults : new ObservableCollection<PingInfo>(SelectedPingResults.Cast<PingInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Ping_ExportFileType = instance.FileType;
+                SettingsManager.Current.Ping_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Ping_ExportFileType, SettingsManager.Current.Ping_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
 
@@ -419,7 +482,7 @@ private async void StartPing()
             EndTime = null;
 
             // Reset the latest results
-            PingResult.Clear();
+            PingResults.Clear();
             PingsTransmitted = 0;
             PingsReceived = 0;
             PingsLost = 0;
@@ -441,13 +504,14 @@ private async void StartPing()
             // Try to parse the string into an IP-Address
             var hostIsIP = IPAddress.TryParse(Host, out var ipAddress);
 
-            try
+            if (!hostIsIP)
             {
-                // Try to resolve the hostname
-                var ipHostEntrys = await Dns.GetHostEntryAsync(Host);
-
-                if (!hostIsIP)
+                try
                 {
+                    // Try to resolve the hostname
+                    var ipHostEntrys = await Dns.GetHostEntryAsync(Host);
+
+
                     foreach (var ip in ipHostEntrys.AddressList)
                     {
                         switch (ip.AddressFamily)
@@ -468,26 +532,26 @@ private async void StartPing()
                         break;
                     }
                 }
-            }
-            catch (SocketException) // This will catch DNS resolve errors
-            {
-                if (CancelPing)
-                    UserHasCanceled();
-                else
-                    PingFinished();
+                catch (SocketException) // This will catch DNS resolve errors
+                {
+                    if (CancelPing)
+                        UserHasCanceled();
+                    else
+                        PingFinished();
 
-                StatusMessage = string.Format(Resources.Localization.Strings.CouldNotResolveHostnameFor, Host);
-                DisplayStatusMessage = true;
+                    StatusMessage = string.Format(Resources.Localization.Strings.CouldNotResolveHostnameFor, Host);
+                    DisplayStatusMessage = true;
 
-                return;
-            }                                            
+                    return;
+                }
+            }
 
             // Add the hostname or ip address to the history
             AddHostToHistory(Host);
 
             _cancellationTokenSource = new CancellationTokenSource();
 
-            var pingOptions = new PingOptions()
+            var pingOptions = new PingOptions
             {
                 Attempts = SettingsManager.Current.Ping_Attempts,
                 Timeout = SettingsManager.Current.Ping_Timeout,
@@ -566,8 +630,8 @@ private void Ping_PingReceived(object sender, PingReceivedArgs e)
             // Add the result to the collection
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
             {
-                lock (PingResult)
-                    PingResult.Add(pingInfo);
+                lock (PingResults)
+                    PingResults.Add(pingInfo);
             }));
 
             // Calculate statistics
@@ -592,8 +656,8 @@ private void Ping_PingReceived(object sender, PingReceivedArgs e)
 
                     // lock, because the collection is changed from another thread...
                     // I hope this won't slow the application or causes a hight cpu load
-                    lock (PingResult)
-                        AverageTime = (int)PingResult.Average(s => s.Time);
+                    lock (PingResults)
+                        AverageTime = (int)PingResults.Average(s => s.Time);
                 }
             }
             else
@@ -646,6 +710,9 @@ private void SettingsManager_PropertyChanged(object sender, PropertyChangedEvent
         {
             if (e.PropertyName == nameof(SettingsInfo.Ping_ShowStatistics))
                 OnPropertyChanged(nameof(ShowStatistics));
+
+            if (e.PropertyName == nameof(SettingsInfo.Ping_HighlightTimeouts))
+                OnPropertyChanged(nameof(HighlightTimeouts));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs
index 69eb5b4cde..79c6f02509 100644
--- a/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs
@@ -107,7 +107,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.PortScanner_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -372,18 +372,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
index 1e9af15f4c..e770af7c3b 100644
--- a/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PortScannerViewModel.cs
@@ -1,6 +1,7 @@
 using System.Windows.Input;
 using System.Windows;
 using System;
+using System.Collections;
 using System.Collections.ObjectModel;
 using NETworkManager.Models.Settings;
 using System.Collections.Generic;
@@ -15,13 +16,18 @@
 using System.Linq;
 using NETworkManager.Utilities;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class PortScannerViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private CancellationTokenSource _cancellationTokenSource;
 
         private readonly int _tabId;
@@ -93,31 +99,45 @@ public bool CancelScan
             }
         }
 
-        private ObservableCollection<PortInfo> _portScanResult = new ObservableCollection<PortInfo>();
+        private ObservableCollection<PortInfo> _portScanResults = new ObservableCollection<PortInfo>();
         public ObservableCollection<PortInfo> PortScanResult
         {
-            get => _portScanResult;
+            get => _portScanResults;
             set
             {
-                if (_portScanResult != null && value == _portScanResult)
+                if (_portScanResults != null && value == _portScanResults)
                     return;
 
-                _portScanResult = value;
+                _portScanResults = value;
             }
         }
 
-        public ICollectionView PortScanResultView { get; }
+        public ICollectionView PortScanResultsView { get; }
+
+        private PortInfo _selectedPortScanResult;
+        public PortInfo SelectedPortScanResult
+        {
+            get => _selectedPortScanResult;
+            set
+            {
+                if (value == _selectedPortScanResult)
+                    return;
+
+                _selectedPortScanResult = value;
+                OnPropertyChanged();
+            }
+        }
 
-        private PortInfo _selectedScanResult;
-        public PortInfo SelectedScanResult
+        private IList _selectedPortScanResults = new ArrayList();
+        public IList SelectedPortScanResults
         {
-            get => _selectedScanResult;
+            get => _selectedPortScanResults;
             set
             {
-                if (value == _selectedScanResult)
+                if (Equals(value, _selectedPortScanResults))
                     return;
 
-                _selectedScanResult = value;
+                _selectedPortScanResults = value;
                 OnPropertyChanged();
             }
         }
@@ -270,10 +290,12 @@ public string StatusMessage
         #endregion
 
         #region Constructor, load settings, shutdown
-        public PortScannerViewModel(int tabId, string host, string port)
+        public PortScannerViewModel(IDialogCoordinator instance, int tabId, string host, string port)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             Host = host;
             Port = port;
@@ -283,8 +305,8 @@ public PortScannerViewModel(int tabId, string host, string port)
             PortHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.PortScanner_PortHistory);
 
             // Result view
-            PortScanResultView = CollectionViewSource.GetDefaultView(PortScanResult);
-            PortScanResultView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(PortInfo.Host)));
+            PortScanResultsView = CollectionViewSource.GetDefaultView(PortScanResult);
+            PortScanResultsView.GroupDescriptions.Add(new PropertyGroupDescription(nameof(PortInfo.IPAddress)));
 
             LoadSettings();
 
@@ -339,7 +361,7 @@ public ICommand CopySelectedIPAddressCommand
 
         private void CopySelectedIPAddressAction()
         {
-            CommonMethods.SetClipboard(SelectedScanResult.Host.Item1.ToString());
+            CommonMethods.SetClipboard(SelectedPortScanResult.IPAddress.ToString());
         }
 
         public ICommand CopySelectedHostnameCommand
@@ -349,7 +371,7 @@ public ICommand CopySelectedHostnameCommand
 
         private void CopySelectedHostnameAction()
         {
-            CommonMethods.SetClipboard(SelectedScanResult.Host.Item2);
+            CommonMethods.SetClipboard(SelectedPortScanResult.Hostname);
         }
 
         public ICommand CopySelectedPortCommand
@@ -359,7 +381,7 @@ public ICommand CopySelectedPortCommand
 
         private void CopySelectedPortAction()
         {
-            CommonMethods.SetClipboard(SelectedScanResult.Port.ToString());
+            CommonMethods.SetClipboard(SelectedPortScanResult.Port.ToString());
         }
 
         public ICommand CopySelectedStatusCommand
@@ -369,7 +391,7 @@ public ICommand CopySelectedStatusCommand
 
         private void CopySelectedStatusAction()
         {
-            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString(SelectedScanResult.Status.ToString()));
+            CommonMethods.SetClipboard(Resources.Localization.Strings.ResourceManager.GetString(SelectedPortScanResult.Status.ToString(), LocalizationManager.Culture));
         }
 
         public ICommand CopySelectedProtocolCommand
@@ -379,7 +401,7 @@ public ICommand CopySelectedProtocolCommand
 
         private void CopySelectedProtocolAction()
         {
-            CommonMethods.SetClipboard(SelectedScanResult.LookupInfo.Protocol.ToString());
+            CommonMethods.SetClipboard(SelectedPortScanResult.LookupInfo.Protocol.ToString());
         }
 
         public ICommand CopySelectedServiceCommand
@@ -389,7 +411,7 @@ public ICommand CopySelectedServiceCommand
 
         private void CopySelectedServiceAction()
         {
-            CommonMethods.SetClipboard(SelectedScanResult.LookupInfo.Service);
+            CommonMethods.SetClipboard(SelectedPortScanResult.LookupInfo.Service);
         }
 
         public ICommand CopySelectedDescriptionCommand
@@ -399,7 +421,50 @@ public ICommand CopySelectedDescriptionCommand
 
         private void CopySelectedDescriptionAction()
         {
-            CommonMethods.SetClipboard(SelectedScanResult.LookupInfo.Description);
+            CommonMethods.SetClipboard(SelectedPortScanResult.LookupInfo.Description);
+        }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType,
+                        instance.ExportAll
+                            ? PortScanResult
+                            : new ObservableCollection<PortInfo>(SelectedPortScanResults.Cast<PortInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.PortScanner_ExportFileType = instance.FileType;
+                SettingsManager.Current.PortScanner_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.PortScanner_ExportFileType, SettingsManager.Current.PortScanner_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
 
diff --git a/Source/NETworkManager/ViewModels/ProfilesViewModel.cs b/Source/NETworkManager/ViewModels/ProfilesViewModel.cs
index 2ab7884d7c..6f62288aea 100644
--- a/Source/NETworkManager/ViewModels/ProfilesViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ProfilesViewModel.cs
@@ -9,6 +9,8 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Collections;
+using System.Diagnostics;
+using System.Windows.Threading;
 
 namespace NETworkManager.ViewModels
 {
@@ -16,7 +18,8 @@ public class ProfilesViewModel : ViewModelBase
     {
         #region Variables
         private readonly IDialogCoordinator _dialogCoordinator;
-        
+        private readonly DispatcherTimer _searchDispatcherTimer = new DispatcherTimer();
+
         public ICollectionView Profiles { get; }
 
         private ProfileInfo _selectedProfile = new ProfileInfo();
@@ -58,7 +61,7 @@ public string Search
 
                 _search = value;
 
-                Profiles.Refresh();
+                _searchDispatcherTimer.Start();
 
                 OnPropertyChanged();
             }
@@ -94,6 +97,9 @@ public ProfilesViewModel(IDialogCoordinator instance)
 
             // This will select the first entry as selected item...
             SelectedProfile = Profiles.SourceCollection.Cast<ProfileInfo>().OrderBy(x => x.Group).ThenBy(x => x.Name).FirstOrDefault();
+
+            _searchDispatcherTimer.Interval = GlobalStaticConfiguration.SearchDispatcherTimerTimeSpan;
+            _searchDispatcherTimer.Tick += SearchDispatcherTimer_Tick;
         }
         #endregion
 
@@ -110,7 +116,12 @@ private void AddProfileAction()
 
         public ICommand EditProfileCommand
         {
-            get { return new RelayCommand(p => EditProfileAction()); }
+            get { return new RelayCommand(p => EditProfileAction(), EditProfile_CanExecute); }
+        }
+
+        private bool EditProfile_CanExecute(object paramter)
+        {
+            return SelectedProfiles.Count == 1;
         }
 
         private void EditProfileAction()
@@ -285,5 +296,14 @@ public void Refresh()
             Profiles.Refresh();
         }
         #endregion
+
+        #region Event
+        private void SearchDispatcherTimer_Tick(object sender, EventArgs e)
+        {
+            _searchDispatcherTimer.Stop();
+
+            Profiles.Refresh();
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
index 4551bef9af..80ca1e8dba 100644
--- a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
@@ -123,7 +123,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.PuTTY_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -193,7 +193,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.PuTTY_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.PuTTY_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.PuTTY_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.PuTTY_ProfileWidth;
         }
@@ -604,18 +604,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index 6e2eee1df2..e1ada391f3 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -120,7 +120,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.RemoteDesktop_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -186,7 +186,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.RemoteDesktop_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.RemoteDesktop_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.RemoteDesktop_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.RemoteDesktop_ProfileWidth;
         }
@@ -699,18 +699,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
index 3df3ed13b4..c369189624 100644
--- a/Source/NETworkManager/ViewModels/SNMPViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
@@ -2,6 +2,7 @@
 using NETworkManager.Models.Network;
 using NETworkManager.Models.Settings;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -16,12 +17,17 @@
 using static NETworkManager.Models.Network.SNMP;
 using NETworkManager.Controls;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class SNMPViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private readonly DispatcherTimer _dispatcherTimer = new DispatcherTimer();
         private readonly Stopwatch _stopwatch = new Stopwatch();
 
@@ -240,20 +246,20 @@ public bool IsWorking
             }
         }
 
-        private ObservableCollection<SNMPReceivedInfo> _queryResult = new ObservableCollection<SNMPReceivedInfo>();
-        public ObservableCollection<SNMPReceivedInfo> QueryResult
+        private ObservableCollection<SNMPReceivedInfo> _queryResults = new ObservableCollection<SNMPReceivedInfo>();
+        public ObservableCollection<SNMPReceivedInfo> QueryResults
         {
-            get => _queryResult;
+            get => _queryResults;
             set
             {
-                if (Equals(value, _queryResult))
+                if (Equals(value, _queryResults))
                     return;
 
-                _queryResult = value;
+                _queryResults = value;
             }
         }
 
-        public ICollectionView QueryResultView { get; }
+        public ICollectionView QueryResultsView { get; }
 
         private SNMPReceivedInfo _selectedQueryResult;
         public SNMPReceivedInfo SelectedQueryResult
@@ -269,6 +275,21 @@ public SNMPReceivedInfo SelectedQueryResult
             }
         }
 
+        private IList _selectedQueryResults = new ArrayList();
+        public IList SelectedQueryResults
+        {
+            get => _selectedQueryResults;
+            set
+            {
+                if (Equals(value, _selectedQueryResults))
+                    return;
+
+                _selectedQueryResults = value;
+                OnPropertyChanged();
+            }
+        }
+
+
         private bool _displayStatusMessage;
         public bool DisplayStatusMessage
         {
@@ -375,10 +396,12 @@ public bool ExpandStatistics
         #endregion
 
         #region Contructor, load settings
-        public SNMPViewModel(int tabId, string host)
+        public SNMPViewModel(IDialogCoordinator instance, int tabId, string host)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+            
             _tabId = tabId;
             Host = host;
 
@@ -387,21 +410,21 @@ public SNMPViewModel(int tabId, string host)
             OIDHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SNMP_OIDHistory);
 
             // Result view
-            QueryResultView = CollectionViewSource.GetDefaultView(QueryResult);
-            QueryResultView.SortDescriptions.Add(new SortDescription(nameof(SNMPReceivedInfo.OID), ListSortDirection.Ascending));
+            QueryResultsView = CollectionViewSource.GetDefaultView(QueryResults);
+            QueryResultsView.SortDescriptions.Add(new SortDescription(nameof(SNMPReceivedInfo.OID), ListSortDirection.Ascending));
 
             // Versions (v1, v2c, v3)
             Versions = Enum.GetValues(typeof(SNMPVersion)).Cast<SNMPVersion>().ToList();
 
             // Modes
-            Modes = new List<SNMPMode>() { SNMPMode.Get, SNMPMode.Walk, SNMPMode.Set };
+            Modes = new List<SNMPMode> { SNMPMode.Get, SNMPMode.Walk, SNMPMode.Set };
 
             // Security
-            Securitys = new List<SNMPV3Security>() { SNMPV3Security.NoAuthNoPriv, SNMPV3Security.AuthNoPriv, SNMPV3Security.AuthPriv };
+            Securitys = new List<SNMPV3Security> { SNMPV3Security.NoAuthNoPriv, SNMPV3Security.AuthNoPriv, SNMPV3Security.AuthPriv };
 
             // Auth / Priv
-            AuthenticationProviders = new List<SNMPV3AuthenticationProvider>() { SNMPV3AuthenticationProvider.MD5, SNMPV3AuthenticationProvider.SHA1 };
-            PrivacyProviders = new List<SNMPV3PrivacyProvider>() { SNMPV3PrivacyProvider.DES, SNMPV3PrivacyProvider.AES };
+            AuthenticationProviders = new List<SNMPV3AuthenticationProvider> { SNMPV3AuthenticationProvider.MD5, SNMPV3AuthenticationProvider.SHA1 };
+            PrivacyProviders = new List<SNMPV3PrivacyProvider> { SNMPV3PrivacyProvider.DES, SNMPV3PrivacyProvider.AES };
 
             LoadSettings();
 
@@ -453,6 +476,45 @@ private void CopySelectedDataAction()
             CommonMethods.SetClipboard(SelectedQueryResult.Data);
         }
 
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? QueryResults : new ObservableCollection<SNMPReceivedInfo>(SelectedQueryResults.Cast<SNMPReceivedInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.SNMP_ExportFileType = instance.FileType;
+                SettingsManager.Current.SNMP_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.SNMP_ExportFileType, SettingsManager.Current.SNMP_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods
@@ -469,7 +531,7 @@ private async void Work()
             _dispatcherTimer.Start();
             EndTime = null;
 
-            QueryResult.Clear();
+            QueryResults.Clear();
             Responses = 0;
 
             // Change the tab title (not nice, but it works)
@@ -622,8 +684,8 @@ private void Snmp_Received(object sender, SNMPReceivedArgs e)
 
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
             {
-                lock (QueryResult)
-                    QueryResult.Add(snmpReceivedInfo);
+                lock (QueryResults)
+                    QueryResults.Add(snmpReceivedInfo);
             }));
 
             Responses++;
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
index 77a2ea8842..a17e1a6ab2 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs
@@ -9,8 +9,12 @@
 using System.Linq;
 using System.Net;
 using System;
+using System.Collections;
 using System.Threading.Tasks;
 using System.Windows.Threading;
+using NETworkManager.Models.Export;
+using NETworkManager.Models.Network;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
@@ -94,7 +98,7 @@ public ObservableCollection<IPNetwork> SubnetsResult
             }
         }
 
-        public ICollectionView SubnetsResultView { get; }
+        public ICollectionView SubnetsResultsView { get; }
 
         private IPNetwork _selectedSubnetResult;
         public IPNetwork SelectedSubnetResult
@@ -110,6 +114,22 @@ public IPNetwork SelectedSubnetResult
             }
         }
 
+
+        private IList _selectedSubnetResults = new ArrayList();
+        public IList SelectedSubnetResults
+        {
+            get => _selectedSubnetResults;
+            set
+            {
+                if (Equals(value, _selectedSubnetResults))
+                    return;
+
+                _selectedSubnetResults = value;
+                OnPropertyChanged();
+            }
+        }
+
+
         private bool _displayStatusMessage;
         public bool DisplayStatusMessage
         {
@@ -149,7 +169,7 @@ public SubnetCalculatorSubnettingViewModel(IDialogCoordinator instance)
             NewSubnetmaskOrCIDRHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Subnetting_NewSubnetmaskOrCIDRHistory);
 
             // Result view
-            SubnetsResultView = CollectionViewSource.GetDefaultView(SubnetsResult);
+            SubnetsResultsView = CollectionViewSource.GetDefaultView(SubnetsResult);
         }
         #endregion
 
@@ -243,6 +263,46 @@ private void CopySelectedHostAction()
         {
             CommonMethods.SetClipboard(SelectedSubnetResult.Usable.ToString());
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? SubnetsResult : new ObservableCollection<IPNetwork>(SelectedSubnetResults.Cast<IPNetwork>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.SubnetCalculator_Subnetting_ExportFileType = instance.FileType;
+                SettingsManager.Current.SubnetCalculator_Subnetting_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.SubnetCalculator_Subnetting_ExportFileType, SettingsManager.Current.SubnetCalculator_Subnetting_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods
@@ -259,7 +319,7 @@ private async void Subnetting()
             // Ask the user if there is a large calculation...
             var baseCidr = subnet.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork ? 32 : 128;
 
-            if (65535 < (Math.Pow(2, baseCidr - subnet.Cidr) / Math.Pow(2, (baseCidr - newCidr))))
+            if (65535 < Math.Pow(2, baseCidr - subnet.Cidr) / Math.Pow(2, (baseCidr - newCidr)))
             {
                 var settings = AppearanceManager.MetroDialog;
 
@@ -281,7 +341,7 @@ await Task.Run(() =>
             {
                 foreach (var network in subnet.Subnet(newCidr))
                 {
-                    Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate ()
+                    Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
                     {
                         lock (SubnetsResult)
                             SubnetsResult.Add(network);
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs
similarity index 71%
rename from Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs
rename to Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs
index 88ab5125f8..61ccf2dbd8 100644
--- a/Source/NETworkManager/ViewModels/SubnetCalculatorSupernettingViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SubnetCalculatorWideSubnetViewModel.cs
@@ -1,5 +1,4 @@
-using System;
-using NETworkManager.Models.Settings;
+using NETworkManager.Models.Settings;
 using System.Windows.Input;
 using NETworkManager.Utilities;
 using System.Windows.Data;
@@ -11,7 +10,7 @@
 
 namespace NETworkManager.ViewModels
 {
-    public class SubnetCalculatorSupernettingViewModel : ViewModelBase
+    public class SubnetCalculatorWideSubnetViewModel : ViewModelBase
     {
         #region Variables
         private readonly IDialogCoordinator _dialogCoordinator;
@@ -191,13 +190,13 @@ public BigInteger Hosts
         #endregion
 
         #region Constructor, load settings
-        public SubnetCalculatorSupernettingViewModel(IDialogCoordinator instance)
+        public SubnetCalculatorWideSubnetViewModel(IDialogCoordinator instance)
         {
             _dialogCoordinator = instance;
 
             // Set collection view
-            Subnet1HistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Supernetting_Subnet1);
-            Subnet2HistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_Supernetting_Subnet2);
+            Subnet1HistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet1);
+            Subnet2HistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet2);
         }
         #endregion
 
@@ -214,73 +213,56 @@ private void CalculateAction()
         #endregion
 
         #region Methods
-        private async void Calculate()
+        private void Calculate()
         {
-            try
-            {
-                IsCalculationRunning = true;
-
-                var subnet1 = IPNetwork.Parse(Subnet1);
-                var subnet2 = IPNetwork.Parse(Subnet2);
+            IsCalculationRunning = true;
 
-                var subnet = subnet1.Supernet(subnet2);
+            var subnet1 = IPNetwork.Parse(Subnet1);
+            var subnet2 = IPNetwork.Parse(Subnet2);
 
-                NetworkAddress = subnet.Network;
-                Broadcast = subnet.Broadcast;
-                Subnetmask = subnet.Netmask;
-                CIDR = subnet.Cidr;
-                IPAddresses = subnet.Total;
-                FirstIPAddress = subnet.FirstUsable;
-                LastIPAddress = subnet.LastUsable;
-                Hosts = subnet.Usable;
+            var subnet = IPNetwork.WideSubnet(new [] {subnet1, subnet2}); //IPNetwork.WideSubnet(new[] { subnet1, subnet2 });
 
-                IsResultVisible = true;
-
-                AddSubnet1ToHistory(Subnet1);
-                AddSubnet2ToHistory(Subnet2);
-            }
-            catch (ArgumentOutOfRangeException ex)
-            {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+            NetworkAddress = subnet.Network;
+            Broadcast = subnet.Broadcast;
+            Subnetmask = subnet.Netmask;
+            CIDR = subnet.Cidr;
+            IPAddresses = subnet.Total;
+            FirstIPAddress = subnet.FirstUsable;
+            LastIPAddress = subnet.LastUsable;
+            Hosts = subnet.Usable;
 
-                ConfigurationManager.Current.IsDialogOpen = true;
+            IsResultVisible = true;
 
-                await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, "This is a known error, see:\n\nhttps://github.com/BornToBeRoot/NETworkManager/issues/151\n\n\n--- Error message ---\n" + 
-                    ex.Message, MessageDialogStyle.Affirmative, settings);
+            AddSubnet1ToHistory(Subnet1);
+            AddSubnet2ToHistory(Subnet2);
 
-                ConfigurationManager.Current.IsDialogOpen = false;
-            }
-            finally
-            {
-                IsCalculationRunning = false;
-            }
+            IsCalculationRunning = false;
         }
 
         private void AddSubnet1ToHistory(string subnet)
         {
             // Create the new list
-            var list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_Supernetting_Subnet1.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
+            var list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet1.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
-            SettingsManager.Current.SubnetCalculator_Supernetting_Subnet1.Clear();
+            SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet1.Clear();
             OnPropertyChanged(nameof(Subnet1)); // Raise property changed again, after the collection has been cleared
 
             // Fill with the new items
-            list.ForEach(x => SettingsManager.Current.SubnetCalculator_Supernetting_Subnet1.Add(x));
+            list.ForEach(x => SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet1.Add(x));
         }
 
         private void AddSubnet2ToHistory(string subnet)
         {
             // Create the new list
-            var list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_Supernetting_Subnet2.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
+            var list = ListHelper.Modify(SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet2.ToList(), subnet, SettingsManager.Current.General_HistoryListEntries);
 
             // Clear the old items
-            SettingsManager.Current.SubnetCalculator_Supernetting_Subnet2.Clear();
+            SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet2.Clear();
             OnPropertyChanged(nameof(Subnet2)); // Raise property changed again, after the collection has been cleared
 
             // Fill with the new items
-            list.ForEach(x => SettingsManager.Current.SubnetCalculator_Supernetting_Subnet2.Add(x));
+            list.ForEach(x => SettingsManager.Current.SubnetCalculator_WideSubnet_Subnet2.Add(x));
         }
 
         public void OnShutdown()
diff --git a/Source/NETworkManager/ViewModels/TightVNCHostViewModel.cs b/Source/NETworkManager/ViewModels/TightVNCHostViewModel.cs
index 179cbba2a4..93c45664de 100644
--- a/Source/NETworkManager/ViewModels/TightVNCHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TightVNCHostViewModel.cs
@@ -123,7 +123,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.TightVNC_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -193,7 +193,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.TightVNC_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.TightVNC_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.TightVNC_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.TightVNC_ProfileWidth;
         }
@@ -539,18 +539,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
                 if (dueToChangedSize)
                 {
-                    ExpandProfileView = ProfileWidth.Value != 40;
+                    ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
                 }
                 else
                 {
                     if (ExpandProfileView)
                     {
-                        ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                        ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                     }
                     else
                     {
                         _tempProfileWidth = ProfileWidth.Value;
-                        ProfileWidth = new GridLength(40);
+                        ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                     }
                 }
 
diff --git a/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs
index 0b12b992b5..f9fc2aa858 100644
--- a/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs
@@ -108,7 +108,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.Traceroute_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -170,7 +170,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.Traceroute_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Traceroute_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Traceroute_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.Traceroute_ProfileWidth;
         }
@@ -373,18 +373,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
index efc5f6e6f1..5e8f53d24e 100644
--- a/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
+++ b/Source/NETworkManager/ViewModels/TracerouteViewModel.cs
@@ -2,6 +2,7 @@
 using System.Windows.Input;
 using System.Windows;
 using System;
+using System.Collections;
 using System.Collections.ObjectModel;
 using System.Net.Sockets;
 using NETworkManager.Models.Settings;
@@ -15,13 +16,18 @@
 using System.Windows.Data;
 using System.Linq;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
+using NETworkManager.Models.Export;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class TracerouteViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+
         private CancellationTokenSource _cancellationTokenSource;
 
         private readonly int _tabId;
@@ -76,20 +82,20 @@ public bool CancelTrace
             }
         }
 
-        private ObservableCollection<TracerouteHopInfo> _traceResult = new ObservableCollection<TracerouteHopInfo>();
-        public ObservableCollection<TracerouteHopInfo> TraceResult
+        private ObservableCollection<TracerouteHopInfo> _traceResults = new ObservableCollection<TracerouteHopInfo>();
+        public ObservableCollection<TracerouteHopInfo> TraceResults
         {
-            get => _traceResult;
+            get => _traceResults;
             set
             {
-                if (Equals(value, _traceResult))
+                if (Equals(value, _traceResults))
                     return;
 
-                _traceResult = value;
+                _traceResults = value;
             }
         }
 
-        public ICollectionView TraceResultView { get; }
+        public ICollectionView TraceResultsView { get; }
 
         private TracerouteHopInfo _selectedTraceResult;
         public TracerouteHopInfo SelectedTraceResult
@@ -105,6 +111,20 @@ public TracerouteHopInfo SelectedTraceResult
             }
         }
 
+        private IList _selectedTraceResults = new ArrayList();
+        public IList SelectedTraceResults
+        {
+            get => _selectedTraceResults;
+            set
+            {
+                if (Equals(value, _selectedTraceResults))
+                    return;
+
+                _selectedTraceResults = value;
+                OnPropertyChanged();
+            }
+        }
+
         public bool ResolveHostname => SettingsManager.Current.Traceroute_ResolveHostname;
 
         private bool _displayStatusMessage;
@@ -213,10 +233,12 @@ public int Hops
         #endregion
 
         #region Constructor, load settings
-        public TracerouteViewModel(int tabId, string host)
+        public TracerouteViewModel(IDialogCoordinator instance, int tabId, string host)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             Host = host;
 
@@ -224,8 +246,8 @@ public TracerouteViewModel(int tabId, string host)
             HostHistoryView = CollectionViewSource.GetDefaultView(SettingsManager.Current.Traceroute_HostHistory);
 
             // Result view
-            TraceResultView = CollectionViewSource.GetDefaultView(TraceResult);
-            TraceResultView.SortDescriptions.Add(new SortDescription(nameof(TracerouteHopInfo.Hop), ListSortDirection.Ascending));
+            TraceResultsView = CollectionViewSource.GetDefaultView(TraceResults);
+            TraceResultsView.SortDescriptions.Add(new SortDescription(nameof(TracerouteHopInfo.Hop), ListSortDirection.Ascending));
 
             LoadSettings();
 
@@ -363,6 +385,46 @@ private void CopySelectedHostnameAction()
         {
             CommonMethods.SetClipboard(SelectedTraceResult.Hostname);
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Resources.Localization.Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, instance.FileType, instance.ExportAll ? TraceResults : new ObservableCollection<TracerouteHopInfo>(SelectedTraceResults.Cast<TracerouteHopInfo>().ToArray()));
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Resources.Localization.Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, Resources.Localization.Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Traceroute_ExportFileType = instance.FileType;
+                SettingsManager.Current.Traceroute_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Traceroute_ExportFileType, SettingsManager.Current.Traceroute_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods
@@ -385,7 +447,7 @@ private async void StartTrace()
             _dispatcherTimer.Start();
             EndTime = null;
 
-            TraceResult.Clear();
+            TraceResults.Clear();
             Hops = 0;
 
             // Change the tab title (not nice, but it works)
@@ -514,8 +576,8 @@ private void Traceroute_HopReceived(object sender, TracerouteHopReceivedArgs e)
 
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(delegate
             {
-                lock (TraceResult)
-                    TraceResult.Add(tracerouteInfo);
+                lock (TraceResults)
+                    TraceResults.Add(tracerouteInfo);
             }));
 
             Hops++;
diff --git a/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs b/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs
index 6b2316e612..100b0194e4 100644
--- a/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs
@@ -221,7 +221,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.WakeOnLAN_ClientWidth = value.Value;
 
                 _profileWidth = value;
@@ -278,7 +278,7 @@ private void LoadSettings()
             Port = SettingsManager.Current.WakeOnLAN_Port;
             ExpandProfileView = SettingsManager.Current.WakeOnLAN_ExpandClientView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.WakeOnLAN_ClientWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.WakeOnLAN_ClientWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.WakeOnLAN_ClientWidth;
         }
@@ -518,18 +518,18 @@ private void ResizeClient(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/WhoisHostViewModel.cs b/Source/NETworkManager/ViewModels/WhoisHostViewModel.cs
index 433c554432..87a0d8ed63 100644
--- a/Source/NETworkManager/ViewModels/WhoisHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WhoisHostViewModel.cs
@@ -107,7 +107,7 @@ public GridLength ProfileWidth
                 if (value == _profileWidth)
                     return;
 
-                if (!_isLoading && value.Value != 40) // Do not save the size when collapsed
+                if (!_isLoading && value.Value != GlobalStaticConfiguration.ProfileWidthCollapsed) // Do not save the size when collapsed
                     SettingsManager.Current.Whois_ProfileWidth = value.Value;
 
                 _profileWidth = value;
@@ -169,7 +169,7 @@ private void LoadSettings()
         {
             ExpandProfileView = SettingsManager.Current.Whois_ExpandProfileView;
 
-            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Whois_ProfileWidth) : new GridLength(40);
+            ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Whois_ProfileWidth) : new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
 
             _tempProfileWidth = SettingsManager.Current.Whois_ProfileWidth;
         }
@@ -373,18 +373,18 @@ private void ResizeProfile(bool dueToChangedSize)
 
             if (dueToChangedSize)
             {
-                ExpandProfileView = ProfileWidth.Value != 40;
+                ExpandProfileView = ProfileWidth.Value != GlobalStaticConfiguration.ProfileWidthCollapsed;
             }
             else
             {
                 if (ExpandProfileView)
                 {
-                    ProfileWidth = _tempProfileWidth == 40 ? new GridLength(250) : new GridLength(_tempProfileWidth);
+                    ProfileWidth = _tempProfileWidth == GlobalStaticConfiguration.ProfileWidthCollapsed ? new GridLength(GlobalStaticConfiguration.ProfileDefaultWidthExpanded) : new GridLength(_tempProfileWidth);
                 }
                 else
                 {
                     _tempProfileWidth = ProfileWidth.Value;
-                    ProfileWidth = new GridLength(40);
+                    ProfileWidth = new GridLength(GlobalStaticConfiguration.ProfileWidthCollapsed);
                 }
             }
 
diff --git a/Source/NETworkManager/ViewModels/WhoisViewModel.cs b/Source/NETworkManager/ViewModels/WhoisViewModel.cs
index fb06f3d305..681c58a18a 100644
--- a/Source/NETworkManager/ViewModels/WhoisViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WhoisViewModel.cs
@@ -1,5 +1,6 @@
 using NETworkManager.Models.Network;
 using System;
+using System.Collections.ObjectModel;
 using System.Windows.Input;
 using NETworkManager.Models.Settings;
 using System.Windows.Threading;
@@ -11,13 +12,18 @@
 using System.Windows;
 using NETworkManager.Controls;
 using Dragablz;
+using MahApps.Metro.Controls.Dialogs;
+using NETworkManager.Models.Export;
 using NETworkManager.Resources.Localization;
+using NETworkManager.Views;
 
 namespace NETworkManager.ViewModels
 {
     public class WhoisViewModel : ViewModelBase
     {
         #region Variables
+        private readonly IDialogCoordinator _dialogCoordinator;
+        
         private readonly int _tabId;
         private bool _firstLoad = true;
 
@@ -176,10 +182,12 @@ public bool ExpandStatistics
         #endregion
 
         #region Contructor, load settings
-        public WhoisViewModel(int tabId, string domain)
+        public WhoisViewModel(IDialogCoordinator instance ,int tabId, string domain)
         {
             _isLoading = true;
 
+            _dialogCoordinator = instance;
+
             _tabId = tabId;
             Domain = domain;
 
@@ -221,6 +229,46 @@ private void QueryAction()
         {
             Query();
         }
+
+        public ICommand ExportCommand
+        {
+            get { return new RelayCommand(p => ExportAction()); }
+        }
+
+        private async void ExportAction()
+        {
+            var customDialog = new CustomDialog
+            {
+                Title = Strings.Export
+            };
+
+            var exportViewModel = new ExportViewModel(async instance =>
+            {
+                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+
+                try
+                {
+                    ExportManager.Export(instance.FilePath, WhoisResult);
+                }
+                catch (Exception ex)
+                {
+                    var settings = AppearanceManager.MetroDialog;
+                    settings.AffirmativeButtonText = Strings.OK;
+
+                    await _dialogCoordinator.ShowMessageAsync(this, Strings.Error, Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine + Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                }
+
+                SettingsManager.Current.Whois_ExportFileType = instance.FileType;
+                SettingsManager.Current.Whois_ExportFilePath = instance.FilePath;
+            }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, SettingsManager.Current.Whois_ExportFileType, SettingsManager.Current.Whois_ExportFilePath);
+
+            customDialog.Content = new ExportDialog
+            {
+                DataContext = exportViewModel
+            };
+
+            await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        }
         #endregion
 
         #region Methods
diff --git a/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml b/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml
index 9be8bd659f..419f436fe3 100644
--- a/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml
+++ b/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml
@@ -30,9 +30,9 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.IPAddress}" />
-            <TextBox x:Name="TextBoxIpAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Address}">
+            <TextBox x:Name="TextBoxIPAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}">
                 <TextBox.Text>
-                    <Binding Path="IpAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                    <Binding Path="IPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
                             <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
                             <validators:IPv4AddressValidator ValidatesOnTargetUpdated="True" />
@@ -41,9 +41,9 @@
                 </TextBox.Text>
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.MACAddress}" />
-            <TextBox x:Name="TextBoxMacAddress" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleMACAddress}">
+            <TextBox x:Name="TextBoxMACAddress" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleMACAddress}">
                 <TextBox.Text>
-                    <Binding Path="MacAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                    <Binding Path="MACAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
                             <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
                             <validators:MACAddressValidator ValidatesOnTargetUpdated="True" />
@@ -61,8 +61,8 @@
                         <Style.Triggers>                            
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxIpAddress}" Value="False" />
-                                    <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxMacAddress}" Value="False" />
+                                    <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxIPAddress}" Value="False" />
+                                    <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxMACAddress}" Value="False" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="True" />
diff --git a/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml.cs b/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml.cs
index 396c175b89..34de9e7aa1 100644
--- a/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml.cs
+++ b/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml.cs
@@ -10,7 +10,7 @@ public ARPTableAddEntryDialog()
         private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
         {
             // Need to be in loaded event, focusmanger won't work...
-            TextBoxIpAddress.Focus();
+            TextBoxIPAddress.Focus();
         }
     }
 }
diff --git a/Source/NETworkManager/Views/ARPTableView.xaml b/Source/NETworkManager/Views/ARPTableView.xaml
index 65fb62c47b..08f91d2bb7 100644
--- a/Source/NETworkManager/Views/ARPTableView.xaml
+++ b/Source/NETworkManager/Views/ARPTableView.xaml
@@ -11,6 +11,7 @@
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:utilities="clr-namespace:NETworkManager.Utilities"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
         dialogs:DialogParticipation.Register="{Binding}" d:DataContext="{d:DesignInstance viewModels:ARPTableViewModel}"
         mc:Ignorable="d">
     <UserControl.Resources>
@@ -30,8 +31,8 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <TextBox x:Name="TextBoxSearch" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Right" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
-        <DataGrid x:Name="DataGridArpTable" Grid.Row="2" ItemsSource="{Binding ARPTableView}" SelectedItem="{Binding SelectedARPTableInfo}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid x:Name="DataGridArpTable" Grid.Row="2" ItemsSource="{Binding ARPInfoResultsView}" SelectedItem="{Binding SelectedARPInfo}" SelectedItemsList="{Binding SelectedARPInfos, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource DefaultDataGrid}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -79,23 +80,44 @@
                             </Rectangle>
                         </MenuItem.Icon>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:ARPTableInfo.IPAddress)}" SortMemberPath="IPAddressInt32" MinWidth="150" />
-                <DataGridTextColumn Header="{x:Static localization:Strings.MACAddress}" Binding="{Binding (network:ARPTableInfo.MACAddress), Converter={StaticResource PhysicalAddressToStringConverter}}" MinWidth="200" />
-                <DataGridTextColumn Header="{x:Static localization:Strings.Multicast}" Binding="{Binding (network:ARPTableInfo.IsMulticast), Converter={StaticResource BooleanToStringConverter}}" MinWidth="100" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
+                <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:ARPInfo.IPAddress)}" SortMemberPath="IPAddressInt32" MinWidth="150" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.MACAddress}" Binding="{Binding (network:ARPInfo.MACAddress), Converter={StaticResource PhysicalAddressToStringConverter}}" MinWidth="200" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Multicast}" Binding="{Binding (network:ARPInfo.IsMulticast), Converter={StaticResource BooleanToStringConverter}}" MinWidth="100" Width="*" />
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
         <TextBlock Grid.Row="3" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         <mahAppsControls:MetroProgressBar Grid.Row="4" Margin="0,10,0,0" Foreground="{DynamicResource AccentColorBrush}" IsIndeterminate="True">
             <mahAppsControls:MetroProgressBar.Style>
@@ -144,7 +166,7 @@
                                     <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
                                 </Rectangle.OpacityMask>
                             </Rectangle>
-                            <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddEntry}" TextAlignment="Center" Margin="10,5" />
+                            <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddEntryDots}" TextAlignment="Center" Margin="10,5" />
                         </Grid>
                     </Button.Content>
                 </Button>
diff --git a/Source/NETworkManager/Views/ConnectionsView.xaml b/Source/NETworkManager/Views/ConnectionsView.xaml
index 4f7daae017..ad7d282776 100644
--- a/Source/NETworkManager/Views/ConnectionsView.xaml
+++ b/Source/NETworkManager/Views/ConnectionsView.xaml
@@ -11,6 +11,7 @@
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:utilities="clr-namespace:NETworkManager.Utilities"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ConnectionsViewModel}">
     <UserControl.Resources>
@@ -29,7 +30,7 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <TextBox x:Name="TextBoxSearch" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Right" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
-        <DataGrid x:Name="DataGridConnection" Grid.Row="2" ItemsSource="{Binding ConnectionsView}" SelectedItem="{Binding SelectedConnectionInfo}">
+        <controls:MultiSelectDataGrid x:Name="DataGridConnection" Grid.Row="2" ItemsSource="{Binding ConnectionResultsView}" SelectedItem="{Binding SelectedConnectionInfo}" SelectedItemsList="{Binding SelectedConnectionInfos, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource DefaultDataGrid}">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
@@ -96,10 +97,31 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
             </DataGrid.Resources>
             <DataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
@@ -113,9 +135,9 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.LocalPort}" Binding="{Binding (network:ConnectionInfo.LocalPort)}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.RemoteIPAddress}" Binding="{Binding (network:ConnectionInfo.RemoteIPAddress)}" SortMemberPath="RemoteIPAddressInt32" MinWidth="150"/>
                 <DataGridTextColumn Header="{x:Static localization:Strings.RemotePort}" Binding="{Binding (network:ConnectionInfo.RemotePort)}" MinWidth="100" />
-                <DataGridTextColumn Header="{x:Static localization:Strings.State}" Binding="{Binding (network:ConnectionInfo.State), Converter={StaticResource TcpStateToStringConverter}}" MinWidth="150" Width="*" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.State}" Binding="{Binding (network:ConnectionInfo.TcpState), Converter={StaticResource TcpStateToStringConverter}}" MinWidth="150" Width="*" />
             </DataGrid.Columns>
-        </DataGrid>
+        </controls:MultiSelectDataGrid>
         <TextBlock Grid.Row="3" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         <mahAppsControls:MetroProgressBar Grid.Row="4" Margin="0,10,0,0" Foreground="{DynamicResource AccentColorBrush}" IsIndeterminate="True">
             <mahAppsControls:MetroProgressBar.Style>
diff --git a/Source/NETworkManager/Views/ConnectionsView.xaml.cs b/Source/NETworkManager/Views/ConnectionsView.xaml.cs
index 127199d01f..2a25dd092d 100644
--- a/Source/NETworkManager/Views/ConnectionsView.xaml.cs
+++ b/Source/NETworkManager/Views/ConnectionsView.xaml.cs
@@ -1,11 +1,12 @@
 using NETworkManager.ViewModels;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
     public partial class ConnectionsView
     {
-        private readonly ConnectionsViewModel _viewModel = new ConnectionsViewModel();
+        private readonly ConnectionsViewModel _viewModel = new ConnectionsViewModel(DialogCoordinator.Instance);
 
         public ConnectionsView()
         {
diff --git a/Source/NETworkManager/Views/CredentialDialog.xaml b/Source/NETworkManager/Views/CredentialDialog.xaml
index f668f5a35a..aeef5e25cf 100644
--- a/Source/NETworkManager/Views/CredentialDialog.xaml
+++ b/Source/NETworkManager/Views/CredentialDialog.xaml
@@ -34,7 +34,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" />
-            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleCredentialName}">
+            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleCredentialName}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Style.Triggers>
@@ -66,7 +66,7 @@
                 </TextBox.Style>
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Username}" />
-            <TextBox x:Name="TextBoxUsername" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleUsername}">
+            <TextBox x:Name="TextBoxUsername" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                 <TextBox.Text>
                     <Binding Path="Username" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/CredentialsView.xaml b/Source/NETworkManager/Views/CredentialsView.xaml
index a69ef3fce2..a504485ee2 100644
--- a/Source/NETworkManager/Views/CredentialsView.xaml
+++ b/Source/NETworkManager/Views/CredentialsView.xaml
@@ -144,7 +144,7 @@
                 </Button>
                 <TextBox x:Name="TextBoxSearch" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
             </Grid>
-            <networkManagerControls:MultiSelectDataGrid x:Name="DataGridCredentials" Grid.Row="2" Style="{StaticResource MetroDataGrid}" FontSize="14" mah:ControlsHelper.ContentCharacterCasing="Normal" ItemsSource="{Binding Credentials}" SelectedItem="{Binding SelectedCredential}" SelectedItemsList="{Binding SelectedCredentials, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" CanUserResizeColumns="False" VerticalScrollBarVisibility="Auto" AutoGenerateColumns="false" IsReadOnly="True">
+            <networkManagerControls:MultiSelectDataGrid x:Name="DataGridCredentials" Grid.Row="2" EnableRowVirtualization="True" EnableColumnVirtualization="True" ScrollViewer.CanContentScroll="True" VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.IsVirtualizingWhenGrouping="True" VirtualizingPanel.VirtualizationMode="Recycling" Style="{StaticResource MetroDataGrid}" FontSize="14" mah:ControlsHelper.ContentCharacterCasing="Normal" ItemsSource="{Binding Credentials}" SelectedItem="{Binding SelectedCredential}" SelectedItemsList="{Binding SelectedCredentials, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" CanUserResizeColumns="False" VerticalScrollBarVisibility="Auto" AutoGenerateColumns="false" IsReadOnly="True">
                 <DataGrid.Resources>
                     <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                     <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
@@ -183,8 +183,8 @@
                     </Style>
                 </DataGrid.RowStyle>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="{x:Static localization:Strings.Name}" Binding="{Binding (settings:CredentialInfo.Name)}" MinWidth="200" />
-                    <DataGridTextColumn Header="{x:Static localization:Strings.Username}" Binding="{Binding (settings:CredentialInfo.Username)}" MinWidth="200" />
+                    <DataGridTextColumn Header="{x:Static localization:Strings.Name}" Binding="{Binding (settings:CredentialInfo.Name)}" SortMemberPath="Name" MinWidth="200" />
+                    <DataGridTextColumn Header="{x:Static localization:Strings.Username}" Binding="{Binding (settings:CredentialInfo.Username)}" SortMemberPath="Username" MinWidth="200" />
                     <DataGridTextColumn Header="{x:Static localization:Strings.Password}" Binding="{Binding Source={x:Static localization:StaticStrings.HiddenPassword}, Path=.}" MinWidth="200" />
                 </DataGrid.Columns>
             </networkManagerControls:MultiSelectDataGrid>
diff --git a/Source/NETworkManager/Views/CredentialsView.xaml.cs b/Source/NETworkManager/Views/CredentialsView.xaml.cs
index aca14361f9..4fc56de44f 100644
--- a/Source/NETworkManager/Views/CredentialsView.xaml.cs
+++ b/Source/NETworkManager/Views/CredentialsView.xaml.cs
@@ -2,6 +2,7 @@
 using NETworkManager.ViewModels;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace NETworkManager.Views
 {
@@ -25,9 +26,10 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
             _viewModel.CheckCredentialsLoaded();
         }
 
-        private void DataGridRow_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            _viewModel.Edit();
+            if (e.ChangedButton == MouseButton.Left)
+                _viewModel.Edit();
         }
     }
 }
diff --git a/Source/NETworkManager/Views/DNSLookupHostView.xaml b/Source/NETworkManager/Views/DNSLookupHostView.xaml
index 6efcc19d8d..374ddb32d3 100644
--- a/Source/NETworkManager/Views/DNSLookupHostView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupHostView.xaml
@@ -9,6 +9,7 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupHostViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -61,26 +62,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToPerformADNSLookup}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToPerformADNSLookup}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" x:Name="ExpanderProfiles" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -199,21 +216,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -233,20 +254,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
index cd4ef73ece..fce2d7aaa0 100644
--- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml
@@ -145,7 +145,7 @@
         </StackPanel>
         <mah:ToggleSwitch Header="{x:Static localization:Strings.AddDNSSuffixToHostname}" IsChecked="{Binding AddDNSSuffix}" Margin="0,0,0,10"/>
         <mah:ToggleSwitch Header="{x:Static localization:Strings.UseCustomDNSSuffix}" IsEnabled="{Binding AddDNSSuffix}" IsChecked="{Binding UseCustomDNSSuffix}" Margin="0,0,0,10"/>
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleSuffix}" Margin="0,0,0,10">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSuffix}" Margin="0,0,0,10">
             <TextBox.Resources>
                 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                     <Setter Property="IsEnabled" Value="False" />
diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml b/Source/NETworkManager/Views/DNSLookupView.xaml
index d7f3f7a076..8ce43604ad 100644
--- a/Source/NETworkManager/Views/DNSLookupView.xaml
+++ b/Source/NETworkManager/Views/DNSLookupView.xaml
@@ -11,6 +11,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupViewModel}">
     <UserControl.Resources>
@@ -51,7 +54,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Host}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="0" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="0" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -123,8 +126,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding LookupResultView}" SelectedItem="{Binding SelectedLookupResult}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding LookupResultsView}" SelectedItem="{Binding SelectedLookupResult}"  SelectedItemsList="{Binding SelectedLookupResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -181,18 +184,39 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.GroupStyle>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.GroupStyle>
                 <GroupStyle>
                     <GroupStyle.ContainerStyle>
                         <Style TargetType="{x:Type GroupItem}">
@@ -214,15 +238,15 @@
                         </Style>
                     </GroupStyle.ContainerStyle>
                 </GroupStyle>
-            </DataGrid.GroupStyle>
-            <DataGrid.Columns>
+            </controls:MultiSelectDataGrid.GroupStyle>
+            <controls:MultiSelectDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.Name}" Binding="{Binding (network:DNSLookupRecordInfo.Name)}" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.TTL}" Binding="{Binding (network:DNSLookupRecordInfo.TTL)}" MinWidth="80" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Class}" Binding="{Binding (network:DNSLookupRecordInfo.Class)}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Type}" Binding="{Binding (network:DNSLookupRecordInfo.Type)}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Result}" Binding="{Binding (network:DNSLookupRecordInfo.Result)}" MinWidth="200" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
         <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
diff --git a/Source/NETworkManager/Views/DNSLookupView.xaml.cs b/Source/NETworkManager/Views/DNSLookupView.xaml.cs
index 5cd9c2b723..f92a4cb93f 100644
--- a/Source/NETworkManager/Views/DNSLookupView.xaml.cs
+++ b/Source/NETworkManager/Views/DNSLookupView.xaml.cs
@@ -1,5 +1,6 @@
 using System.Windows;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views
@@ -12,7 +13,7 @@ public DNSLookupView(int tabId, string host = null)
         {
             InitializeComponent();
 
-            _viewModel = new DNSLookupViewModel(tabId, host);
+            _viewModel = new DNSLookupViewModel(DialogCoordinator.Instance, tabId, host);
 
             DataContext = _viewModel;
         }
diff --git a/Source/NETworkManager/Views/DNSServerDialog.xaml b/Source/NETworkManager/Views/DNSServerDialog.xaml
index cbab14b254..9bcbcd8509 100644
--- a/Source/NETworkManager/Views/DNSServerDialog.xaml
+++ b/Source/NETworkManager/Views/DNSServerDialog.xaml
@@ -32,7 +32,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" />
-            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleCredentialName}">
+            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleCredentialName}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Style.Triggers>
@@ -65,7 +65,7 @@
                 </TextBox.Style>
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.DNSServers}" />
-            <TextBox x:Name="TextBoxDNSServer" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4DNSServers}">
+            <TextBox x:Name="TextBoxDNSServer" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4DNSServers}">
                 <TextBox.Text>
                     <Binding Path="DNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -76,7 +76,7 @@
                 </TextBox.Text>
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Port}" />
-            <TextBox x:Name="TextBoxPort" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort53}">
+            <TextBox x:Name="TextBoxPort" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort53}">
                 <TextBox.Text>
                     <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/ExportDialog.xaml b/Source/NETworkManager/Views/ExportDialog.xaml
new file mode 100644
index 0000000000..04708c4c01
--- /dev/null
+++ b/Source/NETworkManager/Views/ExportDialog.xaml
@@ -0,0 +1,84 @@
+<UserControl x:Class="NETworkManager.Views.ExportDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+             xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:validators="clr-namespace:NETworkManager.Validators"
+             xmlns:converters="clr-namespace:NETworkManager.Converters"
+             mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ExportViewModel}">
+    <UserControl.Resources>
+        <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
+        <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
+</UserControl.Resources>
+    <Grid Margin="0,20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <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 localization:Strings.Export}" Style="{StaticResource DefaultTextBlock}" />
+            <WrapPanel Grid.Column="2" Grid.Row="0" Orientation="Horizontal">
+                <WrapPanel.Resources>
+                    <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource DefaultRadioButton}">
+                        <Setter Property="Margin" Value="0,5,10,5" />
+                    </Style>
+                </WrapPanel.Resources>
+                <RadioButton Content="{x:Static localization:Strings.All}" IsChecked="{Binding ExportAll}" />
+                <RadioButton Content="{x:Static localization:Strings.Selected}" IsChecked="{Binding ExportSelected}" Visibility="{Binding TextOnly, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Margin="10,0,0,0" />
+            </WrapPanel>
+            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Format}" Style="{StaticResource DefaultTextBlock}" />
+            <WrapPanel Grid.Column="2" Grid.Row="2" Orientation="Horizontal">
+                <WrapPanel.Resources>
+                    <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource DefaultRadioButton}">
+                        <Setter Property="Margin" Value="0,5,10,5" />
+                    </Style>
+                </WrapPanel.Resources>
+                <RadioButton Content="{x:Static localization:StaticStrings.CSV}" IsChecked="{Binding UseCSV}" Visibility="{Binding TextOnly, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" />
+                <RadioButton Content="{x:Static localization:StaticStrings.XML}" IsChecked="{Binding UseXML}" Visibility="{Binding TextOnly, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Margin="10,0,0,0" />
+                <RadioButton Content="{x:Static localization:StaticStrings.JSON}" IsChecked="{Binding UseJSON}" Visibility="{Binding TextOnly, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Margin="10,0,0,0" />
+                <RadioButton Content="{x:Static localization:StaticStrings.TXT}" IsChecked="{Binding UseTXT}" Visibility="{Binding TextOnly, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
+            </WrapPanel>
+            <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Path}" Style="{StaticResource DefaultTextBlock}" />
+            <TextBox Grid.Column="2" Grid.Row="4"  x:Name="TextBoxExportFilePath" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.Location}" Style="{StaticResource BrowseFolderTextBox}" mah:TextBoxHelper.ButtonCommand="{Binding BrowseFileCommand}">
+                <TextBox.Text>
+                    <Binding Path="FilePath" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                        <Binding.ValidationRules>
+                            <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
+                            <validators:FilePathValidator ValidatesOnTargetUpdated="True" />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </TextBox.Text>
+            </TextBox>
+        </Grid>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
+            <Button Content="{x:Static localization:Strings.Export}" Command="{Binding ExportCommand}" IsDefault="True" Margin="10,0,0,0">
+                <Button.Style>
+                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ElementName=TextBoxExportFilePath, Path=(Validation.HasError)}" Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Button.Style>
+            </Button>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/Source/NETworkManager/Views/ExportDialog.xaml.cs b/Source/NETworkManager/Views/ExportDialog.xaml.cs
new file mode 100644
index 0000000000..237251a4cf
--- /dev/null
+++ b/Source/NETworkManager/Views/ExportDialog.xaml.cs
@@ -0,0 +1,10 @@
+namespace NETworkManager.Views
+{
+    public partial class ExportDialog
+    {
+        public ExportDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Source/NETworkManager/Views/GroupDialog.xaml b/Source/NETworkManager/Views/GroupDialog.xaml
index 1079c907bc..6e95a10641 100644
--- a/Source/NETworkManager/Views/GroupDialog.xaml
+++ b/Source/NETworkManager/Views/GroupDialog.xaml
@@ -28,7 +28,7 @@
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Group}" />
-            <ComboBox x:Name="ComboBoxGroup" Grid.Column="2" Grid.Row="0" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleGroupServers}">
+            <ComboBox x:Name="ComboBoxGroup" Grid.Column="2" Grid.Row="0" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGroupServers}">
                 <ComboBox.Text>
                     <Binding Path="Group" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/HTTPHeadersHostView.xaml b/Source/NETworkManager/Views/HTTPHeadersHostView.xaml
index 9b27d8febd..fd23d9754d 100644
--- a/Source/NETworkManager/Views/HTTPHeadersHostView.xaml
+++ b/Source/NETworkManager/Views/HTTPHeadersHostView.xaml
@@ -10,6 +10,7 @@
         xmlns:converters="clr-namespace:NETworkManager.Converters"
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:controls="clr-namespace:NETworkManager.Controls"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HTTPHeadersHostViewModel}">
     <UserControl.Resources>
@@ -23,7 +24,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -62,26 +63,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToQueryTheHTTPHeaders}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToQueryTheHTTPHeaders}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" x:Name="ExpanderProfiles" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -200,21 +217,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -234,20 +255,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/HTTPHeadersView.xaml b/Source/NETworkManager/Views/HTTPHeadersView.xaml
index 3f8fb518fa..9e5db2c749 100644
--- a/Source/NETworkManager/Views/HTTPHeadersView.xaml
+++ b/Source/NETworkManager/Views/HTTPHeadersView.xaml
@@ -9,7 +9,11 @@
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"        
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
-        xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" Loaded="UserControl_OnLoaded"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        dialogs:DialogParticipation.Register="{Binding}"
+        xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
+        Loaded="UserControl_OnLoaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HTTPHeadersViewModel}">
     <UserControl.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter"/>
@@ -41,7 +45,7 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.URL}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                    <ComboBox Grid.Column="2" x:Name="ComboBoxWebsiteUri" ItemsSource="{Binding WebsiteUriHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleWebsiteUri}" IsEnabled="{Binding IsCheckRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                    <ComboBox Grid.Column="2" x:Name="ComboBoxWebsiteUri" ItemsSource="{Binding WebsiteUriHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleWebsiteUri}" IsEnabled="{Binding IsCheckRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                         <ComboBox.Text>
                             <Binding Path="WebsiteUri" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                 <Binding.ValidationRules>
@@ -101,7 +105,24 @@
                 <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
             </Grid>
             <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Headers}" />
-            <TextBox Grid.Row="3" Text="{Binding Headers}" Style="{StaticResource ConsoleTextBox}" IsReadOnly="True" ContextMenu="{StaticResource CopyContextMenu}"/>
+            <TextBox Grid.Row="3" VerticalScrollBarVisibility="Auto" Text="{Binding Headers}" IsReadOnly="True">
+                <TextBox.Resources>
+                    <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource TextBoxScrollBar}" />
+                </TextBox.Resources>
+                <TextBox.Style>
+                    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource ConsoleTextBox}">
+                        <Setter Property="ContextMenu" Value="{StaticResource CopyExportContextMenu}" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Headers}" Value="{x:Static sys:String.Empty}">
+                                <Setter Property="ContextMenu" Value="{x:Null}" />
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding Headers}" Value="{x:Null}">
+                                <Setter Property="ContextMenu" Value="{x:Null}" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBox.Style>
+            </TextBox>
             <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
                 <Expander.Header>
                     <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
diff --git a/Source/NETworkManager/Views/HTTPHeadersView.xaml.cs b/Source/NETworkManager/Views/HTTPHeadersView.xaml.cs
index 11238cb6a2..44c7772aff 100644
--- a/Source/NETworkManager/Views/HTTPHeadersView.xaml.cs
+++ b/Source/NETworkManager/Views/HTTPHeadersView.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views
@@ -11,7 +12,7 @@ public HTTPHeadersView(int tabId, string websiteUri = null)
         {
             InitializeComponent();
 
-            _viewModel = new HTTPHeadersViewModel(tabId, websiteUri);
+            _viewModel = new HTTPHeadersViewModel(DialogCoordinator.Instance, tabId, websiteUri);
 
             DataContext = _viewModel;
         }
diff --git a/Source/NETworkManager/Views/IPScannerHostView.xaml b/Source/NETworkManager/Views/IPScannerHostView.xaml
index f40d997ea0..ba0d956a68 100644
--- a/Source/NETworkManager/Views/IPScannerHostView.xaml
+++ b/Source/NETworkManager/Views/IPScannerHostView.xaml
@@ -9,6 +9,7 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerHostViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" Grid.Row="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -61,26 +62,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToPerformANetworkScan}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToPerformANetworkScan}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" x:Name="ExpanderProfiles" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -199,21 +216,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -233,20 +254,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
index 7b4fd2482b..a036b60db1 100644
--- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml
+++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml
@@ -25,7 +25,7 @@
         <mah:ToggleSwitch Header="{x:Static localization:Strings.ResolveHostname}"   IsChecked="{Binding ResolveHostname}" Margin="0,0,0,10"/>
         <mah:ToggleSwitch Header="{x:Static localization:Strings.UseCustomDNSServer}"   IsChecked="{Binding UseCustomDNSServer}" Margin="0,0,0,10"/>
         <TextBlock Text="{x:Static localization:Strings.DNSServers}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" IsEnabled="{Binding UseCustomDNSServer}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4DNSServers}" Style="{StaticResource DefaultTextBox}">
+        <TextBox Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" IsEnabled="{Binding UseCustomDNSServer}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4DNSServers}" Style="{StaticResource DefaultTextBox}">
             <TextBox.Text>
                 <Binding Path="CustomDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
@@ -36,7 +36,7 @@
             </TextBox.Text>
         </TextBox>
         <TextBlock Text="{x:Static localization:Strings.Port}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left"  Margin="0,0,0,10" IsEnabled="{Binding UseCustomDNSServer}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort53}" Style="{StaticResource DefaultTextBox}">
+        <TextBox Width="250" HorizontalAlignment="Left"  Margin="0,0,0,10" IsEnabled="{Binding UseCustomDNSServer}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort53}" Style="{StaticResource DefaultTextBox}">
             <TextBox.Text>
                 <Binding Path="DNSPort" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml
index d53415459d..a2c98d3848 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml
+++ b/Source/NETworkManager/Views/IPScannerView.xaml
@@ -12,7 +12,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
-        xmlns:neTworkManager="clr-namespace:NETworkManager"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerViewModel}">
     <UserControl.Resources>
@@ -49,7 +51,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.IPRange}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                <ComboBox Grid.Column="2" x:Name="ComboBoxIPRange" ItemsSource="{Binding IPRangeHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" x:Name="ComboBoxIPRange" ItemsSource="{Binding IPRangeHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="IPRange" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -162,8 +164,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Result}" />
-        <DataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding IPScanResultView}" SelectedItem="{Binding SelectedIPScanResult}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding IPScanResultsView}" SelectedItem="{Binding SelectedIPScanResult}" SelectedItemsList="{Binding SelectedIPScanResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <wpfHelper:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -342,38 +344,59 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:IPScannerHostInfo.PingInfo).IPAddress}" SortMemberPath="PingInfo.IPAddressInt32" MinWidth="150" />
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
+                <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:HostInfo.PingInfo).IPAddress}" SortMemberPath="PingInfo.IPAddressInt32" MinWidth="150" />
                 <!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
-                <DataGridTextColumn Header="{x:Static localization:Strings.Hostname}" Binding="{Binding (network:IPScannerHostInfo.Hostname)}" Visibility="{Binding Data.ResolveHostname, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="150" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Hostname}" Binding="{Binding (network:HostInfo.Hostname)}" SortMemberPath="Hostname" Visibility="{Binding Data.ResolveHostname, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="150" />
                 <!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
-                <DataGridTextColumn Header="{x:Static localization:Strings.MACAddress}" Binding="{Binding (network:IPScannerHostInfo.MACAddress), Converter={StaticResource PhysicalAddressToStringConverter}}" Visibility="{Binding Data.ResolveMACAddress, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="150" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.MACAddress}" Binding="{Binding (network:HostInfo.MACAddress), Converter={StaticResource PhysicalAddressToStringConverter}}" SortMemberPath="MACAddressString" Visibility="{Binding Data.ResolveMACAddress, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="150" />
                 <!-- ReSharper disable once Xaml.BindingWithContextNotResolved -->
-                <DataGridTextColumn Header="{x:Static localization:Strings.Vendor}" Binding="{Binding (network:IPScannerHostInfo.Vendor)}" Visibility="{Binding Data.ResolveMACAddress, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="200" />
-                <DataGridTextColumn Header="{x:Static localization:Strings.Bytes}" Binding="{Binding (network:IPScannerHostInfo.PingInfo).Bytes, Converter={StaticResource IntToStringConverter}}" MinWidth="80" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Vendor}" Binding="{Binding (network:HostInfo.Vendor)}" SortMemberPath="Vendor" Visibility="{Binding Data.ResolveMACAddress, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="200" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Bytes}" Binding="{Binding (network:HostInfo.PingInfo).Bytes, Converter={StaticResource IntToStringConverter}}" MinWidth="80" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Time}" SortMemberPath="PingInfo.Time" MinWidth="80">
                     <DataGridTextColumn.Binding>
                         <MultiBinding Converter="{StaticResource PingTimeToStringConverter}">
-                            <Binding Path="(network:IPScannerHostInfo.PingInfo).Status" />
-                            <Binding Path="(network:IPScannerHostInfo.PingInfo).Time" />
+                            <Binding Path="(network:HostInfo.PingInfo).Status" />
+                            <Binding Path="(network:HostInfo.PingInfo).Time" />
                         </MultiBinding>
                     </DataGridTextColumn.Binding>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="{x:Static localization:Strings.TTL}" Binding="{Binding (network:IPScannerHostInfo.PingInfo).TTL, Converter={StaticResource IntToStringConverter}}" MinWidth="80" />
-                <DataGridTextColumn Header="{x:Static localization:Strings.Status}" Binding="{Binding (network:IPScannerHostInfo.PingInfo).Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+                <DataGridTextColumn Header="{x:Static localization:Strings.TTL}" Binding="{Binding (network:HostInfo.PingInfo).TTL, Converter={StaticResource IntToStringConverter}}" MinWidth="80" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Status}" Binding="{Binding (network:HostInfo.PingInfo).Status, Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
         <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
diff --git a/Source/NETworkManager/Views/IPScannerView.xaml.cs b/Source/NETworkManager/Views/IPScannerView.xaml.cs
index d7c94a50f0..cd8b24d654 100644
--- a/Source/NETworkManager/Views/IPScannerView.xaml.cs
+++ b/Source/NETworkManager/Views/IPScannerView.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views
@@ -12,7 +13,7 @@ public IPScannerView(int tabId, string ipRange = null)
         {
             InitializeComponent();
 
-            _viewModel = new IPScannerViewModel(tabId, ipRange);
+            _viewModel = new IPScannerViewModel(DialogCoordinator.Instance, tabId, ipRange);
 
             DataContext = _viewModel;
 
diff --git a/Source/NETworkManager/Views/ListenersView.xaml b/Source/NETworkManager/Views/ListenersView.xaml
index 12d47452c0..9e217e8871 100644
--- a/Source/NETworkManager/Views/ListenersView.xaml
+++ b/Source/NETworkManager/Views/ListenersView.xaml
@@ -11,6 +11,7 @@
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:utilities="clr-namespace:NETworkManager.Utilities"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
         dialog:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ListenersViewModel}">
     <UserControl.Resources>
@@ -28,8 +29,8 @@
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <TextBox x:Name="TextBoxSearch" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Right" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
-        <DataGrid x:Name="DataGridConnection" Grid.Row="2" ItemsSource="{Binding ListenersView}" SelectedItem="{Binding SelectedListenerInfo}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid x:Name="DataGridConnection" Grid.Row="2" ItemsSource="{Binding ListenerResultsView}" SelectedItem="{Binding SelectedListenerInfo}" SelectedItemsList="{Binding SelectedListenerInfos, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource DefaultDataGrid}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -68,23 +69,44 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.Protocol}" Binding="{Binding (network:ListenerInfo.Protocol)}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:ListenerInfo.IPAddress)}" SortMemberPath="IPAddressInt32" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Port}" Binding="{Binding (network:ListenerInfo.Port)}" MinWidth="100" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
         <TextBlock Grid.Row="3" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         <mahAppsControls:MetroProgressBar Grid.Row="4" Margin="0,10,0,0" Foreground="{DynamicResource AccentColorBrush}" IsIndeterminate="True">
             <mahAppsControls:MetroProgressBar.Style>
diff --git a/Source/NETworkManager/Views/ListenersView.xaml.cs b/Source/NETworkManager/Views/ListenersView.xaml.cs
index 3dc954982d..8dcedef443 100644
--- a/Source/NETworkManager/Views/ListenersView.xaml.cs
+++ b/Source/NETworkManager/Views/ListenersView.xaml.cs
@@ -1,11 +1,12 @@
 using NETworkManager.ViewModels;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
     public partial class ListenersView
     {
-        private readonly ListenersViewModel _viewModel = new ListenersViewModel();
+        private readonly ListenersViewModel _viewModel = new ListenersViewModel(DialogCoordinator.Instance);
 
         public ListenersView()
         {
diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml b/Source/NETworkManager/Views/LookupOUILookupView.xaml
index 89daeb9e99..00b558a7bb 100644
--- a/Source/NETworkManager/Views/LookupOUILookupView.xaml
+++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml
@@ -12,6 +12,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:lookup="clr-namespace:NETworkManager.Models.Lookup"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupOUILookupViewModel}">
     <UserControl.Resources>
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
@@ -41,7 +44,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.MACAddressOrVendor}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                <ComboBox Grid.Column="2" x:Name="TextBoxMACAddressOrVendor" ItemsSource="{Binding MACAddressOrVendorHistoryView}" wpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressOrVendorHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleMACAddressesOrVendor}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" x:Name="TextBoxMACAddressOrVendor" ItemsSource="{Binding MACAddressOrVendorHistoryView}" wpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressOrVendorHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleMACAddressesOrVendor}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.InputBindings>
                         <KeyBinding Command="{Binding OUILookupCommand}" Key="Return" />
                     </ComboBox.InputBindings>
@@ -87,8 +90,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.NoVendorFoundCheckYourInput}" Visibility="{Binding NoVendorFound, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding OUILookupResultView}" SelectedItem="{Binding SelectedOUILookup}" CanUserSortColumns="False">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding OUILookupResultsView}" SelectedItem="{Binding SelectedOUILookupResult}" SelectedItemsList="{Binding SelectedOUILookupResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -108,31 +111,43 @@
                                 </Rectangle>
                             </MenuItem.Icon>
                         </MenuItem>
-                        <MenuItem Header="{x:Static localization:Strings.Vendor}" Command="{Binding CopySelectedVendorCommand}">
+                        <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
                             <MenuItem.Icon>
                                 <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
                                     <Rectangle.OpacityMask>
-                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentCopy}" />
+                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
                                     </Rectangle.OpacityMask>
                                 </Rectangle>
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}" />
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.MACAddress}" Binding="{Binding (lookup:OUIInfo.MACAddress)}" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Vendor}" Binding="{Binding (lookup:OUIInfo.Vendor), Converter={StaticResource NullOrEmptyToStringConverter}}" MinWidth="200" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs b/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs
index f7f85d7ae4..0db2070441 100644
--- a/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs
+++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml.cs
@@ -1,11 +1,12 @@
 using NETworkManager.ViewModels;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
     public partial class LookupOUILookupView
     {
-        private readonly LookupOUILookupViewModel _viewModel = new LookupOUILookupViewModel();
+        private readonly LookupOUILookupViewModel _viewModel = new LookupOUILookupViewModel(DialogCoordinator.Instance);
 
         public LookupOUILookupView()
         {
diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml b/Source/NETworkManager/Views/LookupPortLookupView.xaml
index 88976ffcdb..d251799d24 100644
--- a/Source/NETworkManager/Views/LookupPortLookupView.xaml
+++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml
@@ -12,6 +12,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:lookup="clr-namespace:NETworkManager.Models.Lookup"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupPortLookupViewModel}">
     <UserControl.Resources>
         <converters:BooleanReverseConverter x:Key="BooleanReverseConverter" />
@@ -40,7 +43,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.PortOrService}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                <ComboBox Grid.Column="2" x:Name="TextBoxPortOrService" ItemsSource="{Binding PortsOrServicesHistoryView}" wpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortOrServiceHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePortPortRangeOrService}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" x:Name="TextBoxPortOrService" ItemsSource="{Binding PortsOrServicesHistoryView}" wpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortOrServiceHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePortPortRangeOrService}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.InputBindings>
                         <KeyBinding Command="{Binding PortLookupCommand}" Key="Return" />
                     </ComboBox.InputBindings>
@@ -86,8 +89,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.NoPortsFoundCheckYourInput}" Visibility="{Binding NoPortsFound, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding PortLookupResultView}" SelectedItem="{Binding SelectedPortLookupResult}" CanUserSortColumns="False">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding PortLookupResultsView}" SelectedItem="{Binding SelectedPortLookupResult}" SelectedItemsList="{Binding SelectedPortLookupResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -135,23 +138,44 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}" />
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.Port}" Binding="{Binding (lookup:PortLookupInfo.Number)}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Protocol}" Binding="{Binding (lookup:PortLookupInfo.Protocol)}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Service}" Binding="{Binding (lookup:PortLookupInfo.Service)}" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Description}" Binding="{Binding (lookup:PortLookupInfo.Description)}" MinWidth="200" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs b/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs
index 781cdca404..0964b2d179 100644
--- a/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs
+++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml.cs
@@ -1,11 +1,12 @@
 using NETworkManager.ViewModels;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
     public partial class LookupPortLookupView
     {
-        private readonly LookupPortLookupViewModel _viewModel = new LookupPortLookupViewModel();
+        private readonly LookupPortLookupViewModel _viewModel = new LookupPortLookupViewModel(DialogCoordinator.Instance);
 
         public LookupPortLookupView()
         {
diff --git a/Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml b/Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml
new file mode 100644
index 0000000000..acada8467c
--- /dev/null
+++ b/Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml
@@ -0,0 +1,77 @@
+<UserControl x:Class="NETworkManager.Views.NetworkInterfaceAddIPAddressDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:validators="clr-namespace:NETworkManager.Validators"
+             xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
+             xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+             mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance viewModels:NetworkInterfaceAddIPAddressViewModel}">
+    <Grid Margin="0,20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="10" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.Resources>
+                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource CenterTextBlock}" />
+                <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}" />                
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.IPv4Address}" />
+            <TextBox x:Name="TextBoxIPAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}">
+                <TextBox.Text>
+                    <Binding Path="IPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                        <Binding.ValidationRules>
+                            <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
+                            <validators:IPv4AddressValidator ValidatesOnTargetUpdated="True" />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </TextBox.Text>
+            </TextBox>
+            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SubnetmaskOrCIDR}" />
+            <TextBox x:Name="TextBoxSubnetmask" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4SubnetmaskIPv4CIDR}">
+                <TextBox.Text>
+                    <Binding Path="SubnetmaskOrCidr" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                        <Binding.ValidationRules>
+                            <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
+                            <validators:IPv4SubnetmaskOrCIDRValidator ValidatesOnTargetUpdated="True" />
+                        </Binding.ValidationRules>
+                    </Binding>
+                </TextBox.Text>
+            </TextBox>            
+        </Grid>
+        <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
+            <Button Content="{x:Static localization:Strings.Add}" Command="{Binding AddCommand}" IsDefault="True" Margin="10,0,0,0">
+                <Button.Style>
+                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
+                        <Setter Property="IsEnabled" Value="False" />
+                        <Style.Triggers>                            
+                            <MultiDataTrigger>
+                                <MultiDataTrigger.Conditions>
+                                    <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxIPAddress}" Value="False" />
+                                    <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxSubnetmask}" Value="False" />
+                                </MultiDataTrigger.Conditions>
+                                <MultiDataTrigger.Setters>
+                                    <Setter Property="IsEnabled" Value="True" />
+                                </MultiDataTrigger.Setters>
+                            </MultiDataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Button.Style>
+            </Button>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml.cs b/Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml.cs
new file mode 100644
index 0000000000..1d648079e1
--- /dev/null
+++ b/Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml.cs
@@ -0,0 +1,16 @@
+namespace NETworkManager.Views
+{
+    public partial class NetworkInterfaceAddIPAddressDialog
+    {
+        public NetworkInterfaceAddIPAddressDialog()
+        {
+            InitializeComponent();
+        }
+
+        private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            // Need to be in loaded event, focusmanger won't work...
+            TextBoxIPAddress.Focus();
+        }
+    }
+}
diff --git a/Source/NETworkManager/Views/NetworkInterfaceView.xaml b/Source/NETworkManager/Views/NetworkInterfaceView.xaml
index 1aaa753628..61455fb3db 100644
--- a/Source/NETworkManager/Views/NetworkInterfaceView.xaml
+++ b/Source/NETworkManager/Views/NetworkInterfaceView.xaml
@@ -12,6 +12,7 @@
         xmlns:dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialog:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:NetworkInterfaceViewModel}">
     <UserControl.InputBindings>
@@ -308,7 +309,7 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+                    <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
                 </Grid.ColumnDefinitions>
                 <Grid Grid.Column="0" Margin="10">
                     <Grid.RowDefinitions>
@@ -446,7 +447,7 @@
                                             <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
                                         <TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.IPv4Address}" />
-                                        <TextBox x:Name="TextBoxConfigIPAddress" Grid.Column="1" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Address}">
+                                        <TextBox x:Name="TextBoxConfigIPAddress" Grid.Column="1" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}">
                                             <TextBox.Text>
                                                 <Binding Path="ConfigIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                                     <Binding.ValidationRules>
@@ -457,7 +458,7 @@
                                             </TextBox.Text>
                                         </TextBox>
                                         <TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.SubnetmaskOrCIDR}" />
-                                        <ComboBox x:Name="ComboBoxConfigSubnetmaskOrCidr" Grid.Column="1" Grid.Row="2" Style="{StaticResource EditableComboBox}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4SubnetmaskIPv4CIDR}" ItemsSource="{x:Static network:Subnetmask.List}">
+                                        <ComboBox x:Name="ComboBoxConfigSubnetmaskOrCidr" Grid.Column="1" Grid.Row="2" Style="{StaticResource EditableComboBox}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4SubnetmaskIPv4CIDR}" ItemsSource="{x:Static network:Subnetmask.List}">
                                             <ComboBox.Text>
                                                 <Binding Path="ConfigSubnetmaskOrCidr" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                                     <Binding.ValidationRules>
@@ -483,7 +484,7 @@
                                             </ComboBox.ItemTemplate>
                                         </ComboBox>
                                         <TextBlock Grid.Column="0" Grid.Row="4" Style="{StaticResource CenterTextBlock}"  Text="{x:Static localization:Strings.DefaultGateway}"  />
-                                        <TextBox x:Name="TextBoxConfigGateway" Grid.Column="1" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Gateway}">
+                                        <TextBox x:Name="TextBoxConfigGateway" Grid.Column="1" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Gateway}">
                                             <TextBox.Text>
                                                 <Binding Path="ConfigGateway" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                                     <Binding.ValidationRules>
@@ -518,7 +519,7 @@
                                             <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
                                         <TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}"  Text="{x:Static localization:Strings.PrimaryDNSServer}"  />
-                                        <TextBox x:Name="TextBoxConfigPrimaryDNSServer" Grid.Column="1" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Gateway}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
+                                        <TextBox x:Name="TextBoxConfigPrimaryDNSServer" Grid.Column="1" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Gateway}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
                                             <TextBox.Text>
                                                 <Binding Path="ConfigPrimaryDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                                     <Binding.ValidationRules>
@@ -528,7 +529,7 @@
                                             </TextBox.Text>
                                         </TextBox>
                                         <TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}"  Text="{x:Static localization:Strings.SecondaryDNSServer}"  />
-                                        <TextBox x:Name="TextBoxConfigSecondaryDNSServer" Grid.Column="1" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4DNSServer}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
+                                        <TextBox x:Name="TextBoxConfigSecondaryDNSServer" Grid.Column="1" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4DNSServer}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
                                             <TextBox.Text>
                                                 <Binding Path="ConfigSecondaryDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                                     <Binding.ValidationRules>
@@ -561,7 +562,7 @@
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <StackPanel Grid.Column="0" Orientation="Horizontal">
-                            <Button HorizontalAlignment="Left" Command="{Binding FlushDNSCacheCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource ImageWithTextButton}">
+                            <Button HorizontalAlignment="Left" Command="{Binding FlushDNSCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource ImageWithTextButton}">
                                 <Button.Content>
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -576,6 +577,22 @@
                                         <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.FlushDNSCache}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
                                     </Grid>
                                 </Button.Content>
+                            </Button> 
+                            <Button HorizontalAlignment="Left" Command="{Binding AddIPv4AddressCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource ImageWithTextButton}" Margin="10,0,0,0">
+                                <Button.Content>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
+                                            <Rectangle.OpacityMask>
+                                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Modern Kind=ListAddBelow}" />
+                                            </Rectangle.OpacityMask>
+                                        </Rectangle>
+                                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddIPv4AddressDots}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
+                                    </Grid>
+                                </Button.Content>
                             </Button>
                             <mah:DropDownButton Margin="10,0,0,0" Style="{StaticResource ImageDropDrownButton}">
                                 <mah:DropDownButton.Content>
@@ -593,7 +610,7 @@
                                     </Grid>
                                 </mah:DropDownButton.Content>
                                 <mah:DropDownButton.Items>
-                                    <MenuItem Header="{x:Static localization:Strings.ReleaseRenew}" Command="{Binding IPConfigReleaseRenewCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}">
+                                    <MenuItem Header="{x:Static localization:Strings.ReleaseRenew}" Command="{Binding ReleaseRenewCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}">
                                         <MenuItem.Icon>
                                             <Rectangle Width="16" Height="16" Fill="{DynamicResource GrayBrush3}">
                                                 <Rectangle.OpacityMask>
@@ -603,7 +620,7 @@
                                         </MenuItem.Icon>
                                     </MenuItem>
                                     <Separator />
-                                    <MenuItem Header="{x:Static localization:Strings.Release}" Command="{Binding IPConfigReleaseCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}">
+                                    <MenuItem Header="{x:Static localization:Strings.Release}" Command="{Binding ReleaseCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}">
                                         <MenuItem.Icon>
                                             <Rectangle Width="16" Height="16" Fill="{DynamicResource GrayBrush3}">
                                                 <Rectangle.OpacityMask>
@@ -612,7 +629,7 @@
                                             </Rectangle>
                                         </MenuItem.Icon>
                                     </MenuItem>
-                                    <MenuItem Header="{x:Static localization:Strings.Renew}" Command="{Binding IPConfigRenewCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}">
+                                    <MenuItem Header="{x:Static localization:Strings.Renew}" Command="{Binding RenewCommand}" IsEnabled="{Binding IsConfigurationRunning, Converter={StaticResource BooleanReverseConverter}}">
                                         <MenuItem.Icon>
                                             <Rectangle Width="16" Height="16" Fill="{DynamicResource GrayBrush3}">
                                                 <Rectangle.OpacityMask>
@@ -682,7 +699,7 @@
                         <ListBox Grid.Column="0" Grid.Row="2" x:Name="ListBoxProfiles" ItemsSource="{Binding Profiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}" Style="{StaticResource ProfileListBox}">
                             <ListBox.Resources>
                                 <ContextMenu x:Key="ListBoxItemContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
-                                    <MenuItem Header="{x:Static localization:Strings.Apply}" Command="{Binding ApplyProfileCommand}">
+                                    <MenuItem Header="{x:Static localization:Strings.Apply}" Command="{Binding ApplyProfileConfigCommand}">
                                         <MenuItem.Icon>
                                             <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
                                                 <Rectangle.OpacityMask>
@@ -784,19 +801,25 @@
                                     </Style.Triggers>
                                 </Style>
                             </Grid.Style>
-                            <StackPanel>
-                                <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                                    <Button.Style>
-                                        <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                            <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                    <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Button.Style>
-                                    <Rectangle Width="20" Height="20">
+                            <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                                <Button.Style>
+                                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                        <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                        <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                                <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}" />
@@ -816,20 +839,23 @@
                                             </Style>
                                         </Rectangle.Style>
                                     </Rectangle>
-                                </Button>
-                                <TextBlock>
-                                    <TextBlock.Style>
-                                        <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                    <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </TextBlock.Style>
-                                </TextBlock>
-                            </StackPanel>
+                                    <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 GrayBrush5}" />
+                                                    </DataTrigger>
+                                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                        <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </TextBlock.Style>
+                                    </TextBlock>
+                                </Grid>
+                            </Button>
                         </Grid>
                         <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                             <Button.Content>
diff --git a/Source/NETworkManager/Views/PingHostView.xaml b/Source/NETworkManager/Views/PingHostView.xaml
index 2157a9a7d9..9f8c309040 100644
--- a/Source/NETworkManager/Views/PingHostView.xaml
+++ b/Source/NETworkManager/Views/PingHostView.xaml
@@ -9,6 +9,7 @@
         xmlns:dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialog:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingHostViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" Grid.Row="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -61,184 +62,206 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToPerformAPing}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToPerformAPing}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="10" />
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="10" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBox x:Name="TextBoxSearch" Grid.Column="0" VerticalAlignment="Center" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}"/>
-                    <ListBox Grid.Row="2" ItemsSource="{Binding Profiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}" Style="{StaticResource ProfileListBox}">
-                        <ListBox.Resources>
-                            <ContextMenu x:Key="ListBoxItemContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
-                                <MenuItem Header="{x:Static localization:Strings.Ping}" Command="{Binding PingProfileCommand}">
-                                    <MenuItem.Icon>
-                                        <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
-                                            <Rectangle.OpacityMask>
-                                                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}" />
-                                            </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 BlackColorBrush}">
-                                            <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 BlackColorBrush}">
-                                            <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 BlackColorBrush}">
-                                            <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" />
-                        </ListBox.InputBindings>
-                        <ListBox.GroupStyle>
-                            <GroupStyle>
-                                <GroupStyle.ContainerStyle>
-                                    <Style TargetType="{x:Type GroupItem}">
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate>
-                                                    <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
-                                                        <Expander.Header>
-                                                            <Grid>
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="*" />
-                                                                    <ColumnDefinition Width="Auto" />
-                                                                </Grid.ColumnDefinitions>
-                                                                <TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource DefaultTextBlock}"/>
-                                                                <Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroup}" 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 GrayBrush3}" />
-                                                                                <Style.Triggers>
-                                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                                                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                                                                    </DataTrigger>
-                                                                                </Style.Triggers>
-                                                                            </Style>
-                                                                        </Rectangle.Style>
-                                                                    </Rectangle>
-                                                                </Button>
-                                                            </Grid>
-                                                        </Expander.Header>
-                                                        <ItemsPresenter />
-                                                    </Expander>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </GroupStyle.ContainerStyle>
-                            </GroupStyle>
-                        </ListBox.GroupStyle>
-                        <ListBox.ItemContainerStyle>
-                            <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MetroListBoxItem}">
-                                <Setter Property="ContextMenu" Value="{StaticResource ListBoxItemContextMenu}" />
-                                <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
-                            </Style>
-                        </ListBox.ItemContainerStyle>
-                    </ListBox>
-                    <Grid Grid.Row="2" VerticalAlignment="Center">
-                        <Grid.Style>
-                            <Style TargetType="{x:Type Grid}">
-                                <Setter Property="Visibility" Value="Collapsed" />
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="10" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="10" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TextBox x:Name="TextBoxSearch" Grid.Column="0" VerticalAlignment="Center" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}"/>
+                <ListBox Grid.Row="2" ItemsSource="{Binding Profiles}" DisplayMemberPath="Name" SelectedItem="{Binding SelectedProfile}" Style="{StaticResource ProfileListBox}">
+                    <ListBox.Resources>
+                        <ContextMenu x:Key="ListBoxItemContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                            <MenuItem Header="{x:Static localization:Strings.Ping}" Command="{Binding PingProfileCommand}">
+                                <MenuItem.Icon>
+                                    <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                        <Rectangle.OpacityMask>
+                                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Play}" />
+                                        </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 BlackColorBrush}">
+                                        <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 BlackColorBrush}">
+                                        <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 BlackColorBrush}">
+                                        <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" />
+                    </ListBox.InputBindings>
+                    <ListBox.GroupStyle>
+                        <GroupStyle>
+                            <GroupStyle.ContainerStyle>
+                                <Style TargetType="{x:Type GroupItem}">
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate>
+                                                <Expander IsExpanded="True" Style="{StaticResource DefaultExpander}">
+                                                    <Expander.Header>
+                                                        <Grid>
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="*" />
+                                                                <ColumnDefinition Width="Auto" />
+                                                            </Grid.ColumnDefinitions>
+                                                            <TextBlock Grid.Column="0" Text="{Binding (CollectionViewGroup.Name)}" Style="{DynamicResource DefaultTextBlock}"/>
+                                                            <Button Grid.Column="1" ToolTip="{x:Static localization:Strings.EditGroup}" 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 GrayBrush3}" />
+                                                                            <Style.Triggers>
+                                                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                                                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                                                                </DataTrigger>
+                                                                            </Style.Triggers>
+                                                                        </Style>
+                                                                    </Rectangle.Style>
+                                                                </Rectangle>
+                                                            </Button>
+                                                        </Grid>
+                                                    </Expander.Header>
+                                                    <ItemsPresenter />
+                                                </Expander>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </GroupStyle.ContainerStyle>
+                        </GroupStyle>
+                    </ListBox.GroupStyle>
+                    <ListBox.ItemContainerStyle>
+                        <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MetroListBoxItem}">
+                            <Setter Property="ContextMenu" Value="{StaticResource ListBoxItemContextMenu}" />
+                            <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
+                        </Style>
+                    </ListBox.ItemContainerStyle>
+                </ListBox>
+                <Grid Grid.Row="2" VerticalAlignment="Center">
+                    <Grid.Style>
+                        <Style TargetType="{x:Type Grid}">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Profiles.Count}" Value="0">
+                                    <Setter Property="Visibility" Value="Visible" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Grid.Style>
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
                                 <Style.Triggers>
-                                    <DataTrigger Binding="{Binding Profiles.Count}" Value="0">
-                                        <Setter Property="Visibility" Value="Visible" />
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
-                        </Grid.Style>
-                        <StackPanel>
-                            <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                                <Button.Style>
-                                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                        <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
+                        </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 GrayBrush3}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                                <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                            </DataTrigger>
                                             <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
+                                                <Setter Property="OpacityMask" Value="{StaticResource VisualClear}" />
+                                            </DataTrigger>
                                         </Style.Triggers>
                                     </Style>
-                                </Button.Style>
-                                <Rectangle 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 GrayBrush3}" />
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                    <Setter Property="OpacityMask" Value="{StaticResource VisualClear}" />
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Rectangle.Style>
-                                </Rectangle>
-                            </Button>
-                            <TextBlock>
+                                </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 GrayBrush5}" />
+                                            </DataTrigger>
                                             <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
                                                 <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
                                             </DataTrigger>
@@ -246,25 +269,26 @@
                                     </Style>
                                 </TextBlock.Style>
                             </TextBlock>
-                        </StackPanel>
-                    </Grid>                 
-                    <Button x:Name="ButtonAddProfile" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
-                        <Button.Content>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
-                                    <Rectangle.OpacityMask>
-                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
-                                    </Rectangle.OpacityMask>
-                                </Rectangle>
-                                <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddProfile}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
-                            </Grid>
-                        </Button.Content>
+                        </Grid>
                     </Button>
                 </Grid>
-            </Expander>
+                <Button x:Name="ButtonAddProfile" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
+                    <Button.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Width="20" Height="20" Margin="10,5,0,5" Fill="{DynamicResource GrayBrush3}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                            <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddProfile}" FontSize="14" Margin="10,5" TextAlignment="Center"/>
+                        </Grid>
+                    </Button.Content>
+                </Button>
+            </Grid>
+        </Expander>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Views/PingSettingsView.xaml b/Source/NETworkManager/Views/PingSettingsView.xaml
index be11546653..e0ee34d857 100644
--- a/Source/NETworkManager/Views/PingSettingsView.xaml
+++ b/Source/NETworkManager/Views/PingSettingsView.xaml
@@ -19,13 +19,15 @@
         <mah:NumericUpDown Value="{Binding TTL}" Minimum="1" Maximum="255" Interval="1" Margin="0,0,0,10" />
         <mah:ToggleSwitch IsChecked="{Binding DontFragment}" Header="{x:Static localization:Strings.DontFragment}" Margin="0,0,0,10"/>
         <TextBlock Text="{x:Static localization:Strings.TimeToWaitBetweenEachPing}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
-        <mah:NumericUpDown Value="{Binding WaitTime}" Maximum="15000" Minimum="100" Interval="100" Margin="0,0,0,20"/>
+        <mah:NumericUpDown Value="{Binding WaitTime}" Maximum="15000" Minimum="100" Interval="100" Margin="0,0,0,10"/>
         <TextBlock Text="{x:Static localization:Strings.NumberOfErrorsAfterWhichIsCanceled}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
-        <mah:NumericUpDown Value="{Binding ExceptionCancelCount}" Maximum="10" Minimum="1" Interval="1" Margin="0,0,0,20"/>
+        <mah:NumericUpDown Value="{Binding ExceptionCancelCount}" Maximum="10" Minimum="1" Interval="1" Margin="0,0,0,20"/>        
         <TextBlock Text="{x:Static localization:Strings.DNS}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.PreferredProtocolWhenResolvingHostname}" TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,0,0,10" />
         <RadioButton Content="{x:Static localization:Strings.IPv4}" IsChecked="{Binding ResolveHostnamePreferIPv4}" Margin="0,0,0,10" />
         <RadioButton Content="{x:Static localization:Strings.IPv6}" IsChecked="{Binding ResolveHostnamePreferIPv6}" Margin="0,0,0,20" />
+        <TextBlock Text="{x:Static localization:Strings.Design}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{x:Static localization:Strings.HighlightTimeouts}" IsChecked="{Binding HighlightTimeouts}" Margin="0,0,0,20"/>
         <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" />
         <mah:ToggleSwitch Header="{x:Static localization:Strings.ShowStatistics}" IsChecked="{Binding ShowStatistics}" />
     </StackPanel>
diff --git a/Source/NETworkManager/Views/PingView.xaml b/Source/NETworkManager/Views/PingView.xaml
index 4decc46331..aea52cb977 100644
--- a/Source/NETworkManager/Views/PingView.xaml
+++ b/Source/NETworkManager/Views/PingView.xaml
@@ -12,6 +12,8 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingViewModel}">
     <UserControl.Resources>
@@ -19,6 +21,7 @@
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:IntToStringConverter x:Key="IntToStringConverter" />
         <converters:IPStatusToStringConverter x:Key="IPStatusToStringConverter" />
+        <converters:PingStatusToBoolConverter x:Key="PingStatusToBoolConverter" />
         <converters:NullableDateTimeToStringConverter x:Key="NullableDateTimeToStringConverter" />
         <converters:PercentConverter x:Key="PercentConverter" />
         <converters:PingTimeToStringConverter x:Key="PingTimeToStringConverter" />
@@ -47,7 +50,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.Host}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                <ComboBox Grid.Column="2" x:Name="ComboBoxHost" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsPingRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" x:Name="ComboBoxHost" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsPingRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -123,8 +126,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Status}" Style="{StaticResource HeaderTextBlock}" />
-        <controls:ScrollingDataGrid Grid.Row="3" ItemsSource="{Binding PingResultView}" SelectedItem="{Binding SelectedPingResult}">
-            <controls:ScrollingDataGrid.Resources>
+        <controls:MultiSelectScrollingDataGrid Grid.Row="3" CanUserSortColumns="False" ItemsSource="{Binding PingResultsView}" SelectedItem="{Binding SelectedPingResult}" SelectedItemsList="{Binding SelectedPingResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectScrollingDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource ScrollingDataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -199,9 +202,29 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </controls:ScrollingDataGrid.Resources>
-            <controls:ScrollingDataGrid.Columns>
+            </controls:MultiSelectScrollingDataGrid.Resources>
+            <controls:MultiSelectScrollingDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.Timestamp}" Binding="{Binding (network:PingInfo.Timestamp)}" MinWidth="180" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:PingInfo.IPAddress)}" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Hostname}" Binding="{Binding (network:PingInfo.Hostname)}" MinWidth="150" />
@@ -216,17 +239,29 @@
                 </DataGridTextColumn>
                 <DataGridTextColumn Header="{x:Static localization:Strings.TTL}" Binding="{Binding (network:PingInfo.TTL), Converter={StaticResource IntToStringConverter}}" MinWidth="80"/>
                 <DataGridTextColumn Header="{x:Static localization:Strings.Status}" Binding="{Binding (network:PingInfo.Status), Converter={StaticResource IPStatusToStringConverter}}" MinWidth="150" Width="*" />
-            </controls:ScrollingDataGrid.Columns>
-            <controls:ScrollingDataGrid.RowStyle>
+            </controls:MultiSelectScrollingDataGrid.Columns>
+            <controls:MultiSelectScrollingDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding DataContext.HighlightTimeouts, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Value="True" />
+                                <Condition Binding="{Binding (network:PingInfo.Status), Converter={StaticResource PingStatusToBoolConverter}}" Value="False" />
+                                <Condition Binding="{Binding (DataGridRow.IsSelected), RelativeSource={RelativeSource Self}}" Value="False" />
+                                <Condition Binding="{Binding (DataGridRow.IsMouseOver), RelativeSource={RelativeSource Self}}" Value="False" />
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.Setters>
+                                <Setter Property="Foreground" Value="Red" />
+                            </MultiDataTrigger.Setters>
+                        </MultiDataTrigger>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </controls:ScrollingDataGrid.RowStyle>
-        </controls:ScrollingDataGrid>
+            </controls:MultiSelectScrollingDataGrid.RowStyle>
+        </controls:MultiSelectScrollingDataGrid>
         <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
diff --git a/Source/NETworkManager/Views/PingView.xaml.cs b/Source/NETworkManager/Views/PingView.xaml.cs
index 6975a7c9c6..86f35b8fc5 100644
--- a/Source/NETworkManager/Views/PingView.xaml.cs
+++ b/Source/NETworkManager/Views/PingView.xaml.cs
@@ -1,6 +1,7 @@
 using NETworkManager.ViewModels;
 using System;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
@@ -12,7 +13,7 @@ public PingView(int tabId, string host = null)
         {
             InitializeComponent();
 
-            _viewModel = new PingViewModel(tabId, host);
+            _viewModel = new PingViewModel(DialogCoordinator.Instance, tabId, host);
 
             DataContext = _viewModel;
 
diff --git a/Source/NETworkManager/Views/PortScannerHostView.xaml b/Source/NETworkManager/Views/PortScannerHostView.xaml
index 74f92db0bd..1d7ff0bd63 100644
--- a/Source/NETworkManager/Views/PortScannerHostView.xaml
+++ b/Source/NETworkManager/Views/PortScannerHostView.xaml
@@ -9,6 +9,7 @@
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerHostViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" Grid.Row="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -61,26 +62,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToPerformAPortScan}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToPerformAPortScan}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" x:Name="ExpanderProfiles" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -199,21 +216,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -233,20 +254,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml
index 2ac491d3e9..acc78178f2 100644
--- a/Source/NETworkManager/Views/PortScannerView.xaml
+++ b/Source/NETworkManager/Views/PortScannerView.xaml
@@ -7,10 +7,13 @@
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         xmlns:validators="clr-namespace:NETworkManager.Validators"
         xmlns:converters="clr-namespace:NETworkManager.Converters"
-        xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
+        xmlns:mahappsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerViewModel}">
     <UserControl.Resources>
@@ -49,7 +52,7 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Host}" Style="{StaticResource CenterTextBlock}" />
-                <ComboBox Grid.Column="2" Grid.Row="0" x:Name="ComboBoxHost" Height="{Binding ElementName=ComboBoxPort, Path=ActualHeight}" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostnameAndOrIPAddress}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" Grid.Row="0" x:Name="ComboBoxHost" Height="{Binding ElementName=ComboBoxPort, Path=ActualHeight}" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameAndOrIPAddress}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -60,7 +63,7 @@
                     </ComboBox.Text>
                 </ComboBox>
                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Ports}" Style="{StaticResource CenterTextBlock}" />
-                <ComboBox Grid.Column="2" Grid.Row="2" x:Name="ComboBoxPort" ItemsSource="{Binding PortHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePortScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" Grid.Row="2" x:Name="ComboBoxPort" ItemsSource="{Binding PortHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePortScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -136,9 +139,9 @@
                         </Style.Triggers>
                     </Style>
                 </StackPanel.Style>
-                <controls:MetroProgressBar Maximum="{Binding PortsToScan}" Foreground="{DynamicResource AccentColorBrush}" Value="{Binding PortsScanned}">
-                    <controls:MetroProgressBar.Style>
-                        <Style TargetType="{x:Type controls:MetroProgressBar}" >
+                <mahappsControls:MetroProgressBar Maximum="{Binding PortsToScan}" Foreground="{DynamicResource AccentColorBrush}" Value="{Binding PortsScanned}">
+                    <mahappsControls:MetroProgressBar.Style>
+                        <Style TargetType="{x:Type mahappsControls:MetroProgressBar}" >
                             <Setter Property="IsIndeterminate" Value="False" />
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding PreparingScan}" Value="True">
@@ -149,8 +152,8 @@
                                 </DataTrigger>
                             </Style.Triggers>
                         </Style>
-                    </controls:MetroProgressBar.Style>
-                </controls:MetroProgressBar>
+                    </mahappsControls:MetroProgressBar.Style>
+                </mahappsControls:MetroProgressBar>
                 <TextBlock HorizontalAlignment="Center">
                     <TextBlock.Style>
                         <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
@@ -176,8 +179,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Result}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding PortScanResultView}" SelectedItem="{Binding SelectedScanResult}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding PortScanResultsView}" SelectedItem="{Binding SelectedPortScanResult}" SelectedItemsList="{Binding SelectedPortScanResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -252,27 +255,48 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:PortInfo.Host).Item1}" MinWidth="150" />
-                <DataGridTextColumn Header="{x:Static localization:Strings.Hostname}" Binding="{Binding (network:PortInfo.Host).Item2, Converter={StaticResource NullOrEmptyToStringConverter}}" MinWidth="150" />
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
+                <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:PortInfo.IPAddress)}" MinWidth="150" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Hostname}" Binding="{Binding (network:PortInfo.Hostname), Converter={StaticResource NullOrEmptyToStringConverter}}" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Port}" Binding="{Binding (network:PortInfo.Port)}" MinWidth="80" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Status}" Binding="{Binding (network:PortInfo.Status), Converter={StaticResource PortStatusToStringConverter}}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Protocol}" Binding="{Binding (network:PortInfo.LookupInfo).Protocol}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Service}" Binding="{Binding (network:PortInfo.LookupInfo).Service}" MinWidth="100" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Description}" Binding="{Binding (network:PortInfo.LookupInfo).Description}" MinWidth="200" Width="*" />
-            </DataGrid.Columns>
-            <DataGrid.GroupStyle>
+            </controls:MultiSelectDataGrid.Columns>
+            <controls:MultiSelectDataGrid.GroupStyle>
                 <GroupStyle>
                     <GroupStyle.ContainerStyle>
                         <Style TargetType="{x:Type GroupItem}">
@@ -293,8 +317,8 @@
                         </Style>
                     </GroupStyle.ContainerStyle>
                 </GroupStyle>
-            </DataGrid.GroupStyle>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.GroupStyle>
+        </controls:MultiSelectDataGrid>
         <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Style="{StaticResource HeaderExpander}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
@@ -341,5 +365,4 @@
             </StackPanel>
         </Expander>
     </Grid>
-</UserControl>
-
+</UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/PortScannerView.xaml.cs b/Source/NETworkManager/Views/PortScannerView.xaml.cs
index cc18bf14f7..7036347ba4 100644
--- a/Source/NETworkManager/Views/PortScannerView.xaml.cs
+++ b/Source/NETworkManager/Views/PortScannerView.xaml.cs
@@ -1,17 +1,18 @@
 using NETworkManager.ViewModels;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
-      public partial class PortScannerView
-      {
-          private readonly PortScannerViewModel _viewModel;
+    public partial class PortScannerView
+    {
+        private readonly PortScannerViewModel _viewModel;
 
         public PortScannerView(int tabId, string host = null, string ports = null)
         {
             InitializeComponent();
 
-            _viewModel = new PortScannerViewModel(tabId, host, ports);
+            _viewModel = new PortScannerViewModel(DialogCoordinator.Instance, tabId, host, ports);
 
             DataContext = _viewModel;
 
diff --git a/Source/NETworkManager/Views/ProfileDialog.xaml b/Source/NETworkManager/Views/ProfileDialog.xaml
index a2cb09a719..83758144fa 100644
--- a/Source/NETworkManager/Views/ProfileDialog.xaml
+++ b/Source/NETworkManager/Views/ProfileDialog.xaml
@@ -51,7 +51,7 @@
                                 <ColumnDefinition Width="34" />
                             </Grid.ColumnDefinitions>
                             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" />
-                            <TextBox x:Name="TextBoxName" GotFocus="TextBoxName_OnGotFocus" TextChanged="TextBoxName_OnTextChanged" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleRemoteDesktopProfileName}">
+                            <TextBox x:Name="TextBoxName" GotFocus="TextBoxName_OnGotFocus" TextChanged="TextBoxName_OnTextChanged" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleRemoteDesktopProfileName}">
                                 <TextBox.Style>
                                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                         <Style.Triggers>
@@ -83,7 +83,7 @@
                                 </TextBox.Style>
                             </TextBox>
                             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                            <TextBox x:Name="TextBoxHost" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                            <TextBox x:Name="TextBoxHost" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                 <TextBox.Text>
                                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                         <Binding.ValidationRules>
@@ -100,7 +100,7 @@
                                 </ComboBox.InputBindings>
                             </ComboBox>
                             <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.Group}" />
-                            <ComboBox x:Name="ComboBoxGroup" Grid.Column="2" Grid.Row="6" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleGroupServers}">
+                            <ComboBox x:Name="ComboBoxGroup" Grid.Column="2" Grid.Row="6" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGroupServers}">
                                 <ComboBox.Text>
                                     <Binding Path="Group" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                         <Binding.ValidationRules>
@@ -115,7 +115,7 @@
                                 </Rectangle.Resources>
                             </Rectangle>
                             <TextBlock Grid.Column="0" Grid.Row="8" Text="{x:Static localization:Strings.Tags}" />
-                            <TextBox Grid.Column="2" Grid.Row="8" Text="{Binding Tags, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleTags}"/>
+                            <TextBox Grid.Column="2" Grid.Row="8" Text="{Binding Tags, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleTags}"/>
                             <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="8" ToolTip="{x:Static localization:Strings.HelpMessage_Tags}" Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
                                 <Rectangle.Resources>
                                     <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
@@ -169,7 +169,7 @@
                                     <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.IPv4Address}" />
-                                <TextBox x:Name="TextBoxNetworkInterfaceIPAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Address}" >
+                                <TextBox x:Name="TextBoxNetworkInterfaceIPAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}" >
                                     <TextBox.Text>
                                         <Binding Path="NetworkInterface_IPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -180,7 +180,7 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SubnetmaskOrCIDR}" />
-                                <ComboBox x:Name="ComboBoxNetworkInterfaceSubnetmaskOrCidr" Grid.Column="2" Grid.Row="2" Style="{StaticResource EditableComboBox}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4SubnetmaskIPv4CIDR}" ItemsSource="{x:Static network:Subnetmask.List}">
+                                <ComboBox x:Name="ComboBoxNetworkInterfaceSubnetmaskOrCidr" Grid.Column="2" Grid.Row="2" Style="{StaticResource EditableComboBox}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4SubnetmaskIPv4CIDR}" ItemsSource="{x:Static network:Subnetmask.List}">
                                     <ComboBox.Text>
                                         <Binding Path="NetworkInterface_SubnetmaskOrCidr" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -191,7 +191,7 @@
                                     </ComboBox.Text>
                                 </ComboBox>
                                 <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.DefaultGateway}" />
-                                <TextBox x:Name="TextBoxNetworkInterfaceGateway" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Gateway}" >
+                                <TextBox x:Name="TextBoxNetworkInterfaceGateway" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Gateway}" >
                                     <TextBox.Text>
                                         <Binding Path="NetworkInterface_Gateway" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -220,7 +220,7 @@
                                     <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.PrimaryDNSServer}" />
-                                <TextBox x:Name="TextBoxNetworkInterfacePrimaryDNSServer" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Gateway}" >
+                                <TextBox x:Name="TextBoxNetworkInterfacePrimaryDNSServer" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Gateway}" >
                                     <TextBox.Text>
                                         <Binding Path="NetworkInterface_PrimaryDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -230,7 +230,7 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.SecondaryDNSServer}" />
-                                <TextBox x:Name="TextBoxNetworkInterfaceSecondaryDNSServer" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4DNSServer}" >
+                                <TextBox x:Name="TextBoxNetworkInterfaceSecondaryDNSServer" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4DNSServer}" >
                                     <TextBox.Text>
                                         <Binding Path="NetworkInterface_SecondaryDNSServer" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -285,7 +285,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding IPScanner_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.IPRange}" />
-                                <TextBox x:Name="TextBoxIPScannerIPRange" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding IPScanner_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4SubnetWithCIDR}">
+                                <TextBox x:Name="TextBoxIPScannerIPRange" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding IPScanner_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4SubnetWithCIDR}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -360,7 +360,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding PortScanner_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxPortScannerHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding PortScanner_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxPortScannerHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding PortScanner_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -387,7 +387,7 @@
                                     </TextBox.Style>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Ports}" />
-                                <TextBox x:Name="TextBoxPortScannerPorts" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePortScanRange}">
+                                <TextBox x:Name="TextBoxPortScannerPorts" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePortScanRange}">
                                     <TextBox.Text>
                                         <Binding Path="PortScanner_Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -443,7 +443,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding Ping_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxPingHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Ping_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxPingHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Ping_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -515,7 +515,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding Traceroute_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxTracerouteHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Traceroute_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxTracerouteHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Traceroute_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -587,7 +587,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding DNSLookup_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxDNSLookupHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding DNSLookup_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxDNSLookupHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding DNSLookup_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -659,7 +659,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding RemoteDesktop_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxRemoteDesktopHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding RemoteDesktop_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxRemoteDesktopHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding RemoteDesktop_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -765,7 +765,7 @@
                                         </Style>
                                     </TextBlock.Style>
                                 </TextBlock>
-                                <TextBox x:Name="TextBoxPuTTYHost" Grid.Column="2" Grid.Row="4" IsEnabled="{Binding PuTTY_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxPuTTYHost" Grid.Column="2" Grid.Row="4" IsEnabled="{Binding PuTTY_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -792,7 +792,7 @@
                                         </Style>
                                     </TextBox.Style>
                                 </TextBox>
-                                <TextBox x:Name="TextBoxPuTTYSerialLine" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleSerialLine}" Visibility="{Binding PuTTY_UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                <TextBox x:Name="TextBoxPuTTYSerialLine" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSerialLine}" Visibility="{Binding PuTTY_UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                     <TextBox.Text>
                                         <Binding Path="PuTTY_SerialLine" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -814,7 +814,7 @@
                                         </Style>
                                     </TextBlock.Style>
                                 </TextBlock>
-                                <TextBox x:Name="TextBoxPuTTYPort" Grid.Column="2" Grid.Row="6" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort22}" Visibility="{Binding PuTTY_UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
+                                <TextBox x:Name="TextBoxPuTTYPort" Grid.Column="2" Grid.Row="6" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort22}" Visibility="{Binding PuTTY_UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
                                     <TextBox.Text>
                                         <Binding Path="PuTTY_Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -824,7 +824,7 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBox x:Name="TextBoxPuTTYBaud" Grid.Column="2" Grid.Row="6" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleBaud9600}" Visibility="{Binding PuTTY_UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                <TextBox x:Name="TextBoxPuTTYBaud" Grid.Column="2" Grid.Row="6" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleBaud9600}" Visibility="{Binding PuTTY_UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                     <TextBox.Text>
                                         <Binding Path="PuTTY_Baud" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -835,7 +835,7 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="8" Text="{x:Static localization:Strings.Username}" />
-                                <TextBox Grid.Column="2" Grid.Row="8" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleUsername}">
+                                <TextBox Grid.Column="2" Grid.Row="8" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                                     <TextBox.Text>
                                         <Binding Path="PuTTY_Username" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -904,7 +904,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding TightVNC_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxTightVNCHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding TightVNC_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxTightVNCHost" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding TightVNC_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
@@ -931,7 +931,7 @@
                                     </TextBox.Style>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Port}" />
-                                <TextBox x:Name="TextBoxTightVNCPort" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort5900}">
+                                <TextBox x:Name="TextBoxTightVNCPort" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort5900}">
                                     <TextBox.Text>
                                         <Binding Path="TightVNC_Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -987,7 +987,7 @@
                                     <ColumnDefinition Width="34" />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.MACAddress}" />
-                                <TextBox x:Name="TextBoxWakeOnLANMACAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleMACAddress}">
+                                <TextBox x:Name="TextBoxWakeOnLANMACAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleMACAddress}">
                                     <TextBox.Text>
                                         <Binding Path="WakeOnLAN_MACAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -998,7 +998,7 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Broadcast}" />
-                                <TextBox x:Name="TextBoxWakeOnLANBroadcast" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Broadcast}">
+                                <TextBox x:Name="TextBoxWakeOnLANBroadcast" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Broadcast}">
                                     <TextBox.Text>
                                         <Binding Path="WakeOnLAN_Broadcast" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -1009,7 +1009,7 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Port}" />
-                                <TextBox x:Name="TextBoxWakeOnLANPort" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort7}">
+                                <TextBox x:Name="TextBoxWakeOnLANPort" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort7}">
                                     <TextBox.Text>
                                         <Binding Path="WakeOnLAN_Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -1061,7 +1061,7 @@
                                     <ColumnDefinition Width="34" />
                                 </Grid.ColumnDefinitions>
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Host}" />
-                                <TextBox x:Name="TextBoxHTTPHeadersWebsite" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleWebsiteUri}">
+                                <TextBox x:Name="TextBoxHTTPHeadersWebsite" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleWebsiteUri}">
                                     <TextBox.Text>
                                         <Binding Path="HTTPHeaders_Website" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
@@ -1117,7 +1117,7 @@
                                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.InheritHostFromDefault}" />
                                 <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OnLabel="" OffLabel="" IsChecked="{Binding Whois_InheritHost}" />
                                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Domain}" />
-                                <TextBox x:Name="TextBoxWhoisDomain" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Whois_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}">
+                                <TextBox x:Name="TextBoxWhoisDomain" Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Whois_InheritHost, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                                             <Style.Triggers>
diff --git a/Source/NETworkManager/Views/ProfilesView.xaml b/Source/NETworkManager/Views/ProfilesView.xaml
index aed01d97f3..eac6a27da7 100644
--- a/Source/NETworkManager/Views/ProfilesView.xaml
+++ b/Source/NETworkManager/Views/ProfilesView.xaml
@@ -32,7 +32,7 @@
             </Grid.ColumnDefinitions>
             <TextBox x:Name="TextBoxSearch" Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right" Width="250" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource SearchTextBox}" />
         </Grid>
-        <controls:MultiSelectDataGrid x:Name="DataGridProfiles" Grid.Row="2" Style="{StaticResource MetroDataGrid}" FontSize="14" mah:ControlsHelper.ContentCharacterCasing="Normal" ItemsSource="{Binding Profiles}" SelectedItem="{Binding SelectedProfile}" SelectedItemsList="{Binding SelectedProfiles, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" CanUserResizeColumns="False" VerticalScrollBarVisibility="Auto" AutoGenerateColumns="false" IsReadOnly="True">
+        <controls:MultiSelectDataGrid x:Name="DataGridProfiles" Grid.Row="2" EnableRowVirtualization="True" EnableColumnVirtualization="True" ScrollViewer.CanContentScroll="True" VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.IsVirtualizingWhenGrouping="True" VirtualizingPanel.VirtualizationMode="Recycling" Style="{StaticResource MetroDataGrid}" FontSize="14" mah:ControlsHelper.ContentCharacterCasing="Normal" ItemsSource="{Binding Profiles}" SelectedItem="{Binding SelectedProfile}" SelectedItemsList="{Binding SelectedProfiles, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" CanUserResizeColumns="False" VerticalScrollBarVisibility="Auto" AutoGenerateColumns="false" IsReadOnly="True">
             <DataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened"  MinWidth="150">
@@ -123,19 +123,19 @@
                 </GroupStyle>
             </DataGrid.GroupStyle>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="{x:Static localization:Strings.Name}" Binding="{Binding (settings:ProfileInfo.Name)}" MinWidth="200" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.NetworkInterface}" Binding="{Binding (settings:ProfileInfo.NetworkInterface_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.IPScanner}" Binding="{Binding (settings:ProfileInfo.IPScanner_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.PortScanner}" Binding="{Binding (settings:ProfileInfo.PortScanner_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.Ping}" Binding="{Binding (settings:ProfileInfo.Ping_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.Traceroute}" Binding="{Binding (settings:ProfileInfo.Traceroute_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.DNSLookup}" Binding="{Binding (settings:ProfileInfo.DNSLookup_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.RemoteDesktop}" Binding="{Binding (settings:ProfileInfo.RemoteDesktop_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.PuTTY}" Binding="{Binding (settings:ProfileInfo.PuTTY_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.TightVNC}" Binding="{Binding (settings:ProfileInfo.TightVNC_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.WakeOnLAN}" Binding="{Binding (settings:ProfileInfo.WakeOnLAN_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.HTTPHeaders}" Binding="{Binding (settings:ProfileInfo.HTTPHeaders_Enabled)}" />
-                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.Whois}" Binding="{Binding (settings:ProfileInfo.Whois_Enabled)}" />
+                <DataGridTextColumn Header="{x:Static localization:Strings.Name}" Binding="{Binding (settings:ProfileInfo.Name)}" SortMemberPath="Name" MinWidth="200" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.NetworkInterface}" Binding="{Binding (settings:ProfileInfo.NetworkInterface_Enabled)}" SortMemberPath="NetworkInterface_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.IPScanner}" Binding="{Binding (settings:ProfileInfo.IPScanner_Enabled)}" SortMemberPath="IPScanner_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.PortScanner}" Binding="{Binding (settings:ProfileInfo.PortScanner_Enabled)}" SortMemberPath="PortScanner_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.Ping}" Binding="{Binding (settings:ProfileInfo.Ping_Enabled)}" SortMemberPath="Ping_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.Traceroute}" Binding="{Binding (settings:ProfileInfo.Traceroute_Enabled)}" SortMemberPath="Traceroute_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.DNSLookup}" Binding="{Binding (settings:ProfileInfo.DNSLookup_Enabled)}" SortMemberPath="DNSLookup_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.RemoteDesktop}" Binding="{Binding (settings:ProfileInfo.RemoteDesktop_Enabled)}" SortMemberPath="RemoteDesktop_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.PuTTY}" Binding="{Binding (settings:ProfileInfo.PuTTY_Enabled)}" SortMemberPath="PuTTY_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.TightVNC}" Binding="{Binding (settings:ProfileInfo.TightVNC_Enabled)}" SortMemberPath="TightVNC_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.WakeOnLAN}" Binding="{Binding (settings:ProfileInfo.WakeOnLAN_Enabled)}" SortMemberPath="WakeOnLAN_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.HTTPHeaders}" Binding="{Binding (settings:ProfileInfo.HTTPHeaders_Enabled)}" SortMemberPath="HTTPHeaders_Enabled" />
+                <DataGridCheckBoxColumn ElementStyle="{StaticResource MetroDataGridCheckBox}" Header="{x:Static localization:Strings.Whois}" Binding="{Binding (settings:ProfileInfo.Whois_Enabled)}" SortMemberPath="Whois_Enabled" />
             </DataGrid.Columns>
         </controls:MultiSelectDataGrid>
         <StackPanel Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal">
diff --git a/Source/NETworkManager/Views/ProfilesView.xaml.cs b/Source/NETworkManager/Views/ProfilesView.xaml.cs
index 9b9e706241..cb90578e30 100644
--- a/Source/NETworkManager/Views/ProfilesView.xaml.cs
+++ b/Source/NETworkManager/Views/ProfilesView.xaml.cs
@@ -2,6 +2,7 @@
 using NETworkManager.ViewModels;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace NETworkManager.Views
 {
@@ -20,9 +21,10 @@ private void ContextMenu_Opened(object sender, RoutedEventArgs e)
             if (sender is ContextMenu menu) menu.DataContext = _viewModel;
         }
 
-        private void DataGridRow_MouseDoubleClick(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            _viewModel.EditProfile();
+            if (e.ChangedButton == MouseButton.Left)
+                _viewModel.EditProfile();
         }
 
         public void Refresh()
diff --git a/Source/NETworkManager/Views/PuTTYConnectDialog.xaml b/Source/NETworkManager/Views/PuTTYConnectDialog.xaml
index 745aafcc47..8f3ba3b00f 100644
--- a/Source/NETworkManager/Views/PuTTYConnectDialog.xaml
+++ b/Source/NETworkManager/Views/PuTTYConnectDialog.xaml
@@ -67,7 +67,7 @@
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
-            <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -77,7 +77,7 @@
                     </Binding>
                 </ComboBox.Text>
             </ComboBox>
-            <ComboBox x:Name="ComboBoxSerialLine" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding SerialLineHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleSerialLine}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxSerialLine" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding SerialLineHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSerialLine}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="SerialLine" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -99,7 +99,7 @@
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
-            <ComboBox x:Name="ComboBoxPort" Grid.Column="2" Grid.Row="4" ItemsSource="{Binding PortHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort22}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxPort" Grid.Column="2" Grid.Row="4" ItemsSource="{Binding PortHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort22}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -109,7 +109,7 @@
                     </Binding>
                 </ComboBox.Text>
             </ComboBox>
-            <ComboBox x:Name="ComboBoxBaud" Grid.Column="2" Grid.Row="4" ItemsSource="{Binding BaudHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleBaud9600}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxBaud" Grid.Column="2" Grid.Row="4" ItemsSource="{Binding BaudHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleBaud9600}" Visibility="{Binding UseSerial, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Baud" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -120,7 +120,7 @@
                 </ComboBox.Text>
             </ComboBox>
             <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.Username}" />
-            <ComboBox x:Name="ComboBoxUsername" Grid.Column="2" Grid.Row="6" ItemsSource="{Binding UsernameHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleUsername}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxUsername" Grid.Column="2" Grid.Row="6" ItemsSource="{Binding UsernameHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Username" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/PuTTYHostView.xaml b/Source/NETworkManager/Views/PuTTYHostView.xaml
index aa4ab36814..e4e21815f2 100644
--- a/Source/NETworkManager/Views/PuTTYHostView.xaml
+++ b/Source/NETworkManager/Views/PuTTYHostView.xaml
@@ -12,8 +12,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
         xmlns:controls="clr-namespace:NETworkManager.Controls"
-             xmlns:wpfHelper="clr-namespace:NETworkManager.WpfHelper"
-             dialogs:DialogParticipation.Register="{Binding}"
+        xmlns:wpfHelper="clr-namespace:NETworkManager.WpfHelper"
+        xmlns:networkManager="clr-namespace:NETworkManager"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PuTTYHostViewModel}">
     <UserControl.Resources>
@@ -41,7 +42,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+                <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
             </Grid.ColumnDefinitions>
             <airspaceFixer:AirspacePanel Grid.Column="0" Grid.Row="0" FixAirspace="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsDialogOpen}">
                 <dragablz:TabablzControl ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsDialogOpen, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
@@ -99,6 +100,9 @@
                                                     <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
                                                         <Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
                                                         <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsMouseOver}" Value="True">
+                                                                <Setter Property="Foreground" Value="{DynamicResource GrayBrush5}" />
+                                                            </DataTrigger>
                                                             <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsSelected}" Value="True">
                                                                 <Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
                                                             </DataTrigger>
@@ -143,26 +147,42 @@
                         </Style.Triggers>
                     </Style>
                 </Grid.Style>
-                <StackPanel>
-                    <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                        <Rectangle Width="20" Height="20">
-                            <Rectangle.OpacityMask>
-                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                            </Rectangle.OpacityMask>
-                            <Rectangle.Style>
-                                <Style TargetType="{x:Type Rectangle}">
-                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Rectangle.Style>
-                        </Rectangle>
-                    </Button>
-                    <TextBlock Text="{x:Static localization:Strings.AddATabToOpenANewConnection}" Style="{StaticResource MessageTextBlock}" />
-                </StackPanel>
+                <Button HorizontalAlignment="Center" Command="{Binding ConnectCommand}" Style="{StaticResource CleanButton}">
+                    <Button.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Width="20" Height="20">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                                </Rectangle.OpacityMask>
+                                <Rectangle.Style>
+                                    <Style TargetType="{x:Type Rectangle}">
+                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                                <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Rectangle.Style>
+                            </Rectangle>
+                            <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToOpenANewConnection}">
+                                <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button.Content>
+                </Button>
             </Grid>
             <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
             <Expander Grid.Column="2" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -290,21 +310,25 @@
                                 </Style.Triggers>
                             </Style>
                         </Grid.Style>
-                        <StackPanel>
-                            <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                                <Button.Style>
-                                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                        <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                        <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Button.Style>
-                                <Rectangle Width="20" Height="20">
+                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                            <Button.Style>
+                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                            <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}" />
@@ -324,20 +348,23 @@
                                         </Style>
                                     </Rectangle.Style>
                                 </Rectangle>
-                            </Button>
-                            <TextBlock>
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                        <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                        </StackPanel>
+                                <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 GrayBrush5}" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                    <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                            </Grid>
+                        </Button>
                     </Grid>
                     <Button Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                         <Button.Content>
diff --git a/Source/NETworkManager/Views/PuTTYSettingsView.xaml b/Source/NETworkManager/Views/PuTTYSettingsView.xaml
index ad105970ef..106cd17d81 100644
--- a/Source/NETworkManager/Views/PuTTYSettingsView.xaml
+++ b/Source/NETworkManager/Views/PuTTYSettingsView.xaml
@@ -26,7 +26,7 @@
         <TextBlock Text="{x:Static localization:Strings.PuTTYProfile}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
         <TextBox Width="250" Text="{Binding PuTTYProfile}" HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10" />
         <TextBlock Text="{x:Static localization:Strings.DefaultSSHPort}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort22}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort22}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
             <TextBox.Text>
                 <Binding Path="SSHPort" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
@@ -37,7 +37,7 @@
             </TextBox.Text>
         </TextBox>
         <TextBlock Text="{x:Static localization:Strings.DefaultTelnetPort}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort23}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort23}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
             <TextBox.Text>
                 <Binding Path="TelnetPort" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
@@ -48,7 +48,7 @@
             </TextBox.Text>
         </TextBox> 
         <TextBlock Text="{x:Static localization:Strings.DefaultRloginPort}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort513}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort513}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
             <TextBox.Text>
                 <Binding Path="RloginPort" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
@@ -59,9 +59,9 @@
             </TextBox.Text>
         </TextBox>
         <TextBlock Text="{x:Static localization:Strings.SerialLine}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" Text="{Binding SerialLine}" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleSerialLine}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10" />
+        <TextBox Width="250" Text="{Binding SerialLine}" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSerialLine}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10" />
         <TextBlock Text="{x:Static localization:Strings.DefaultBaudRate}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleBaud9600}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleBaud9600}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
             <TextBox.Text>
                 <Binding Path="BaudRate" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml b/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
index 4a55fe195c..268fa5c74e 100644
--- a/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml
@@ -43,7 +43,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Margin="0,0,0,10" />
-            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleRemoteDesktopProfileName}" Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" Margin="0,0,0,10">
+            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleRemoteDesktopProfileName}" Visibility="{Binding ConnectAs, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" Margin="0,0,0,10">
                 <TextBox.Text>
                     <Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -53,7 +53,7 @@
                 </TextBox.Text>
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="1" Text="{x:Static localization:Strings.Host}" />
-            <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="1" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="1" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}" IsEnabled="{Binding ConnectAs, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -88,7 +88,7 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Username}" />
-                <TextBox x:Name="TextBoxUsername" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleUsername}">
+                <TextBox x:Name="TextBoxUsername" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                     <TextBox.Text>
                         <Binding Path="Username" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" >
                             <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/RemoteDesktopHostView.xaml b/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
index 5158f2ad3a..7f239abc26 100644
--- a/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
@@ -12,6 +12,7 @@
         xmlns:asf="clr-namespace:AirspaceFixer;assembly=AirspaceFixer"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:RemoteDesktopHostViewModel}">
@@ -39,7 +40,7 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+                <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
             </Grid.ColumnDefinitions>
             <asf:AirspacePanel Grid.Column="0" Grid.Row="0" FixAirspace="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsDialogOpen}">
                 <dragablz:TabablzControl ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
@@ -80,26 +81,42 @@
                         </Style.Triggers>
                     </Style>
                 </Grid.Style>
-                <StackPanel>
-                    <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                        <Rectangle Width="20" Height="20">
-                            <Rectangle.OpacityMask>
-                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                            </Rectangle.OpacityMask>
-                            <Rectangle.Style>
-                                <Style TargetType="{x:Type Rectangle}">
-                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Rectangle.Style>
-                        </Rectangle>
-                    </Button>
-                    <TextBlock Text="{x:Static localization:Strings.AddATabToOpenANewConnection}" Style="{StaticResource MessageTextBlock}" />
-                </StackPanel>
+                <Button HorizontalAlignment="Center" Command="{Binding ConnectCommand}" Style="{StaticResource CleanButton}">
+                    <Button.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Width="20" Height="20">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                                </Rectangle.OpacityMask>
+                                <Rectangle.Style>
+                                    <Style TargetType="{x:Type Rectangle}">
+                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                                <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Rectangle.Style>
+                            </Rectangle>
+                            <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToOpenANewConnection}">
+                                <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button.Content>
+                </Button>
             </Grid>
             <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
             <Expander Grid.Column="2" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -236,21 +253,25 @@
                                 </Style.Triggers>
                             </Style>
                         </Grid.Style>
-                        <StackPanel>
-                            <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                                <Button.Style>
-                                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                        <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                        <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Button.Style>
-                                <Rectangle Width="20" Height="20">
+                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                            <Button.Style>
+                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                            <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}" />
@@ -270,20 +291,23 @@
                                         </Style>
                                     </Rectangle.Style>
                                 </Rectangle>
-                            </Button>
-                            <TextBlock>
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                        <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                        </StackPanel>
+                                <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 GrayBrush5}" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                    <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                            </Grid>
+                        </Button>
                     </Grid>
                     <Button x:Name="ButtonAddProfile" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                         <Button.Content>
diff --git a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml
index 3781d80896..7d9a28910d 100644
--- a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml
@@ -60,7 +60,7 @@
         <ComboBox ItemsSource="{Binding ColorDepths}" SelectedItem="{Binding SelectedColorDepth}" Width="250" HorizontalAlignment="Left"  Margin="0,0,0,20" />
         <TextBlock Text="{x:Static localization:Strings.Network}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Text="{x:Static localization:Strings.Port}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort3389 }" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,20">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort3389 }" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,20">
             <TextBox.Text>
                 <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/SNMPHostView.xaml b/Source/NETworkManager/Views/SNMPHostView.xaml
index 99d46d26ba..6cdb35a848 100644
--- a/Source/NETworkManager/Views/SNMPHostView.xaml
+++ b/Source/NETworkManager/Views/SNMPHostView.xaml
@@ -49,26 +49,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToPerformAnSNMPAction}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToPerformAnSNMPAction}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml b/Source/NETworkManager/Views/SNMPSettingsView.xaml
index d5ff561822..466c7a926d 100644
--- a/Source/NETworkManager/Views/SNMPSettingsView.xaml
+++ b/Source/NETworkManager/Views/SNMPSettingsView.xaml
@@ -15,7 +15,7 @@
         <TextBlock Text="{x:Static localization:Strings.Timeout}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
         <mah:NumericUpDown Value="{Binding Timeout}" Maximum="900000" Minimum="100" Interval="100" Margin="0,0,0,10" />
         <TextBlock Text="{x:Static localization:Strings.Port}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
-        <TextBox Width="150" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort161}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,20">
+        <TextBox Width="150" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort161}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,20">
             <TextBox.Text>
                 <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml
index 11b3e56110..03f3d33a71 100644
--- a/Source/NETworkManager/Views/SNMPView.xaml
+++ b/Source/NETworkManager/Views/SNMPView.xaml
@@ -11,6 +11,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNMPViewModel}">
     <UserControl.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter"/>
@@ -58,7 +61,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Host}" Style="{StaticResource CenterTextBlock}" />
-            <ComboBox Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="3" x:Name="ComboBoxHost" Height="{Binding ElementName=ComboBoxOID, Path=ActualHeight}" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+            <ComboBox Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="3" x:Name="ComboBoxHost" Height="{Binding ElementName=ComboBoxOID, Path=ActualHeight}" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -72,7 +75,7 @@
             <TextBlock Grid.Column="10" Grid.Row="0" Text="{x:Static localization:Strings.Mode}" Style="{StaticResource CenterTextBlock}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}" />
             <ComboBox Grid.Column="12" Grid.Row="0" ItemsSource="{Binding Modes}" SelectedItem="{Binding Mode}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}" />
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.OID}" Style="{StaticResource CenterTextBlock}" />
-            <ComboBox Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="3" x:Name="ComboBoxOID" Height="{Binding ElementName=ButtonQuery, Path=ActualHeight}" ItemsSource="{Binding OIDHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleSNMPOID}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+            <ComboBox Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="3" x:Name="ComboBoxOID" Height="{Binding ElementName=ButtonQuery, Path=ActualHeight}" ItemsSource="{Binding OIDHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSNMPOID}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                 <ComboBox.Text>
                     <Binding Path="OID" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -94,7 +97,7 @@
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
-            <TextBox Grid.Column="8" Grid.Row="2" Grid.ColumnSpan="5" Name="TextBoxCommunity" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleSNMPCommunity}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}">
+            <TextBox Grid.Column="8" Grid.Row="2" Grid.ColumnSpan="5" Name="TextBoxCommunity" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSNMPCommunity}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Setter Property="Visibility" Value="Visible" />
@@ -149,7 +152,7 @@
                     </Style>
                 </TextBlock.Style>
             </TextBlock>
-            <TextBox Grid.Column="12" Grid.Row="2" x:Name="TextBoxUsername" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleUsername}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}">
+            <TextBox Grid.Column="12" Grid.Row="2" x:Name="TextBoxUsername" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}" IsEnabled="{Binding IsWorking, Converter={StaticResource BooleanReverseConverter}}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Setter Property="Visibility" Value="Collapsed" />
@@ -472,8 +475,8 @@
                 </Style>
             </TextBlock.Style>
         </TextBlock>
-        <DataGrid Grid.Row="5" Grid.ColumnSpan="3" Grid.Column="0" ItemsSource="{Binding QueryResultView}" SelectedItem="{Binding SelectedQueryResult}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="5" Grid.ColumnSpan="3" Grid.Column="0" ItemsSource="{Binding QueryResultsView}" SelectedItem="{Binding SelectedQueryResult}" SelectedItemsList="{Binding SelectedQueryResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -503,9 +506,29 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.Style>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.Style>
                 <Style TargetType="{x:Type DataGrid}" BasedOn="{StaticResource DefaultDataGrid}">
                     <Setter Property="Visibility" Value="Collapsed" />
                     <Style.Triggers>
@@ -517,21 +540,22 @@
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.Style>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Style>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.RowStyle>
             <DataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.OID}" Binding="{Binding (network:SNMPReceivedInfo.OID)}" MinWidth="200" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Data}" Binding="{Binding (network:SNMPReceivedInfo.Data)}" MinWidth="300" Width="*" />
             </DataGrid.Columns>
-        </DataGrid>
+        </controls:MultiSelectDataGrid>
         <TextBox Grid.Row="5" Grid.Column="0" Text="{Binding Data}">
             <TextBox.Style>
                 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource ConsoleTextBox}">
@@ -547,7 +571,6 @@
                 </Style>
             </TextBox.Style>
         </TextBox>
-
         <Expander Grid.Row="7" Grid.ColumnSpan="3" Grid.Column="0" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
diff --git a/Source/NETworkManager/Views/SNMPView.xaml.cs b/Source/NETworkManager/Views/SNMPView.xaml.cs
index dcc3bc03c9..bb7365c5a5 100644
--- a/Source/NETworkManager/Views/SNMPView.xaml.cs
+++ b/Source/NETworkManager/Views/SNMPView.xaml.cs
@@ -1,5 +1,6 @@
 using NETworkManager.ViewModels;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 
 namespace NETworkManager.Views
 {
@@ -11,7 +12,7 @@ public SNMPView(int tabId, string host = null)
         {
             InitializeComponent();
 
-            _viewModel = new SNMPViewModel(tabId, host);
+            _viewModel = new SNMPViewModel(DialogCoordinator.Instance, tabId, host);
 
             DataContext = _viewModel;
         }
diff --git a/Source/NETworkManager/Views/SubnetCalculatorCalculatorView.xaml b/Source/NETworkManager/Views/SubnetCalculatorCalculatorView.xaml
index 14b6f45077..d356f354cc 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorCalculatorView.xaml
+++ b/Source/NETworkManager/Views/SubnetCalculatorCalculatorView.xaml
@@ -32,7 +32,7 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.Subnet}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-            <ComboBox Grid.Column="2" x:Name="ComboBoxSubnet" ItemsSource="{Binding SubnetHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4IPv6Subnet}" Style="{StaticResource HistoryComboBox}" >
+            <ComboBox Grid.Column="2" x:Name="ComboBoxSubnet" ItemsSource="{Binding SubnetHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4IPv6Subnet}" Style="{StaticResource HistoryComboBox}" >
                 <ComboBox.Text>
                     <Binding Path="Subnet" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" >
                         <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/SubnetCalculatorHostView.xaml b/Source/NETworkManager/Views/SubnetCalculatorHostView.xaml
index 0a858a4e56..4d2d70d0c6 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorHostView.xaml
+++ b/Source/NETworkManager/Views/SubnetCalculatorHostView.xaml
@@ -23,8 +23,8 @@
         <TabItem Header="{x:Static localization:Strings.Subnetting}">
             <views:SubnetCalculatorSubnettingView Margin="10" />
         </TabItem>
-        <TabItem Header="{x:Static localization:Strings.Supernetting}">
-            <views:SubnetCalculatorSupernettingView Margin="10" />
+        <TabItem Header="{x:Static localization:Strings.WideSubnet}">
+            <views:SubnetCalculatorWideSubnetView Margin="10" />
         </TabItem>
     </TabControl>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
index da8977ebd4..c3fb810a57 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
+++ b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml
@@ -12,6 +12,7 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:net="clr-namespace:System.Net;assembly=System.Net.IPNetwork"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SubnetCalculatorSubnettingViewModel}">
     <UserControl.Resources>
@@ -50,7 +51,7 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.Subnet}" />
-                <ComboBox Grid.Column="2" Grid.Row="0" x:Name="ComboBoxSubnet" Height="{Binding ElementName=ComboBoxNewSubnetmaskOrCIDR, Path=ActualHeight}" ItemsSource="{Binding SubnetHistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4IPv6Subnet}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" Grid.Row="0" x:Name="ComboBoxSubnet" Height="{Binding ElementName=ComboBoxNewSubnetmaskOrCIDR, Path=ActualHeight}" ItemsSource="{Binding SubnetHistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4IPv6Subnet}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Subnet" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" >
                             <Binding.ValidationRules>
@@ -61,7 +62,7 @@
                     </ComboBox.Text>
                 </ComboBox>
                 <TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.NewSubnetmaskOrCIDR}" />
-                <ComboBox x:Name="ComboBoxNewSubnetmaskOrCIDR" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding NewSubnetmaskOrCIDRHistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4SubnetmaskIPv6CIDR}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox x:Name="ComboBoxNewSubnetmaskOrCIDR" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding NewSubnetmaskOrCIDRHistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4SubnetmaskIPv6CIDR}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="NewSubnetmaskOrCIDR" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" >
                             <Binding.ValidationRules>
@@ -134,8 +135,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Text="{x:Static localization:Strings.Result}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding SubnetsResultView}" Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" SelectedItem="{Binding SelectedSubnetResult}">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" ItemsSource="{Binding SubnetsResultsView}" Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" SelectedItem="{Binding SelectedSubnetResult}" SelectedItemsList="{Binding SelectedSubnetResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
                     <MenuItem Header="{x:Static localization:Strings.CopyDots}">
@@ -219,18 +220,39 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count,RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.NetworkAddress}" Binding="{Binding (net:IPNetwork.Network), Converter={StaticResource IPAddressToStringConverter}}" MinWidth="150" Width="Auto" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Broadcast}" Binding="{Binding (net:IPNetwork.Broadcast), Converter={StaticResource IPAddressToStringConverter}}" MinWidth="150" Width="Auto" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.IPAddresses}" Binding="{Binding (net:IPNetwork.Total), Converter={StaticResource BigIntegerToStringConverter}}" MinWidth="150"  Width="Auto" />
@@ -239,8 +261,8 @@
                 <DataGridTextColumn Header="{x:Static localization:Strings.FirstUsableIPAddress}" Binding="{Binding (net:IPNetwork.FirstUsable), Converter={StaticResource IPAddressToStringConverter}}" MinWidth="150" Width="Auto" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.LastUsableIPAddress}" Binding="{Binding (net:IPNetwork.LastUsable), Converter={StaticResource IPAddressToStringConverter}}" MinWidth="150" Width="Auto" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Hosts}" Binding="{Binding (net:IPNetwork.Usable), Converter={StaticResource BigIntegerToStringConverter}}" MinWidth="80" Width="Auto" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
         <TextBlock Grid.Row="3" Foreground="{DynamicResource GrayBrush3}" Text="{x:Static localization:Strings.EnterSubnetAndANewSubnetmaskToCreateSubnets}" Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderTextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml b/Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml
similarity index 87%
rename from Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml
rename to Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml
index c122d9657c..02689b660b 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml
+++ b/Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.SubnetCalculatorSupernettingView"
+<UserControl x:Class="NETworkManager.Views.SubnetCalculatorWideSubnetView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -18,7 +18,6 @@
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
         <converters:IPAddressToStringConverter x:Key="IPAddressToStringConverter" />
-        <converters:ValidateSubnetCalculatorSupernettingConverter x:Key="ValidateSubnetCalculatorSupernettingConverter" />
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
@@ -47,23 +46,23 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.Subnet1}" />
-                <ComboBox Grid.Column="2" Grid.Row="0" x:Name="ComboBoxSubnet1" Height="{Binding ElementName=ComboBoxSubnet2, Path=ActualHeight}" ItemsSource="{Binding Subnet1HistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4IPv6Subnet}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" Grid.Row="0" x:Name="ComboBoxSubnet1" Height="{Binding ElementName=ComboBoxSubnet2, Path=ActualHeight}" ItemsSource="{Binding Subnet1HistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Subnet}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Subnet1" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" >
                             <Binding.ValidationRules>
                                 <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
-                                <validators:IPv4IPv6SubnetValidator ValidatesOnTargetUpdated="True" />
+                                <validators:IPv4SubnetValidator ValidatesOnTargetUpdated="True" />
                             </Binding.ValidationRules>
                         </Binding>
                     </ComboBox.Text>
                 </ComboBox>
                 <TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.Subnet2}" />
-                <ComboBox x:Name="ComboBoxSubnet2" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding Subnet2HistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4IPv6Subnet2}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox x:Name="ComboBoxSubnet2" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding Subnet2HistoryView}" IsEnabled="{Binding IsCalculationRunning, Converter={StaticResource BooleanReverseConverter}}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Subnet2}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Subnet2" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" >
                             <Binding.ValidationRules>
                                 <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
-                                <validators:IPv4IPv6SubnetValidator ValidatesOnTargetUpdated="True" />
+                                <validators:IPv4SubnetValidator ValidatesOnTargetUpdated="True" />
                             </Binding.ValidationRules>
                         </Binding>
                     </ComboBox.Text>
@@ -72,15 +71,10 @@
                     <Button.Style>
                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
                             <Style.Triggers>
-                                <DataTrigger Value="False">
-                                    <DataTrigger.Binding>
-                                        <MultiBinding Converter="{StaticResource ValidateSubnetCalculatorSupernettingConverter}">
-                                            <Binding ElementName="ComboBoxSubnet1" Path="(Validation.HasError)" />
-                                            <Binding ElementName="ComboBoxSubnet2" Path="(Validation.HasError)" />
-                                            <Binding Path="Subnet1" />
-                                            <Binding Path="Subnet2" />
-                                        </MultiBinding>
-                                    </DataTrigger.Binding>
+                                <DataTrigger Binding="{Binding ElementName=ComboBoxSubnet1, Path=(Validation.HasError)}" Value="True">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding ElementName=ComboBoxSubnet2, Path=(Validation.HasError)}" Value="True">
                                     <Setter Property="IsEnabled" Value="False" />
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding IsCalculationRunning}" Value="True">
@@ -163,6 +157,6 @@
                 </Grid>
             </ScrollViewer>
         </StackPanel>
-        <TextBlock Grid.Row="2" Foreground="{DynamicResource GrayBrush3}" Text="{x:Static localization:Strings.EnterSubnetsToCreateASupernet}" Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderTextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" />
+        <TextBlock Grid.Row="2" Foreground="{DynamicResource GrayBrush3}" Text="{x:Static localization:Strings.EnterSubnetsToCreateAWideSubnet}" Visibility="{Binding IsResultVisible, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderTextBlock}" VerticalAlignment="Center" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center" Margin="10,0" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs b/Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml.cs
similarity index 62%
rename from Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs
rename to Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml.cs
index ce5549a78d..8a4c29ffbd 100644
--- a/Source/NETworkManager/Views/SubnetCalculatorSupernettingView.xaml.cs
+++ b/Source/NETworkManager/Views/SubnetCalculatorWideSubnetView.xaml.cs
@@ -3,11 +3,11 @@
 
 namespace NETworkManager.Views
 {
-    public partial class SubnetCalculatorSupernettingView
+    public partial class SubnetCalculatorWideSubnetView
     {
-        private readonly SubnetCalculatorSupernettingViewModel _viewModel = new SubnetCalculatorSupernettingViewModel(DialogCoordinator.Instance);
+        private readonly SubnetCalculatorWideSubnetViewModel _viewModel = new SubnetCalculatorWideSubnetViewModel(DialogCoordinator.Instance);
 
-        public SubnetCalculatorSupernettingView()
+        public SubnetCalculatorWideSubnetView()
         {
             InitializeComponent();
             DataContext = _viewModel;
diff --git a/Source/NETworkManager/Views/TightVNCConnectDialog.xaml b/Source/NETworkManager/Views/TightVNCConnectDialog.xaml
index c144b60688..2e5f1e30db 100644
--- a/Source/NETworkManager/Views/TightVNCConnectDialog.xaml
+++ b/Source/NETworkManager/Views/TightVNCConnectDialog.xaml
@@ -33,7 +33,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Host}" />
-            <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="0" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostname}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="0" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostname}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -44,7 +44,7 @@
                 </ComboBox.Text>
             </ComboBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Port}" />
-            <ComboBox x:Name="ComboBoxPort" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding PortHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort5900}" Style="{StaticResource EditableComboBox}">
+            <ComboBox x:Name="ComboBoxPort" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding PortHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort5900}" Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/TightVNCHostView.xaml b/Source/NETworkManager/Views/TightVNCHostView.xaml
index c0b050e35a..ed0f9b7dd1 100644
--- a/Source/NETworkManager/Views/TightVNCHostView.xaml
+++ b/Source/NETworkManager/Views/TightVNCHostView.xaml
@@ -11,9 +11,8 @@
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
-        xmlns:controls="clr-namespace:NETworkManager.Controls"
-             xmlns:wpfHelper="clr-namespace:NETworkManager.WpfHelper"
-             dialogs:DialogParticipation.Register="{Binding}"
+        xmlns:networkManager="clr-namespace:NETworkManager"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TightVNCHostViewModel}">
     <UserControl.Resources>
@@ -41,13 +40,10 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
-                <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+                <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
             </Grid.ColumnDefinitions>
             <airspaceFixer:AirspacePanel Grid.Column="0" Grid.Row="0" FixAirspace="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsDialogOpen}">
                 <dragablz:TabablzControl ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}" Visibility="{Binding Source={x:Static settings:ConfigurationManager.Current}, Path=IsDialogOpen, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
-                    <dragablz:TabablzControl.Resources>
-                        <wpfHelper:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
-                    </dragablz:TabablzControl.Resources>
                     <dragablz:TabablzControl.InterTabController>
                         <dragablz:InterTabController InterTabClient="{Binding InterTabClient}" MoveWindowWithSolitaryTabs="False" x:Name="InterTabController" />
                     </dragablz:TabablzControl.InterTabController>
@@ -85,26 +81,42 @@
                         </Style.Triggers>
                     </Style>
                 </Grid.Style>
-                <StackPanel>
-                    <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                        <Rectangle Width="20" Height="20">
-                            <Rectangle.OpacityMask>
-                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                            </Rectangle.OpacityMask>
-                            <Rectangle.Style>
-                                <Style TargetType="{x:Type Rectangle}">
-                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Rectangle.Style>
-                        </Rectangle>
-                    </Button>
-                    <TextBlock Text="{x:Static localization:Strings.AddATabToOpenANewConnection}" Style="{StaticResource MessageTextBlock}" />
-                </StackPanel>
+                <Button HorizontalAlignment="Center" Command="{Binding ConnectCommand}" Style="{StaticResource CleanButton}">
+                    <Button.Content>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Rectangle Width="20" Height="20">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                                </Rectangle.OpacityMask>
+                                <Rectangle.Style>
+                                    <Style TargetType="{x:Type Rectangle}">
+                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                                <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Rectangle.Style>
+                            </Rectangle>
+                            <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToOpenANewConnection}">
+                                <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button.Content>
+                </Button>
             </Grid>
             <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
             <Expander Grid.Column="2" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -232,21 +244,25 @@
                                 </Style.Triggers>
                             </Style>
                         </Grid.Style>
-                        <StackPanel>
-                            <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                                <Button.Style>
-                                    <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                        <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                        <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </Button.Style>
-                                <Rectangle Width="20" Height="20">
+                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                            <Button.Style>
+                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                            <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}" />
@@ -266,20 +282,23 @@
                                         </Style>
                                     </Rectangle.Style>
                                 </Rectangle>
-                            </Button>
-                            <TextBlock>
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                        <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
-                        </StackPanel>
+                                <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 GrayBrush5}" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                    <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                            </Grid>
+                        </Button>
                     </Grid>
                     <Button Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                         <Button.Content>
diff --git a/Source/NETworkManager/Views/TightVNCSettingsView.xaml b/Source/NETworkManager/Views/TightVNCSettingsView.xaml
index 952f3971ac..d8b5ac6f8a 100644
--- a/Source/NETworkManager/Views/TightVNCSettingsView.xaml
+++ b/Source/NETworkManager/Views/TightVNCSettingsView.xaml
@@ -24,7 +24,7 @@
         </TextBox>
         <Button Content="{x:Static localization:Strings.ConfigureTightVNC}" Command="{Binding ConfigureTightVNCCommand}" IsEnabled="{Binding IsTightVNCConfigured}" Style="{StaticResource DefaultButton}" HorizontalAlignment="Left" Margin="0,0,0,10" />
         <TextBlock Text="{x:Static localization:Strings.DefaultVNCPort}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
-        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort5900}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
+        <TextBox Width="250" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort5900}" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10">
             <TextBox.Text>
                 <Binding Path="VNCPort" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/TracerouteHostView.xaml b/Source/NETworkManager/Views/TracerouteHostView.xaml
index 84c38d1ff1..1349967efc 100644
--- a/Source/NETworkManager/Views/TracerouteHostView.xaml
+++ b/Source/NETworkManager/Views/TracerouteHostView.xaml
@@ -9,6 +9,7 @@
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TracerouteHostViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" Grid.Row="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -61,26 +62,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToPerformATrace}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToPerformATrace}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -199,21 +216,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -233,20 +254,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml
index fe6d3de121..2f37febd75 100644
--- a/Source/NETworkManager/Views/TracerouteView.xaml
+++ b/Source/NETworkManager/Views/TracerouteView.xaml
@@ -12,6 +12,9 @@
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:network="clr-namespace:NETworkManager.Models.Network"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:controls="clr-namespace:NETworkManager.Controls"
+        dialogs:DialogParticipation.Register="{Binding}"
         Loaded="UserControl_Loaded"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TracerouteViewModel}">
     <UserControl.Resources>
@@ -47,7 +50,7 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.Host}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                <ComboBox Grid.Column="2" x:Name="TextBoxHost" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsTraceRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="2" x:Name="TextBoxHost" ItemsSource="{Binding HostHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}" IsEnabled="{Binding IsTraceRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -113,8 +116,8 @@
             <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{x:Static localization:Strings.Route}" Style="{StaticResource HeaderTextBlock}" />
-        <DataGrid Grid.Row="3" ItemsSource="{Binding TraceResultView}" SelectedItem="{Binding SelectedTraceResult}" CanUserSortColumns="False">
-            <DataGrid.Resources>
+        <controls:MultiSelectDataGrid Grid.Row="3" Style="{StaticResource DefaultDataGrid}" CanUserSortColumns="False" ItemsSource="{Binding TraceResultsView}" SelectedItem="{Binding SelectedTraceResult}" SelectedItemsList="{Binding SelectedTraceResults, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <controls:MultiSelectDataGrid.Resources>
                 <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource DataGridScrollBar}" />
                 <wpfHelpers:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
                 <ContextMenu x:Key="RowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
@@ -272,18 +275,39 @@
                             </MenuItem.Icon>
                         </MenuItem>
                     </MenuItem>
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+                <ContextMenu x:Key="MultiRowContextMenu" Opened="ContextMenu_Opened" MinWidth="150">
+                    <MenuItem Header="{x:Static localization:Strings.ExportDots}" Command="{Binding ExportCommand}">
+                        <MenuItem.Icon>
+                            <Rectangle Width="16" Height="16" Fill="{DynamicResource BlackColorBrush}">
+                                <Rectangle.OpacityMask>
+                                    <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Export}" />
+                                </Rectangle.OpacityMask>
+                            </Rectangle>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </ContextMenu>
-            </DataGrid.Resources>
-            <DataGrid.RowStyle>
+            </controls:MultiSelectDataGrid.Resources>
+            <controls:MultiSelectDataGrid.RowStyle>
                 <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource MetroDataGridRow}">
+                    <Setter Property="ContextMenu" Value="{StaticResource MultiRowContextMenu}"/>
                     <Style.Triggers>
                         <DataTrigger Binding="{Binding SelectedItems.Count, RelativeSource={RelativeSource FindAncestor,AncestorType={x:Type DataGrid}}}" Value="1" >
                             <Setter Property="ContextMenu" Value="{StaticResource RowContextMenu}"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
-            </DataGrid.RowStyle>
-            <DataGrid.Columns>
+            </controls:MultiSelectDataGrid.RowStyle>
+            <controls:MultiSelectDataGrid.Columns>
                 <DataGridTextColumn Header="{x:Static localization:Strings.Hop}" Binding="{Binding (network:TracerouteHopInfo.Hop)}" MinWidth="80" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Time1}" MinWidth="100">
                     <DataGridTextColumn.Binding>
@@ -311,8 +335,8 @@
                 </DataGridTextColumn>
                 <DataGridTextColumn Header="{x:Static localization:Strings.IPAddress}" Binding="{Binding (network:TracerouteHopInfo.IPAddress), Converter={StaticResource IPAddressToStringConverter}}" MinWidth="150" />
                 <DataGridTextColumn Header="{x:Static localization:Strings.Hostname}" Binding="{Binding (network:TracerouteHopInfo.Hostname)}" Visibility="{Binding Data.ResolveHostname, Source={StaticResource BindingProxy}, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" MinWidth="150" Width="*" />
-            </DataGrid.Columns>
-        </DataGrid>
+            </controls:MultiSelectDataGrid.Columns>
+        </controls:MultiSelectDataGrid>
         <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
             <Expander.Header>
                 <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
diff --git a/Source/NETworkManager/Views/TracerouteView.xaml.cs b/Source/NETworkManager/Views/TracerouteView.xaml.cs
index 0e75433cb7..5bea0113b9 100644
--- a/Source/NETworkManager/Views/TracerouteView.xaml.cs
+++ b/Source/NETworkManager/Views/TracerouteView.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Controls;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views
@@ -12,7 +13,7 @@ public TracerouteView(int tabId, string host = null)
         {
             InitializeComponent();
 
-            _viewModel = new TracerouteViewModel(tabId, host);
+            _viewModel = new TracerouteViewModel(DialogCoordinator.Instance, tabId, host);
 
             DataContext = _viewModel;
 
diff --git a/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml b/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml
index 156221eb4d..c3b79a7360 100644
--- a/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml
+++ b/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml
@@ -11,7 +11,7 @@
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.WakeOnLAN}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Text="{x:Static localization:Strings.DefaultPort}" Style="{StaticResource DefaultTextBlock}" Margin="0,0,0,10" />
-        <TextBox Width="80" HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort7}">
+        <TextBox Width="80" HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort7}">
             <TextBox.Text>
                 <Binding Path="DefaultPort" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/WakeOnLANView.xaml b/Source/NETworkManager/Views/WakeOnLANView.xaml
index 2acfeb1372..ba2ddb76c2 100644
--- a/Source/NETworkManager/Views/WakeOnLANView.xaml
+++ b/Source/NETworkManager/Views/WakeOnLANView.xaml
@@ -12,6 +12,7 @@
              xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+             xmlns:networkManager="clr-namespace:NETworkManager"
              dialogs:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WakeOnLANViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <Grid Grid.Row="0" Margin="10">
             <Grid.RowDefinitions>
@@ -49,7 +50,7 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
                 <TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{x:Static localization:Strings.MACAddress}" />
-                <TextBox Grid.Column="2" Grid.Row="0" x:Name="TextBoxMACAddress" Height="{Binding ElementName=TextBoxPort, Path=ActualHeight}" wpfHelpers:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleMACAddress}">
+                <TextBox Grid.Column="2" Grid.Row="0" x:Name="TextBoxMACAddress" Height="{Binding ElementName=TextBoxPort, Path=ActualHeight}" wpfHelpers:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleMACAddress}">
                     <TextBox.InputBindings>
                         <KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
                     </TextBox.InputBindings>
@@ -63,7 +64,7 @@
                     </TextBox.Text>
                 </TextBox>
                 <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Broadcast}" Style="{StaticResource CenterTextBlock}" />
-                <TextBox x:Name="TextBoxBroadcast" Grid.Column="2" Grid.Row="2" Height="{Binding ElementName=TextBoxPort, Path=ActualHeight}" wpfHelpers:ProtocolSettingsLayout.MVVMHasError="{Binding BroadcastHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleIPv4Broadcast}">
+                <TextBox x:Name="TextBoxBroadcast" Grid.Column="2" Grid.Row="2" Height="{Binding ElementName=TextBoxPort, Path=ActualHeight}" wpfHelpers:ProtocolSettingsLayout.MVVMHasError="{Binding BroadcastHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Broadcast}">
                     <TextBox.InputBindings>
                         <KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
                     </TextBox.InputBindings>
@@ -77,7 +78,7 @@
                     </TextBox.Text>
                 </TextBox>
                 <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Port}" Style="{StaticResource CenterTextBlock}" />
-                <TextBox x:Name="TextBoxPort" Grid.Column="2" Grid.Row="4" wpfHelpers:ProtocolSettingsLayout.MVVMHasError="{Binding PortHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExamplePort7}" HorizontalAlignment="Left" Width="65" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
+                <TextBox x:Name="TextBoxPort" Grid.Column="2" Grid.Row="4" wpfHelpers:ProtocolSettingsLayout.MVVMHasError="{Binding PortHasError}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort7}" HorizontalAlignment="Left" Width="65" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
                     <TextBox.InputBindings>
                         <KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
                     </TextBox.InputBindings>
@@ -252,21 +253,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -286,20 +291,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/WhoisHostView.xaml b/Source/NETworkManager/Views/WhoisHostView.xaml
index bae684f0e7..daf8443abd 100644
--- a/Source/NETworkManager/Views/WhoisHostView.xaml
+++ b/Source/NETworkManager/Views/WhoisHostView.xaml
@@ -9,6 +9,7 @@
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
         xmlns:converters="clr-namespace:NETworkManager.Converters"
         xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        xmlns:networkManager="clr-namespace:NETworkManager"
         dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WhoisHostViewModel}">
     <UserControl.Resources>
@@ -22,7 +23,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition MinWidth="40" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="350" />
+            <ColumnDefinition MinWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileWidthCollapsed}" Width="{Binding ProfileWidth, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" MaxWidth="{x:Static networkManager:GlobalStaticConfiguration.ProfileMaxWidthExpanded}" />
         </Grid.ColumnDefinitions>
         <dragablz:TabablzControl Grid.Column="0" ClosingItemCallback="{Binding CloseItemCommand}" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
@@ -61,26 +62,42 @@
                     </Style.Triggers>
                 </Style>
             </Grid.Style>
-            <StackPanel>
-                <Button HorizontalAlignment="Center" Focusable="False" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Style="{StaticResource CleanButton}" Margin="0,0,0,10">
-                    <Rectangle Width="20" Height="20">
-                        <Rectangle.OpacityMask>
-                            <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
-                        </Rectangle.OpacityMask>
-                        <Rectangle.Style>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
-                                        <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Rectangle.Style>
-                    </Rectangle>
-                </Button>
-                <TextBlock Text="{x:Static localization:Strings.AddATabToQueryWhois}" Style="{StaticResource MessageTextBlock}" />
-            </StackPanel>
+            <Button HorizontalAlignment="Center" Command="{Binding AddTabCommand}" Style="{StaticResource CleanButton}">
+                <Button.Content>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Rectangle Width="20" Height="20">
+                            <Rectangle.OpacityMask>
+                                <VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
+                            </Rectangle.OpacityMask>
+                            <Rectangle.Style>
+                                <Style TargetType="{x:Type Rectangle}">
+                                    <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
+                                            <Setter Property="Fill" Value="{DynamicResource GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Rectangle.Style>
+                        </Rectangle>
+                        <TextBlock Grid.Column="1" Text="{x:Static localization:Strings.AddATabToQueryWhois}">
+                            <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 GrayBrush5}" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </TextBlock.Style>
+                        </TextBlock>
+                    </Grid>
+                </Button.Content>
+            </Button>
         </Grid>
         <GridSplitter Grid.Column="1" Style="{StaticResource ProfileGridSplitter}" />
         <Expander Grid.Column="2" x:Name="ExpanderProfiles" Header="{x:Static localization:Strings.Profiles}" Style="{StaticResource RightExpander}" IsExpanded="{Binding ExpandProfileView}">
@@ -199,21 +216,25 @@
                             </Style.Triggers>
                         </Style>
                     </Grid.Style>
-                    <StackPanel>
-                        <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
-                            <Button.Style>
-                                <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
-                                    <Setter Property="Command" Value="{Binding AddProfileCommand}" />
-                                    <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
-                                            <Setter Property="ToolTip" Value="{x:Static localization:Strings.ClearFilter}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Button.Style>
-                            <Rectangle Width="20" Height="20">
+                    <Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
+                        <Button.Style>
+                            <Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
+                                <Setter Property="Command" Value="{Binding AddProfileCommand}" />
+                                <Setter Property="ToolTip" Value="{x:Static localization:Strings.AddProfileDots}" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                        <Setter Property="Command" Value="{Binding ClearSearchCommand}" />
+                                        <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}" />
@@ -233,20 +254,23 @@
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                        </Button>
-                        <TextBlock>
-                            <TextBlock.Style>
-                                <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MessageTextBlock}">
-                                    <Setter Property="Text" Value="{x:Static localization:Strings.NoProfilesFoundCreateOne}" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
-                                            <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </TextBlock.Style>
-                        </TextBlock>
-                    </StackPanel>
+                            <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 GrayBrush5}" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding Search, Converter={StaticResource NullOrEmptyToBoolConverter}}" Value="False">
+                                                <Setter Property="Text" Value="{x:Static localization:Strings.NothingFound}" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBlock.Style>
+                            </TextBlock>
+                        </Grid>
+                    </Button>
                 </Grid>
                 <Button x:Name="ButtonAddProfile" Grid.Column="0" Grid.Row="4" Command="{Binding AddProfileCommand}" Style="{StaticResource ImageWithTextButton}">
                     <Button.Content>
diff --git a/Source/NETworkManager/Views/WhoisView.xaml b/Source/NETworkManager/Views/WhoisView.xaml
index 9429f1f66d..cd41095141 100644
--- a/Source/NETworkManager/Views/WhoisView.xaml
+++ b/Source/NETworkManager/Views/WhoisView.xaml
@@ -10,6 +10,9 @@
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
         xmlns:localization="clr-namespace:NETworkManager.Resources.Localization"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
+        xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+        dialogs:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WhoisViewModel}" Loaded="UserControl_OnLoaded">
     <UserControl.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter"/>
@@ -41,7 +44,7 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0" Text="{x:Static localization:Strings.Domain}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" />
-                    <ComboBox Grid.Column="2" x:Name="ComboBoxWebsiteUri" ItemsSource="{Binding WebsiteUriHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.ExampleDomain}" IsEnabled="{Binding IsWhoisRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                    <ComboBox Grid.Column="2" x:Name="ComboBoxWebsiteUri" ItemsSource="{Binding WebsiteUriHistoryView}" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}" IsEnabled="{Binding IsWhoisRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                         <ComboBox.Text>
                             <Binding Path="Domain" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                                 <Binding.ValidationRules>
@@ -101,7 +104,24 @@
                 <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding StatusMessage}" Visibility="{Binding DisplayStatusMessage, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
             </Grid>
             <TextBlock Grid.Row="2" Style="{StaticResource HeaderTextBlock}" Text="{x:Static localization:Strings.Result}" />
-            <TextBox Grid.Row="3" Text="{Binding WhoisResult}" Style="{StaticResource ConsoleTextBox}" IsReadOnly="True" ContextMenu="{StaticResource CopyContextMenu}"/>
+            <TextBox Grid.Row="3" VerticalScrollBarVisibility="Auto" Text="{Binding WhoisResult}" IsReadOnly="True" >
+                <TextBox.Resources>
+                    <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource TextBoxScrollBar}" />
+                </TextBox.Resources>
+                <TextBox.Style>
+                    <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource ConsoleTextBox}">
+                        <Setter Property="ContextMenu" Value="{StaticResource CopyExportContextMenu}" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding WhoisResult}" Value="{x:Static sys:String.Empty}">
+                                <Setter Property="ContextMenu" Value="{x:Null}" />
+                            </DataTrigger>
+                            <DataTrigger Binding="{Binding WhoisResult}" Value="{x:Null}">
+                                <Setter Property="ContextMenu" Value="{x:Null}" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBox.Style>
+            </TextBox>
             <Expander Grid.Row="4" IsExpanded="{Binding ExpandStatistics}" Visibility="{Binding ShowStatistics, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" Style="{StaticResource HeaderExpander}" Margin="0,20,0,0">
                 <Expander.Header>
                     <TextBlock Text="{x:Static localization:Strings.Statistics}" Style="{StaticResource HeaderTextBlock}" Margin="0" />
@@ -133,7 +153,7 @@
                         <TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Duration, StringFormat={}{0:hh}h {0:mm}m {0:ss}s {0:ff}ms}" />
                         <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.EndTime}" />
                         <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding EndTime, Converter={StaticResource NullableDateTimeToStringConverter}}" />
-                       <!-- <TextBlock Grid.Column="3" Grid.Row="0" Text="{x:Static localization:Strings.Headers}" />
+                        <!-- <TextBlock Grid.Column="3" Grid.Row="0" Text="{x:Static localization:Strings.Headers}" />
                         <TextBox Grid.Column="4" Grid.Row="0" Text="{Binding HeadersCount}" />-->
                     </Grid>
                 </StackPanel>
diff --git a/Source/NETworkManager/Views/WhoisView.xaml.cs b/Source/NETworkManager/Views/WhoisView.xaml.cs
index df281434f9..33e09c18aa 100644
--- a/Source/NETworkManager/Views/WhoisView.xaml.cs
+++ b/Source/NETworkManager/Views/WhoisView.xaml.cs
@@ -1,4 +1,5 @@
 using System.Windows;
+using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views
@@ -11,7 +12,7 @@ public WhoisView(int tabId, string domain = null)
         {
             InitializeComponent();
 
-            _viewModel = new WhoisViewModel(tabId, domain);
+            _viewModel = new WhoisViewModel(DialogCoordinator.Instance, tabId, domain);
 
             DataContext = _viewModel;
         }
diff --git a/Source/NETworkManager/packages.config b/Source/NETworkManager/packages.config
index 81a288c50e..f4f643930a 100644
--- a/Source/NETworkManager/packages.config
+++ b/Source/NETworkManager/packages.config
@@ -7,5 +7,6 @@
   <package id="Lextm.SharpSnmpLib" version="10.0.11" targetFramework="net46" />
   <package id="MahApps.Metro" version="1.6.5" targetFramework="net46" />
   <package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="Octokit" version="0.32.0" targetFramework="net46" />
 </packages>
\ No newline at end of file